From c7133364c11ecc7097c1933d9e8dccaa665c769e Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Fri, 25 Jul 2025 15:42:19 +0000
Subject: [PATCH] [strings] Update from Codeberg Translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cayenne79 <cayenne79@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Edison_Lu <edison_lu@noreply.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Juno Takano <jutty@noreply.codeberg.org>
Co-authored-by: Lenny Angst <lenny@familie-angst.ch>
Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me>
Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: Supaplextw <supaplextw@noreply.codeberg.org>
Co-authored-by: Weblate <noreply-mt-weblate@weblate.org>
Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org>
Co-authored-by: ZeljkoBG <zeljkobg@noreply.codeberg.org>
Co-authored-by: alexgabi <alexgabi@noreply.codeberg.org>
Co-authored-by: hosara <hosara@noreply.codeberg.org>
Co-authored-by: ldmpub <ldmpub@noreply.codeberg.org>
Co-authored-by: phama <phama@noreply.codeberg.org>
Co-authored-by: rimas <rimas@noreply.codeberg.org>
Co-authored-by: sunsand <sunsand@noreply.codeberg.org>
Co-authored-by: x7z4w <x7z4w@noreply.codeberg.org>
Co-authored-by: yannikbloscheck <yannikbloscheck@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/comaps/ios/
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/Countries and regions names
Translation: CoMaps/Google Play and Huawei AppGallery descriptions
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 .../play/listings/eu-ES/full-description.txt  |  35 ++
 .../src/google/play/listings/eu-ES/title.txt  |   1 +
 .../app/src/main/res/values-ar/strings.xml    |   1 +
 .../app/src/main/res/values-eu/strings.xml    |   3 +
 .../src/main/res/values-eu/types_strings.xml  |   2 +
 .../app/src/main/res/values-fa/strings.xml    |   1 +
 .../src/main/res/values-fi/types_strings.xml  |   1 +
 .../app/src/main/res/values-fr/strings.xml    |  10 +-
 .../app/src/main/res/values-iw/strings.xml    |   1 +
 .../app/src/main/res/values-kab/strings.xml   |   1 +
 .../app/src/main/res/values-ml/strings.xml    |   1 +
 .../main/res/values-pt-rBR/types_strings.xml  |   1 +
 .../app/src/main/res/values-pt/strings.xml    |   3 +
 .../src/main/res/values-pt/types_strings.xml  |   8 +
 .../app/src/main/res/values-sv/strings.xml    |  19 +
 .../src/main/res/values-sv/types_strings.xml  |   2 +-
 .../src/main/res/values-zh-rTW/strings.xml    |  16 +
 .../main/res/values-zh-rTW/types_strings.xml  | 286 ++++++++++++++
 data/countries-strings/pt.json/localize.json  |   8 +-
 .../zh-Hant.json/localize.json                |  98 ++---
 .../af.lproj/Localizable.strings              |   3 +
 .../ar.lproj/Localizable.strings              |   5 +-
 .../ast.lproj/Localizable.strings             |   3 +
 .../az.lproj/Localizable.strings              |   3 +
 .../be.lproj/Localizable.strings              |   3 +
 .../bg.lproj/Localizable.strings              |   3 +
 .../bn.lproj/Localizable.strings              |   3 +
 .../ca.lproj/Localizable.strings              |   5 +-
 .../cs.lproj/Localizable.strings              |   3 +
 .../da.lproj/Localizable.strings              |   3 +
 .../de.lproj/Localizable.strings              |   3 +
 .../el.lproj/Localizable.strings              |   3 +
 .../es-MX.lproj/Localizable.strings           |   3 +
 .../es.lproj/Localizable.strings              |   5 +-
 .../et.lproj/Localizable.strings              |   5 +-
 .../eu.lproj/Localizable.strings              |   3 +
 .../eu.lproj/Localizable.stringsdict          |   8 +-
 .../eu.lproj/LocalizableTypes.strings         |   2 +-
 .../fa.lproj/Localizable.strings              |   5 +-
 .../fi.lproj/Localizable.strings              |   3 +
 .../fi.lproj/LocalizableTypes.strings         |   2 +-
 .../fr.lproj/Localizable.strings              |   7 +-
 .../gl.lproj/Localizable.strings              |   5 +-
 .../gsw.lproj/Localizable.strings             |   3 +
 .../he.lproj/Localizable.strings              |   5 +-
 .../hi.lproj/Localizable.strings              |   3 +
 .../hr.lproj/Localizable.strings              |   3 +
 .../hu.lproj/Localizable.strings              |   3 +
 .../ia.lproj/Localizable.strings              |   3 +
 .../id.lproj/Localizable.strings              |   3 +
 .../is.lproj/Localizable.strings              |   3 +
 .../it.lproj/Localizable.strings              |   7 +-
 .../ja.lproj/Localizable.strings              |   5 +-
 .../kab.lproj/Localizable.strings             |   7 +-
 .../ko.lproj/Localizable.strings              |   3 +
 .../lt.lproj/Localizable.strings              |   9 +-
 .../lt.lproj/Localizable.stringsdict          |   6 +
 .../lv.lproj/Localizable.strings              |   3 +
 .../ml.lproj/Localizable.strings              |   3 +
 .../mr.lproj/Localizable.strings              |   3 +
 .../mt.lproj/Localizable.strings              |   3 +
 .../nb.lproj/Localizable.strings              |   3 +
 .../nl.lproj/Localizable.strings              |   3 +
 .../pl.lproj/Localizable.strings              |   5 +-
 .../pt-BR.lproj/Localizable.strings           |   3 +
 .../pt.lproj/Localizable.strings              |   9 +-
 .../pt.lproj/LocalizableTypes.strings         |  12 +-
 .../ro.lproj/Localizable.strings              |   3 +
 .../ru.lproj/Localizable.strings              |   5 +-
 .../sk.lproj/Localizable.strings              |   3 +
 .../sq.lproj/Localizable.strings              |   3 +
 .../sr.lproj/Localizable.strings              |   3 +
 .../sv.lproj/Localizable.strings              |   5 +-
 .../sv.lproj/LocalizableTypes.strings         |   2 +-
 .../sw.lproj/Localizable.strings              |   3 +
 .../th.lproj/Localizable.strings              |   3 +
 .../tr.lproj/Localizable.strings              |   5 +-
 .../uk.lproj/Localizable.strings              |   3 +
 .../vi.lproj/Localizable.strings              |   3 +
 .../zh-Hans.lproj/Localizable.strings         |   5 +-
 .../zh-Hant.lproj/Localizable.strings         |   5 +-
 .../zh-Hant.lproj/LocalizableTypes.strings    | 362 +++++++++---------
 82 files changed, 830 insertions(+), 279 deletions(-)
 create mode 100644 android/app/src/google/play/listings/eu-ES/full-description.txt
 create mode 100644 android/app/src/google/play/listings/eu-ES/title.txt

diff --git a/android/app/src/google/play/listings/eu-ES/full-description.txt b/android/app/src/google/play/listings/eu-ES/full-description.txt
new file mode 100644
index 000000000..caf95caa8
--- /dev/null
+++ b/android/app/src/google/play/listings/eu-ES/full-description.txt
@@ -0,0 +1,35 @@
+Komunitateak gidatutako doako eta kode irekiko aplikazioa OpenStreetMap datuetan oinarrituta, gardentasuna, pribatutasuna eta irabazi asmorik gabeko konpromisoarekin indartua.
+
+Sartu komunitatean eta lagundu mapa aplikaziorik onena egiten
+• Erabili aplikazioa eta horri buruzko iritsia zabaldu
+• Eman feedbacka eta txostenetako gaiak
+• Eguneratu maparen datuak aplikazioan edo OpenStreetMap webgunean
+<i> Zure iritzia eta 5 izarreko berrikuspenak dira guretzako laguntza onena! </ i>
+
+‣ <b>Sinplea</b>: oso erraza da ondo funtzionatzen duten funtzioak erabiltzea.
+‣ <b> Lineaz kanpo erabiltzeko prest </ b> Planifikatu eta nabigatu atzerrira bidaiatzea, konexio beharrik gabe, bilatu bideak urruneko ibilaldi batean, etab. Aplikazioaren funtzio guztiak lineaz kanpo lan egiteko diseinatuta daude.
+‣ <b> Pribatutasuna errespetatzea </ b>: aplikazioa pribatutasunarekin diseinatuta dago, ez du pertsonak identifikatzen, ez du jarraipena egiten, eta ez du informazio pertsonala biltzen. Iragarkirik gabe.
+‣ <b> Zure bateria eta espazioa gordetzen ditu </ b>: ez du bateria xukatu beste nabigazio aplikazioak bezala. Mapa trinkoek espazioa aurrezten dute zure telefonoan.
+‣ <b> Libre eta komunitateak eraikitakoa: Zu bezalako jendeak aplikazioa eraikitzen lagundu du tokiak gehituz OpenStreetMapen, probatuz eta funtzioei buruzko iritzia emanez eta iritsiz eta diruz lagunduz.
+‣ <b> Erabakiak hartzea eta finantza gardenak, irabazi asmorik gabekoa eta guztiz iturburu irekikoa. </ B>
+
+<b> Ezaugarri nagusiak </ b>:
+• Deskargatu mapa zehatzak Google Maps-ekin eskuragarri ez dauden lekuekin
+• Landa eremua moduan nabarmendutako mendi ibilbideak, kanpinak, ur iturriak, gailurrak, sestra-lerroak, etab
+• Bideak eta bidegorriak
+• Jatetxe, gasolindegiak, hotelak, dendak, bisitak eta bestelako interesguneak
+• Bilatu izenaren edo helbide baten arabera, edo kategoriaren arabera
+• Oinez, txirrindularitzarako edo gidatzeko ahots-oharrak dituen nabigazioa
+• Markatu zure gogoko lekuak ikutu bakarrarekin
+• Lineaz kanpoko Wikipedia artikuluak
+• Metroaren garraio geruza eta jarraibideak
+• Arrastoen grabazioa
+• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Gauean erabiltzeko modu iluna
+• Hobetu mapako datuak oinarrizko editore integratua erabiliz
+• Android Auto laguntza
+
+Mesedez, jakinarazi aplikazioaren gorabeherak, ideiak proposatu eta sartu gure komunitatean <b> <i> comaps.app </ i> </ b> webgunean.
+
+<b> Askatasuna hemen </ b> da
+Ezagutu zure bidaia, nabigatu munduan pribatutasunarekin eta komunitatearen abangoardian!
diff --git a/android/app/src/google/play/listings/eu-ES/title.txt b/android/app/src/google/play/listings/eu-ES/title.txt
new file mode 100644
index 000000000..0bb3e8703
--- /dev/null
+++ b/android/app/src/google/play/listings/eu-ES/title.txt
@@ -0,0 +1 @@
+Comaps - Pribatuki nabigatu
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 28780acc5..2144ed2d6 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -890,4 +890,5 @@
     <string name="panoramax">صورة Panoramax</string>
     <string name="app_site_url">https://comaps.app/ar</string>
     <string name="saved">تم الحفظ</string>
+    <string name="bluesky">بلوسكاي</string>
 </resources>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 28f3559cf..edcba37ab 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -913,4 +913,7 @@
     <string name="pref_backup_now_summary_folder_unavailable">Babeskopiaren karpeta ez dago eskuragarri</string>
     <string name="dialog_report_error_missing_folder">Babeskopiarako hautatutako kokapena ez dago eskuragarri edo ezin da idatzi. Hautatu beste kokapen bat.</string>
     <string name="pref_backup_now_summary_progress">Babeskopia egiten…</string>
+    <string name="editor_level">Solairuak (O beheko solairua da)</string>
+    <string name="editor_building_levels">Solairuak (beheko solairua barne, sabaia ez)</string>
+    <string name="error_enter_correct_level">Sartu baliozko solairu kopurua</string>
 </resources>
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/app/src/main/res/values-eu/types_strings.xml
index e83a18570..93ee4f4ad 100644
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -1343,4 +1343,6 @@
     <string name="type.man_made">Artifiziala</string>
     <string name="type.amenity.love_hotel">Maitasun hotela</string>
     <string name="type.noexit">Irteerarik gabeko bidea</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.landuse.religious">Eremu erlijiosoa</string>
 </resources>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index e2cb62b1a..af631c5d5 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -817,4 +817,5 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app</string>
     <string name="saved">ذخیره شد</string>
+    <string name="bluesky">بلواسکای</string>
 </resources>
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index b124c9ef6..6d2503b53 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -1407,4 +1407,5 @@
     <string name="type.natural.wetland.mangrove">Mangrove</string>
     <string name="type.natural.wetland.tidalflat">Vuorovesitasanko</string>
     <string name="type.natural.wetland.reedbed">Ruovikko</string>
+    <string name="type.leisure.escape_game">Pakohuonepeli</string>
 </resources>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index a84c24308..9a994e121 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -34,7 +34,7 @@
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="precise_location_is_disabled_long_text">Pour garantir une navigation précise, activez l\'option Position Exacte dans les paramètres.</string>
     <!-- View and button titles for accessibility -->
-    <string name="zoom_to_country">Voir sur la carte</string>
+    <string name="zoom_to_country">Afficher la carte</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
     <string name="country_status_download_failed">Échec lors du téléchargement</string>
     <!-- Button text for the button under the country_status_download_failed message -->
@@ -905,15 +905,15 @@
     <string name="bookmark_color">Couleur du marque-page</string>
     <string name="panoramax">Image Panoramax</string>
     <string name="pref_backup_now_title">Sauvegarder maintenant</string>
-    <string name="backup_interval_every_day">Chaque jour</string>
+    <string name="backup_interval_every_day">Quotidien</string>
     <string name="open_now">Actuellement ouvert</string>
     <string name="closed_now">Fermé actuellement</string>
     <string name="pref_backup_now_summary_progress">Sauvegarde en cours…</string>
     <string name="pref_backup_now_summary_failed">La sauvegarde a échoué</string>
