diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index dd39b939e..1b3fe3eb5 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -903,4 +903,6 @@
     <string name="editor_submit">Saada</string>
     <string name="power_management">Toitehaldus</string>
     <string name="charge_socket_schuko">EU-sisene</string>
+    <string name="prefs_speed_cameras_information">Kiiruskaamerate teavitused on nendes riikides lülitatud välja, kus seda keelab kohalik seadusandlus.</string>
+    <string name="navigation_start_tts_message">"Alustan tee juhatamist, hääljuhiste keel: "</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 a72052169..6be37987b 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -9,9 +9,9 @@
     <string name="delete">سِتُردن</string>
     <string name="download_maps">بارگیری نقشه‌ها</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">دانلود ناموفق بود، برای تلاش مجدد لمس کنید</string>
+    <string name="download_has_failed">بارگیری ناکام بود، برای تلاش دوباره بِپَرماسید</string>
     <!-- Settings/Downloader - info for country which started downloading -->
-    <string name="downloading">درحال دانلود…</string>
+    <string name="downloading">بارگیری می‌شود…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">کیلومتر</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
@@ -21,9 +21,9 @@
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
     <string name="search">جستجو</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">جست‌وجوی نقشه</string>
+    <string name="search_map">جستجوی نقشه</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">سرویس موقعیت مکانی شما غیر فعال است. لطفا جهت کارکرد صحیح نرم افزار آن را فعال کنید.</string>
+    <string name="location_is_disabled_long_text">هم‌اینک، شما همه‌ی سامانه‌های گیاگ‌یابی را برای این دستگاه یا این برنامه ناکارا کرده‌اید. خواهشمند است آن را در پیکربندی‌ها کارا کنید.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">دقت محدود</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
diff --git a/android/app/src/main/res/values-hr/strings.xml b/android/app/src/main/res/values-hr/strings.xml
index e97d2283c..6dab16674 100644
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -255,4 +255,10 @@
     <string name="downloader_download_map">Preuzmi kartu</string>
     <string name="downloader_delete_map">Obriši kartu</string>
     <string name="downloader_update_map">Ažuriraj kartu</string>
+    <string name="dialog_routing_select_closer_end">Molimo odaberite odredišnu točku koja se nalazi bliže cesti</string>
+    <string name="dialog_routing_change_intermediate">Nije moguće pronaći međutočku</string>
+    <string name="dialog_routing_intermediate_not_determined">Molimo prilagodite svoju međutočku</string>
+    <string name="dialog_routing_system_error">Sistemska greška</string>
+    <string name="dialog_routing_application_error">Nije moguće napraviti rutu zbog greške u aplikaciji</string>
+    <string name="dialog_routing_try_again">Pokušajte ponovno</string>
 </resources>
