From 6ab3bfdeabe16b9a057f48a6dc1e8085e28077cd Mon Sep 17 00:00:00 2001
From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Tue, 25 Nov 2014 02:50:12 +0100
Subject: [PATCH] strings.xml file, improvements

---
 README.md                           |  2 +-
 app/src/main/res/values/strings.xml | 72 +++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 04972d4..ea90a53 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ Weather Information
 =========================
 
 <p align="center">
-  <img src="screenshots/logo.png?raw=true" alt="Sublime's custom image"/>
+  <img src="screenshots/logo.png?raw=true" alt="Weather Information's logo"/>
 </p>
 
 Weather Information is a simple and made for fun Android application for displaying current weather conditions and weather forecast worldwide. It implements a simple and clear user interface by means of default Android layouts and libraries.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e8b4936..50b0a6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="app_name">Weather Information</string>
     <string name="icon_weather_description">Icon weather</string>
 
+
     <!-- Activities Current, Overview and Specific< -->
     <string name="text_tab_five_days_forecast">5 DAY FORECAST</string>
     <string name="text_tab_ten_days_forecast">10 DAY FORECAST</string>
@@ -38,11 +39,18 @@
     <string name="text_field_remote_error">No data available</string>
     <string name="text_field_description_when_error">no description available</string>
     <string name="text_field_no_chosen_location">no chosen location</string>
+    <!-- DO NOT TRANSLATE -->
+    <string name="refresh_interval_900000">900000</string>
+    <string name="refresh_interval_1800000">1800000</string>
+    <string name="refresh_interval_3600000">3600000</string>
+    <string name="refresh_interval_7200000">7200000</string>
+    <string name="refresh_interval_43200000">43200000</string>
+    <string name="refresh_interval_86400000">86400000</string>
+
 
     <!-- Preferences Acitivity -->
     <string name="weather_preferences_action_settings">Settings</string>
     <string name="weather_preferences_units">Units</string>
-    <string name="weather_preferences_temperature_key">weather_preferences_temperature</string>
     <string name="weather_preferences_temperature">Temperature</string>
     <string name="weather_preferences_temperature_celsius">ºC</string>
     <string name="weather_preferences_temperature_fahrenheit">ºF</string>
@@ -56,7 +64,6 @@
     <string name="weather_preferences_notifications_switch_off">OFF</string>
     <string name="weather_preferences_notifications_switch_on">ON</string>
     <string name="weather_preferences_notifications_switch_key">weather_preferences_notifications_switch</string>
-    <string name="weather_preferences_update_time_rate_key">weather_preferences_update_time_rate</string>
     <string name="weather_preferences_update_time_rate">Refresh interval</string>
     <string name="weather_preferences_update_time_rate_human_value_fifteen_minutes">fifteen minutes</string>
     <string name="weather_preferences_update_time_rate_human_value_half_hour">half hour</string>
@@ -69,63 +76,71 @@
     <string name="weather_preferences_refresh_interval_human_value_two_hours">two hours</string>
     <string name="weather_preferences_refresh_interval_human_value_half_day">half day</string>
     <string name="weather_preferences_refresh_interval_human_value_one_day">one day</string>
-    <string name="weather_preferences_notifications_temperature_key">weather_preferences_notifications_temperature</string>
     <string name="weather_preferences_notifications_temperature">Temperature</string>
-    <string name="weather_preferences_day_forecast_key">weather_preferences_day_forecast</string>
     <string name="weather_preferences_day_forecast">Forecast days number</string>
     <string name="weather_preferences_day_forecast_human_value_five_day">5 day forecast</string>
     <string name="weather_preferences_day_forecast_human_value_ten_day">10 day forecast</string>
     <string name="weather_preferences_day_forecast_human_value_fourteen_day">14 day forecast</string>
-    <string name="weather_preferences_refresh_interval_key">weather_preferences_refresh_interval</string>
     <string name="weather_preferences_refresh_interval">Refresh interval</string>
-    <string name="weather_preferences_wind_key">weather_preferences_wind</string>
     <string name="weather_preferences_wind">Wind</string>
     <string name="weather_preferences_wind_meters">m/s</string>
     <string name="weather_preferences_wind_miles">mph</string>
     <string name="weather_preferences_wind_human_value_meters">meter per second</string>
     <string name="weather_preferences_wind_human_value_miles">miles per hour</string>
-    <string name="weather_preferences_pressure_key">weather_preferences_pressure</string>
     <string name="weather_preferences_pressure">Pressure</string>
     <string name="weather_preferences_pressure_pascal">hpa</string>
     <string name="weather_preferences_pressure_standard_atm">atm</string>
     <string name="weather_preferences_pressure_human_value_pascal">pascal</string>
     <string name="weather_preferences_pressure_human_value_standard_atm">standard atmosphere</string>
-    <string name="weather_preferences_app_id_key">weather_preferences_app_id_key</string>
     <string name="weather_preferences_app_id">API Key</string>
     <string name="weather_preferences_app_id_text">OpenWeatherMap API Key</string>
+    <!-- DO NOT TRANSLATE -->
     <string name="weather_preferences_app_id_text_empty_key">value not found</string>