-    <string name="backup_interval_every_week">Chaque semaine</string>
+    <string name="backup_interval_every_week">Hebdomadaire</string>
     <string name="pref_backup_location_title">Emplacement de sauvegarde</string>
-    <string name="pref_backup_location_summary_initial">Veuillez d\'abord sélectionner répertoire et accorder l\'autorisation</string>
-    <string name="pref_backup_now_summary_empty_lists">Aucun signet ni de trace à sauvegarder</string>
+    <string name="pref_backup_location_summary_initial">Veuillez d\'abord sélectionner un dossier puis accorder l\'autorisation</string>
+    <string name="pref_backup_now_summary_empty_lists">Ni signet ni trace à sauvegarder</string>
     <string name="pref_backup_interval_title">Sauvegarde automatique</string>
     <string name="pref_backup_status_summary_success">Dernière sauvegarde réussie</string>
     <string name="pref_backup_now_summary_ok">La sauvegarde s\'est déroulée avec succès</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 46e58f2c7..18216d4cc 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -862,4 +862,5 @@
     <string name="panoramax">תמונת Panoramax</string>
     <string name="app_site_url">https://comaps.app</string>
     <string name="saved">נשמר</string>
+    <string name="bluesky">בלוסקיי</string>
 </resources>
diff --git a/android/app/src/main/res/values-kab/strings.xml b/android/app/src/main/res/values-kab/strings.xml
index 9cd87fce6..8ed0f8128 100644
--- a/android/app/src/main/res/values-kab/strings.xml
+++ b/android/app/src/main/res/values-kab/strings.xml
@@ -28,4 +28,5 @@
     <string name="kilometres">ⴽⵉⵍⵓⵎⵉⵜⵔⴻⵏ</string>
     <string name="saved">Yettwasekles</string>
     <string name="about_proposition_3">• Yezmer ad yaweḍ berra i usmel, s tɣawla yerna d ameẓyan</string>
+    <string name="bluesky">Bluesky</string>
 </resources>
diff --git a/android/app/src/main/res/values-ml/strings.xml b/android/app/src/main/res/values-ml/strings.xml
index 890894841..06c1a3097 100644
--- a/android/app/src/main/res/values-ml/strings.xml
+++ b/android/app/src/main/res/values-ml/strings.xml
@@ -12,4 +12,5 @@
     <string name="mastodon">മാസ്റ്റഡോൺ</string>
     <string name="saved">സംരക്ഷിച്ചു</string>
     <string name="about_proposition_3">• ഓഫ്‌ലൈൻ, വേഗതയേറിയതും ഒതുക്കമുള്ളതും</string>
+    <string name="bluesky">Bluesky</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index 8a461199a..86481c647 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -1397,4 +1397,5 @@
     <string name="type.natural.wetland.mangrove">Manguezal</string>
     <string name="type.natural.wetland.tidalflat">Planície de maré</string>
     <string name="type.natural.wetland.saltmarsh">Sapal</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 28889af87..8ea416b53 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -906,4 +906,7 @@
     <string name="pref_backup_title">Backup dos marcadores e trajetos</string>
     <string name="dialog_report_error_missing_folder">A localização de backup selecionada não está disponível ou não permite escrita. Selecione outra localização, por favor.</string>
     <string name="dialog_report_error_with_logs">Por favor, envie-nos um reporte de erro:\n - \"Ativar o histórico\" nas definições\n - reproduza o problema\n - no ecrã de \"Acerca &amp; Ajuda\" pressione o botão para \"Reportar um problema\" e envie via email ou chat\n - desative o histórico</string>
+    <string name="open_now">Aberto agora</string>
+    <string name="closed_now">Fechado agora</string>
+    <string name="at">às %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml
index 684fc3754..e307ba68a 100644
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -1401,4 +1401,12 @@
     <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
     <string name="type.landuse.education">Instalação Educativa</string>
     <string name="type.railway.station.subway.qingdao">Estação de metro</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.landuse.religious">Local Religioso</string>
+    <string name="type.natural.wetland.saltmarsh">Sapal</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Marisma</string>
+    <string name="type.natural.wetland.fen">Fen</string>
+    <string name="type.natural.wetland.reedbed">Caniçal</string>
+    <string name="type.natural.wetland.swamp">Pântano</string>
+    <string name="type.natural.wetland.mangrove">Mangal</string>
 </resources>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index d29c1d8c2..3f53872c5 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -854,4 +854,23 @@
     <string name="backup_interval_every_week">Veckovis</string>
     <string name="app_site_url">https://comaps.app/sv/</string>
     <string name="saved">Sparad</string>
+    <string name="pref_left_button_title">Inställning för vänster knapp</string>
+    <string name="pref_backup_title">Säkerhetskopiering av bokmärken och spår</string>
+    <string name="pref_backup_now_summary_empty_lists">Inga bokmärken eller spår att säkerhetskopiera</string>
+    <string name="dialog_report_error_missing_folder">Den valda platsen för säkerhetskopiering är inte tillgänglig eller skrivbar. Vänligen välj en annan plats.</string>
+    <string name="pref_backup_now_title">Säkerhetskopiera nu</string>
+    <string name="pref_left_button_disable">Inaktivera</string>
+    <string name="pref_backup_summary">Säkerhetskopiera automatiskt till en mapp på din enhet</string>
+    <string name="pref_backup_now_summary">Skapa en säkerhetskopia omedelbart</string>
+    <string name="pref_backup_now_summary_progress">Säkerhetskopiering pågår…</string>
+    <string name="pref_backup_now_summary_ok">Säkerhetskopiering slutförd</string>
+    <string name="pref_backup_now_summary_failed">Säkerhetskopiering misslyckades</string>
+    <string name="pref_backup_now_summary_folder_unavailable">Mappen för säkerhetskopiering är inte tillgänglig</string>
+    <string name="pref_backup_location_summary_initial">Vänligen välj en mapp först och ge åtkomst</string>
+    <string name="pref_backup_interval_title">Automatisk säkerhetskopiering</string>
+    <string name="backup_interval_manual_only">Av (endast manuellt)</string>
+    <string name="pref_backup_location_title">Plats för säkerhetskopiering</string>
+    <string name="open_now">Öppet nu</string>
+    <string name="closed_now">Stängt nu</string>
+    <string name="at">kl. %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-sv/types_strings.xml b/android/app/src/main/res/values-sv/types_strings.xml
index f5240d2ce..5b153c8b8 100644
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -72,7 +72,7 @@
     <string name="type.amenity.nursing_home">Vårdhem</string>
     <string name="type.amenity.parking">Parkering</string>
     <string name="type.amenity.parking.fee">Parkering</string>
-    <string name="type.amenity.parking.multi.storey">Flervånings parkering</string>
+    <string name="type.amenity.parking.multi.storey">Flervåningsparkering</string>
     <string name="type.amenity.parking.multi.storey.fee">Flervånings parkering</string>
     <string name="type.amenity.parking.no.access">Privat parkering</string>
     <string name="type.amenity.parking.permissive">Privat parkering</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 9c006c6bb..42d1ff048 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -908,4 +908,20 @@
     <string name="pref_backup_location_summary_initial">請先選擇資料夾並授予權限</string>
     <string name="about_help">關於和幫助</string>
     <string name="pref_backup_summary">自動備份至您裝置上的資料夾</string>
+    <string name="pref_backup_history_title">需要備份的數目</string>
+    <string name="dialog_report_error_missing_folder">選擇的備份位置無法使用或是無法寫入，請選擇另外的位置。</string>
+    <string name="dialog_report_error_with_logs">請寄送錯誤報告：\n\n - 設定中\"啟動記錄\"\n\n - 重現問題\n\n - 在\"關於&amp;說明\"畫面按\"回報臭蟲\"按鈕以及透過電子郵件傳送或聊天\n\n - 關閉記錄</string>
+    <string name="pref_backup_now_title">立刻備份</string>
+    <string name="pref_backup_now_summary">立即建立備份</string>
+    <string name="pref_backup_now_summary_progress">備份中…</string>
+    <string name="pref_backup_now_summary_ok">成功建立備份</string>
+    <string name="pref_backup_now_summary_empty_lists">沒有書籤與軌跡需要備份</string>
+    <string name="pref_backup_now_summary_failed">備份失敗</string>
+    <string name="pref_backup_now_summary_folder_unavailable">備份資料夾並不能用</string>
+    <string name="pref_backup_status_summary_success">最後成功的備份</string>
+    <string name="pref_backup_interval_title">自動備份</string>
+    <string name="backup_interval_every_day">每日</string>
+    <string name="backup_interval_every_week">每週</string>
+    <string name="backup_interval_manual_only">關閉 (只有手動)</string>
+    <string name="at">在 %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-zh-rTW/types_strings.xml b/android/app/src/main/res/values-zh-rTW/types_strings.xml
index 469c3bcec..aa33fc517 100644
--- a/android/app/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml
@@ -177,4 +177,290 @@
     <string name="type.barrier.lift_gate">遮斷機</string>
     <string name="type.barrier.entrance">入口</string>
     <string name="type.barrier.kissing_gate">窄門</string>