diff --git a/android/app/src/main/res/values-kw/strings.xml b/android/app/src/main/res/values-kw/strings.xml
new file mode 100644
index 000000000..f84d92845
--- /dev/null
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_site_url">https://comaps.app/</string>
+    <string name="back">Dehweles</string>
+    <string name="cancel">Hedhi</string>
+    <string name="delete">Dilea</string>
+    <string name="download_maps">Iskarga Mappys</string>
+    <string name="kilometres">Kilometrow</string>
+    <string name="miles">Mildiryow</string>
+    <string name="later">Wosa henna</string>
+    <string name="search">Hwilas</string>
+    <string name="search_map">Hwilas Mappa</string>
+    <string name="limited_accuracy">Kewerder Strothys</string>
+    <string name="zoom_to_country">Diskwedhes war dhe mappa</string>
+    <string name="try_again">Assayewgh Arta</string>
+    <string name="about_menu_title">A-dro CoMaps</string>
+    <string name="about_proposition_3">• Dhywarlinen, uskis ha kesstrothys</string>
+    <string name="location_settings">Settyansow GPS</string>
+    <string name="close">Degea</string>
+    <string name="download">Iskarga</string>
+    <string name="download_resources_continue">Mos yn dhe Mappa</string>
+    <string name="download_country_ask">Iskarga %1$s? (%2$s)</string>
+    <string name="update_country_ask">Nowedhi %1$s? (%2$s)</string>
+    <string name="pause">Powes</string>
+    <string name="continue_button">Pesyewgh</string>
+    <string name="bookmarks">Lyververkys</string>
+    <string name="bookmarks_and_tracks">Lyververkys ha Lerghow</string>
+    <string name="name">Hanow</string>
+    <string name="address">Trigva</string>
+    <string name="list">Rol</string>
+    <string name="settings">Settyansow</string>
+    <string name="move_maps">Gwaya mappys?</string>
+    <string name="measurement_units">Systemow musurans</string>
+    <string name="measurement_units_summary">Dewis yntra mildiryow ha kilometrow</string>
+    <string name="category_food">Gwara boos</string>
+    <string name="category_transport">Karyans</string>
+    <string name="category_fuel">Petrol</string>
+    <string name="category_parking">Parkyans</string>
+    <string name="category_hotel">Ostel</string>
+    <string name="category_tourism">Tornyaseth</string>
+    <string name="category_entertainment">Didhan</string>
+    <string name="category_atm">Toll y\'n fos</string>
+    <string name="category_children">Dy\'gol teylu</string>
+    <string name="category_bank">Arghanti</string>
+    <string name="category_pharmacy">Ferylva</string>
+    <string name="category_hospital">Klavji</string>
+    <string name="category_toilet">Attesva</string>
+    <string name="category_post">Post</string>
+    <string name="category_police">Kreslu</string>
+    <string name="category_recycling">Eylgylghyans</string>
+    <string name="category_water">Dowr</string>
+    <string name="category_rv">Komodytys Karavans</string>
+    <string name="description">Notennow</string>
+    <string name="load_kmz_title">Ow Karga Lyververkys</string>
+    <string name="bookmark_share_email_subject">Dydh da, checkyewgh ow pynn yn CoMaps!</string>
+    <string name="my_position_share_email_subject">Dydh da, checkyewgh ow tyller a\'n jydh war an mappa CoMaps!</string>
+    <string name="share">Kevrenna</string>
+    <string name="email">Ebost</string>
+    <string name="done">Gwrys</string>
+    <string name="data_version">Data OpenStreetMap: %s</string>
+    <string name="tracks_title">Lerghow</string>
+    <string name="length">Hys</string>
+    <string name="share_my_location">Kevrennewgh Ow Tyller</string>
+    <string name="prefs_group_general">Settyansow mayni</string>
+    <string name="prefs_group_information">Kedhlow</string>
+    <string name="prefs_group_route">Navygacyon</string>
+    <string name="pref_zoom_summary">Displetya war an mappa</string>
+    <string name="pref_map_style_title">Fordh Nos</string>
+    <string name="auto">Awtomatek</string>
+    <string name="pref_map_3d_title">Gwel gemusur</string>
+    <string name="pref_map_3d_buildings_title">Drehevyansow lymnys tri</string>
+    <string name="pref_tts_enable_title">Danvonadow dre lev</string>
+    <string name="pref_tts_street_names_title">Deklarya Henwyn Stretow</string>
+    <string name="pref_tts_language_title">Tavas Lev</string>
+    <string name="pref_tts_test_voice_title">Prov Tuyow Dre Lev</string>
+    <string name="pref_tts_unavailable">Nakavadow</string>
+    <string name="search_show_on_map">Gweles war mappa</string>
+    <string name="menu">Rol</string>
+    <string name="website">Gwiasva</string>
+    <string name="news">Nowodhow</string>
+    <string name="panoramax">Imach Panoramax</string>
+    <string name="feedback">Dasliv</string>
+    <string name="rate_the_app">Breusyans an app</string>
+    <string name="help">Gweres</string>
+    <string name="faq">Govynnow Kemmyn</string>
+    <string name="donate">Argevri</string>
+    <string name="copyright">Gwirbryntyan</string>
+    <string name="report_a_bug">Reportya unn kudyn</string>
+    <string name="downloader_update_all_button">Nowedhi Oll</string>
+    <string name="downloader_cancel_all">Dilea Oll</string>
+    <string name="downloader_near_me_subtitle">Dhe dhorn</string>
+    <string name="downloader_status_maps">Mappys</string>
+    <string name="downloader_download_all_button">Iskarga Oll</string>
+    <string name="downloader_download_map">Iskarga mappa</string>
+    <string name="downloader_retry">Hwilewgh arta</string>
+    <string name="downloader_delete_map">Dilea Mappa</string>
+    <string name="downloader_update_map">Nowedhi Mappa</string>
+    <string name="google_play_services">Servis GPS gans Google</string>
+    <string name="routing_not_enough_space">Nyns eus lowr dalghuster</string>
+    <string name="enable_location_services">Gallosegi Servisyow GPS mar pleg</string>
+    <string name="create">Gul</string>
+    <string name="red">Rudh</string>
+    <string name="yellow">Melyn</string>
+    <string name="blue">Blou</string>
+    <string name="green">Gwyrdh</string>
+    <string name="purple">Purpur</string>
+    <string name="orange">Melynrudh</string>
+    <string name="brown">Godhlos</string>
+    <string name="pink">Kigliw</string>
+    <string name="deep_purple">Rudhlas</string>
+    <string name="light_blue">Glaswyn</string>
+    <string name="teal">Gwerlas</string>
+    <string name="lime">Gwerwyn</string>
+    <string name="deep_orange">Rudhvelyn</string>
+    <string name="gray">Loos</string>
+    <string name="blue_gray">Glas</string>
+    <string name="dialog_routing_check_gps">Checkya sinell GPS</string>
+    <string name="dialog_routing_location_turn_on">Gallosegi servisyow GPS</string>
+    <string name="dialog_routing_change_end">Desedha destnans</string>
+    <string name="dialog_routing_system_error">Error gans an kevreyth</string>
+    <string name="dialog_routing_try_again">Assayewgh arta mar pleg</string>
+    <string name="not_now">Na Vynnav Lemmyn</string>
+    <string name="search_select_map">Dewis Mappa</string>
+    <string name="show">Showya</string>
+    <string name="hide">Kudha</string>
+    <string name="categories">Klassow</string>
+    <string name="history">Istori</string>
+    <string name="search_history_title">Istori Hwilas</string>
+    <string name="clear_search">Dilea Istori Hwilas</string>
+    <string name="read_in_wikipedia">Wikipedya</string>
+    <string name="wikimedia_commons">Wikimedia Commons</string>
+    <string name="p2p_your_location">Agas Tyller</string>
+    <string name="p2p_start">Dalleth</string>
+    <string name="next_button">Nessa</string>
+    <string name="editor_time_add">Addya Rol Vetyansow</string>
+    <string name="editor_time_delete">Dilea Rol Vetyansow</string>
+    <string name="editor_time_allday">Dres an Jorna (24 ourys)</string>
+    <string name="editor_time_open">Ygor</string>
+    <string name="editor_time_close">Deges</string>
+    <string name="editor_time_add_closed">Addya Ourys Nanegys</string>
+    <string name="editor_time_title">Ourys Negys</string>
+    <string name="editor_time_advanced">Fordh Avonsys</string>
+    <string name="editor_time_simple">Fordh Sempel</string>
+    <string name="editor_hours_closed">Ourys Nanegys</string>
+    <string name="editor_correct_mistake">Ewna kammgemeryans</string>
+    <string name="editor_add_select_location">Dewis Tyller</string>
+    <string name="editor_report_problem_send_button">Danvon</string>
+    <string name="editor_report_problem_title">Kudyn</string>
+    <string name="daily">Dedhyek</string>
+    <string name="twentyfour_seven">24/7</string>
+    <string name="day_off_today">Deges hedhyw</string>
+    <string name="day_off">Deges</string>
+    <string name="closed">Deges</string>
+    <string name="edit_opening_hours">Golegi ourys negys</string>
+    <string name="no_osm_account">Vyth akont OpenStreetMap?</string>
+    <string name="register_at_openstreetmap">Kovskrifa orth OpenStreetMap</string>
+    <string name="login">Omgelmi</string>
+    <string name="login_osm">Omgelmi dhe OpenStreetMap</string>
+    <string name="logout">Omdenna</string>
+    <string name="edit_place">Golegi Le</string>
+    <string name="add_language">Addya unn tavas</string>
+    <string name="street">Stret</string>
+    <string name="house_number">Niver drehevyans</string>
+    <string name="details">Manylyon</string>
+    <string name="social_media">Media Socyal</string>
+    <string name="building">Drehevyans</string>
+    <string name="add_street">Addya unn stret</string>
+    <string name="empty_street_name_error">Ynworra unn hanow street mar pleg</string>
+    <string name="choose_language">Dewis unn tavas</string>
+    <string name="choose_street">Dewis unn stret</string>
+    <string name="editor_add_phone">Addya Niver Fon</string>
+    <string name="level">Leur</string>
+    <string name="level_value_generic">Leur: %s</string>
+    <string name="downloader_update_maps">Nowedhi Mappys</string>
+    <string name="downloader_search_field_hint">Kavos mappa</string>
+    <string name="editor_login_error_dialog">Error dres omgelmi</string>
+    <string name="editor_edit_place_name_hint">Hanow a an le</string>
+    <string name="editor_default_language_hint">Dell yw skrifys yn an tavas teythiek</string>
+    <string name="editor_edit_place_category_title">Klass</string>
+    <string name="detailed_problem_description">Deskrifans manylys a an kudyn</string>
+    <string name="editor_report_problem_other_title">Kudyn dyffrans</string>
+    <string name="download_over_mobile_header">Iskarga dres unn kevren klapkodh?</string>
+    <string name="error_enter_correct_house_number">Ynworra unn niver trigva ewn</string>
+    <string name="editor_building_levels">Leur (ow komprehendya leur a-woles, a-der to)</string>
+    <string name="editor_zip_code">Kod Post</string>
+    <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
+    <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
+    <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
+    <string name="editor_osm_history">Agas istori golegi</string>
+    <string name="editor_osm_notes">Agas notennow mappow</string>
+    <string name="editor_operator">Oberador</string>
+    <string name="operator">Oberador: %s</string>
+    <string name="kilometers_per_hour">kdo</string>
+    <string name="miles_per_hour">mdo</string>
+    <string name="hour">o</string>
+    <string name="minute">mynysen</string>
+    <string name="placepage_more_button">Moy</string>
+    <string name="placepage_edit_bookmark_button">Pennskrifa Lyververk</string>
+    <string name="placepage_personal_notes_hint">Notennow privedh (tekst bo html)</string>
+    <string name="editor_reset_edits_message">Dilea oll chanjyow dhywarlinen?</string>
+    <string name="editor_reset_edits_button">Dilea</string>
+    <string name="editor_remove_place_message">Dilea le keworrys?</string>
+    <string name="editor_remove_place_button">Dilea</string>
+    <string name="editor_place_doesnt_exist">Le na eksistya</string>
+    <string name="delete_place_empty_comment_error">Provia an acheson rag dilea an le mar pleg</string>
+    <string name="editor_business_vacant_button">Negys usi gwag</string>
+    <string name="editor_mark_business_vacant_title">Sin negys dell gwag</string>
+    <string name="editor_submit">Danvon</string>
+    <string name="error_enter_correct_phone">Ynworra unn niver fon ewn</string>
+    <string name="error_enter_correct_web">Ynworra unn trigva gwiasva ewn</string>
+    <string name="error_enter_correct_email">Ynworra unn trigva ebost ewn</string>
+    <string name="editor_level">Leur (0 usi leur a-woles)</string>
+    <string name="error_enter_correct_level">Ynworra unn niver leur ewn</string>
+    <string name="error_enter_correct_facebook_page">Ynworra unn trigva Lyverenep, akont, bo hanow folen ewn</string>
+    <string name="error_enter_correct_instagram_page">Ynworra unn hanow usyer Instagram bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_twitter_page">Ynworra unn hanow usyer Twytter bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_vk_page">Ynworra unn hanow usyer VK bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_line_page">Ynworra unn ID LINE bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_fediverse_page">Ynworra unn hanow usyer Mastodon bo trigva gwiasva ewn</string>
+    <string name="error_enter_correct_bluesky_page">Ynworra unn hanow usyer Bluesky bo trigva gwiasva ewn</string>
+    <string name="placepage_add_place_button">Addya Le dhe OpenStreetMap</string>
+    <string name="osm_note_hint">Bo, yn tereylys, skrifa unn noten dhe kemeneth OpenStreetMap, ha orth nebonan yll addya bo ewnhe unn le omma.</string>
+    <string name="osm_note_toast">Noten a vydh danvon dhe OpenStreetMap</string>
+    <string name="editor_share_to_all_dialog_title">A vynn\'ta mos danvon dhe oll usyoryon?</string>
+    <string name="navigation_stop_button">Hedhi</string>
+    <string name="track_recording">Y\'n eur ma rekordya an lergh</string>
+    <string name="accept">Amyttya</string>
+    <string name="decline">Nagha</string>
+    <string name="mobile_data_option_today">Unn Hedhyw</string>
+    <string name="traffic_update_app">Nowedhi CoMaps mar pleg</string>
+    <string name="feedback_general">Dasliv Mayni</string>
+    <string name="learn_more">Dyski moy</string>
+    <string name="button_plan">Devisya</string>
+    <string name="placepage_remove_stop">Dilea Powes</string>
+    <string name="placepage_add_stop">Addya Powes</string>
+    <string name="error_enter_correct_name">Ynworra unn hanow ewn mar pleg</string>
+    <string name="bookmark_lists">Rolyow</string>
+    <string name="bookmark_lists_hide_all">Keles oll</string>
+    <string name="bookmark_lists_show_all">Diskwedhes oll</string>
+    <string name="bookmarks_create_new_group">Gul unn rol nowydh</string>
+    <string name="bookmarks_import">Ynperthi Lyververkys ha Lerghow</string>
+    <string name="bookmarks_error_message_empty_list_name">Ynworra an hanow rol mar pleg</string>
+    <string name="bookmarks_new_list_hint">Rol nowydh</string>
+    <string name="bookmarks_error_title_list_name_already_taken">An hanow ma usi seulabrys yn usyans</string>
+    <string name="bookmarks_error_message_list_name_already_taken">Dewis aral hanow mar pleg</string>
+    <string name="please_wait">Gortos mar pleg…</string>
+    <string name="phone_number">Niver fon</string>
+    <string name="profile">Akont OpenStreetMap</string>
+    <string name="restore">Astiveri</string>
+    <string name="privacy">Privetter</string>
+    <string name="privacy_policy">Polici privetter</string>
+    <string name="power_management">Dyghtyans batri</string>
+    <string name="terms_of_use">Termys usadow</string>
+    <string name="button_layer_traffic">Data daromdak</string>
+    <string name="subway">Metro</string>
+    <string name="layers_title">Gisyow ha gwiskasow mappow</string>
+    <string name="bookmarks_empty_list_title">An rol ma usi gwag</string>
+    <string name="category_desc_more">…moy</string>
+    <string name="export_file">Esperthi KMZ</string>
+    <string name="export_file_gpx">Esperthi GPX</string>
+    <string name="delete_list">Dilea rol</string>
+    <string name="speedcams_alert_title">Kameras finweth tooth</string>
+    <string name="place_description_title">Deskrifans Le</string>
+    <string name="pref_tts_speedcams_auto">Gwarnya a tothya</string>
+    <string name="define_to_avoid_btn">Styrya fordhow rag avodya</string>
+    <string name="toll_road">Tollfordh</string>
+    <string name="unpaved_road">Fordh dor</string>
+    <string name="ferry_crossing">Kowbalhyns</string>
+    <string name="yes">Ya</string>
+    <string name="no">Na</string>
+    <string name="yes_available">Ya</string>
+    <string name="no_available">Na</string>
+    <string name="capacity">Dalghuster: %s</string>
+    <string name="network">Rosweyth: %s</string>
+    <string name="trip_finished">Hwi re wrug!</string>
+    <string name="ok">Da lowr</string>
+    <string name="sort">Sortya…</string>
+    <string name="sort_bookmarks">Sortya lyververkys</string>
+    <string name="by_default">Dre defowt</string>
+    <string name="by_type">Dre eghen</string>
+    <string name="by_distance">Dre pellder</string>
+    <string name="by_date">Dre dydh</string>
+    <string name="by_name">Dre hanow</string>
+    <string name="near_me_sorttype">Dhe dhorn</string>
+    <string name="others_sorttype">Re erel</string>
+    <string name="food_places">Boos</string>
+    <string name="tourist_places">Tornyaseth</string>
+    <string name="museums">Gwithtiow</string>
+    <string name="parks">Parkow</string>
+    <string name="swim_places">Neuvya</string>
+    <string name="mountains">Menydhyow</string>
+    <string name="animals">Bestes</string>
+    <string name="hotels">Ostelyow</string>
+    <string name="buildings">Drehevyansow</string>
+    <string name="money">Mona</string>
+    <string name="shops">Gwerthjiow</string>
+    <string name="parkings">Parkyans</string>
+    <string name="fuel_places">Petrolva</string>
+    <string name="medicine">Medhegneth</string>
+    <string name="search_in_the_list">Hwilas yn an rol</string>
+    <string name="religious_places">Leow kryjyk</string>
+    <string name="select_list">Dewis rol</string>
+    <string name="transit_not_found">Navygacyon metro yn an pow ma usi nakavadow hwath</string>
+    <string name="button_layer_isolines">Linen kettres</string>
+    <string name="elevation_profile_min_elevation">Ughelder ispoyntel</string>
+    <string name="elevation_profile_max_elevation">Ughelder ughboyntel</string>
+    <string name="elevation_profile_difficulty">Kaletter</string>
+    <string name="elevation_profile_distance">Pellder:</string>
+    <string name="elevation_profile_time">Prys:</string>
+    <string name="isolines_toast_zooms_1_10">Moghhe dhe furya linen kettres</string>
+    <string name="download_map_title">Iskarga an mappa bys simpel</string>
+    <string name="disk_error_title">Error plasen</string>
+    <string name="connection_failure">Defowt kevren</string>
+    <string name="change_map_locale">Tavas mappow</string>
+    <string name="splash_subtitle">Data mappow a OpenStreetMap</string>
+    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
+    <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
+    <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
+    <string name="comma_separated_pair">%1$s, %2$s</string>
+    <string name="app_tip_00">Meur ras rag usya a\'gan mappys drehevys gans an kemeneth!</string>
+    <string name="app_tip_01">Gans agas argevrohow ha skoodhyans, ni a yll gul an mappys an gwella yn an Nor!</string>
+    <string name="app_tip_02">Yw da genes a\'gan app? Argevri mar pleg dhe skoodhya an displegyans! Yw na da genes a\'n hwath? Mar pleg, kedhlewgh dhyn prag ha ni a ewnhe a\'n!</string>
+    <string name="app_tip_06">Hwi a yll gweres treylya a\'gan app yn agas tavas.</string>
+    <string name="aa_connected_title">Dha vos lemmyn rosweythys dhe Android Auto</string>
+    <string name="aa_grant_permissions">Grontya grontys</string>
+    <string name="button_layer_outdoor">Yn-mes</string>
+    <string name="browser_not_available">Peurell nakavadow</string>
+    <string name="volume">Ughelder</string>
+    <string name="bookmarks_export">Esperthi oll Lyververkys ha Lerghow</string>
+    <string name="clear_the_search">Dilea an hwithrans</string>
+    <string name="zoom_in">Moghhe</string>
+    <string name="zoom_out">Lehe</string>
+    <string name="website_menu">Kevren Rol Voos</string>
+    <string name="view_menu">Vu Rol Voos</string>
+    <string name="open_in_app">Ygeri yn Aral App</string>
+    <string name="select_option">Dewis dewis</string>
+    <string name="outdoor_seating">Esedhow yn-mes</string>
+    <string name="start_track_recording">Rekordya Lergh</string>
+    <string name="choose_color">Dewis Kolor</string>
+    <string name="edit_track">Golegi Lergh</string>
+    <string name="nav_auto">Awtomatek yn navygacyon</string>
+    <string name="pref_left_button_title">Boton kledh dewisyow</string>
+    <string name="backup_interval_every_day">Dedhyek</string>
+    <string name="backup_interval_every_week">Seythennyek</string>
+    <string name="clear">Dilea</string>
+    <string name="vehicle">Karr</string>
+    <string name="pedestrian">Kerdher</string>
+    <string name="bicycle">Diwros</string>
+    <string name="ruler">Rewlell</string>
+    <string name="bookmark_color">Kolor lyververk</string>
+    <string name="about_help">A-dro ha Gweres</string>
+    <string name="share_track">Kevren Lergh</string>
+    <string name="delete_track_dialog_title">Dilea %s?</string>
+    <string name="unknown_power_output">ankoth</string>
+    <string name="charge_socket_type2">Eghen diw (na fun)</string>
+    <string name="charge_socket_type2_cable">Eghen diw (gans fun)</string>
+    <string name="charge_socket_type2_combo">Eghen diw kesunyans</string>
+    <string name="charge_socket_type1">Eghen unn</string>
+    <string name="charge_socket_nacs">NACS</string>
+    <string name="charge_socket_chademo">CHAdeMO</string>
+    <string name="charge_socket_schuko">Unyans Europek a-bervedh</string>
+    <string name="unknown_socket_type">ankoth kraw</string>
+    <string name="edit_socket_info_tooltip">Gul krawyow nowydh bo golegi krowyow a‑lemmyn.</string>
+    <string name="charging_station_available_sockets">Krawyow kavadow</string>
+    <string name="charge_socket_unknown_other">Aral bo anokth</string>
+    <string name="charge_socket_count">Somm</string>
+    <string name="charge_socket_power">Gallosedh (kW)</string>
+    <string name="editor_socket">Golegi kraw</string>
+    <string name="unknown_count">ankoth</string>
+    <string name="error_value_must_be_positive">Res an niver positiv</string>
+    <string name="error_invalid_number">Niver anewn</string>
+    <string name="offline_explanation_title">Mappys Dhywarlinen</string>
+</resources>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 216573125..ea8a036c4 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -896,4 +896,7 @@
     <string name="editor_submit">Send</string>
     <string name="charge_socket_schuko">Schuko</string>
     <string name="power_management">Strømstyring</string>
