diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
| commit | 40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d (patch) | |
| tree | b6a6fa2fdbb7009859ef0ca4616a8b9c59169440 /res/values/strings.xml | |
| parent | 4b4a5a0ebc7f285d7cdcfa1d72640dbc097bdbb2 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar.gz | |
Merge branch 'dev'
Conflicts:
AndroidManifest.xml
res/values/strings.xml
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 7c08887..c602a26 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -17,6 +17,7 @@ <string name="U9">U9</string> <string name="menu_about">About</string> <string name="menu_favourites">Favourites</string> + <string name="favourites_dialog_title">Favourites</string> <!-- Help Messages --> <string name="map_help_message">You can drag the map to move it, you can use pinch motions to zoom in and out, this can also be done with the buttons at the bottom of the screen. Taping the building markers will show you there full name, and tapping the bus stop markers will show the live times at that stop. Presing and holding a marker, will add the item to the favourites list.</string> @@ -77,10 +78,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< <string name="preferences_gps">GPS</string> <string name="preferences_gps_enabled">GPS Enabled</string> <string name="preferences_gps_disabled">GPS Disabled</string> - <string name="preferences_catagory_bus_times">Bus Times</string> - <string name="preferences_live_bus_times">Live Bus Times</string> - <string name="preferences_live_bus_times_enabled">Live Bus Times Enabled</string> - <string name="preferences_live_bus_times_disabled">Live Bus Times Disabled</string> + <string name="preferences_catagory_live_bus_times">Live Bus Times</string> + <string name="preferences_uni_link_live_bus_times">Uni-Link</string> + <string name="preferences_uni_link_live_bus_times_enabled">Uni-Link Enabled</string> + <string name="preferences_uni_link_live_bus_times_disabled">Uni-Link Disabled</string> + <string name="preferences_non_uni_link_live_bus_times">Non Uni-Link</string> + <string name="preferences_non_uni_link_live_bus_times_enabled">Non Uni-Link Enabled</string> + <string name="preferences_non_uni_link_live_bus_times_disabled">Non Uni-Link Disabled</string> + <string name="preferences_catagory_data">Data</string> + <string name="preferences_non_uni_link">Non Uni-Link Bus Stops</string> + <string name="preferences_non_uni_link_enabled">Non Uni-Link Bus Stops Enabled</string> + <string name="preferences_non_uni_link_disabled">Non Uni-Link Bus Stops Disabled</string> + + <!-- About Messages --> <string name="about_menu_instruction_text">Expand the items below to learn more about each feature of the application.</string> <string name="bustimes_favourite_checkbox_label">Favourite</string> <string name="donate_dialog_message">Loading bitcoin client</string> @@ -88,11 +98,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< <string name="menu_previous_stop">Previous</string> <string name="menu_next_stop">Next</string> <string name="menu_refresh_stop">Refresh</string> - - <!-- About Strings --> + + <!-- About Strings --> <string name="about">About</string> <string name="about_version">Version</string> - <string name="about_version_summary">0.2.2 (alpha)</string> + <string name="about_version_summary">0.3 (alpha)</string> <string name="about_copyright">Copyright</string> <string name="about_copyright_summary">© 2012, Christopher Baines</string> <string name="about_license">License</string> |