+    <string name="type.amenity.car_sharing">共享汽車</string>
+    <string name="type.amenity.charging_station.motorcar">汽車充電站</string>
+    <string name="type.aerialway.gondola">纜車</string>
+    <string name="type.aerialway.mixed_lift">混合纜車</string>
+    <string name="type.aerialway.station">纜車站</string>
+    <string name="type.aerialway.drag_lift">拖曳纜車</string>
+    <string name="type.aeroway.aerodrome">機場</string>
+    <string name="type.aeroway">機場設施</string>
+    <string name="type.aeroway.aerodrome.international">國際機場</string>
+    <string name="type.aeroway.apron">機棚</string>
+    <string name="type.aeroway.gate">登機門</string>
+    <string name="type.aeroway.helipad">停機坪</string>
+    <string name="type.aeroway.runway">跑道</string>
+    <string name="type.aeroway.taxiway">滑行道</string>
+    <string name="type.amenity.bench">長椅</string>
+    <string name="type.amenity.bicycle_parking">單車停車場</string>
+    <string name="type.amenity.bicycle_rental">單車租借</string>
+    <string name="type.amenity.bicycle_repair_station">單車修理站</string>
+    <string name="type.amenity.biergarten">啤酒花園</string>
+    <string name="type.amenity.brothel">妓院</string>
+    <string name="type.amenity.bureau_de_change">外匯兌換店</string>
+    <string name="type.amenity.bus_station">客運站</string>
+    <string name="type.amenity.cafe">咖啡店</string>
+    <string name="type.amenity.car_rental">租車</string>
+    <string name="type.amenity.motorcycle_rental">機車租借</string>
+    <string name="type.amenity.car_wash">洗車店</string>
+    <string name="type.amenity.casino">賭場</string>
+    <string name="type.amenity.gambling">賭間</string>
+    <string name="type.leisure.adult_gaming_centre">成人娛樂中心</string>
+    <string name="type.amenity.charging_station">充電站</string>
+    <string name="type.amenity.charging_station.bicycle">單車充電站</string>
+    <string name="type.amenity.childcare">托兒所</string>
+    <string name="type.amenity.cinema">電影院</string>
+    <string name="type.amenity.college">學院</string>
+    <string name="type.amenity.community_centre">社區中心</string>
+    <string name="type.amenity.parking.underground.private">私人地下停車場</string>
+    <string name="type.amenity.place_of_worship.christian.jehovahs_witness">耶和華見證人</string>
+    <string name="type.amenity.sanitary_dump_station">儲槽傾倒站</string>
+    <string name="type.amenity.parking_entrance">停車場出入口</string>
+    <string name="type.amenity.parking_entrance.private">私停車場出入口</string>
+    <string name="type.amenity.parking_entrance.permissive">停車場出入口</string>
+    <string name="type.amenity.parking_space">停車格</string>
+    <string name="type.amenity.parking_space.permissive">停車格</string>
+    <string name="type.amenity.parking_space.private">停車格</string>
+    <string name="type.amenity.parking_space.underground">停車格</string>
+    <string name="type.amenity.parking_space.disabled">無障礙停車格</string>
+    <string name="type.amenity.payment_terminal">繳費機</string>
+    <string name="type.amenity.pharmacy">藥局</string>
+    <string name="type.amenity.place_of_worship">宗教崇拜場所</string>
+    <string name="type.amenity.place_of_worship.buddhist">佛寺</string>
+    <string name="type.amenity.place_of_worship.christian">教堂</string>
+    <string name="type.amenity.place_of_worship.christian.mormon">耶穌基督後期聖徒教會</string>
+    <string name="type.recycling.paper">紙張</string>
+    <string name="type.recycling.plastic">塑膠</string>
+    <string name="type.recycling.plastic_bottles">塑膠瓶</string>
+    <string name="type.recycling.scrap_metal">廢金屬</string>
+    <string name="type.recycling.small_appliances">電子廢棄物</string>
+    <string name="type.amenity.restaurant">餐廳</string>
+    <string name="type.amenity.compressed_air">壓縮空氣</string>
+    <string name="type.amenity.conference_centre">會議中心</string>
+    <string name="type.amenity.courthouse">法院</string>
+    <string name="type.amenity.dentist">牙醫</string>
+    <string name="type.amenity.doctors">醫生</string>
+    <string name="type.amenity.drinking_water">飲水</string>
+    <string name="type.drinking_water.yes">飲水</string>
+    <string name="type.amenity.driving_school">駕訓班</string>
+    <string name="type.amenity.exhibition_centre">展覽中心</string>
+    <string name="type.amenity.money_transfer">匯款</string>
+    <string name="type.amenity.music_school">音樂學校</string>
+    <string name="type.amenity.language_school">語言學校</string>
+    <string name="type.office.diplomatic">大使館</string>
+    <string name="type.amenity.fast_food">速食餐廳</string>
+    <string name="type.amenity.ferry_terminal">渡輪</string>
+    <string name="type.amenity.fire_station">消防隊</string>
+    <string name="type.amenity.food_court">美食街</string>
+    <string name="type.amenity.fountain">噴泉</string>
+    <string name="type.amenity.fuel">加油站</string>
+    <string name="type.amenity.grave_yard.christian">教會墓園</string>
+    <string name="type.amenity.grave_yard">宗教墓園</string>
+    <string name="type.amenity.hospital">醫院</string>
+    <string name="type.amenity.hunting_stand">狩獵小屋</string>
+    <string name="type.amenity.ice_cream">冰淇淋</string>
+    <string name="type.amenity.internet_cafe">網咖</string>
+    <string name="type.amenity.kindergarten">幼兒園</string>
+    <string name="type.amenity.library">圖書館</string>
+    <string name="type.amenity.loading_dock">卸貨碼頭</string>
+    <string name="type.amenity.marketplace">市場</string>
+    <string name="type.amenity.motorcycle_parking">機車停車場</string>
+    <string name="type.amenity.nightclub">俱樂部</string>
+    <string name="type.amenity.nursing_home">療養院</string>
+    <string name="type.amenity.parking">停車場</string>
+    <string name="type.amenity.parking.fee">停車費用</string>
+    <string name="type.amenity.parking.multi.storey">立體停車場</string>
+    <string name="type.amenity.parking.multi.storey.fee">立體停車場費用</string>
+    <string name="type.amenity.parking.no.access">私人停車場</string>
+    <string name="type.amenity.parking.permissive">私人停車場</string>
+    <string name="type.amenity.parking.private">私人停車場</string>
+    <string name="type.amenity.parking.park_and_ride">停車轉乘</string>
+    <string name="type.amenity.parking.underground">地下停車場</string>
+    <string name="type.amenity.parking.underground.fee">地下停車場</string>
+    <string name="type.amenity.parking.street_side">路邊停車格</string>
+    <string name="type.amenity.parking.street_side.fee">路邊停車格</string>
+    <string name="type.amenity.parking.street_side.private">私人路邊停車格</string>
+    <string name="type.amenity.parking.lane">車道停車</string>
+    <string name="type.amenity.parking.lane.fee">車道停車</string>
+    <string name="type.amenity.place_of_worship.hindu">印度教寺廟</string>
+    <string name="type.amenity.place_of_worship.jewish">猶太會堂</string>
+    <string name="type.amenity.place_of_worship.muslim">清真寺</string>
+    <string name="type.amenity.place_of_worship.shinto">神道教</string>
+    <string name="type.amenity.place_of_worship.taoist">道觀</string>
+    <string name="type.amenity.police">警察局</string>
+    <string name="type.amenity.post_box">郵筒</string>
+    <string name="type.amenity.post_office">郵局</string>
+    <string name="type.amenity.prison">監獄</string>
+    <string name="type.amenity.pub">酒吧</string>
+    <string name="type.amenity.public_bookcase">漂書站</string>
+    <string name="type.amenity.recycling.centre">回收中心</string>
+    <string name="type.amenity.recycling">回收箱</string>
+    <string name="type.amenity.recycling.container">回收箱</string>
+    <string name="type.recycling.batteries">電池</string>
+    <string name="type.recycling.clothes">衣服</string>
+    <string name="type.recycling.glass_bottles">玻璃瓶</string>
+    <string name="type.amenity.school">學校</string>
+    <string name="type.amenity.veterinary">獸醫</string>
+    <string name="type.cuisine.georgian">喬治亞菜</string>
+    <string name="type.cuisine.filipino">菲律賓菜</string>
+    <string name="type.cuisine.sandwich">三明治</string>
+    <string name="type.cuisine.austrian">澳洲菜</string>
+    <string name="type.boundary.administrative.3">地區邊界</string>
+    <string name="type.cuisine.deli">熟食店</string>
+    <string name="type.emergency.lifeguard">救生員</string>
+    <string name="type.healthcare.alternative">另類醫療</string>
+    <string name="type.cuisine.turkish">土耳其菜</string>
+    <string name="type.amenity.waste_disposal">大垃圾桶</string>
+    <string name="type.craft.electronics_repair">電子產品維修</string>
+    <string name="type.healthcare.physiotherapist">物理治療師</string>
+    <string name="type.leisure.escape_game">密室脫逃</string>
+    <string name="type.barrier">障礙物</string>
+    <string name="type.entrance.main">主要入口</string>
+    <string name="type.entrance.exit">出口</string>
+    <string name="type.amenity.shelter">涼亭</string>
+    <string name="type.amenity.shelter.public_transport">渟亭</string>
+    <string name="type.amenity.shelter.basic_hut">露營小屋</string>
+    <string name="type.amenity.public_bath">公共浴場</string>
+    <string name="type.amenity.shower">淋浴設施</string>
+    <string name="type.amenity.taxi">計程車招呼站</string>
+    <string name="type.amenity.telephone">公共電話</string>
+    <string name="type.amenity.theatre">戲院</string>
+    <string name="type.amenity.toilets">廁所</string>
+    <string name="type.toilets.yes">廁所</string>
+    <string name="type.amenity.townhall">市政廳</string>
+    <string name="type.amenity.university">大學</string>
+    <string name="type.amenity.vending_machine">自動販賣機</string>
+    <string name="type.amenity.vending_machine.cigarettes">香菸販賣機</string>
+    <string name="type.amenity.vending_machine.coffee">咖啡販賣機</string>
+    <string name="type.amenity.vending_machine.condoms">保險套販賣機</string>
+    <string name="type.amenity.vending_machine.drinks">飲料販賣機</string>
+    <string name="type.amenity.vending_machine.food">食品販賣機</string>
+    <string name="type.amenity.vending_machine.newspapers">報紙販賣機</string>
+    <string name="type.amenity.vending_machine.parking_tickets">停車錶</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">票券販賣機</string>
+    <string name="type.amenity.vending_machine.sweets">甜點販賣機</string>
+    <string name="type.amenity.vehicle_inspection">監理站</string>
+    <string name="type.amenity.vending_machine.fuel">燃油幫浦</string>
+    <string name="type.amenity.waste_basket">垃圾筒</string>
+    <string name="type.amenity.water_point">水箱加水點</string>
+    <string name="type.amenity.water_point.drinking_water_no">水箱加水點</string>
+    <string name="type.boundary">邊界</string>
+    <string name="type.boundary.administrative">行政邊界</string>
+    <string name="type.boundary.administrative.2">國家邊界</string>
+    <string name="type.boundary.administrative.4">地區邊界</string>
+    <string name="type.boundary.national_park">國家公園</string>
+    <string name="type.boundary.aboriginal_lands">原住民土地</string>
+    <string name="type.boundary.protected_area">保護區</string>
+    <string name="type.boundary.protected_area.1">保護區</string>
+    <string name="type.boundary.protected_area.2">保護區</string>
+    <string name="type.boundary.protected_area.3">保護區</string>
+    <string name="type.boundary.protected_area.4">保護區</string>
+    <string name="type.boundary.protected_area.5">保護區</string>
+    <string name="type.boundary.protected_area.6">保護區</string>
+    <string name="type.building">建築</string>
+    <string name="type.building.address">地址</string>
+    <string name="type.building.has_parts">建築</string>
+    <string name="type.building_part">建築</string>
+    <string name="type.building.train_station">車站建築</string>
+    <string name="type.building.warehouse">倉庫</string>
+    <string name="type.cemetery.grave">墓穴</string>
+    <string name="type.craft">工藝</string>
+    <string name="type.craft.beekeeper">養蜂</string>
+    <string name="type.craft.blacksmith">鐵匠</string>
+    <string name="type.craft.brewery">釀酒師</string>
+    <string name="type.craft.caterer">餐飲服務商</string>
+    <string name="type.craft.carpenter">木匠</string>
+    <string name="type.craft.confectionery">糖果師</string>
+    <string name="type.craft.electrician">電工</string>
+    <string name="type.craft.gardener">園丁</string>
+    <string name="type.craft.grinding_mill">磨粉</string>
+    <string name="type.craft.handicraft">手工匠</string>
+    <string name="type.craft.hvac">暖氣空調</string>
+    <string name="type.craft.key_cutter">鑰匙切割</string>
+    <string name="type.cuisine.fine_dining">精緻餐飲</string>
+    <string name="type.cuisine.fish">魚類</string>
+    <string name="type.cuisine.french">法式</string>
+    <string name="type.cuisine.friture">煎炸</string>
+    <string name="type.cuisine.german">德國菜</string>
+    <string name="type.cuisine.greek">希臘菜</string>
+    <string name="type.cuisine.grill">燒烤</string>
+    <string name="type.craft.locksmith">鎖匠</string>
+    <string name="type.craft.metal_construction">鐵工</string>
+    <string name="type.craft.painter">房屋油漆工</string>
+    <string name="type.shop.camera">相機店</string>
+    <string name="type.craft.plumber">水管工</string>
+    <string name="type.craft.sawmill">鋸木</string>
+    <string name="type.craft.shoemaker">修鞋匠</string>
+    <string name="type.craft.winery">酒廠</string>
+    <string name="type.craft.tailor">裁縫</string>
+    <string name="type.cuisine.african">非洲菜</string>
+    <string name="type.cuisine.american">美洲菜</string>
+    <string name="type.cuisine.arab">阿拉伯菜</string>
+    <string name="type.cuisine.argentinian">阿根庭菜</string>
+    <string name="type.cuisine.asian">亞洲菜</string>
+    <string name="type.cuisine.brazilian">巴西菜</string>
+    <string name="type.cuisine.breakfast">早餐</string>
+    <string name="type.cuisine.bubble_tea">珍珠奶茶</string>
+    <string name="type.cuisine.burger">漢堡</string>
+    <string name="type.cuisine.buschenschank">小酒館</string>
+    <string name="type.cuisine.cake">蛋糕</string>
+    <string name="type.cuisine.caribbean">加勒比菜</string>
+    <string name="type.cuisine.chicken">雞肉</string>
+    <string name="type.cuisine.chinese">中式</string>
+    <string name="type.cuisine.coffee_shop">咖啡</string>
+    <string name="type.cuisine.crepe">可麗餅</string>
+    <string name="type.cuisine.croatian">克羅埃西亞菜</string>
+    <string name="type.cuisine.curry">咖哩</string>
+    <string name="type.cuisine.diner">晚餐</string>
+    <string name="type.cuisine.donut">甜甜圈</string>
+    <string name="type.cuisine.ethiopian">伊索匹亞菜</string>
+    <string name="type.cuisine.korean">韓式</string>
+    <string name="type.cuisine.lao">寮國菜</string>
+    <string name="type.cuisine.lebanese">黎巴嫰菜</string>
+    <string name="type.cuisine.local">地方菜</string>
+    <string name="type.cuisine.malagasy">馬達加斯加菜</string>
+    <string name="type.cuisine.malaysian">馬來西亞菜</string>
+    <string name="type.cuisine.mediterranean">地中海菜</string>
+    <string name="type.cuisine.mexican">墨西哥菜</string>
+    <string name="type.cuisine.moroccan">摩洛哥菜</string>
+    <string name="type.cuisine.noodles">麵食</string>
+    <string name="type.cuisine.oriental">東亞菜</string>
+    <string name="type.cuisine.pancake">鬆餅</string>
+    <string name="type.cuisine.pasta">義大利麵</string>
+    <string name="type.cuisine.persian">波斯菜</string>
+    <string name="type.cuisine.peruvian">秘魯菜</string>
+    <string name="type.cuisine.pizza">批薩</string>
+    <string name="type.cuisine.polish">波蘭菜</string>
+    <string name="type.cuisine.portuguese">葡萄牙語</string>
+    <string name="type.cuisine.ramen">拉麵</string>
+    <string name="type.cuisine.regional">地區菜</string>
+    <string name="type.cuisine.russian">俄羅斯菜</string>
+    <string name="type.cuisine.sausage">香腸</string>
+    <string name="type.cuisine.savory_pancakes">美味煎餅</string>
+    <string name="type.cuisine.seafood">海鮮</string>
+    <string name="type.cuisine.soba">蕎麥麵</string>
+    <string name="type.cuisine.spanish">西班牙菜</string>
+    <string name="type.cuisine.steak_house">牛排館</string>
+    <string name="type.cuisine.sushi">生魚片</string>
+    <string name="type.cuisine.tapas">西班牙小吃</string>
+    <string name="type.cuisine.tea">茶</string>
+    <string name="type.cuisine.thai">泰式</string>
+    <string name="type.cuisine.vegan">維根</string>
+    <string name="type.cuisine.vegetarian">素食</string>
+    <string name="type.cuisine.vietnamese">越南菜</string>
+    <string name="type.emergency">緊急</string>
+    <string name="type.emergency.assembly_point">緊急集合點</string>
+    <string name="type.emergency.defibrillator">除顫器</string>
+    <string name="type.emergency.fire_hydrant">消防栓</string>
+    <string name="type.emergency.phone">緊急電話</string>
+    <string name="type.emergency.mountain_rescue">山區救難站</string>
+    <string name="type.entrance">入口</string>
+    <string name="type.healthcare.audiologist">聽力師</string>
+    <string name="type.healthcare.blood_donation">捐血中心</string>
+    <string name="type.healthcare.optometrist">驗光師</string>
+    <string name="type.healthcare.podiatrist">足病醫生</string>
+    <string name="type.healthcare.psychotherapist">心理治療師</string>
+    <string name="type.natural.wetland.saltmarsh">鹽沼</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">潮間鹽沼</string>
+    <string name="type.natural.wetland.fen">鹼沼</string>
 </resources>