+    <string name="navigation_start_tts_disabled_message">Taleveiledninger deaktivert: TTS-motor ikke tilgjengelig</string>
+    <string name="navigation_start_tts_message">"Starter navigering, taleveiledningsspråk: "</string>
+    <string name="prefs_speed_cameras_information">Fotoboksvarsler er deaktivert i land hvor varsler er forbudt i henhold til lokal lovgivning.</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 19c60cd48..c80113fdc 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -909,4 +909,5 @@
     <string name="charge_socket_schuko">Binnenlandse EU</string>
     <string name="navigation_start_tts_message">"Navigatie starten, taal voor steminstructie: "</string>
     <string name="prefs_speed_cameras_information">Waarschuwingen voor flitsers zijn uitgeschakeld in landen waar deze wettelijk zijn verboden.</string>
+    <string name="navigation_start_tts_disabled_message">Spraakinstructies uitgeschakeld: TTS-engine niet beschikbaar</string>
 </resources>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 2f0c56a3a..765534a96 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -915,4 +915,7 @@
     <string name="pref_tts_no_system_tts_short">Nie znaleziono silnika text-to-speech, sprawdź ustawienia aplikacji</string>
     <string name="list_description_empty">Edytuj listę, aby dodać opis</string>
     <string name="editor_submit">Wyślij</string>
