Merge remote-tracking branch 'upstream/release'

3 files changed, 14 insertions, 44 deletions

diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 8c89df6..e8487bf 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -387,6 +387,7 @@
   <string name="init_login_popup_not_authorized">Non autorisé</string>
   <string name="init_login_popup_invalid_timestamp">Heure locale invalide, réglez votre appareil</string>
   <string name="init_login_popup_invalid_token">Autorisation non valide, ré-autoriser</string>
+  <string name="settings_service_active">Activé</string>
   <string name="init_signature">Signature</string>
   <string name="init_template_help">Les constructions comme [NAME] seront développées lors de l\'utilisation du modèle.</string>
   <string name="init_signature_template_button">Insérer un modèle</string>
@@ -1117,6 +1118,7 @@
   <string name="status_new_rc" tools:ignore="UnusedResources">Nouvelle version candidate disponible.\nCliquer pour installer.</string>
   <string name="status_geocaching_change" tools:ignore="UnusedResources">Des changements récents sur Geocaching.com ont cassé c:geo.\nNous sommes en train de nous en occuper.</string>
   <string name="status_geocaching_livemap" tools:ignore="UnusedResources">Des changements récents sur Geocaching.com ont cassé la carte active.\nNous sommes en train de nous en occuper.</string>
+  <string name="status_geocaching_maintenance" tools:ignore="UnusedResources">Maintenant en cours sur geocaching.com.\nIl se peut que vous rencontriez des problèmes.</string>
   <string name="status_closeout_warning" tools:ignore="UnusedResources">Vous utilisez une version d\'Android inférieure à 2.1. Les futures versions de c:geo pourront ne pas être disponibles pour votre appareil.</string>
   <string name="tts_service">Boussole parlante</string>
   <string name="tts_start">Commencer à parler</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index b64ce15..1237699 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -66,6 +66,8 @@
   <string name="log_unarchived">Vzet iz arhiva</string>
   <string name="log_needs_archived">Potrebuje arhiviranje</string>
   <string name="log_discovered">Odkrit</string>
+  <string name="log_reviewer">Zapis recenzenta</string>
+  <string name="log_submit_for_review">Pošlji recenzentu</string>
   <string name="log_retractlisting">Preklicana objava</string>
   <string name="log_marked_missing">Označen kot izgubljen</string>
   <string name="log_tb_nothing">Brez akcije</string>
@@ -362,6 +364,12 @@
   <string name="init_oc_pl">Opencaching.pl</string>
   <string name="settings_activate_oc_pl">Aktiviraj</string>
   <string name="init_oc_pl_description">Poveži c:geo z opencaching.pl za iskanje zakladov in dostop in filter najdenih zakladov.</string>
+  <string name="settings_activate_oc_nl">Aktiviraj</string>
+  <string name="init_oc_nl_description">Poveži c:geo z opencaching.nl za iskanje zakladov in dostop in filter najdenih zakladov.</string>
+  <string name="settings_activate_oc_us">Aktiviraj</string>
+  <string name="init_oc_us_description">Poveži c:geo z opencaching.us za iskanje zakladov in dostop in filter najdenih zakladov.</string>
+  <string name="settings_activate_oc_ro">Aktiviraj</string>
+  <string name="init_oc_ro_description">Poveži c:geo z opencaching.ro za iskanje zakladov in dostop in filter najdenih zakladov.</string>
   <string name="init_gcvote">GCvote.com</string>
   <string name="init_twitter">Twitter</string>
   <string name="settings_activate_twitter">Aktiviraj</string>
@@ -376,6 +384,7 @@
   <string name="init_login_popup_not_authorized">Ni avtoriziran</string>
   <string name="init_login_popup_invalid_timestamp">Lokalni čas ni veljaven, nastavite trenutni čas na napravi</string>
   <string name="init_login_popup_invalid_token">Neveljavna avtorizacija. Poskusite ponovno</string>
+  <string name="settings_service_active">Aktivno</string>
   <string name="init_signature">Podpis</string>
   <string name="init_template_help">Spremenljivke kot na primer [NAME] bodo razširjene kasneje.</string>
   <string name="init_signature_template_button">Vnesi predlogo</string>