diff --git a/data/countries-strings/pt.json/localize.json b/data/countries-strings/pt.json/localize.json
index 2770ac83a..6eacd5b1c 100644
--- a/data/countries-strings/pt.json/localize.json
+++ b/data/countries-strings/pt.json/localize.json
@@ -568,8 +568,8 @@
 "Italy_Sardinia":"Sardenha",
 "Italy_Sicily":"Sicília",
 "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Alto Ádige",
-"Italy_Tuscany_Grosseto":"Toscana — Grosseto",
-"Italy_Tuscany_Massa e Carrara":"Toscana — Massa-Carrara",
+"Italy_Tuscany_Grosseto":"Toscana — Sudeste",
+"Italy_Tuscany_Massa e Carrara":"Toscana — Noroeste",
 "Italy_Umbria":"Úmbria",
 "Italy_Veneto":"Véneto",
 "Italy_Veneto_Belluno":"Belluno",
@@ -1376,7 +1376,7 @@
 "Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg",
 "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg",
 "Austria_Lower Austria_West Description":"Mostviertel, Waldviertel",
-"Austria_Lower Austria_Wien Description":"Viena",
+"Austria_Lower Austria_Wien Description":"Viena, Industrieviertel, Weinviertel",
 "Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau",
 "Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg",
 "Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld",
@@ -1864,7 +1864,7 @@
 "Italy_Sicily Description":"Palermo, Catânia",
 "Italy_Trentino-Alto Adige Sudtirol Description":"Bolzano",
 "Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena",
-"Italy_Tuscany_Massa e Carrara Description":"Florença",
+"Italy_Tuscany_Massa e Carrara Description":"Florença, Livorno, Luca, Pisa, Prato, Pistoia, Carrara, Massa",
 "Italy_Umbria Description":"Perúgia",
 "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico",
 "Italy_Veneto_Padova Description":"Pádua",
diff --git a/data/countries-strings/zh-Hant.json/localize.json b/data/countries-strings/zh-Hant.json/localize.json
index cbadfce57..2ed804f2f 100644
--- a/data/countries-strings/zh-Hant.json/localize.json
+++ b/data/countries-strings/zh-Hant.json/localize.json
@@ -43,7 +43,7 @@
 "Azerbaijan":"阿塞拜疆",
 "Azerbaijan Region":"阿塞拜疆",
 "Bahrain":"巴林",
-"Bangladesh":"孟加拉國",
+"Bangladesh":"孟加拉",
 "Barbados":"巴巴多斯",
 "Belarus":"白俄羅斯",
 "Belarus_Brest Region":"布列斯特州",
@@ -140,7 +140,7 @@
 "Canada_Northwest Territories_Yellowknife":"黃刀鎮",
 "Canada_Nova Scotia":"新斯科舍",
 "Canada_Nova Scotia_Halifax":"哈利法克斯",
-"Canada_Nova Scotia_Sydney":"Sydney,NS",
+"Canada_Nova Scotia_Sydney":"雪梨",
 "Canada_Nunavut":"努納武特",
 "Canada_Nunavut_North":"努納武特 - 北部",
 "Canada_Nunavut_South":"努納武特 - 南部",
@@ -256,11 +256,11 @@
 "Egypt":"埃及",
 "El Salvador":"薩爾瓦多",
 "Equatorial Guinea":"赤道幾內亞",
-"Eritrea":"厄立特里亞",
+"Eritrea":"厄利垂亞",
 "Estonia":"愛沙尼亞",
 "Estonia_East":"愛沙尼亞 - 東部",
 "Estonia_West":"愛沙尼亞 - 西部",
-"Ethiopia":"埃塞俄比亞",
+"Ethiopia":"伊索匹亞",
 "Falkland Islands":"福克蘭群島",
 "Faroe Islands":"法羅群島",
 "Federated States of Micronesia":"密克羅尼西亞聯邦",
@@ -446,9 +446,9 @@
 "Greece_Decentralized Administration of Thessaly - Central Greece":"薩利和希臘中部地方管理部門",
 "Greece_Decentralized Administration of West Greece":"伯羅奔尼撒半島地方管理部門",
 "Greenland":"格陵蘭",
-"Grenada":"格林納達",
+"Grenada":"格拉納達",
 "Guadeloupe":"瓜德羅普",
-"Guatemala":"危地馬拉",
+"Guatemala":"瓜地馬拉",
 "Guernsey":"根西島",
 "Guinea":"幾內亞",
 "Guinea-Bissau":"幾內亞比索",
@@ -504,7 +504,7 @@
 "Indonesia_Jawa Timur":"東爪哇省",
 "Indonesia_Nusa Tenggara":"小巽他群島",
 "Indonesia_West":"蘇門答臘",
-"Iowa":"艾奧瓦州",
+"Iowa":"愛荷華州",
 "Iran":"伊朗",
 "Iran_North":"伊朗 - 北部",
 "Iran_South":"伊朗 - 南部",
@@ -517,7 +517,7 @@
 "Isle of Man":"馬恩島",
 "Israel":"以色列",
 "Israel Region":"以色列",
-"Italy":"意大利",
+"Italy":"義大利",
 "Italy_Abruzzo":"阿布魯佐",
 "Italy_Aosta Valley":"瓦萊達奧斯塔",
 "Italy_Apulia":"普利亞",
@@ -568,8 +568,8 @@
 "Italy_Sardinia":"撒丁島",
 "Italy_Sicily":"西西里島",
 "Italy_Trentino-Alto Adige Sudtirol":"特倫蒂諾-上阿迪傑",
-"Italy_Tuscany_Grosseto":"托斯卡納 — 格羅塞托省",
-"Italy_Tuscany_Massa e Carrara":"托斯卡納 — 馬薩-卡拉拉省",
+"Italy_Tuscany_Grosseto":"托斯卡納 — 東南",
+"Italy_Tuscany_Massa e Carrara":"托斯卡納 —西北",
 "Italy_Umbria":"翁布里亞",
 "Italy_Veneto":"威尼托",
 "Italy_Veneto_Belluno":"貝盧諾省",
@@ -640,14 +640,14 @@
 "Jerusalem":"耶路撒冷",
 "Jordan":"約旦",
 "Kansas":"堪薩斯州",
-"Kazakhstan":"哈薩克斯坦",
+"Kazakhstan":"哈薩克",
 "Kentucky":"肯塔基州",
-"Kenya":"肯尼亞",
-"Kingdom of Lesotho":"萊索托",
+"Kenya":"肯亞",
+"Kingdom of Lesotho":"賴索托",
 "Kiribati":"吉里巴斯",
 "Kuwait":"科威特",
 "Kyrgyzstan":"吉爾吉斯斯坦",
-"Laos":"老撾",
+"Laos":"寮國",
 "Latvia":"拉脫維亞",
 "Lebanon":"黎巴嫩",
 "Liberia":"利比里亞",
@@ -660,7 +660,7 @@
 "Madagascar":"馬達加斯加",
 "Malawi":"馬拉維",
 "Malaysia":"馬來西亞",
-"Maldives":"馬爾代夫",
+"Maldives":"馬爾地夫",
 "Mali":"馬里共和國",
 "Malta":"馬耳他",
 "Marshall Islands":"馬紹爾群島",
@@ -677,7 +677,7 @@
 "Mexico_Mexico":"墨西哥城",
 "Mexico_North":"墨西部哥 - 北部",
 "Mexico_South":"墨西部哥 - 南部",
-"Michigan":"密歇根州",
+"Michigan":"密西根州",
 "Minnesota":"明尼蘇達州",
 "Missouri":"密蘇里州",
 "Moldova":"摩爾多瓦",
@@ -731,12 +731,12 @@
 "New Zealand South_Canterbury":"南部 - 坎特伯雷地區",
 "New Zealand South_Southland":"南部 - 南部地區",
 "Nicaragua":"尼加拉瓜",
-"Niger":"尼日爾",
+"Niger":"尼日",
 "Nigeria":"奈及利亞",
 "Niue":"紐埃",
 "North Carolina":"北卡羅來納州",
 "North Dakota":"北達科他州",
-"North Korea":"朝鮮民主主義人民共和國",
+"North Korea":"北韓",
 "Norway":"挪威",
 "Norway_Bouvet Island":"布韋島",
 "Norway_Central":"奧斯陸",
@@ -760,7 +760,7 @@
 "Papua New Guinea":"巴布亞新幾內亞",
 "Paraguay":"巴拉圭",
 "Pennsylvania":"賓夕法尼亞州",
-"People's Republic of China":"中華人民共和國",
+"People's Republic of China":"中國",
 "Peru":"秘魯",
 "Peru_North":"秘魯 - 北部",
 "Peru_South":"秘魯 - 南部",
@@ -928,9 +928,9 @@
 "South Africa_Western Cape":"西開普省",
 "South Carolina":"南卡羅來納州",
 "South Georgia and the South Sandwich Islands":"南喬治亞島與南桑威奇群島",
-"South Korea":"大韓民國",
-"South Korea_North":"韓國 - 北部",
-"South Korea_South":"韓國 - 南部",
+"South Korea":"南韓",
+"South Korea_North":"南韓 - 北部",
+"South Korea_South":"南韓 - 南部",
 "South Ossetia":"南奧塞梯",
 "South Sudan":"南蘇丹",
 "Spain":"西班牙",
@@ -959,11 +959,11 @@
 "Sri Lanka":"斯里蘭卡",
 "Sudan":"蘇丹共和國",
 "Suriname":"蘇利南",
-"Swaziland":"埃斯瓦蒂尼",
+"Swaziland":"史瓦蒂尼",
 "Sweden":"瑞典",
-"Sweden_Bergslagen":"Bergslagen",
+"Sweden_Bergslagen":"伯格斯拉根",
 "Sweden_Malardalen":"梅拉達倫",
-"Sweden_Mellannorrland":"Mellannorrland",
+"Sweden_Mellannorrland":"中北部",
 "Sweden_Norra Sverige":"瑞典北部",
 "Sweden_Ostra Gotaland":"東約特蘭",
 "Sweden_Sodra Gotaland":"南約特蘭",
@@ -977,11 +977,11 @@
 "Switzerland_Ticino":"提契諾州",
 "Switzerland_Zurich":"蘇黎世都會區",
 "Syria":"敘利亞",
-"Taiwan":"中華民國",
-"Tajikistan":"塔吉克斯坦",
+"Taiwan":"臺灣",
+"Tajikistan":"塔吉克",
 "Tanzania":"坦桑尼亞",
 "Tennessee":"田納西州",
-"Texas":"得克薩斯州",
+"Texas":"德克薩斯州",
 "Thailand":"泰國",
 "Thailand_North":"泰國 - 北部",
 "Thailand_South":"泰國 - 南部",
@@ -1086,14 +1086,14 @@
 "US_Minnesota_Rochester":"羅徹斯特",
 "US_Minnesota_Saint Cloud":"聖克勞德",
 "US_Mississippi":"密西西比州",
-"US_Missouri_East":"密蘇裏州 - 東部",
-"US_Missouri_West":"密蘇裏州 - 西部",
+"US_Missouri_East":"密蘇里州 - 東部",
+"US_Missouri_West":"密蘇里州 - 西部",
 "US_Montana":"蒙大拿州",
 "US_Nebraska":"內布拉斯加州",
 "US_Nevada":"內華達州",
 "US_New Hampshire":"新罕布什爾州",
-"US_New Jersey_North":"新澤西部州 - 北部",
-"US_New Jersey_South":"新澤西部州 - 南部",
+"US_New Jersey_North":"紐澤西州 - 北部",
+"US_New Jersey_South":"紐澤西州 - 南部",
 "US_New Mexico":"新墨西哥州",
 "US_New York_East":"紐約州 — 長島",
 "US_New York_New York":"紐約州 — 紐約",
@@ -1175,22 +1175,22 @@
 "Ukraine_Zakarpattia Oblast":"外喀爾巴阡州",
 "Ukraine_Zaporizhia Oblast":"扎波羅熱州",
 "Ukraine_Zhytomyr Oblast":"日托米爾州",
-"United Arab Emirates":"阿拉伯聯合酋長國",
+"United Arab Emirates":"阿拉伯聯合大公國",
 "United Kingdom":"英國",
 "United States Virgin Islands":"美屬維爾京群島",
 "United States of America":"美國",
 "Uruguay":"烏拉圭",
-"Uzbekistan":"烏茲別克斯坦",
+"Uzbekistan":"烏茲別克",
 "Vanuatu":"萬那杜",
 "Venezuela":"委內瑞拉",
 "Vietnam":"越南",
-"Virginia":"弗吉尼亞州",
+"Virginia":"維吉尼亞州",
 "Wallis and Futuna":"瓦利斯和富圖納群島",
 "Washington":"華盛頓州",
 "Willis Island":"威利斯島",
 "Wisconsin":"威斯康辛州",
-"Yemen":"也門",
-"Zambia":"贊比亞",
+"Yemen":"葉門",
+"Zambia":"尚比亞",
 "Zimbabwe":"辛巴威",
 "Argentina_Santa Fe":"聖大非省",
 "Australia_Brisbane":"布里斯班",
@@ -1215,8 +1215,8 @@
 "Chile_Central":"智利 - 中心",
 "Congo-Kinshasa_Kivu":"基伍",
 "Congo-Kinshasa_West":"剛果 - 西",
-"Croatia_Central":"克羅地亞 - 中",
-"Croatia_West":"克羅地亞 - 西",
+"Croatia_Central":"克羅埃西亞 - 中部",
+"Croatia_West":"克羅埃西亞 - 西",
 "Ecuador_East":"厄瓜多爾 - 東",
 "Ecuador_West":"厄瓜多爾 - 西",
 "Finland_Eastern Finland_North":"東芬蘭 - 北",