+    <string name="prefs_speed_cameras_information">Ostrzeżenia o fotoradarach są wyłączone w krajach, gdzie takie alerty są zabronione prawnie.</string>
+    <string name="navigation_start_tts_message">"Startowanie nawigacji, język komunikatów głosowych: "</string>
+    <string name="navigation_start_tts_disabled_message">Komunikaty głosowe są wyłączone: silnik TTS jest niedostępny</string>
 </resources>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 07d108606..169802384 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -911,4 +911,5 @@
     <string name="charge_socket_schuko">欧盟标准</string>
     <string name="navigation_start_tts_message">"启动导航，语音指令语言： "</string>
     <string name="prefs_speed_cameras_information">在当地法律禁止发出警报的国家/地区，测速摄像头警告功能将被禁用。</string>
+    <string name="navigation_start_tts_disabled_message">语音指令已禁用：TTS 引擎不可用</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-fa/types_strings.xml b/android/sdk/src/main/res/values-fa/types_strings.xml
index 85f6efa1f..5e08dd4ac 100644
--- a/android/sdk/src/main/res/values-fa/types_strings.xml
+++ b/android/sdk/src/main/res/values-fa/types_strings.xml
@@ -601,31 +601,29 @@
     <string name="type.railway.monorail">مونوریل</string>
     <string name="type.railway.rail">راه آهن</string>
     <string name="type.railway.rail.highspeed">راه آهن پرسرعت</string>
