Merge branch 'release' into upstream

4 files changed, 10 insertions, 2 deletions

diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index c933af5..9038426 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -648,6 +648,7 @@
   <string name="cache_menu_whereyougo">WhereYouGo</string>
   <string name="cache_menu_oruxmaps">OruxMaps</string>
   <string name="cache_menu_pebble">Pebble</string>
+  <string name="cache_menu_vote">Stem</string>
   <string name="cache_status">Status</string>
   <string name="cache_status_offline_log">Log gemt</string>
   <string name="cache_status_found">Fundet</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index c8e3cdd..2f010a0 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -17,7 +17,7 @@
   <string name="letterbox">Buzón híbrido</string>
   <string name="event">Eventos</string>
   <string name="mega">Mega-Eventos</string>
-  <string name="giga">Caché Giga-Evento</string>
+  <string name="giga">Giga-Eventos</string>
   <string name="earth">Educativos (Earth)</string>
   <string name="cito">Eventos Limpieza(CITO)</string>
   <string name="webcam">Webcams</string>
@@ -937,7 +937,7 @@
   <string name="attribute_cow_yes">Hay que tener cuidado con el ganado</string>
   <string name="attribute_cow_no">No hay que tener cuidado con el ganado</string>
   <string name="attribute_field_puzzle_yes">Puzzle en el lugar</string>
-  <string name="attribute_field_puzzle_no">Terreno no enrevesado</string>
+  <string name="attribute_field_puzzle_no">No es puzzle en el lugar</string>
   <string name="attribute_nightcache_yes">Caché nocturno</string>
   <string name="attribute_nightcache_no">Caché no nocturno</string>
   <string name="attribute_parkngrab_yes">Se puede aparcar justo al lado</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index aea813b..06e02a8 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -324,12 +324,14 @@
   <string name="list_not_available">La liste n\'est plus disponible, basculement vers la liste standard</string>
   <string name="about_version">Version</string>
   <string name="about_changelog">Versions</string>
+  <string name="about_system">Système</string>
   <string name="about_donate">Dons</string>
   <string name="about_donation_more">Don\ndéveloppement</string>
   <string name="about_contributors">Contributeurs</string>
   <string name="about_license">Licence</string>
   <string name="about_apache_license"><a href="">Apache License, Version 2.0</a></string>
   <string name="about_help">Aide</string>
+  <string name="about_system_include">Merci d\'inclure systématiquement les informations suivantes lorsque vous signalez un problème ou demandez plus d\'information à propos de c:geo:</string>
   <string name="settings_title_services">Services</string>
   <string name="settings_summary_services">Configuration des données de connexion et des services optionnels.</string>
   <string name="settings_title_appearance">Apparence</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 273fda8..84f6c0d 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -295,6 +295,8 @@
   <string name="caches_filter_personal_note">Med personlig anteckning</string>
   <string name="caches_filter_popularity">Favoriter</string>
   <string name="caches_filter_popularity_ratio">Favoriter [%]</string>
+  <string name="caches_filter_rating">Med betyg</string>
+  <string name="caches_filter_own_rating">Med eget betyg</string>
   <string name="caches_removing_from_history">Tar bort från historik…</string>
   <string name="caches_clear_offlinelogs">Rensa offline loggar</string>
   <string name="caches_clear_offlinelogs_message">Vill du rensa offline loggarna?</string>
@@ -327,6 +329,7 @@
   <string name="about_apache_license"><a href="">Apache License, Version 2.0</a></string>
   <string name="about_help">Hjälp</string>
   <string name="settings_title_services">Tjänster</string>
+  <string name="settings_summary_services">Ställ in kontoinformation och tillgång till valbara tjänster.</string>
   <string name="settings_title_appearance">Utseende</string>
   <string name="settings_title_cachedetails">Cachedetaljer</string>
   <string name="settings_title_offlinedata">Offlinedata</string>
@@ -376,6 +379,7 @@
   <string name="init_gcvote">GCvote.com</string>
   <string name="init_gcvote_password_description">För att kunna betygsätta en cache måste du följa instruktionerna på GCVote.com och ange ditt lösenord till GCVote här.</string>
   <string name="err_gcvote_send_rating">Fel uppstod när betyg skulle sparas, kontrollera eller ta bort lösenordet för GCVote i inställningarna.</string>
+  <string name="gcvote_sent">Röst skickades</string>
   <string name="init_twitter">Twitter</string>
   <string name="settings_activate_twitter">Aktivera</string>
   <string name="init_username">Användare</string>
@@ -660,6 +664,7 @@
   <string name="cache_menu_navigon">Navigon</string>
   <string name="cache_menu_pebble">Pebble</string>
   <string name="cache_menu_android_wear">Android Wear</string>
+  <string name="cache_menu_vote">Rösta</string>
   <string name="cache_status">Status</string>
   <string name="cache_status_offline_log">Sparad logg</string>
   <string name="cache_status_found">Hittad</string>