@@ -1247,8 +1247,8 @@
 "Nepal_Kathmandu":"加德滿都",
 "Nepal_Madhyamanchal":"中部地區",
 "Nepal_Purwanchal":"東部地區",
-"Nigeria_North":"尼日利亞 - 北",
-"Nigeria_South":"尼日利亞 - 南",
+"Nigeria_North":"尼日 - 北",
+"Nigeria_South":"尼日 - 南",
 "Norway_Hordaland":"霍達蘭郡",
 "Norway_Nordland":"諾爾蘭郡",
 "Norway_North Trondelag":"北特倫德拉格郡",
@@ -1271,8 +1271,8 @@
 "Russia_Yugra_Surgut":"漢特-曼西自治區 — 蘇爾古特",
 "Saudi Arabia_North":"沙烏地阿拉伯 - 北",
 "Saudi Arabia_South":"沙烏地阿拉伯 - 南",
-"Slovenia_East":"斯洛文尼亞 - 東",
-"Slovenia_West":"斯洛文尼亞 - 西",
+"Slovenia_East":"斯洛維尼亞 - 東",
+"Slovenia_West":"斯洛維尼亞 - 西",
 "Spain_Andalusia_Granada":"安達魯西亞 — 格拉納達",
 "Spain_Andalusia_Sevilla":"安達魯西亞 — 塞維利亞",
 "Spain_Castile and Leon_East":"卡斯蒂利亞和萊昂 - 東",
@@ -1345,7 +1345,7 @@
 "US_Virginia_Norfolk":"諾福克",
 "Abkhazia Description":"Pitsunda, Gudauta, Sukhum",
 "Afghanistan Description":"Kabul, Kandahar, Tokzar",
-"Albania Description":"斯库台",
+"Albania Description":"斯庫台卡瓦耶地拉那",
 "Algeria_Central Description":"Batna, Djelfa, Biskra",
 "Algeria_Coast Description":"Algiers, Oran, Constantine",
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
@@ -1376,7 +1376,7 @@
 "Austria_Burgenland Description":"Oberpullendorf, Eisenstadt, Mattersburg",
 "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg",
 "Austria_Lower Austria_West Description":"莫斯特地區，瓦爾德地區",
-"Austria_Lower Austria_Wien Description":"維也納新城",
+"Austria_Lower Austria_Wien Description":"維也納工業區",
 "Austria_Salzburg Description":"Salzburg, Oberndorf bei Salzburg, Abtenau",
 "Austria_Styria_Graz Description":"Graz, Feldbach, Voitsberg",
 "Austria_Styria_Leoben Description":"Eisenerz, Mariazell, Knittelfeld",
@@ -1417,7 +1417,7 @@
 "Brazil_Bahia Description":"维多利亚-达孔基斯塔",
 "Brazil_Goias_Brasilia Description":"阿帕雷西達迪戈亞尼亞",
 "Brazil_Goias_North Description":"Goianésia, Jaraguá, Porangatu",
-"Brazil_Mato Grosso Description":"龙多诺波利斯",
+"Brazil_Mato Grosso Description":"隆多諾波利斯大瓦爾澤亞庫亞巴",
 "Brazil_Mato Grosso Do Sul Description":"Campo Grande, Dourados, Três Lagoas",
 "Brazil_North Region_East Description":"馬卡帕",
 "Brazil_North Region_West Description":"里約布蘭科",
@@ -1754,7 +1754,7 @@
 "Greenland Description":"Kangaatsiaq, Qaqortoq, Paamiut",
 "Grenada Description":"St. George's, Gouyave, Calivigny",
 "Guadeloupe Description":"Les Abymes, Baie-Mahault, Le Gosier",
-"Guatemala Description":"Guatemala City, Quetzaltenango (Xela), Santo Tomas De Castilla",
+"Guatemala Description":"瓜地馬拉市, Quetzaltenango (Xela), Santo Tomas De Castilla",
 "Guernsey Description":"Saint Peter Port, St Anne, The Bridge",
 "Guinea Description":"Conakry, Coyah, Nzérékoré",
 "Guinea-Bissau Description":"Bissau, Mansôa, Bubaque",
@@ -1863,8 +1863,8 @@
 "Italy_Sardinia Description":"Casteddu/Cagliari, Sassari, Cuartu Sant'Aleni/Quartu Sant'Elena",
 "Italy_Sicily Description":"墨西拿",
 "Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto",
-"Italy_Tuscany_Grosseto Description":"格罗塞托",
-"Italy_Tuscany_Massa e Carrara Description":"普拉托",
+"Italy_Tuscany_Grosseto Description":"錫耶納格羅塞托阿雷佐",
+"Italy_Tuscany_Massa e Carrara Description":"佛羅倫斯、利沃諾、盧卡、披薩、普拉托、皮斯托亞、卡拉拉、馬薩",
 "Italy_Umbria Description":"Perugia, Terni, Foligno",
 "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico",
 "Italy_Veneto_Padova Description":"Padua, Cittadella, Selvazzano Dentro",
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
index 1d69f689c..66dfa12e4 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 783c19c81..db35932b7 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "line" = "Line";
 
 /* Text in the editor */
-"bluesky" = "Bluesky";
+"bluesky" = "بلوسكاي";
 
 /* Text in menu */
 "panoramax" = "Panoramax";
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
index 88af52a5b..f57d31779 100644
--- a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "traffic_update_maps_text" = "To display traffic data, maps must be updated.";
 "routing_requires_all_map" = "In order to create a route, we need to download and update all the maps from your location to your destination.";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 815c79078..15b0d38f2 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -1080,3 +1080,6 @@
 "app_tip_02" = "Do you like our app? Please donate to support the development! Don't like it yet? Please let us know why, and we will fix it!";
 "app_tip_01" = "With your donations and support, we can create the best maps in the World!";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 7e3a92789..5750846da 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 66aa0d234..b80d95ae4 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
index 33c0a3de8..b7091f026 100644
--- a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "yes_available" = "Yes";
 "pref_mapappearance_title" = "Map Appearance";
 "pref_tts_enable_title" = "Enable Voice Instructions";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index b328f84c1..16050613a 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -322,7 +322,7 @@
 "volunteer" = "Fer-se voluntari";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Segueix i contacta amb nosaltres";
+"follow_us" = "Connecta amb nosaltres";
 
 /* Alert text */
 "email_error_body" = "No s'ha configurat cap client de correu electrònic. Configureu-lo o useu un altra via per contactar amb nosaltres a %@";
@@ -1094,3 +1094,6 @@
 "about_headline" = "Projecte obert, desenvolupat per la comunitat";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 31494f0e8..774dd859c 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1098,3 +1098,6 @@
 "osm_profile_view_notes" = "Zobrazit poznámky";
 "osm_profile_view_edit_history" = "Zobrazit historii úprav";
 "pref_mapappearance_title" = "Vzhled mapy";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index c610ea7bb..5a1805499 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1096,3 +1096,6 @@
 "osm_profile_view_notes" = "Se bemærkninger";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index f3044e060..c940b9322 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1098,3 +1098,6 @@
 "track_recording_toast_nothing_to_save" = "Route ist leer - nichts zu speichern";
 "edit_track" = "Track bearbeiten";
 "pref_mapappearance_title" = "Kartendarstellung";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 56678dc34..2e9ed8a2f 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "about_headline" = "Open project powered by the community";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index eae2744d6..9e23ee69e 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "Ver historial de ediciones";
 "osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index e279ab30f..a189536ad 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -328,7 +328,7 @@
 "volunteer" = "Voluntariado";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Síganos y póngase en contacto con nosotros";
+"follow_us" = "Conecta con nosotros";
 
 /* Alert text */
 "email_error_body" = "No se ha configurado el cliente de correo electrónico. Configúrelo o contáctenos en %@";
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "Ver historial de ediciones";
 "osm_profile_view_notes" = "Ver notas";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index cb9a512d6..644d73d6e 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "volunteer" = "Vabatahtlik kaastöö";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Võta meiega ühendust";
+"follow_us" = "Suhtle meiega";
 
 /* Alert text */
 "email_error_body" = "E-posti klienti ei ole seadistatud. Palun seadista see või kasuta mõnda muud võimalust meiega ühenduse võtmiseks aadressil %@";
@@ -1096,3 +1096,6 @@
 "osm_profile_view_notes" = "Vaata märkused";
 "about_proposition_3" = "Läbipaistev ja kasumit mittetaotlev";
 "pref_mapappearance_title" = "Kaardi välimus";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index f5363225f..2439d348a 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -1096,3 +1096,6 @@
 "osm_profile_view_edit_history" = "Aldaketen historia ikusi";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
index d9e7259e5..9d014d36e 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.stringsdict
@@ -31,9 +31,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>fitxategi %d aurkitu da. Elkarrizketaren ondoren ikusiko duzu.</string>
+			<string>Fitxategi %d aurkitu da. Bihurketaren ondoren ikusiko duzu.</string>
 			<key>other</key>
-			<string>%d fitxategi aurkitu dira. Elkarrizketaren ondoren ikusiko dituzu.</string>
+			<string>%d fitxategi aurkitu dira. Bihurketaren ondoren ikusiko dituzu.</string>
 		</dict>
 	</dict>
 	<key>tracks</key>
@@ -47,9 +47,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d arrasto</string>
+			<string>arrasto %d</string>
 			<key>other</key>
-			<string>%d arrastos</string>
+			<string>%d arrasto</string>
 		</dict>
 	</dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
index 99287bee8..6a758dee1 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Hilerria";
-"type.landuse.religious" = "Religious Land";
+"type.landuse.religious" = "Eremu erlijiosoa";
 "type.landuse.commercial" = "Komertzial-gunea";
 "type.landuse.construction" = "Eraikitze-gunea";
 "type.landuse.education" = "Hezkuntza-azpiegitura";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 1b33cbbe9..3f853379d 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "line" = "Line";
 
 /* Text in the editor */
-"bluesky" = "Bluesky";
+"bluesky" = "بلواسکای";
 
 /* Text in menu */
 "panoramax" = "Panoramax";
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 9c8e685cb..d41811620 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "Näytä muokkaushistoria";
 "osm_profile_view_notes" = "Näytä ilmoitukset";
 "pref_mapappearance_title" = "Kartan ulkoasu";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
index dd0c8eeae..c8b2f60f7 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -1499,4 +1499,4 @@
 "type.natural.wetland.swamp" = "Suo";
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.natural.wetland.tidalflat" = "Vuorovesitasanko";
-"type.leisure.escape_game" = "Escape Room";
+"type.leisure.escape_game" = "Pakohuonepeli";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 7341dc077..78a6b5a8b 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -34,7 +34,7 @@
 "use_cellular_data" = "Oui";
 
 /* View and button titles for accessibility */
-"zoom_to_country" = "Voir sur la carte";
+"zoom_to_country" = "Afficher la carte";
 
 /* Button text for the button at the center of the screen when the country is not downloaded and the size should not be shown */
 "country_status_download_without_size" = "Téléchargez la carte";
@@ -328,7 +328,7 @@
 "volunteer" = "Se porter volontaire";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Échange avec nous";
+"follow_us" = "Rentrez en contact avec nous";
 
 /* Alert text */
 "email_error_body" = "Le client de courriel n'a pas été configuré. Veuillez le configurer ou nous contacter à %@";
@@ -1098,3 +1098,6 @@
 "osm_profile_view_notes" = "Afficher les notes";
 "osm_profile_view_edit_history" = "Afficher l'historique des modifications";
 "pref_mapappearance_title" = "Apparence de la carte";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
index fcca687e8..120215c59 100644
--- a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
@@ -128,7 +128,7 @@
 "report_a_bug" = "Informar dun fallo";
 "report_incorrect_map_bug" = "Informar ou corrixir datos de mapa incorrectos";
 "volunteer" = "Voluntariado";
-"follow_us" = "Síganos e póñase en contacto connosco";
+"follow_us" = "Contacta con nós";
 "email_error_body" = "Non se configurou o cliente de correo electrónico. Configúreo ou @contáctar en %@";
 "email_error_title" = "Erro de envío de correo";
 "pref_calibration_title" = "Calibración do compás";
@@ -586,3 +586,6 @@
 "osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org).";
 "social_pixelfed" = "Pixelfed";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
index 5eb807300..e90877a42 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "social_mastodon" = "Mastodon";
 "social_pixelfed" = "Pixelfed";
 "pref_mapappearance_title" = "Chartedarstellig";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 30e6af2c8..416176651 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -289,7 +289,7 @@
 "line" = "Line";
 
 /* Text in the editor */
-"bluesky" = "Bluesky";
+"bluesky" = "בלוסקיי";
 
 /* Text in menu */
 "panoramax" = "Panoramax";
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index 90c8027ee..d97e63bc0 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "about_headline" = "Open project powered by the community";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
index b1d9ee476..ffe003382 100644
--- a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "dialog_routing_intermediate_not_determined" = "Please adjust your intermediate point.";
 "open_in_app" = "Open in Another App";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index eb4f9cd7c..ca49e2a3b 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "about_headline" = "Open project powered by the community";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
index 9c0b2bc00..5e05d3159 100644
--- a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "thank_you" = "Thank You";
 "yes_available" = "Yes";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 2e459bd58..ebb192d5f 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "about_headline" = "Open project powered by the community";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
index 15eb3f0da..7e78c7d17 100644
--- a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "pref_zoom_title" = "Zoom buttons";
 "car_continue_in_the_car" = "To the car screen";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 159ff2ba3..bb1d15572 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -328,7 +328,7 @@
 "volunteer" = "Per fare il volontario";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Seguici e contattaci";
+"follow_us" = "Contattaci";
 
 /* Alert text */
 "email_error_body" = "Il client di posta elettronica non è stato configurato. Per favore, configuralo o contattaci all'indirizzo %@";