-    <string name="type.railway.rail.tourism">راه آهن توریستی</string>
-    <string name="type.railway.rail.main">راه آهن</string>
+    <string name="type.railway.rail.tourism">راه‌آهن گردشگرانه</string>
+    <string name="type.railway.rail.main">راه‌آهن</string>
     <!-- Includes ordinary railway=rail w/o more specific usage= and service= tags. -->
-    <string name="type.railway.rail.branch">راه آهن ثانویه</string>
+    <string name="type.railway.rail.branch">اَزگ راه‌آهن</string>
     <!-- Non-passenger utility tracks: industrial, military, test. -->
-    <string name="type.railway.rail.utility">راه آهن شهری</string>
-    <string name="type.railway.rail.spur">خار راه آهن</string>
-    <!-- Short service tracks: siding, yard, crossover. -->
-    <string name="type.railway.rail.service">ریل کمکی</string>
-    <string name="type.railway.rail.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.highspeed.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.tourism.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.main.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.branch.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.utility.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.spur.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.service.bridge">پل راه آهن</string>
-    <string name="type.railway.rail.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.highspeed.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.tourism.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.main.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.branch.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.utility.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.spur.tunnel">تونل راه آهن</string>
-    <string name="type.railway.rail.service.tunnel">تونل راه آهن</string>
+    <string name="type.railway.rail.utility">سامانه راه‌آهن برقی</string>
+    <string name="type.railway.rail.spur">شاخک راه‌آهن</string>
+    <string name="type.railway.rail.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.highspeed.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.tourism.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.main.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.branch.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.utility.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.spur.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.service.bridge">پل راه‌آهن</string>
+    <string name="type.railway.rail.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.highspeed.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.tourism.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.main.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.branch.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.utility.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.spur.tunnel">آهون راه‌آهن</string>
+    <string name="type.railway.rail.service.tunnel">آهون راه‌آهن</string>
     <string name="type.railway.station">ایستگاه قطار</string>
     <string name="type.railway.station.funicular">فونیکولور</string>
     <string name="type.railway.station.light_rail">ایستگاه قطار</string>
@@ -1071,7 +1069,7 @@
     <string name="type.wheelchair.limited">دسترسی کرانمند با رواگ‌صندلی</string>
     <string name="type.wheelchair.no">بدون دسترسی با صندلی چرخ دار</string>
     <string name="type.wheelchair.yes">دسترسی کامل با صندلی چرخ دار</string>
-    <string name="type.piste_type.snow_park">پارک برفی</string>
+    <string name="type.piste_type.snow_park">بوستان برفی</string>
     <string name="type.piste_type.hike">مسیر پیاده روی برفی</string>
     <string name="type.piste_type.connection">اتصال پیست</string>
     <string name="type.piste_type.skitour">مسیر اسکیتور</string>
