Merge branch 'dev'

1 files changed, 43 insertions, 31 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9932e9..208f4eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,54 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="menu_find">Find</string>
-    <string name="menu_preferences">Preferences</string>
-    <string name="menu_view">View</string>
-    <string name="menu_find_my_location">Find my Location</string>
     <string name="app_name">Southampton University Map</string>
-    <string name="legal_message">Southampton University Map comes with ABSOLUTELY NO WARRANTY; do not rely on the data or functionality provided by this application. This is free software, and you are welcome to redistribute it under certain conditions; expand the Licence item above for more details.</string>
-    <string name="building_residential">Residential Building</string>
-    <string name="building_non_residential">Non-Residential Building</string>
-    <string name="pref_bus_stop">Bus Stops</string>
+
+    <!-- General -->
     <string name="U1">U1</string>
     <string name="U1N">U1N</string>
     <string name="U2">U2</string>
     <string name="U6">U6</string>
     <string name="U9">U9</string>
+
+    <!-- Map Activity -->
+    <string name="menu_find">Find</string>
+    <string name="menu_preferences">Preferences</string>
+    <string name="menu_view">View</string>
+    <string name="menu_find_my_location">Find my Location</string>
+    <string name="pref_bus_stop">Bus Stops</string>
     <string name="menu_about">About</string>
     <string name="menu_favourites">Favourites</string>
-    <string name="favourites_dialog_title">Favourites</string>
+    <string name="search_settings_description">Southampton University Map</string>
+    <string name="search_results_dialog_title">Search Results for\u0020</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>
-    <string name="find_help_message">The Find screen allows you to search for buildings, bus stops and sites. You can search by description and id. If your location is known, the results will be sorted by distance from your current location.</string>
-    <string name="preferences_help_message">You can disable and enable the apps use of live bus times and gps positioning from the preferences screen.</string>
-    <string name="findmylocation_help_message">When you press the Find my Location button on the menu, the map view will move to your location, and zoom in.</string>
-    <string name="view_help_message">Use the options in the View dialog to enable and disable the map elements.</string>
-    <string name="about_help_message">The About screen displays the help messages and also the contact details of the developer. You also have the option of making a Bitcoin donation using the Donate button at the bottom. WARNING, the donation address is not private as it is hardcoded in to the app.</string>
-    <string name="favourites_help_message">The favourites dialog includes a list of buildings or bus stops marked as favourites, this is meant to allow for easier access to frequently used locations.</string>
-    <string name="licence_help_message">Southampton University Map App Copyright © 2011 Christopher Baines\n
-\n
-This program is free software; you can redistribute it and/or
+    <!-- Welcome Dialog -->
+    <string name="welcome_dialog_title">Southampton University Map App</string>
+    <string name="welcome_dialog_version">Version 0.9 (beta)</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
+ • This message\n
+ • New Search interface\n
+
+\nThis program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.\n
+
+\nThis program is distributed in the hope that it will be useful,
+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 and Bus Stops\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
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.\n
-\n
-This program is distributed in the hope that it will be useful,
+
+\nThis program is distributed in the hope that it will be useful,
 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.\n
-\n
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.</string>
-    <string name="credits_help_message">Data:  Map Icons: From the "Map Icons Collection" (http://mapicons.nicolasmollet.com). Map Tiles: From the Mapnik project, through the OSMDroid libary. Database: Using the ORMLite libary.</string>
+GNU General Public License for more details.</string>
+
     <string name="donate_button">Donate</string>
     <string name="bitcoin_error_message">You appear to have no bitcoin client installed, or at least none that listen for bitcoin uri\'s. Either install such a client, or just send coins via any method from any device to the address below.</string>
     <string name="preferences">Preferences</string>
     <string name="favourites_dialog_message">No Favourite\'s. To add a building or bus stop to the favourites list, just press and hold it on the map.</string>
 
-    <!-- View Strings -->
+    <!-- View Dialog -->
     <string-array name="uniLinkBusRoutes">
         <item>U1</item>
         <item>U1N</item>
@@ -95,7 +104,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <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>
     <string name="donate_dialog_error_title">Error</string>
@@ -107,7 +115,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.7 (alpha)</string>
+    <string name="about_version_summary">0.9 (beta)</string>
     <string name="about_copyright">Copyright</string>
     <string name="about_copyright_summary">© 2012, Christopher Baines</string>
     <string name="about_license">License</string>
@@ -147,4 +155,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <string name="bus_activity_destination_label">Destination:\u0020</string>
     <string name="bus_activity_no_destination_message">No given destination</string>
 
+    <!-- Favourites Dialog -->
+    <string name="favourites_dialog_title">Favourites</string>
+    <string name="welcome_dialog_button_text">Continue</string>
+
 </resources>
\ No newline at end of file