aboutsummaryrefslogtreecommitdiff
path: root/res/values
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2012-03-11 13:37:46 +0000
committerChristopher Baines <cbaines8@gmail.com>2012-03-11 13:37:46 +0000
commitacbff20cc3eb148621e1ffed9b06d17a2a1f53ce (patch)
treed249ffc6e531887760209b71cf4c3b0837b82dab /res/values
parent264b93bd42753d66dbcaea74ed2024ecb757b5f7 (diff)
parent120ca654b0476a628d2d53e709804066ecb73992 (diff)
downloadsouthamptonuniversitymap-acbff20cc3eb148621e1ffed9b06d17a2a1f53ce.tar
southamptonuniversitymap-acbff20cc3eb148621e1ffed9b06d17a2a1f53ce.tar.gz
Merge branch 'dev' of github.com:cbaines/SouthamptonUniversityMap into dev
Conflicts: AndroidManifest.xml src/net/cbaines/suma/MapActivity.java
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1009d3f..7a62ceb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,7 +18,8 @@
<string name="pref_bus_stop">Bus Stops</string>
<string name="menu_about">About</string>
<string name="menu_favourites">Favourites</string>
- <string name="map_activity_search_hint">Search for buildings, and bus stops</string>
+ <string name="search_settings_description">Southampton University Map</string>
+ <string name="search_results_dialog_title">Search Results</string>
<!-- Welcome Dialog -->
<string name="welcome_dialog_title">Southampton University Map App</string>