+    <string name="weather_preferences_app_id_key">weather_preferences_app_id_key</string>
+    <string name="weather_preferences_pressure_key">weather_preferences_pressure</string>
+    <string name="weather_preferences_wind_key">weather_preferences_wind</string>
+    <string name="weather_preferences_refresh_interval_key">weather_preferences_refresh_interval</string>
+    <string name="weather_preferences_day_forecast_key">weather_preferences_day_forecast</string>
+    <string name="weather_preferences_notifications_temperature_key">weather_preferences_notifications_temperature</string>
+    <string name="weather_preferences_update_time_rate_key">weather_preferences_update_time_rate</string>
+    <string name="weather_preferences_temperature_key">weather_preferences_temperature</string>
+
 
     <!-- API key Notice Dialog -->
-    <string name="api_id_key_notice_preference_key">api_key_notice_preference_key</string>
     <string name="api_id_key_notice_title">OpenWeatherMap API Key</string>
     <string name="api_id_key_notice_message">OpenWeatherMap works better with an application ID.\n\nThis key can be added in the preferences window.\n\nTo obtain an API Key for OpenWeatherMap register on the OpenWeatherMap website.\n\nPress OK button if you don\'t want to see this message again.</string>
     <string name="api_id_key_notice_ok_button">OK</string>
     <string name="api_id_key_notice_cancel_button">Cancel</string>
+    <!-- DO NOT TRANSLATE -->
+    <string name="api_id_key_notice_preference_key">api_key_notice_preference_key</string>
+
 
     <!-- Widget Preferences Activity -->
     <string name="widget_preferences_action_settings">Settings</string>
     <string name="widget_preferences_button_refresh">Refresh</string>
     <string name="widget_configure_button_refresh_summary">Refresh values</string>
     <string name="widget_preferences_temperature_units">Temperature units</string>
-    <string name="widget_preferences_temperature_units_key">widget_preferences_temperature</string>
     <string name="widget_preferences_country">Country</string>
-    <string name="widget_preferences_country_switch_key">widget_preferences_country_switch</string>
     <string name="widget_preferences_country_switch_off_summary">Hide country</string>
     <string name="widget_preferences_country_switch_on_summary">Show country</string>
     <string name="widget_preferences_country_switch_off">OFF</string>
     <string name="widget_preferences_country_switch_on">ON</string>
+    <!-- DO NOT TRANSLATE -->
+    <string name="widget_preferences_temperature_units_key">widget_preferences_temperature</string>
+    <string name="widget_preferences_country_switch_key">widget_preferences_country_switch</string>
+
 
     <!-- Map Activity -->
     <string name="weather_map_action_map">Select Location</string>
     <string name="city_not_found">city not found</string>
     <string name="country_not_found">country not found</string>
-    <string name="progress_dialog_generic_message">Please wait…</string>
     <string name="weather_map_button_savelocation">Save Location</string>
     <string name="weather_map_button_getlocation">Get Location</string>
-    <string name="weather_map_not_enabled_location">You do not have enabled location.</string>
+    <string name="weather_map_not_enabled_location">Location is not enabled on your device.</string>
     <string name="weather_map_no_geocoder_available">Cannot get address. No geocoder available.</string>
     <string name="weather_map_mark_location">Mark your location</string>
 
+
     <!-- About Activity -->
     <string name="title_activity_about">About</string>
     <string name="weather_about_action">About</string>
@@ -139,9 +154,26 @@
     <string name="weather_about_application_developer_name">Gustavo Martin Morcuende</string>
     <string name="weather_about_application_developer_web">Web</string>
 
+
     <!-- Licenses Activity -->
     <string name="weather_licenses_title">Licenses</string>
 
+
+    <!-- MainTabsActivity -->
+    <string name="weather_preferences_day_forecast_five_day">5</string>
+    <string name="weather_preferences_day_forecast_ten_day">10</string>
+    <string name="weather_preferences_day_forecast_fourteen_day">14</string>
+
+
+    <!-- BootReceiver -->
+    <!-- DO NOT TRANSLATE -->
+    <string name="update_time_rate_900">900</string>
+    <string name="update_time_rate_1800">1800</string>
+    <string name="update_time_rate_3600">3600</string>
+    <string name="update_time_rate_43200">43200</string>
+    <string name="update_time_rate_86400">86400</string>
+
+
     <!-- DO NOT TRANSLATE -->
     <string name="uri_api_weather_today">http://api.openweathermap.org/data/{0}/weather?lat={1}&amp;lon={2}&amp;cnt=1</string>
     <string name="uri_api_weather_forecast">http://api.openweathermap.org/data/{0}/forecast/daily?lat={1}&amp;lon={2}&amp;cnt={3}&amp;mode=json</string>
@@ -150,18 +182,4 @@
     <string name="my_url">http://gumartinm.name</string>
     <string name="openweathermap_url">http://openweathermap.org/</string>
     <string name="http_client_agent">Android Weather Information Agent</string>
-    <string name="update_time_rate_900">900</string>
-    <string name="update_time_rate_1800">1800</string>
-    <string name="update_time_rate_3600">3600</string>
-    <string name="update_time_rate_43200">43200</string>
-    <string name="update_time_rate_86400">86400</string>
-    <string name="refresh_interval_900000">900000</string>
-    <string name="refresh_interval_1800000">1800000</string>
-    <string name="refresh_interval_3600000">3600000</string>
-    <string name="refresh_interval_7200000">7200000</string>
-    <string name="refresh_interval_43200000">43200000</string>
-    <string name="refresh_interval_86400000">86400000</string>
-    <string name="weather_preferences_day_forecast_five_day">5</string>
-    <string name="weather_preferences_day_forecast_ten_day">10</string>
-    <string name="weather_preferences_day_forecast_fourteen_day">14</string>
 </resources>
-- 
2.1.4