diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
| commit | cde3c08d7e9e486d7d1a795832ea1b767d96a4f3 (patch) | |
| tree | f1af1424ebf5cb3a548a7d73257723395dccb267 /res/values/strings.xml | |
| parent | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (diff) | |
| parent | 5f2b8712079aeb5b7cee476b06b36013edac4fb3 (diff) | |
| download | southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar.gz | |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6333664..f3850a3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -74,6 +74,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< </string-array> <!-- Preferences Messages --> + <string name="preferences_catagory_appearance">Appearance</string> + <string name="preferences_show_identifiers">Show Identifiers</string> + <string name="preferences_show_identifiers_enabled">Showing Identifiers</string> + <string name="preferences_show_identifiers_disabled">Hiding Identifiers</string> <string name="preferences_catagory_positioning">Positioning</string> <string name="preferences_gps">GPS</string> <string name="preferences_gps_enabled">GPS Enabled</string> @@ -102,7 +106,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< <!-- About Strings --> <string name="about">About</string> <string name="about_version">Version</string> - <string name="about_version_summary">0.4 (alpha)</string> + <string name="about_version_summary">0.5 (alpha)</string> <string name="about_copyright">Copyright</string> <string name="about_copyright_summary">© 2012, Christopher Baines</string> <string name="about_license">License</string> |