diff --git a/android/sdk/src/main/res/values-kw/types_strings.xml b/android/sdk/src/main/res/values-kw/types_strings.xml
new file mode 100644
index 000000000..4866dd6ea
--- /dev/null
+++ b/android/sdk/src/main/res/values-kw/types_strings.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type.addr_interpolation">Trigva</string>
+    <string name="type.addr_interpolation.even">Trigva</string>
+    <string name="type.addr_interpolation.odd">Trigva</string>
+    <string name="type.aerialway.chair_lift">Kador-yskynna</string>
+    <string name="type.aeroway.aerodrome">Ayrborth</string>
+    <string name="type.aeroway.aerodrome.international">Ayrborth Keswlasek</string>
+    <string name="type.aeroway.apron">Ayrborth Apron</string>
+    <string name="type.aeroway.gate">Ayrborth Porth</string>
+    <string name="type.aeroway.helipad">Le Tirans Askel Dro</string>
+    <string name="type.aeroway.runway">Hyns-tira</string>
+    <string name="type.aeroway.terminal">Termynal</string>
+    <string name="type.amenity.arts_centre">Kresen-art</string>
+    <string name="type.amenity.atm">Toll y\'n Fos</string>
+    <string name="type.amenity.bank">Arghanti</string>
+    <string name="type.amenity.bar">Barr</string>
+    <string name="type.amenity.bbq">Rastella Barbakoa</string>
+    <string name="type.amenity.bench">Form</string>
+    <string name="type.amenity.bicycle_parking">Parkyans Diwros</string>
+    <string name="type.amenity.bicycle_parking.covered">Parkyans Kdhys Diwros</string>
+    <string name="type.amenity.boat_rental">Arveth Skath</string>
+    <string name="type.amenity.bicycle_rental">Arveth Diwros</string>
+    <string name="type.amenity.bicycle_repair_station">Ewnansva Diwros</string>
+    <string name="type.amenity.biergarten">Jardin Korev</string>
+    <string name="type.amenity.brothel">Horji</string>
+    <string name="type.amenity.love_hotel">Ostel Karnal</string>
+    <string name="type.amenity.bureau_de_change">Keschanj Arghansedh</string>
+    <string name="type.amenity.bus_station">Gorsav Kyttrin</string>
+    <string name="type.amenity.cafe">Koffiji</string>
+    <string name="type.amenity.car_rental">Arveth Karr</string>
+    <string name="type.amenity.motorcycle_rental">Arveth Jynn Diwros</string>
+    <string name="type.amenity.car_wash">Golghva Gerri</string>
+    <string name="type.man_made.telescope">Pellweler</string>
+    <string name="type.man_made.telescope.radio">Pellweler (Radyo)</string>
+    <string name="type.man_made.observatory">Mirji</string>
+    <string name="type.amenity.childcare">Skol-veythrin</string>
+    <string name="type.amenity.cinema">Cinema</string>
+    <string name="type.amenity.studio">Studhla Media</string>
+    <string name="type.amenity.clinic">Medhegva</string>
+    <string name="type.amenity.college">Kolji</string>
+    <string name="type.amenity.community_centre">Kresen Gemeneth</string>
+    <string name="type.amenity.conference_centre">Kresen Keskussulyans</string>
+    <string name="type.amenity.courthouse">Stevel an Lys</string>
+    <string name="type.amenity.dentist">Medhek Dens</string>
+    <string name="type.amenity.doctors">Medhek</string>
+    <string name="type.amenity.drinking_water">Dowr Evadow</string>
+    <string name="type.drinking_water.yes">Dowr Evadow</string>
+    <string name="type.amenity.exhibition_centre">Kresen Diskwedhyans</string>
+    <string name="type.amenity.money_transfer">Treusworrans Mona</string>
+    <string name="type.amenity.music_school">Skol-ilowek</string>
+    <string name="type.amenity.flight_school">Skol Ayr</string>
+    <string name="type.amenity.language_school">Skol Tavas</string>
+    <string name="type.office.diplomatic">Kanatti</string>
+    <string name="type.office.security">Buro Gwithyas Diogeledh</string>
+    <string name="type.building.guardhouse">Borth Gwithyas Diogeledh</string>
+    <string name="type.power.portal">Portal Tredan</string>
+    <string name="type.amenity.fast_food">Boos Uskis</string>
+    <string name="type.amenity.ferry_terminal">Kowbal</string>
+    <string name="type.amenity.fire_station">Tanlu</string>
+    <string name="type.amenity.fountain">Fenten</string>
+    <string name="type.amenity.fuel">Petrolva</string>
+    <string name="type.amenity.grave_yard">Bedhros</string>
+    <string name="type.amenity.grave_yard.christian">Bedhros Kristyon</string>
+    <string name="type.amenity.hospital">Klavji</string>
+    <string name="type.amenity.ice_cream">Dehen Rew</string>
+    <string name="type.amenity.internet_cafe">Koffiji Kesrosweyth</string>
+    <string name="type.amenity.kindergarten">Floghva</string>
+    <string name="type.amenity.library">Lyverva</string>
+    <string name="type.amenity.loading_dock">Kay Dalgarga</string>
+    <string name="type.amenity.luggage_locker">Amari Fardellow</string>
+    <string name="type.amenity.marketplace">Tyller Marghas</string>
+    <string name="type.amenity.motorcycle_parking">Parkyans Jynn Diwros</string>
+    <string name="type.amenity.nightclub">Kist Nos</string>
+    <string name="type.amenity.parking">Parkyans</string>
+    <string name="type.amenity.parking.fee">Parkyans</string>
+    <string name="type.amenity.parking.multi.storey">Parkyans Liesleur</string>
+    <string name="type.amenity.parking.multi.storey.fee">Parkyans Liesleur</string>
+    <string name="type.amenity.parking.no.access">Parkyans Privedh</string>
+    <string name="type.amenity.parking.permissive">Parkyans Privedh</string>
+    <string name="type.amenity.parking.private">Parkyans Privedh</string>
+    <string name="type.amenity.parking.park_and_ride">Parkyans Parkya hag Ehwias</string>
+    <string name="type.amenity.parking.underground">Parkyans yn-dann dhor</string>
+    <string name="type.amenity.parking.underground.fee">Parkyans yn-dann dhor</string>
+    <string name="type.amenity.parking.underground.private">Parkyans privedh yn-dann dhor</string>
+    <string name="type.amenity.parking_entrance">Entrans Parkyans</string>
+    <string name="type.amenity.parking_entrance.private">Entrans Privedh Parkyans</string>
+    <string name="type.amenity.parking_entrance.permissive">Entrans Parkyans</string>
+    <string name="type.amenity.pharmacy">Ferylva</string>
+    <string name="type.amenity.place_of_worship.buddhist">Eglos Teg Bouddiek</string>
+    <string name="type.amenity.place_of_worship.christian">Eglos</string>
+    <string name="type.amenity.place_of_worship.jewish">Synaga</string>
+    <string name="type.amenity.place_of_worship.muslim">Mosk</string>
+    <string name="type.amenity.police">Kreslu</string>
+    <string name="type.amenity.post_office">Chei Post</string>
+    <string name="type.amenity.prison">Prison</string>
+    <string name="type.amenity.pub">Barr</string>
+    <string name="type.amenity.public_bookcase">Keschanj Lyver</string>
+    <string name="type.amenity.recycling.centre">Kresen Eylgylghyans</string>
+    <string name="type.amenity.recycling">Kofen Eylgylghyans</string>
+    <string name="type.amenity.recycling.container">Kofen Eylgylghyans</string>
+    <string name="type.recycling.batteries">Batriow</string>
+    <string name="type.recycling.clothes">Dillas</string>
+    <string name="type.recycling.glass_bottles">Botellow Gweder</string>
+    <string name="type.recycling.paper">Paper</string>
+    <string name="type.recycling.plastic">Plastek</string>
+    <string name="type.recycling.plastic_bottles">Botellow Plastek</string>
+    <string name="type.recycling.scrap_metal">Wast Alkan</string>
+    <string name="type.recycling.small_appliances">Wast Elektronek</string>
+    <string name="type.recycling.cardboard">Pasbord</string>
+    <string name="type.recycling.cans">Kannys</string>
+    <string name="type.recycling.shoes">Eskisyow</string>
+    <string name="type.recycling.green_waste">Lygennow</string>
+    <string name="type.amenity.restaurant">Bosti</string>
+    <string name="type.amenity.school">Skol</string>
+    <string name="type.amenity.shelter">Skovva</string>
+    <string name="type.amenity.shelter.public_transport">Skovva</string>
+    <string name="type.amenity.public_bath">Bath Poblek</string>
+    <string name="type.amenity.shower">Kowas</string>
+    <string name="type.amenity.telephone">Fon</string>
+    <string name="type.amenity.theatre">Gwariji</string>
+    <string name="type.amenity.toilets">Attesva</string>
+    <string name="type.toilets.yes">Attesva</string>
+    <string name="type.amenity.townhall">Odyans</string>
+    <string name="type.amenity.university">Pennskol</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Jynn Tokyn</string>
+    <string name="type.amenity.parcel_locker">Amari Fardel</string>
+    <string name="type.amenity.vehicle_inspection">Hwithrans Karr</string>
+    <string name="type.amenity.vending_machine.fuel">Pomp Petrol</string>
+    <string name="type.amenity.veterinary">Medhek Bestes</string>
+    <string name="type.amenity.animal_shelter">Gredi</string>
+    <string name="type.amenity.waste_basket">Argh</string>
+    <string name="type.amenity.waste_disposal">Argh Bras</string>
+    <string name="type.barrier">Lett</string>
+    <string name="type.barrier.yes">Lett</string>
+    <string name="type.barrier.block">Stock</string>
+    <string name="type.barrier.border_control">Amalborth</string>
+    <string name="type.barrier.chain">Chayn</string>
+    <string name="type.barrier.city_wall">Fos Cita</string>
+    <string name="type.barrier.cycle_barrier">Lett Diwros</string>
+    <string name="type.waterway.ditch">Kleys</string>
+    <string name="type.barrier.entrance">Entrans</string>
+    <string name="type.barrier.fence">Ke</string>
+    <string name="type.barrier.guard_rail">Kledhren</string>
+    <string name="type.barrier.gate">Porth</string>
+    <string name="type.barrier.hedge">Ke</string>
+    <string name="type.barrier.kissing_gate">Porth Amm</string>
+    <string name="type.barrier.stile">Kammva</string>
+    <string name="type.barrier.wicket_gate">Porth Darasik</string>
+    <string name="type.barrier.toll_booth">Tollva</string>
+    <string name="type.barrier.wall">Fos</string>
+    <string name="type.boundary">Or</string>
+    <string name="type.boundary.administrative">Or Menystrek</string>
+    <string name="type.boundary.administrative.2">Or Kenedhlegi</string>
+    <string name="type.boundary.administrative.3">Or Ranndirek</string>
+    <string name="type.boundary.administrative.4">Or Ranndirek</string>
+    <string name="type.boundary.national_park">Park Kenedhlek</string>
+    <string name="type.boundary.aboriginal_lands">Tir Teythiek</string>
+    <string name="type.building">Drehevyans</string>
+    <string name="type.building.address">Trigva</string>
+    <string name="type.building.has_parts">Drehevyans</string>
+    <string name="type.building_part">Drehevyans</string>
+    <string name="type.building.garage">Karrji</string>
+    <string name="type.building.train_station">Drehevyans Gorsav</string>
+    <string name="type.building.warehouse">Gwaraji</string>
+    <string name="type.cemetery.grave">Bedh</string>
+    <string name="type.craft">Kreft</string>
+    <string name="type.craft.blacksmith">Ferror</string>
+    <string name="type.craft.carpenter">Karpenter</string>
+    <string name="type.craft.electrician">Tredaner</string>
+    <string name="type.craft.electronics_repair">Ewnans Tredanegek</string>
+    <string name="type.craft.gardener">Lowarther</string>
+    <string name="type.craft.handicraft">Dornweyth</string>
+    <string name="type.craft.metal_construction">Gweythor Alkan</string>
+    <string name="type.craft.painter">Payntyer</string>
+    <string name="type.craft.photographer">Skeusenner</string>
+    <string name="type.shop.camera">Gwerthji Kamera</string>
+    <string name="type.craft.plumber">Plommer</string>
+    <string name="type.craft.shoemaker">Ewnans Eskis</string>
+    <string name="type.craft.winery">Gwinyer</string>
+    <string name="type.craft.tailor">Tregher</string>
+    <string name="type.cuisine.african">afrikan</string>
+    <string name="type.cuisine.american">amerikanek</string>
+    <string name="type.cuisine.arab">arabek</string>
+    <string name="type.cuisine.argentinian">arghantinek</string>
+    <string name="type.cuisine.asian">asiek</string>
+    <string name="type.cuisine.austrian">ostrian</string>
+    <string name="type.cuisine.barbecue">Barbakoa</string>
+    <string name="type.cuisine.beef_bowl">Bolla Bewin</string>
+    <string name="type.cuisine.brazilian">brasiliek</string>
+    <string name="type.cuisine.breakfast">Hansel</string>
+    <string name="type.cuisine.bubble_tea">Te Hwethen</string>
+    <string name="type.cuisine.burger">Borger</string>
+    <string name="type.cuisine.cake">Tesen</string>
+    <string name="type.cuisine.chicken">Kig Yar</string>
+    <string name="type.cuisine.chinese">chinek</string>
+    <string name="type.cuisine.coffee_shop">Koffi</string>
+    <string name="type.cuisine.croatian">kroatek</string>
+    <string name="type.cuisine.curry">Kurri</string>
+    <string name="type.cuisine.donut">Knowen Doos</string>
+    <string name="type.cuisine.ethiopian">ethiopek</string>
+    <string name="type.cuisine.fine_dining">Dybri Brav</string>
+    <string name="type.cuisine.fish">Pysk</string>
+    <string name="type.cuisine.fish_and_chips">Asklotti</string>
+    <string name="type.cuisine.french">frynkek</string>
+    <string name="type.cuisine.georgian">jorjiek</string>
+    <string name="type.cuisine.german">almaynek</string>
+    <string name="type.cuisine.greek">grek</string>
+    <string name="type.cuisine.grill">Rastell</string>
+    <string name="type.cuisine.hungarian">hungarek</string>
+    <string name="type.cuisine.ice_cream">Dehen Rew</string>
+</resources>
diff --git a/data/countries-strings/fa.json/localize.json b/data/countries-strings/fa.json/localize.json
index 1e2bf7013..bba2c4257 100644
--- a/data/countries-strings/fa.json/localize.json
+++ b/data/countries-strings/fa.json/localize.json
@@ -484,5 +484,18 @@
 "Iraq_North":"اپاختر اراک",
 "Iran_East Description":"مشهد، زاهدان، یزد",
 "Iran_North Description":"تهران، کرج، تبریز",