@@ -1097,4 +1097,7 @@
 "osm_profile_delete" = "Elimina account OpenStreetMap";
 "osm_profile_reauthorize" = "Riconnettiti a OpenStreetMap";
 "osm_profile_view_notes" = "Visualizza note";
-"pref_mapappearance_title" = "Map Appearance";
+"pref_mapappearance_title" = "Aspetto della mappa";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index ee26b6b47..08ed5972f 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1097,4 +1097,7 @@
 "edit_track" = "ルートを編集";
 "osm_profile_view_notes" = "メモを表示";
 "osm_profile_view_edit_history" = "編集履歴を表示";
-"pref_mapappearance_title" = "Map Appearance";
+"pref_mapappearance_title" = "マップの外観";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
index 1547a298f..27e1b0482 100644
--- a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
@@ -16,13 +16,13 @@
 "social_codeberg" = "Codeberg";
 "osm_profile_delete" = "Kkes amiḍan n OpenStreetMap";
 "osm_profile_logout" = "Tuffɣa seg umiḍan n OpenStreetMap";
-"osm_profile_view_notes" = "Wali tamawt";
+"osm_profile_view_notes" = "Wali tizmilin";
 "social_lemmy" = "Lemmy";
 "social_bluesky" = "Bluesky";
 "osm_profile_login" = "Akeccum ɣer amiḍan n OpenStreetMap";
 "osm_profile_reauthorize" = "Aɛiwed n tuqqna s OpenStreetMap";
 "osm_profile_remove" = "Kkes tasmekta n umiḍan n OpenStreetMap seg useɣzan-a";
-"osm_profile_view_edit_history" = "Wali amezruy n ubeddel";
+"osm_profile_view_edit_history" = "Wali amezruy n tiẓrigin";
 "osm_profile_reauthorize_promt" = "Imiḍan n OpenStreetMap yettwaqleɛ seg useɣzan-a";
 "osm_profile_remove_promt" = "Ma ur tezmireḍ ara neɣ ur tebɣiḍ ara ad ternuḍ amidan-ik, tzemreḍ kan ad t-tekkseḍ seg usmel-a";
 "downloader_search_field_hint" = "Find map";
@@ -586,3 +586,6 @@
 "length" = "Length";
 "done" = "Done";
 "pref_mapappearance_title" = "Map Appearance";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_title" = "Map Language";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 3166b19c3..3464bd0ad 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
index 9ddcd7200..fe426386f 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
@@ -202,7 +202,7 @@
 "share_my_location" = "Bendrinti mano vietą";
 "prefs_group_route" = "Navigacija";
 "pref_zoom_title" = "Mastelio mygtukai";
-"pref_left_button_type" = "Left Main Button";
+"pref_left_button_type" = "Kairysis pagrindinis mygtukas";
 
 /* Settings «Map» category: «Appearance» title */
 "pref_appearance_title" = "Išvaizda";
@@ -1094,5 +1094,8 @@
 "edit_track" = "Redaguoti trasą";
 "osm_profile_view_notes" = "Peržiūrėti pastabas";
 "osm_profile_view_edit_history" = "Peržiūrėti keitimų istoriją";
-"about_proposition_3" = "Transparent and not for profit";
-"pref_mapappearance_title" = "Map Appearance";
+"about_proposition_3" = "Skaidrus ir nesiekiantis pelno";
+"pref_mapappearance_title" = "Žemėlapio išvaizda";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict
index a0b50aef1..ab55ab95f 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.stringsdict
@@ -12,6 +12,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d žymių</string>
 			<key>one</key>
 			<string>%d žymė</string>
 			<key>few</key>
@@ -30,6 +32,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Aptikta %d failų. Juos galėsite pamatyti, atlikus konvertavimą.</string>
 			<key>one</key>
 			<string>Aptiktas %d failas. Jį (juos) galėsite pamatyti, atlikus konvertavimą.</string>
 			<key>few</key>
@@ -48,6 +52,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>%d trasų</string>
 			<key>one</key>
 			<string>%d trasa</string>
 			<key>few</key>
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
index bb77428aa..e436d2fd3 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
index 7a86dc75f..f93e4e321 100644
--- a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "hide" = "Hide";
 "navigation_stop_button" = "Stop";
 "pref_mapappearance_title" = "Map Appearance";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_title" = "Map Language";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 7890da415..0591568b7 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -1092,3 +1092,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "about_headline" = "Open project powered by the community";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
index 41671b466..b01aa404c 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org).";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index d50f58463..df65f768a 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1096,3 +1096,6 @@
 "osm_profile_view_notes" = "Vis merknader";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 03ede5fa4..5667fc4c2 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "Bewerkingsgeschiedenis bekijken";
 "osm_profile_view_notes" = "Opmerkingen bekijken";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 6ef720caa..625d2d3cb 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "volunteer" = "Wolontariusz";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Śledź nas i skontaktuj się z nami";
+"follow_us" = "Skontaktuj się z nami";
 
 /* Alert text */
 "email_error_body" = "Klient pocztowy nie został skonfigurowany. Proszę skonfigurować go, bądź skorzystać z innych opcji, aby się z nami skontaktować na %@";
@@ -1096,3 +1096,6 @@
 "osm_profile_view_notes" = "Wyświetl uwagi";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_local" = "Local Language";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index bef67cbf1..28c8db259 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "Ver histórico de edições";
 "osm_profile_view_notes" = "Ver notas";
 "pref_mapappearance_title" = "Aparência do mapa";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index aa20388f6..03f4a1841 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "volunteer" = "Voluntaria-te";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Segue-nos e contacta-nos";
+"follow_us" = "Entra em contacto connosco";
 
 /* Alert text */
 "email_error_body" = "O programa de email não está configurado. Por favor, configure-o ou utilize qualquer outra forma de nos contactar através de %@";
@@ -1094,5 +1094,8 @@
 "edit_track" = "Editar trajeto";
 "osm_profile_view_notes" = "Ver notas";
 "osm_profile_view_edit_history" = "Ver histórico de edições";
-"about_proposition_3" = "Transparent and not for profit";
-"pref_mapappearance_title" = "Map Appearance";
+"about_proposition_3" = "Transparente e sem fins lucrativos";
+"pref_mapappearance_title" = "Aparência do Mapa";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
index ef2788e79..9045a9432 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
@@ -672,7 +672,7 @@
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Cemitério cristão";
-"type.landuse.religious" = "Religious Land";
+"type.landuse.religious" = "Local Religioso";
 "type.landuse.commercial" = "Área comercial";
 "type.landuse.construction" = "Construção";
 "type.landuse.education" = "Instalação Educativa";
@@ -1493,10 +1493,10 @@
 "type.sport.diving" = "Mergulho alto";
 "type.railway.station.subway.qingdao" = "Estação de metro";
 "type.natural.wetland.tidalflat" = "Tidal Flat";
-"type.natural.wetland.swamp" = "Swamp";
-"type.natural.wetland.saltmarsh" = "Salt Marsh";
-"type.natural.wetland.mangrove" = "Mangrove";
+"type.natural.wetland.swamp" = "Pântano";
+"type.natural.wetland.saltmarsh" = "Sapal";
+"type.natural.wetland.mangrove" = "Mangal";
 "type.natural.wetland.fen" = "Fen";
-"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
-"type.natural.wetland.reedbed" = "Reed Bed";
+"type.natural.wetland.saltmarsh.tidal" = "Marisma";
+"type.natural.wetland.reedbed" = "Caniçal";
 "type.leisure.escape_game" = "Escape Room";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index da0399ade..13ec86a68 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 1e7ef6b34..13fb53d08 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -328,7 +328,7 @@
 "volunteer" = "Cтать волонтёром";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Подписывайтесь и пишите нам";
+"follow_us" = "Свяжитесь с нами";
 
 /* Alert text */
 "email_error_body" = "Почтовый клиент не настроен. Настройте его или используйте другие способы для связи. Наш адрес - %@";
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "История правок";
 "osm_profile_view_notes" = "Заметки";
 "pref_mapappearance_title" = "Map Appearance";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_title" = "Map Language";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index e4a0f10c0..4527ac5ae 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_title" = "Map Language";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
index 9f4c40f97..5f95cc83b 100644
--- a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
@@ -586,3 +586,6 @@
 "drive_through" = "Drive-through";
 "enable_icloud_synchronization_title" = "Enable iCloud Syncronization";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
index a057c2e12..75fa28aa0 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
@@ -1096,3 +1096,6 @@
 "osm_profile_view_edit_history" = "Погледајте историју измена";
 "about_headline" = "Отворени пројекат који покреће заједница";
 "pref_mapappearance_title" = "Изглед мапе";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 87af3a49a..9867a9075 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -518,7 +518,7 @@
 "autodownload" = "Automatisk nedladdning";
 
 /* Place Page opening hours text */
-"closed_now" = "Stängt just nu";
+"closed_now" = "Stängt nu";
 
 /* Place Page opening hours text */
 "daily" = "Dagligen";
@@ -1094,3 +1094,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "about_headline" = "Open project powered by the community";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
index 1894562b8..fa5fb14fa 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
@@ -87,7 +87,7 @@
 "type.amenity.nursing_home" = "Vårdhem";
 "type.amenity.parking" = "Parkering";
 "type.amenity.parking.fee" = "Parkering";
-"type.amenity.parking.multi.storey" = "Flervånings parkering";
+"type.amenity.parking.multi.storey" = "Flervåningsparkering";
 "type.amenity.parking.multi.storey.fee" = "Flervånings parkering";
 "type.amenity.parking.no.access" = "Privat parkering";
 "type.amenity.parking.permissive" = "Privat parkering";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 406b5db3d..7064b9a42 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1088,3 +1088,6 @@
 "about_proposition_3" = "Transparent and not for profit";
 "downloading" = "Downloading…";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 746ba5865..2dcb8670d 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index a91a0f35a..430f100ca 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -328,7 +328,7 @@
 "volunteer" = "Gönüllü ol";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Bizi izle ve iletişime geç";
+"follow_us" = "Bize Bağlanın";
 
 /* Alert text */
 "email_error_body" = "E-posta istemcisi henüz kurulmamış. Lütfen e-posta istemcisini yapılandırın veya bize %@ adresinden ulaşmak için başka bir yöntem deneyin";
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "Düzenleme geçmişini görüntüle";
 "osm_profile_view_notes" = "Notları görüntüle";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 55601aa34..f5ffdfc7f 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1096,3 +1096,6 @@
 "osm_profile_view_edit_history" = "Переглянути історію редагувань";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 297fb79cb..f49759c13 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1094,3 +1094,6 @@
 "about_headline" = "Open project powered by the community";
 "about_proposition_3" = "Transparent and not for profit";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index f05f4c867..0dad7aec3 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -328,7 +328,7 @@
 "volunteer" = "志愿者";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "关注并联系我们";
+"follow_us" = "联系我们";
 
 /* Alert text */
 "email_error_body" = "尚未设置电子邮件客户端。请进行配置或通过 %@ 联系我们";
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "查看编辑历史";
 "osm_profile_view_notes" = "查看注记";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 94abceb9c..636b217d1 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -328,7 +328,7 @@
 "volunteer" = "志願者";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "追蹤並聯絡我們";
+"follow_us" = "聯絡我們";
 
 /* Alert text */
 "email_error_body" = "電子郵件客戶端未設定。請配置電子郵件客戶端或通過 %@ 聯絡我們";
@@ -1098,3 +1098,6 @@
 "osm_profile_view_edit_history" = "查看編輯歷史記錄";
 "osm_profile_view_notes" = "查看註記";
 "pref_mapappearance_title" = "Map Appearance";
+"pref_maplanguage_title" = "Map Language";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"pref_maplanguage_local" = "Local Language";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
index 6db1e6f22..2f556bb34 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
@@ -4,17 +4,17 @@
 "type.aerialway" = "架空索道";
 "type.aerialway.cable_car" = "纜車";
 "type.aerialway.chair_lift" = "吊椅索道";
-"type.aerialway.drag_lift" = "纜車要素";
-"type.aerialway.gondola" = "循環式索道";
-"type.aerialway.mixed_lift" = "纜車";
+"type.aerialway.drag_lift" = "拖曳纜車";
+"type.aerialway.gondola" = "纜車";
+"type.aerialway.mixed_lift" = "混合纜車";
 "type.aerialway.station" = "纜車站";
-"type.aeroway" = "機場要素";
+"type.aeroway" = "機場設施";
 "type.aeroway.aerodrome" = "機場";
-"type.aeroway.aerodrome.international" = "機場";
-"type.aeroway.apron" = "機場停機坪";
-"type.aeroway.gate" = "登機口";
-"type.aeroway.helipad" = "直升機場";
-"type.aeroway.runway" = "機場跑道";
+"type.aeroway.aerodrome.international" = "國際機場";
+"type.aeroway.apron" = "機棚";
+"type.aeroway.gate" = "登機門";
+"type.aeroway.helipad" = "停機坪";
+"type.aeroway.runway" = "跑道";
 "type.aeroway.taxiway" = "滑行道";
 "type.aeroway.terminal" = "航廈";
 "type.amenity" = "設施";
@@ -23,136 +23,136 @@
 "type.amenity.bank" = "銀行";
 "type.amenity.bar" = "酒吧";
 "type.amenity.bbq" = "烤肉架";
-"type.amenity.bench" = "長板凳";
-"type.amenity.bicycle_parking" = "腳踏車停放區";
-"type.amenity.bicycle_rental" = "自行車出租";
-"type.amenity.bicycle_repair_station" = "自行車維修站";
+"type.amenity.bench" = "長椅";
+"type.amenity.bicycle_parking" = "單車停車場";
+"type.amenity.bicycle_rental" = "單車租借";
+"type.amenity.bicycle_repair_station" = "單車修理站";
 "type.amenity.biergarten" = "啤酒花園";
 "type.amenity.brothel" = "妓院";