@@ -1106,6 +1115,7 @@
   <string name="status_new_rc" tools:ignore="UnusedResources">Na voljo je nova preizkusna različica.\nKliknite za namestitev.</string>
   <string name="status_geocaching_change" tools:ignore="UnusedResources">Spremembe na spletni strani Geocaching.com so povzročile, da c:geo ne deluje popolno.\nŽe delamo na tem! Poskusite ponovno čez nekaj časa.</string>
   <string name="status_geocaching_livemap" tools:ignore="UnusedResources">Spremembe na spletni strani Geocaching.com so povzročile, da zemljevid zakladov ne deluje več.\nŽe delamo na tem! Poskusite ponovno čez nekaj časa.</string>
+  <string name="status_geocaching_maintenance" tools:ignore="UnusedResources">Trenutno poteka vzdrževanje spletne strani geocaching.com.\nMorda boste imeli težave pri povezovanju.</string>
   <string name="status_closeout_warning" tools:ignore="UnusedResources">Izgleda da uporabljate android s starejšo različico od 2.1. Naslednje različice aplikacije c:geo morda ne bodo več podprte za vašo različico Androida.</string>
   <string name="tts_service">Glasovni kompas</string>
   <string name="tts_start">Začni glasovno navigacijo</string>
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 0041e0f..b317a3d 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,6 +2,7 @@
 <resources>
   <!-- changelog for the release branch -->
   <string name="changelog_release" translatable="false">\n
+    <b>Next release:</b>\n
     <b>New features:</b>\n
     · Support of opencaching.nl, opencaching.us, opencaching.ro\n
     · Changed initial coordinate format for waypoints to MinDec\n
@@ -14,51 +15,8 @@
     · Fixed wrong arrow direction on live map and list in landscape mode\n
     · Fixed several possible crashes\n
     \n
-    <b>2014.04.01:</b>\n
-    <b>Bugfixing:</b>\n
-    · Remove support of Android versions older than 2.3\n
-      (Split to a legacy version available for v2.1 and v2.2)\n
-    · Fixed some possible crash scenarios\n
-    \n
-    <b>2014.03.31:</b>\n
-    <b>Bugfixing:</b>\n
-    · Make it again compatible with Android before 2.3\n
-    · Fix a bug with downloading of preview maps\n
-    \n
-    <b>2014.03.30:</b>\n
-    <b>New features:</b>\n
-    · New languages: Catalan, Lithuanian, Romanian\n
-    · Parallel loading from different platforms to speed up live map\n
-    · All GCVote related settings moved to Menu-Services-GCVote\n
-    · Support of some GSAK specific GPX contents\n
-    · Create waypoint from personal note also for OC caches\n
-    · Copy and translate operations also for TB information\n
-    · Decrypt waypoint note by tapping on it\n
-    · Long press filter button in main menu to reset it\n
-    · List sorting now permanent during session\n
-    · Also include embedded images on image tab\n
-    <b>Bugfixing:</b>\n
-    · Corrected wrong field note progress indication\n
-    · When using "external map" sometimes the position marker was not shown\n
-    · Circles on map now also shown for caches with final coords defined\n
-    · Adding event caches to calendar corrected for events without starting time\n
-    · Logging of OC caches was not possible if no GC login data was stored\n
-    · TB details have been empty if HTML syntax was incorrect\n
-    · Swipe left from cache details not working in some cases\n
-    · Database optimizations\n
-    · Filtered list was not shown on map\n
-    · OC-login was not possible if no GC-login stored\n
-    · Geocodes are always case insensitive\n
-    · Fixed crashes in dir chooser\n
-    · Log password field missing for OC if changing log type\n
-    · Send2cgeo import screen not shown on second import start\n
-    · Fixed parsing of waypoints from personal note if no valid coords stored\n
-    · Special log types for unpublished caches now recognized correct\n
-    · HTML entities in image titles are properly decoded\n
-    · Pocket queries in status "to be deleted" now shown in list\n
-    \n
     \n
-    <a href="https://github.com/cgeo/cgeo/issues?milestone=24&amp;state=closed">Detailed list of all changes</a>\n
+    <a href="https://github.com/cgeo/cgeo/issues?milestone=29&amp;state=closed">Detailed list of all changes</a>\n
     \n
     <b>Old releases</b>\n
     · Please refer to the release notes on the <a href="http://www.cgeo.org">c:geo-website</a>.\n