-"Iran_South Description":"اسپهان، شیراز، اهواز"
+"Iran_South Description":"اسپهان، شیراز، اهواز",
+"Japan_Kinki Region_Osaka_Osaka":"اوساکا",
+"Japan_Kinki Region_Osaka_West":"اوساکا — خاور",
+"Lithuania_East":"لیتوانی — باختر",
+"Lithuania_West":"لیتوانی — خاور",
+"Mexico_Chihuahua":"چی‌واوا",
+"Mexico_Sonora":"سونورا",
+"Nepal_Kathmandu":"کاتماندو",
+"Nigeria_North":"نیجریه — اپاختر",
+"Nigeria_South":"نیجریه — اواخشتر",
+"Norway_Hordaland":"هوردالاند",
+"Norway_Nordland":"نوردلاند",
+"Peru_Lima":"لیما",
+"Portugal_Islands":"گزیرگ‌های پرتغال"
 }
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 65681fa34..1ad11eef8 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -10,7 +10,7 @@
 "download_maps" = "بارگیری نقشه‌ها";
 
 /* Settings/Downloader - info for country which started downloading */
-"downloading" = "درحال دانلود…";
+"downloading" = "بارگیری می‌شود…";
 
 /* Choose measurement on first launch alert - choose metric system button */
 "kilometres" = "کیلومتر";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