-"type.amenity.bureau_de_change" = "匯率";
-"type.amenity.bus_station" = "公車站";
-"type.amenity.cafe" = "咖啡廳";
+"type.amenity.bureau_de_change" = "外匯兌換店";
+"type.amenity.bus_station" = "客運站";
+"type.amenity.cafe" = "咖啡店";
 "type.amenity.car_rental" = "租車";
-"type.amenity.motorcycle_rental" = "摩托車租賃";
-"type.amenity.car_sharing" = "汽車共用";
-"type.amenity.car_wash" = "洗車";
+"type.amenity.motorcycle_rental" = "機車租借";
+"type.amenity.car_sharing" = "共享汽車";
+"type.amenity.car_wash" = "洗車店";
 "type.amenity.casino" = "賭場";
-"type.amenity.gambling" = "賭博";
-"type.leisure.adult_gaming_centre" = "成人遊戲中心";
+"type.amenity.gambling" = "賭間";
+"type.leisure.adult_gaming_centre" = "成人娛樂中心";
 "type.leisure.amusement_arcade" = "電子遊樂場";
 "type.amenity.charging_station" = "充電站";
-"type.amenity.charging_station.bicycle" = "自行車充電站";
+"type.amenity.charging_station.bicycle" = "單車充電站";
 "type.amenity.charging_station.motorcar" = "汽車充電站";
-"type.amenity.childcare" = "保育";
+"type.amenity.childcare" = "托兒所";
 "type.amenity.cinema" = "電影院";
 "type.leisure.bowling_alley" = "保齡球館";
 "type.amenity.clinic" = "診所";
 "type.amenity.college" = "學院";
-"type.amenity.community_centre" = "社區活動中心";
-"type.amenity.compressed_air" = "壓縮的空氣";
+"type.amenity.community_centre" = "社區中心";
+"type.amenity.compressed_air" = "壓縮空氣";
 "type.amenity.conference_centre" = "會議中心";
 "type.amenity.courthouse" = "法院";
 "type.amenity.dentist" = "牙醫";
-"type.amenity.doctors" = "醫師診間";
-"type.amenity.drinking_water" = "飲用水";
-"type.drinking_water.yes" = "飲用水";
+"type.amenity.doctors" = "醫生";
+"type.amenity.drinking_water" = "飲水";
+"type.drinking_water.yes" = "飲水";
 "type.amenity.driving_school" = "駕訓班";
 "type.amenity.exhibition_centre" = "展覽中心";
 "type.amenity.money_transfer" = "匯款";
 "type.amenity.music_school" = "音樂學校";
 "type.amenity.language_school" = "語言學校";
 "type.office.diplomatic" = "大使館";
-"type.amenity.fast_food" = "速食店";
-"type.amenity.ferry_terminal" = "渡船";
-"type.amenity.fire_station" = "消防局";
-"type.amenity.food_court" = "美食廣場";
+"type.amenity.fast_food" = "速食餐廳";
+"type.amenity.ferry_terminal" = "渡輪";
+"type.amenity.fire_station" = "消防隊";
+"type.amenity.food_court" = "美食街";
 "type.amenity.fountain" = "噴泉";
-"type.amenity.fuel" = "加氣站";
+"type.amenity.fuel" = "加油站";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.amenity.grave_yard" = "墓地";
+"type.amenity.grave_yard" = "宗教墓園";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.amenity.grave_yard.christian" = "基督教墓地";
+"type.amenity.grave_yard.christian" = "教會墓園";
 "type.amenity.hospital" = "醫院";
-"type.amenity.hunting_stand" = "狩獵場";
-"type.amenity.ice_cream" = "冰淇淋攤";
-"type.amenity.internet_cafe" = "網路咖啡店";
+"type.amenity.hunting_stand" = "狩獵小屋";
+"type.amenity.ice_cream" = "冰淇淋";
+"type.amenity.internet_cafe" = "網咖";
 "type.amenity.kindergarten" = "幼兒園";
 "type.amenity.library" = "圖書館";
-"type.amenity.loading_dock" = "裝卸碼頭";
+"type.amenity.loading_dock" = "卸貨碼頭";
 "type.amenity.marketplace" = "市場";
-"type.amenity.motorcycle_parking" = "機車停車格";
-"type.amenity.nightclub" = "夜店";
-"type.amenity.nursing_home" = "養老院";
+"type.amenity.motorcycle_parking" = "機車停車場";
+"type.amenity.nightclub" = "俱樂部";
+"type.amenity.nursing_home" = "療養院";
 "type.amenity.parking" = "停車場";
-"type.amenity.parking.fee" = "停車場";
-"type.amenity.parking.multi.storey" = "多層停車場";
-"type.amenity.parking.multi.storey.fee" = "多層停車場";
+"type.amenity.parking.fee" = "停車費用";
+"type.amenity.parking.multi.storey" = "立體停車場";
+"type.amenity.parking.multi.storey.fee" = "立體停車場費用";
 "type.amenity.parking.no.access" = "私人停車場";
 "type.amenity.parking.permissive" = "私人停車場";
 "type.amenity.parking.private" = "私人停車場";
-"type.amenity.parking.park_and_ride" = "停車場";
+"type.amenity.parking.park_and_ride" = "停車轉乘";
 "type.amenity.parking.underground" = "地下停車場";
 "type.amenity.parking.underground.fee" = "地下停車場";
 "type.amenity.parking.underground.private" = "私人地下停車場";
-"type.amenity.parking.street_side" = "街邊停車";
-"type.amenity.parking.street_side.fee" = "街邊停車";
-"type.amenity.parking.street_side.private" = "私人街邊停車場";
+"type.amenity.parking.street_side" = "路邊停車格";
+"type.amenity.parking.street_side.fee" = "路邊停車格";
+"type.amenity.parking.street_side.private" = "私人路邊停車格";
 "type.amenity.parking.lane" = "車道停車";
 "type.amenity.parking.lane.fee" = "車道停車";
 "type.amenity.parking.lane.private" = "私人車道停車場";
-"type.amenity.parking_entrance" = "停車場入口";
-"type.amenity.parking_entrance.private" = "私人停車場入口";
-"type.amenity.parking_entrance.permissive" = "停車場入口";
-"type.amenity.parking_space" = "停車地點";
-"type.amenity.parking_space.permissive" = "停車地點";
-"type.amenity.parking_space.private" = "停車地點";
-"type.amenity.parking_space.underground" = "停車地點";
-"type.amenity.parking_space.disabled" = "殘疾人停車位";
-"type.amenity.payment_terminal" = "付款終端";
+"type.amenity.parking_entrance" = "停車場出入口";
+"type.amenity.parking_entrance.private" = "私停車場出入口";
+"type.amenity.parking_entrance.permissive" = "停車場出入口";
+"type.amenity.parking_space" = "停車格";
+"type.amenity.parking_space.permissive" = "停車格";
+"type.amenity.parking_space.private" = "停車格";
+"type.amenity.parking_space.underground" = "停車格";
+"type.amenity.parking_space.disabled" = "無障礙停車格";
+"type.amenity.payment_terminal" = "繳費機";
 "type.amenity.pharmacy" = "藥局";
-"type.amenity.place_of_worship" = "寺廟";
-"type.amenity.place_of_worship.buddhist" = "佛教寺廟";
-"type.amenity.place_of_worship.christian" = "基督教堂";
+"type.amenity.place_of_worship" = "宗教崇拜場所";
+"type.amenity.place_of_worship.buddhist" = "佛寺";
+"type.amenity.place_of_worship.christian" = "教堂";
 "type.amenity.place_of_worship.christian.mormon" = "耶穌基督後期聖徒教會";
-"type.amenity.place_of_worship.christian.jehovahs_witness" = "耶和華見證人王國大廳";
+"type.amenity.place_of_worship.christian.jehovahs_witness" = "耶和華見證人";
 "type.amenity.place_of_worship.hindu" = "印度教寺廟";
-"type.amenity.place_of_worship.jewish" = "猶太教堂";
+"type.amenity.place_of_worship.jewish" = "猶太會堂";
 "type.amenity.place_of_worship.muslim" = "清真寺";
-"type.amenity.place_of_worship.shinto" = "聖殿";
-"type.amenity.place_of_worship.taoist" = "道教宮觀";
+"type.amenity.place_of_worship.shinto" = "神道教";
+"type.amenity.place_of_worship.taoist" = "道觀";
 "type.amenity.police" = "警察局";
 "type.amenity.post_box" = "郵筒";
 "type.amenity.post_office" = "郵局";
 "type.amenity.prison" = "監獄";
-"type.amenity.pub" = "酒館";
-"type.amenity.public_bookcase" = "書架";
+"type.amenity.pub" = "酒吧";
+"type.amenity.public_bookcase" = "漂書站";
 "type.amenity.recycling.centre" = "回收中心";
 "type.amenity.recycling" = "回收箱";
 "type.amenity.recycling.container" = "回收箱";
 "type.recycling.batteries" = "電池";
-"type.recycling.clothes" = "舊衣物";
+"type.recycling.clothes" = "衣服";
 "type.recycling.glass_bottles" = "玻璃瓶";
-"type.recycling.paper" = "廢紙";
-"type.recycling.plastic" = "廢塑料";
-"type.recycling.plastic_bottles" = "塑料瓶";
+"type.recycling.paper" = "紙張";
+"type.recycling.plastic" = "塑膠";
+"type.recycling.plastic_bottles" = "塑膠瓶";
 "type.recycling.scrap_metal" = "廢金屬";
-"type.recycling.small_appliances" = "電子垃圾";
+"type.recycling.small_appliances" = "電子廢棄物";
 "type.recycling.cardboard" = "硬紙板";
 "type.recycling.cans" = "金屬罐";
 "type.recycling.shoes" = "鞋子";
 "type.recycling.green_waste" = "綠色垃圾/有機廢棄物";
 "type.recycling.cartons" = "紙盒";
 "type.amenity.restaurant" = "餐廳";
-"type.amenity.sanitary_dump_station" = "儲液池排泄站";
+"type.amenity.sanitary_dump_station" = "儲槽傾倒站";
 "type.amenity.school" = "學校";
 
 /* Weather shelter (including sun shelters and natural rock shelters). */
-"type.amenity.shelter" = "隱藏處";
+"type.amenity.shelter" = "涼亭";
 
 /* A weather shelter by the public transport stop. */
-"type.amenity.shelter.public_transport" = "隱藏處";
+"type.amenity.shelter.public_transport" = "渟亭";
 
 /* Compared to wilderness_hut its smaller and simpler, without a fireplace. */
 "type.amenity.shelter.basic_hut" = "露營小屋";
@@ -160,35 +160,35 @@
 /* A traditional 3-walled shelter (one side open), suitable for overnight camping. */
 "type.amenity.shelter.lean_to" = "三面避難所";
 "type.amenity.public_bath" = "公共浴場";
-"type.amenity.shower" = "淋浴間";
+"type.amenity.shower" = "淋浴設施";
 "type.amenity.stripclub" = "脫衣舞俱樂部";
-"type.amenity.taxi" = "計程車";
-"type.amenity.telephone" = "電話";
-"type.amenity.theatre" = "劇場";
+"type.amenity.taxi" = "計程車招呼站";
+"type.amenity.telephone" = "公共電話";
+"type.amenity.theatre" = "戲院";
 "type.amenity.toilets" = "廁所";
 "type.toilets.yes" = "廁所";
 "type.amenity.townhall" = "市政廳";
 "type.amenity.university" = "大學";
-"type.amenity.vending_machine" = "自動售貨機";
-"type.amenity.vending_machine.cigarettes" = "香菸自動販賣機";
-"type.amenity.vending_machine.coffee" = "咖啡售賣機";
-"type.amenity.vending_machine.condoms" = "避孕套售賣機";
-"type.amenity.vending_machine.drinks" = "飲料自動販賣機";
-"type.amenity.vending_machine.food" = "食品售賣機";
-"type.amenity.vending_machine.newspapers" = "報紙售賣機";
-"type.amenity.vending_machine.parking_tickets" = "違規停車罰單繳費機";
-"type.amenity.vending_machine.public_transport_tickets" = "公共交通售票機";
-"type.amenity.vending_machine.sweets" = "糖果售賣機";
+"type.amenity.vending_machine" = "自動販賣機";
+"type.amenity.vending_machine.cigarettes" = "香菸販賣機";
+"type.amenity.vending_machine.coffee" = "咖啡販賣機";
+"type.amenity.vending_machine.condoms" = "保險套販賣機";
+"type.amenity.vending_machine.drinks" = "飲料販賣機";
+"type.amenity.vending_machine.food" = "食品販賣機";
+"type.amenity.vending_machine.newspapers" = "報紙販賣機";
+"type.amenity.vending_machine.parking_tickets" = "停車錶";
+"type.amenity.vending_machine.public_transport_tickets" = "票券販賣機";
+"type.amenity.vending_machine.sweets" = "甜點販賣機";
 "type.amenity.vending_machine.excrement_bags" = "撿便袋販賣機";
 "type.amenity.parcel_locker" = "智取櫃";
-"type.amenity.vehicle_inspection" = "車輛檢驗";
-"type.amenity.vending_machine.fuel" = "燃油泵";
+"type.amenity.vehicle_inspection" = "監理站";
+"type.amenity.vending_machine.fuel" = "燃油幫浦";
 "type.amenity.veterinary" = "獸醫";
-"type.amenity.waste_basket" = "垃圾箱";
-"type.amenity.waste_disposal" = "垃圾";
+"type.amenity.waste_basket" = "垃圾筒";
+"type.amenity.waste_disposal" = "大垃圾桶";
 "type.amenity.waste_transfer_station" = "垃圾轉運站";
