diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
| commit | c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7 (patch) | |
| tree | 69ba7ee4c132b2bf6ec138fdcaf0988309b40e56 /res/values | |
| parent | a32b31c29d45b68918ec2a28fff7d87e675c6768 (diff) | |
| parent | 4a45362d8823a84cf9c3c805c006331303a0da33 (diff) | |
| download | southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar.gz | |
Merge branch 'dev-search' into dev
Conflicts:
gen/net/cbaines/suma/R.java
res/values/strings.xml
src/net/cbaines/suma/DataManager.java
src/net/cbaines/suma/MapActivity.java
src/net/cbaines/suma/POI.java
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b61609b..1009d3f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -18,15 +18,15 @@ <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> <!-- Welcome Dialog --> <string name="welcome_dialog_title">Southampton University Map App</string> <string name="welcome_dialog_version">Version 0.7 (alpha)</string> <string name="welcome_dialog_copyright">© 2011 Christopher Baines</string> - <string name="welcome_dialog_upgrade_message"> -Thanks for upgrading this app, and it\'s hoped that its better for you than the previous version. Noteable changes include\:\n - • New Search\n - • Other\n + <string name="welcome_dialog_upgrade_message">Thanks for upgrading this app, and it\'s hoped that its better for you than the previous version. Noteable changes include\:\n + • New Search\n + • Other\n \nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -37,10 +37,9 @@ of the License, or (at your option) any later version.\n but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</string> - <string name="welcome_dialog_install_message"> -Welcome to the Southampton University Map App. Noteable features include\:\n - • Search for Buildings\n - • Get Live Bus Times\n + <string name="welcome_dialog_install_message">Welcome to the Southampton University Map App. Noteable features include\:\n + • Search for Buildings\n + • Get Live Bus Times\n \nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License |