index 35364b854..78f8ba671 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -914,34 +914,31 @@
 "type.railway.preserved.tunnel" = "Preserved Rail Tunnel";
 "type.railway.rail" = "راه آهن";
 "type.railway.rail.highspeed" = "راه آهن پرسرعت";
-"type.railway.rail.tourism" = "راه آهن توریستی";
-"type.railway.rail.main" = "راه آهن";
+"type.railway.rail.tourism" = "راه‌آهن گردشگرانه";
+"type.railway.rail.main" = "راه‌آهن";
 
 /* Includes ordinary railway=rail w/o more specific usage= and service= tags. */
-"type.railway.rail.branch" = "راه آهن ثانویه";
+"type.railway.rail.branch" = "اَزگ راه‌آهن";
 
 /* Non-passenger utility tracks: industrial, military, test. */
-"type.railway.rail.utility" = "راه آهن شهری";
-"type.railway.rail.spur" = "خار راه آهن";
-
-/* Short service tracks: siding, yard, crossover. */
-"type.railway.rail.service" = "ریل کمکی";
-"type.railway.rail.bridge" = "پل راه آهن";
-"type.railway.rail.highspeed.bridge" = "پل راه آهن";
-"type.railway.rail.tourism.bridge" = "پل راه آهن";
-"type.railway.rail.main.bridge" = "پل راه آهن";
-"type.railway.rail.branch.bridge" = "پل راه آهن";
-"type.railway.rail.utility.bridge" = "پل راه آهن";
-"type.railway.rail.spur.bridge" = "پل راه آهن";
-"type.railway.rail.service.bridge" = "پل راه آهن";
-"type.railway.rail.tunnel" = "تونل راه آهن";
-"type.railway.rail.highspeed.tunnel" = "تونل راه آهن";
-"type.railway.rail.tourism.tunnel" = "تونل راه آهن";
-"type.railway.rail.main.tunnel" = "تونل راه آهن";
-"type.railway.rail.branch.tunnel" = "تونل راه آهن";
-"type.railway.rail.utility.tunnel" = "تونل راه آهن";
-"type.railway.rail.spur.tunnel" = "تونل راه آهن";
-"type.railway.rail.service.tunnel" = "تونل راه آهن";
+"type.railway.rail.utility" = "سامانه راه‌آهن برقی";
+"type.railway.rail.spur" = "شاخک راه‌آهن";
+"type.railway.rail.bridge" = "پل راه‌آهن";
+"type.railway.rail.highspeed.bridge" = "پل راه‌آهن";
+"type.railway.rail.tourism.bridge" = "پل راه‌آهن";
+"type.railway.rail.main.bridge" = "پل راه‌آهن";
+"type.railway.rail.branch.bridge" = "پل راه‌آهن";
+"type.railway.rail.utility.bridge" = "پل راه‌آهن";
+"type.railway.rail.spur.bridge" = "پل راه‌آهن";
+"type.railway.rail.service.bridge" = "پل راه‌آهن";
+"type.railway.rail.tunnel" = "آهون راه‌آهن";
+"type.railway.rail.highspeed.tunnel" = "آهون راه‌آهن";
+"type.railway.rail.tourism.tunnel" = "آهون راه‌آهن";
+"type.railway.rail.main.tunnel" = "آهون راه‌آهن";
+"type.railway.rail.branch.tunnel" = "آهون راه‌آهن";
+"type.railway.rail.utility.tunnel" = "آهون راه‌آهن";
+"type.railway.rail.spur.tunnel" = "آهون راه‌آهن";
+"type.railway.rail.service.tunnel" = "آهون راه‌آهن";
 "type.railway.station" = "ایستگاه قطار";
 "type.railway.station.funicular" = "فونیکولور";
 "type.railway.station.light_rail" = "ایستگاه قطار";
@@ -1438,7 +1435,7 @@
 "type.piste_type.nordic" = "Nordic Ski Trail";
 "type.piste_type.sled" = "Sledding Piste";
 "type.piste_type.sled.area" = "Sledding Piste";
-"type.piste_type.snow_park" = "پارک برفی";
+"type.piste_type.snow_park" = "بوستان برفی";
 "type.piste_type.hike" = "مسیر پیاده روی برفی";
 "type.piste_type.connection" = "اتصال پیست";
 "type.piste_type.skitour" = "مسیر اسکیتور";
diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
index b577346c2..a6d99240c 100644
--- a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
@@ -439,7 +439,7 @@
 "dialog_incorrect_feature_position" = "Change location";
 "app_tip_01" = "With your donations and support, we can create the best maps in the World!";
 "downloader_status_failed" = "Failed";
-"dialog_routing_system_error" = "System error";
+"dialog_routing_system_error" = "Sistemska greška";
 "buildings" = "Buildings";
 "dialog_routing_download_and_build_cross_route" = "Would you like to download the map and create a more optimal route spanning more than one map?";
 "dialog_routing_disclaimer_beware" = "Please stay alert and safe on the roads!";
@@ -479,7 +479,7 @@
 "placepage_remove_stop" = "Remove Stop";
 "core_placepage_unknown_place" = "Map Point";
 "elevation_profile_diff_level_hard" = "Hard";
-"dialog_routing_try_again" = "Please try again";
+"dialog_routing_try_again" = "Pokušajte ponovno";
 "no_available" = "No";
 "fuel_places" = "Gas Stations";
 "clear_search" = "Clear Search History";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index c02a2c6e3..a9e317230 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1024,7 +1024,7 @@
 "icloud_disabled_title" = "iCloud jest wyłączony";
 
 /* Message for the "iCloud is Disabled" alert. */
-"icloud_disabled_message" = "Aby korzystać z tej funkcji, włącz usługę iCloud w ustawieniach urządzenia.";
+"icloud_disabled_message" = "Aby korzystać z tej funkcji, włącz usługę iCloud dla CoMaps w ustawieniach swojego konta Apple.";
 
 /* Title for the "Enable iCloud Syncronization" alert's "Enable" action button. */
 "enable" = "Włącz";