-"type.amenity.water_point" = "飲水站";
-"type.amenity.water_point.drinking_water_no" = "飲水站";
+"type.amenity.water_point" = "水箱加水點";
+"type.amenity.water_point.drinking_water_no" = "水箱加水點";
 "type.barrier" = "障礙物";
 "type.barrier.block" = "街區";
 "type.barrier.bollard" = "柱";
@@ -212,16 +212,16 @@
 "type.barrier.toll_booth" = "收費站";
 "type.barrier.wall" = "墻";
 "type.boundary" = "邊界";
-"type.boundary.administrative" = "行政區域界線";
+"type.boundary.administrative" = "行政邊界";
 
 /* Borders between countries. */
-"type.boundary.administrative.2" = "國家行政區域界線";
+"type.boundary.administrative.2" = "國家邊界";
 
 /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
-"type.boundary.administrative.3" = "行政區域邊界";
+"type.boundary.administrative.3" = "地區邊界";
 
 /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */
-"type.boundary.administrative.4" = "行政區域邊界";
+"type.boundary.administrative.4" = "地區邊界";
 "type.boundary.national_park" = "國家公園";
 "type.boundary.aboriginal_lands" = "原住民土地";
 "type.boundary.protected_area" = "保護區";
@@ -231,80 +231,80 @@
 "type.boundary.protected_area.4" = "保護區";
 "type.boundary.protected_area.5" = "保護區";
 "type.boundary.protected_area.6" = "保護區";
-"type.building" = "建築物";
+"type.building" = "建築";
 
 /* Duplicates [address] in strings.txt */
 "type.building.address" = "地址";
-"type.building.has_parts" = "建築物";
-"type.building_part" = "建築物";
+"type.building.has_parts" = "建築";
+"type.building_part" = "建築";
 "type.building.garage" = "私人車庫";
-"type.building.train_station" = "車站大樓";
+"type.building.train_station" = "車站建築";
 "type.building.warehouse" = "倉庫";
 "type.cemetery.grave" = "墓穴";
-"type.craft" = "工藝作坊";
-"type.craft.beekeeper" = "蜂農";
+"type.craft" = "工藝";
+"type.craft.beekeeper" = "養蜂";
 "type.craft.blacksmith" = "鐵匠";
-"type.craft.brewery" = "釀酒廠";
+"type.craft.brewery" = "釀酒師";
 "type.craft.caterer" = "餐飲服務商";
-"type.craft.carpenter" = "木工";
-"type.craft.confectionery" = "糖果商";
+"type.craft.carpenter" = "木匠";
+"type.craft.confectionery" = "糖果師";
 "type.craft.electrician" = "電工";
 "type.craft.electronics_repair" = "電子產品維修";
-"type.craft.gardener" = "園藝師";
-"type.craft.grinding_mill" = "磨粉機";
-"type.craft.handicraft" = "手工藝";
+"type.craft.gardener" = "園丁";
+"type.craft.grinding_mill" = "磨粉";
+"type.craft.handicraft" = "手工匠";
 
 /* Heating, Ventilation, and Air Conditioning */
-"type.craft.hvac" = "空調設備";
-"type.craft.key_cutter" = "鍵切割";
+"type.craft.hvac" = "暖氣空調";
+"type.craft.key_cutter" = "鑰匙切割";
 "type.craft.locksmith" = "鎖匠";
 "type.craft.metal_construction" = "鐵工";
-"type.craft.painter" = "油漆工";
+"type.craft.painter" = "房屋油漆工";
 "type.craft.photographer" = "攝影棚";
 "type.shop.camera" = "相機店";
-"type.craft.plumber" = "水管工人";
-"type.craft.sawmill" = "鋸木廠";
-"type.craft.shoemaker" = "修鞋工";
-"type.craft.winery" = "酒莊";
-"type.craft.tailor" = "裁縫師";
-"type.cuisine.african" = "非洲料理";
-"type.cuisine.american" = "美國料理";
-"type.cuisine.arab" = "阿拉伯料理";
-"type.cuisine.argentinian" = "阿根廷料理";
-"type.cuisine.asian" = "亞洲料理";
-"type.cuisine.austrian" = "奧地利料理";
+"type.craft.plumber" = "水管工";
+"type.craft.sawmill" = "鋸木";
+"type.craft.shoemaker" = "修鞋匠";
+"type.craft.winery" = "酒廠";
+"type.craft.tailor" = "裁縫";
+"type.cuisine.african" = "非洲菜";
+"type.cuisine.american" = "美洲菜";
+"type.cuisine.arab" = "阿拉伯菜";
+"type.cuisine.argentinian" = "阿根庭菜";
+"type.cuisine.asian" = "亞洲菜";
+"type.cuisine.austrian" = "澳洲菜";
 "type.cuisine.bagel" = "貝果";
 "type.cuisine.balkan" = "巴爾幹料理";
 "type.cuisine.barbecue" = "燒烤";
 "type.cuisine.bavarian" = "巴伐利亞料理";
 "type.cuisine.beef_bowl" = "牛丼";
-"type.cuisine.brazilian" = "巴西料理";
+"type.cuisine.brazilian" = "巴西菜";
 "type.cuisine.breakfast" = "早餐";
 "type.cuisine.bubble_tea" = "珍珠奶茶";
 "type.cuisine.burger" = "漢堡";
-"type.cuisine.buschenschank" = "酒莊";
+"type.cuisine.buschenschank" = "小酒館";
 "type.cuisine.cake" = "蛋糕";
-"type.cuisine.caribbean" = "加勒比料理";
+"type.cuisine.caribbean" = "加勒比菜";
 "type.cuisine.chicken" = "雞肉";
-"type.cuisine.chinese" = "中華料理";
+"type.cuisine.chinese" = "中式";
 "type.cuisine.coffee_shop" = "咖啡";
 "type.cuisine.crepe" = "可麗餅";
-"type.cuisine.croatian" = "克羅埃西亞料理";
+"type.cuisine.croatian" = "克羅埃西亞菜";
 "type.cuisine.curry" = "咖哩";
 "type.cuisine.deli" = "熟食店";
-"type.cuisine.diner" = "美式餐廳";
+"type.cuisine.diner" = "晚餐";
 "type.cuisine.donut" = "甜甜圈";
-"type.cuisine.ethiopian" = "衣索比亞料理";
-"type.cuisine.filipino" = "菲律賓料理";
-"type.cuisine.fine_dining" = "高級餐飲";
-"type.cuisine.fish" = "魚";
+"type.cuisine.ethiopian" = "伊索匹亞菜";
+"type.cuisine.filipino" = "菲律賓菜";
+"type.cuisine.fine_dining" = "精緻餐飲";
+"type.cuisine.fish" = "魚類";
 "type.cuisine.fish_and_chips" = "炸魚薯條";
-"type.cuisine.french" = "法國料理";
-"type.cuisine.friture" = "油炸";
-"type.cuisine.georgian" = "喬治亞料理";
-"type.cuisine.german" = "德國料理";
-"type.cuisine.greek" = "希臘料理";
-"type.cuisine.grill" = "烤";
+"type.cuisine.french" = "法式";
+"type.cuisine.friture" = "煎炸";
+"type.cuisine.georgian" = "喬治亞菜";
+"type.cuisine.german" = "德國菜";
+"type.cuisine.greek" = "希臘菜";
+"type.cuisine.grill" = "燒烤";
 "type.cuisine.heuriger" = "霍里格";
 "type.cuisine.hotdog" = "熱狗";
 "type.cuisine.hungarian" = "匈牙利料理";
@@ -317,45 +317,45 @@
 "type.cuisine.italian_pizza" = "義大利料理，披薩";
 "type.cuisine.japanese" = "日本料理";
 "type.cuisine.kebab" = "烤肉";
-"type.cuisine.korean" = "韓國料理";
-"type.cuisine.lao" = "寮國料理";
-"type.cuisine.lebanese" = "黎巴嫩料理";
-"type.cuisine.local" = "本地料理";
-"type.cuisine.malagasy" = "馬達加斯加料理";
-"type.cuisine.malaysian" = "馬來西亞料理";
-"type.cuisine.mediterranean" = "地中海料理";
-"type.cuisine.mexican" = "墨西哥料理";
-"type.cuisine.moroccan" = "摩洛哥料理";
+"type.cuisine.korean" = "韓式";
+"type.cuisine.lao" = "寮國菜";
+"type.cuisine.lebanese" = "黎巴嫰菜";
+"type.cuisine.local" = "地方菜";
+"type.cuisine.malagasy" = "馬達加斯加菜";
+"type.cuisine.malaysian" = "馬來西亞菜";
+"type.cuisine.mediterranean" = "地中海菜";
+"type.cuisine.mexican" = "墨西哥菜";
+"type.cuisine.moroccan" = "摩洛哥菜";
 "type.cuisine.noodles" = "麵食";
-"type.cuisine.oriental" = "東方料理";
-"type.cuisine.pancake" = "煎餅";
+"type.cuisine.oriental" = "東亞菜";
+"type.cuisine.pancake" = "鬆餅";
 "type.cuisine.pasta" = "義大利麵";
-"type.cuisine.persian" = "波斯料理";
-"type.cuisine.peruvian" = "秘魯料理";
-"type.cuisine.pizza" = "披薩";
-"type.cuisine.polish" = "波蘭料理";
-"type.cuisine.portuguese" = "葡萄牙料理";
+"type.cuisine.persian" = "波斯菜";
+"type.cuisine.peruvian" = "秘魯菜";
+"type.cuisine.pizza" = "批薩";
+"type.cuisine.polish" = "波蘭菜";
+"type.cuisine.portuguese" = "葡萄牙語";
 "type.cuisine.ramen" = "拉麵";
-"type.cuisine.regional" = "地方料理";
-"type.cuisine.russian" = "俄羅斯料理";
+"type.cuisine.regional" = "地區菜";
+"type.cuisine.russian" = "俄羅斯菜";
 "type.cuisine.sandwich" = "三明治";
-"type.cuisine.sausage" = "火腿";
-"type.cuisine.savory_pancakes" = "鹹味煎餅";
+"type.cuisine.sausage" = "香腸";
+"type.cuisine.savory_pancakes" = "美味煎餅";
 "type.cuisine.seafood" = "海鮮";
-"type.cuisine.soba" = "蕎麥面";
-"type.cuisine.spanish" = "西班牙料理";
+"type.cuisine.soba" = "蕎麥麵";
+"type.cuisine.spanish" = "西班牙菜";
 "type.cuisine.steak_house" = "牛排館";
-"type.cuisine.sushi" = "壽司";
-"type.cuisine.tapas" = "塔帕斯";
+"type.cuisine.sushi" = "生魚片";
+"type.cuisine.tapas" = "西班牙小吃";
 "type.cuisine.tea" = "茶";
-"type.cuisine.thai" = "泰國料理";
-"type.cuisine.turkish" = "土耳其料理";
-"type.cuisine.vegan" = "全素料理";
+"type.cuisine.thai" = "泰式";
+"type.cuisine.turkish" = "土耳其菜";
+"type.cuisine.vegan" = "維根";
 "type.cuisine.vegetarian" = "素食";
-"type.cuisine.vietnamese" = "越南料理";
-"type.emergency" = "緊急服務";
+"type.cuisine.vietnamese" = "越南菜";
+"type.emergency" = "緊急";
 "type.emergency.assembly_point" = "緊急集合點";
-"type.emergency.defibrillator" = "心臟電擊器";
+"type.emergency.defibrillator" = "除顫器";
 "type.emergency.fire_hydrant" = "消防栓";
 "type.emergency.phone" = "緊急電話";
 
@@ -363,7 +363,7 @@
 "type.emergency.lifeguard" = "救生員";
 
 /* A mountain rescue base for search and rescue activities. */
-"type.emergency.mountain_rescue" = "山地救援站";
+"type.emergency.mountain_rescue" = "山區救難站";
 
 /* This is for secondary entrances, for main entrances see type.entrance.main */
 "type.entrance" = "入口";
@@ -375,12 +375,12 @@
 "type.fee.no" = "免費";
 "type.healthcare.laboratory" = "醫學實驗室";
 "type.healthcare.physiotherapist" = "物理治療師";
-"type.healthcare.alternative" = "替代藥物";
-"type.healthcare.audiologist" = "聽力學";
+"type.healthcare.alternative" = "另類醫療";
+"type.healthcare.audiologist" = "聽力師";
 "type.healthcare.blood_donation" = "捐血中心";
-"type.healthcare.optometrist" = "驗光";
-"type.healthcare.podiatrist" = "足病學";
-"type.healthcare.psychotherapist" = "心理治療";
+"type.healthcare.optometrist" = "驗光師";
+"type.healthcare.podiatrist" = "足病醫生";
+"type.healthcare.psychotherapist" = "心理治療師";
 "type.healthcare.sample_collection" = "採樣";
 "type.healthcare.speech_therapist" = "言語治療";
 "type.highway" = "道路";
@@ -1494,9 +1494,9 @@
 "type.railway.station.subway.qingdao" = "青島地鐵站";
 "type.natural.wetland.tidalflat" = "Tidal Flat";
 "type.natural.wetland.swamp" = "Swamp";
-"type.natural.wetland.saltmarsh" = "Salt Marsh";
+"type.natural.wetland.saltmarsh" = "鹽沼";
 "type.natural.wetland.mangrove" = "Mangrove";
-"type.natural.wetland.fen" = "Fen";
-"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
+"type.natural.wetland.fen" = "鹼沼";
+"type.natural.wetland.saltmarsh.tidal" = "潮間鹽沼";
 "type.natural.wetland.reedbed" = "Reed Bed";
-"type.leisure.escape_game" = "Escape Room";
+"type.leisure.escape_game" = "密室脫逃";