diff --git a/android/app/build.gradle b/android/app/build.gradle
index e41c2af04..5190d912f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -80,8 +80,8 @@ def getCommitMessage() {
 
 def osName = System.properties['os.name'].toLowerCase()
 
-project.ext.appId = 'app.organicmaps'
-project.ext.appName = 'Organic Maps'
+project.ext.appId = 'app.comaps'
+project.ext.appName = 'CoMaps'
 
 // I have Java 21 installed, but this doesn't work on MacOS.
 //java {
@@ -103,7 +103,7 @@ android {
   ndkVersion '27.2.12479018'
 
   defaultConfig {
-    // Default package name is taken from the manifest and should be app.organicmaps
+    // Default package name is taken from the manifest and should be app.comaps
     def ver = getVersion()
     versionCode = ver.V1
     versionName = ver.V2
@@ -184,7 +184,7 @@ android {
       dimension 'default'
       versionName = android.defaultConfig.versionName + '-Google'
       buildConfigField 'String', 'SUPPORT_MAIL', '"gplay@comaps.app"'
-      buildConfigField 'String', 'REVIEW_URL', '"market://details?id=app.organicmaps"'
+      buildConfigField 'String', 'REVIEW_URL', '"market://details?id=app.comaps"'
     }
 
     web {
@@ -205,7 +205,7 @@ android {
       versionName = android.defaultConfig.versionName + '-Huawei'
       versionCode = HUAWEI_VERSION_CODE_BASE + android.defaultConfig.versionCode
       buildConfigField 'String', 'SUPPORT_MAIL', '"huawei@comaps.app"'
-      buildConfigField 'String', 'REVIEW_URL', '"appmarket://details?id=app.organicmaps"'
+      buildConfigField 'String', 'REVIEW_URL', '"appmarket://details?id=app.comaps"'
     }
   }
 
@@ -241,7 +241,7 @@ android {
     android.applicationVariants.all { variant ->
       def task = variant.name.capitalize()
       project.task(type: Exec, "run${task}", dependsOn: "install${task}") {
-        commandLine android.getAdbExe(), 'shell', 'am', 'start', '-n', "$applicationId/app.organicmaps.DownloadResourcesActivity", '-a', 'android.intent.action.MAIN', '-c', 'android.intent.category.LAUNCHER'
+        commandLine android.getAdbExe(), 'shell', 'am', 'start', '-n', "$applicationId/app.comaps.DownloadResourcesActivity", '-a', 'android.intent.action.MAIN', '-c', 'android.intent.category.LAUNCHER'
       }
     }
   }
@@ -279,7 +279,7 @@ android {
       jniDebuggable true           // Enable jni debug build
       zipAlignEnabled true
       signingConfig signingConfigs.debug
-      resValue 'string', 'app_name', 'Debug Organic Maps'
+      resValue 'string', 'app_name', 'Debug CoMaps'
       // Do not generate separate debug symbols for debug apps, because we don't distribute them.
       ndk.debugSymbolLevel = 'none'
 
@@ -320,7 +320,7 @@ android {
       // To learn more, go to the documentation section about R8 configuration files.
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       matchingFallbacks = ['debug', 'release']
-      resValue 'string', 'app_name', 'Beta Organic Maps'
+      resValue 'string', 'app_name', 'Beta CoMaps'
       // Full size symbols are too big for Google, 217mb aab vs 95mb.
       ndk.debugSymbolLevel = 'symbol_table'
 
diff --git a/android/app/src/fdroid/play/contact-email.txt b/android/app/src/fdroid/play/contact-email.txt
index d55d8796a..4e090eb53 100644
--- a/android/app/src/fdroid/play/contact-email.txt
+++ b/android/app/src/fdroid/play/contact-email.txt
@@ -1 +1 @@
-fdroid@organicmaps.app
+fdroid@comaps.app
diff --git a/android/app/src/google/play/contact-email.txt b/android/app/src/google/play/contact-email.txt
index 9212f11c9..cec97757d 100644
--- a/android/app/src/google/play/contact-email.txt
+++ b/android/app/src/google/play/contact-email.txt
@@ -1 +1 @@
-googleplay@organicmaps.app
+googleplay@comaps.app
diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
index 25a839155..c33dcda61 100644
--- a/android/app/src/main/cpp/CMakeLists.txt
+++ b/android/app/src/main/cpp/CMakeLists.txt
@@ -75,7 +75,7 @@ omim_add_library(${PROJECT_NAME} SHARED ${SRC})
 target_include_directories(${PROJECT_NAME} PRIVATE .)
 
 target_link_libraries(${PROJECT_NAME}
-  # Organic Maps libs
+  # CoMaps libs
   map
   # ge0
   # tracking
diff --git a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp b/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp
index b0a15d22d..fc0222f72 100644
--- a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp
@@ -337,7 +337,7 @@ Java_app_organicmaps_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass claz
 {
   // TODO: Handle upload status in callback
   Editor::Instance().UploadChanges(jni::ToNativeString(env, token),
-      {{"created_by", "Organic Maps " OMIM_OS_NAME " " + jni::ToNativeString(env, appVersion)},
+      {{"created_by", "CoMaps " OMIM_OS_NAME " " + jni::ToNativeString(env, appVersion)},
        {"bundle_id", jni::ToNativeString(env, appId)}}, nullptr);
 }
 
diff --git a/android/app/src/main/java/app/organicmaps/util/Constants.java b/android/app/src/main/java/app/organicmaps/util/Constants.java
index 614dec203..c563d2700 100644
--- a/android/app/src/main/java/app/organicmaps/util/Constants.java
+++ b/android/app/src/main/java/app/organicmaps/util/Constants.java
@@ -13,7 +13,7 @@ public final class Constants
   public static class Url
   {
     public static final String SHORT_SHARE_PREFIX = "om://";
-    public static final String HTTP_SHARE_PREFIX = "https://omaps.app/";
+    public static final String HTTP_SHARE_PREFIX = "https://comaps.app/";
 
     public static final String MAILTO_SCHEME = "mailto:";
     public static final String MAIL_SUBJECT = "?subject=";
diff --git a/android/app/src/main/res/layout/place_page_email.xml b/android/app/src/main/res/layout/place_page_email.xml
index a01a2cd02..0f3d1f17a 100644
--- a/android/app/src/main/res/layout/place_page_email.xml
+++ b/android/app/src/main/res/layout/place_page_email.xml
@@ -20,5 +20,5 @@
     android:textAlignment="viewStart"
     style="@style/PlacePageMetadataText"
     android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
-    tools:text="support@organicmaps.app" />
+    tools:text="support@comaps.app" />
 </LinearLayout>
diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index 5223c589f..7c48b7c73 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">Aflaai het misluk</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Probeer weer</string>
-    <string name="about_menu_title">Oor Organic Maps</string>
+    <string name="about_menu_title">Oor CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratis vir almal, gemaak met liefde</string>
     <!-- Text in About screen -->
@@ -54,7 +54,7 @@
     <string name="unsupported_phone">’n Apparatuurversnelde OpenGL is nodig vir die toep. U toestel word ongelukkig nie gesteun nie.</string>
     <string name="download">Laai af</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Ontkoppel die USB-kabel of gebruik ’n geheuekaart om Organic Maps te gebruik</string>
+    <string name="disconnect_usb_cable">Ontkoppel die USB-kabel of gebruik ’n geheuekaart om CoMaps te gebruik</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Maak asb. eers spasie op die SD-kaart/USB-berging beskikbaar om die kaart te kan gebruik</string>
     <string name="download_resources">Voordat u die toep begin gebruik, moet u asb. die algemene wêreldkaart na u toestel aflaai.
@@ -166,12 +166,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps-boekmerke is met u gedeel</string>
+    <string name="share_bookmarks_email_subject">CoMaps-boekmerke is met u gedeel</string>
     <string name="share_bookmarks_email_body">Hallo!
 \n
-\nMy boekmerke is aangeheg; open dit asb. in Organic Maps. Indien dit nie geïnstalleer is nie, kan u dit hier aflaai: https://omaps.app/get?kmz
+\nMy boekmerke is aangeheg; open dit asb. in CoMaps. Indien dit nie geïnstalleer is nie, kan u dit hier aflaai: https://comaps.app/get?kmz
 \n
-\nGeniet dit om met Organic Maps te reis!</string>
+\nGeniet dit om met CoMaps te reis!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Laai tans boekmerke</string>
     <!-- Kmz file successful loading -->
@@ -181,7 +181,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Die lêertipe word nie deur die toepassing herken nie:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Kon nie lêer oopmaak nie %1$s
 \n
 \n%2$s</string>
@@ -193,13 +193,13 @@
     <string name="cant_change_this_setting">Jammer, Kaartbergingsinstellings is tans gedeaktiveer.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Die kaart word tans afgelaai.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Kyk my huidige posisie in Organic Maps! %1$s of %2$s Het u nie vanlyn kaarte nie? Laai hier af: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Kyk my huidige posisie in CoMaps! %1$s of %2$s Het u nie vanlyn kaarte nie? Laai hier af: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hallo, kyk my liggingmerker in Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Hallo, kyk my liggingmerker in CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hallo, sien my huidige ligging op die Organic Maps-toep!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hallo, sien my huidige ligging op die CoMaps-toep!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Dagsê,
 \n
 \nEk is nou hier: %1$s. Klik op die skakel %2$s of hierdie een %3$s om die plek op die kaart te sien.
@@ -254,7 +254,7 @@
     <string name="menu">Kieslys</string>
     <!-- Text in menu -->
     <string name="website">Webwerf</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nuus</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Terugvoer</string>
@@ -268,7 +268,7 @@
     <string name="donate">Skenk</string>
     <string name="already_donated">Reeds geskenk</string>
     <string name="remind_me_later">Herinner later</string>
-    <string name="support_organic_maps">Ondersteun Organic Maps</string>
+    <string name="support_organic_maps">Ondersteun CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Ondersteun die projek</string>
     <!-- Button in the main Help dialog -->
@@ -495,7 +495,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Gemeenskap-geskepte OpenStreetMap-data vanaf %s. Kom meer te wete oor hoe om die kaart te redigeer en op te dateer by OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) is \'n gemeenskapsprojek om \'n gratis en oop kaart te bou. Dit is die hoofbron van kaartdata in Organic Maps en werk soortgelyk aan Wikipedia. Jy kan plekke byvoeg of wysig en hulle word beskikbaar vir miljoene gebruikers regoor die wêreld.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) is \'n gemeenskapsprojek om \'n gratis en oop kaart te bou. Dit is die hoofbron van kaartdata in CoMaps en werk soortgelyk aan Wikipedia. Jy kan plekke byvoeg of wysig en hulle word beskikbaar vir miljoene gebruikers regoor die wêreld.
 \nSluit aan by die gemeenskap en help om \'n beter kaart vir almal te maak!</string>
     <string name="login_to_make_edits_visible">Skep \'n OpenStreetMap-rekening of meld aan om jou kaartwysigings aan die wêreld te publiseer.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -523,7 +523,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operateur: %s</string>
     <string name="editor_category_unsuitable_title">Kan u nie \'n geskikte kategorie vind nie?</string>
-    <string name="editor_category_unsuitable_text">Organiese kaarte laat toe om slegs eenvoudige puntkategorieë by te voeg, dit beteken geen dorpe, paaie, mere, gebouomlynings, ens. Voeg asseblief sulke kategorieë direk by <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Gaan ons <a href="https://organicmaps.app/faq/editing/advanced-map-editing">gids</a> na vir gedetailleerde stap-vir-stap-instruksies.</string>
+    <string name="editor_category_unsuitable_text">Organiese kaarte laat toe om slegs eenvoudige puntkategorieë by te voeg, dit beteken geen dorpe, paaie, mere, gebouomlynings, ens. Voeg asseblief sulke kategorieë direk by <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Gaan ons <a href="https://comaps.app/faq/editing/advanced-map-editing">gids</a> na vir gedetailleerde stap-vir-stap-instruksies.</string>
     <string name="downloader_no_downloaded_maps_title">U het geen kaarte afgelaai nie</string>
     <string name="downloader_no_downloaded_maps_message">Laai kaarte af om die ligging te soek en vanlyn te navigeer.</string>
     <string name="current_location_unknown_error_title">Huidige ligging is onbekend.</string>
@@ -584,7 +584,7 @@
     <string name="mobile_data_option_ask">Vra altyd</string>
     <string name="traffic_update_maps_text">Kaarte moet bygewerk word om verkeersdata te vertoon.</string>
     <string name="big_font">Vergroot lettergrootte op kaart</string>
-    <string name="traffic_update_app">Werk Organic Maps asb. by</string>
+    <string name="traffic_update_app">Werk CoMaps asb. by</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Verkeersdata is nie beskikbaar nie</string>
     <string name="enable_logging">Staan logboekinskrywing toe</string>
@@ -610,7 +610,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Meld asseblief aan by OpenStreetMap om al jou kaartwysigings outomaties op te laai. Kom meer te wete <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
     <string name="dialog_error_storage_title">Bergtoegangprobleem</string>
-    <string name="dialog_error_storage_message">Eksterne bergspasie is nie toeganklik nie. Die SD-kaart is dalk verwyder, beskadig, of die lêerstelsel is leesalleen. Gaan u SD-kaart na of kontak ons by support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Eksterne bergspasie is nie toeganklik nie. Die SD-kaart is dalk verwyder, beskadig, of die lêerstelsel is leesalleen. Gaan u SD-kaart na of kontak ons by support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuleer slegte bergspasie</string>
     <string name="core_entrance">Ingang</string>
     <string name="error_enter_correct_name">Voer asb. ’n korrekte naam in</string>
@@ -767,11 +767,11 @@
     <!-- App tip #04 -->
     <string name="app_tip_04">Tik enige plek op die kaart om enigiets te kies. Tik lank om te versteek en om die koppelvlak terug te wys.</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps benodig liggingtoegang. Gaan die kennisgewing op jou foon na wanneer dit veilig is.</string>
+    <string name="aa_location_permissions_request">CoMaps benodig liggingtoegang. Gaan die kennisgewing op jou foon na wanneer dit veilig is.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Hierdie toepassing benodig jou toestemming</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps in Android Auto het \'n liggingtoestemming nodig om effektief te werk</string>
+    <string name="aa_request_permission_activity_text">CoMaps in Android Auto het \'n liggingtoestemming nodig om effektief te werk</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
     <string name="button_layer_outdoor">Stap</string>
     <!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index caa2076bd..7d395573b 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">فشلت عملية تنزيل</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">محاولة مرة أخرى</string>
-    <string name="about_menu_title">حول Organic Maps</string>
+    <string name="about_menu_title">حول CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">مجاني للجميع ، مصنوع من الحب</string>
     <!-- Text in About screen -->
@@ -56,7 +56,7 @@
     <string name="unsupported_phone">أنت بحاجة الى OpenGL بأجهزة تسريع. لسوء الحظ جهازك لا يدعم هذه الخاصية.</string>
     <string name="download">تنزيل</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">الرجاء فصل كابل الناقل التسلسلي الشامل أو إدخال بطاقة الذاكرة من أجل استخدام Organic Maps.</string>
+    <string name="disconnect_usb_cable">الرجاء فصل كابل الناقل التسلسلي الشامل أو إدخال بطاقة الذاكرة من أجل استخدام CoMaps.</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">الرجاء إخلاء بعض المساحة في تخزين البطاقة الرقمية الآمنة\الناقل التسلسلي الشامل أولا من أجل استخدام هذا التطبيق.</string>
     <string name="download_resources">قبل أن تبدأ باستخدام التطبيق، سنقوم بتنزيل خريطة العالم العامة على جهازك.
@@ -170,12 +170,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">ملاحظات</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">تم مشاركة إشارات Organic Maps المرجعية معك</string>
+    <string name="share_bookmarks_email_subject">تم مشاركة إشارات CoMaps المرجعية معك</string>
     <string name="share_bookmarks_email_body">مرحباً! ْ
 \n
-\n تم إرفاق إشاراتي المرجعية من تطبيق Organic Maps. الرجاء فتحهم إذا لديك تطبيق Organic Maps مثبتاً. أو، إذا لم يكن مثبتاً، قم بتنزيل التطبيق لنظام iOS أو أندرويد من خلال الضغط على هذا الرابط: https://omaps.app/get?kmz 
+\n تم إرفاق إشاراتي المرجعية من تطبيق CoMaps. الرجاء فتحهم إذا لديك تطبيق CoMaps مثبتاً. أو، إذا لم يكن مثبتاً، قم بتنزيل التطبيق لنظام iOS أو أندرويد من خلال الضغط على هذا الرابط: https://comaps.app/get?kmz 
 \n
-\nاستمتع بالسفر مع Organic Maps!</string>
+\nاستمتع بالسفر مع CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">يتم تحميل الإشارات المرجعية</string>
     <!-- Kmz file successful loading -->
@@ -185,7 +185,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">لم يتعرف التطبيق على نوع الملف:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">فشل فتح ملف %1$s
 \n
 \n%2$s</string>
@@ -197,13 +197,13 @@
     <string name="cant_change_this_setting">نأسف، اعدادات تخزين الخرائط معطلة حالياً.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">جاري الآن تنزيل الخريطة</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">مرحباً، تفقد الموقع الخاص بي على Organic Maps! %1$s أو %2$s. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">مرحباً، تفقد الموقع الخاص بي على CoMaps! %1$s أو %2$s. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">مرحباً، تفقد الدبوس الخاص بي على خريطة Organic Maps!</string>
+    <string name="bookmark_share_email_subject">مرحباً، تفقد الدبوس الخاص بي على خريطة CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">مرحباً، تحقق من موقعي الحالي على خريطة Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">مرحباً، تحقق من موقعي الحالي على خريطة CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">ًمرحبا،
 \n
 \nأنا هنا الآن: %1$s. انقر على هذا الرابط %2$s أو ذلك الرابط %3$s لمشاهدة المكان على الخريطة.
@@ -268,7 +268,7 @@
     <string name="menu">القائمة</string>
     <!-- Text in menu -->
     <string name="website">الموقع الإلكتروني</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">أخبار</string>
     <!-- Text in menu -->
     <string name="telegram">تيليجرام</string>
@@ -292,7 +292,7 @@
     <string name="donate">تبرع</string>
     <string name="already_donated">تم التبرع</string>
     <string name="remind_me_later">ذكر لاحقاً</string>
-    <string name="support_organic_maps">دعم Organic Maps</string>
+    <string name="support_organic_maps">دعم CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">دعم المشروع</string>
     <!-- Button in the main Help dialog -->
@@ -548,7 +548,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">المشغل: %s</string>
     <string name="editor_category_unsuitable_title">لا يمكن العثور على فئة مناسبة؟</string>
-    <string name="editor_category_unsuitable_text">تسمح الخرائط العضوية بإضافة فئات نقاط بسيطة فقط، وهذا يعني عدم وجود بلدات وطرق وبحيرات ومخططات للمباني وما إلى ذلك. يرجى إضافة هذه الفئات مباشرة إلى <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. راجع موقعنا <a href="https://organicmaps.app/faq/editing/advanced-map-editing">دليل</a> للحصول على تعليمات مفصلة خطوة بخطوة.</string>
+    <string name="editor_category_unsuitable_text">تسمح الخرائط العضوية بإضافة فئات نقاط بسيطة فقط، وهذا يعني عدم وجود بلدات وطرق وبحيرات ومخططات للمباني وما إلى ذلك. يرجى إضافة هذه الفئات مباشرة إلى <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. راجع موقعنا <a href="https://comaps.app/faq/editing/advanced-map-editing">دليل</a> للحصول على تعليمات مفصلة خطوة بخطوة.</string>
     <string name="downloader_no_downloaded_maps_title">لم تقم بتنزيل أية خرائط</string>
     <string name="downloader_no_downloaded_maps_message">قم بتنزيل خرائط للبحث عن مكان واستخدام الملاحة بدون اتصال بالإنترنت.</string>
     <string name="current_location_unknown_error_title">الموقع الحالي غير معروف.</string>
@@ -610,7 +610,7 @@
     <string name="mobile_data_option_ask">السؤال دوماً</string>
     <string name="traffic_update_maps_text">لعرض البيانات المرورية، يجب تحديث الخرائط.</string>
     <string name="big_font">زيادة حجم الخط على الخريطة</string>
-    <string name="traffic_update_app">الرجاء تحديث Organic Maps</string>
+    <string name="traffic_update_app">الرجاء تحديث CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">البيانات المرورية غير متاحة</string>
     <string name="enable_logging">تفعيل التسجيل</string>
@@ -636,7 +636,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">برجاء تسجيل الدخول إلى OpenStreetMap لتحميل جميع تعديلات الخريطة تلقائيًا. تعرف على المزيد <a href="https://github.com/organicmaps/organicmaps/issues/6144">هنا</a>.</string>
     <string name="dialog_error_storage_title">مشكلة الوصول للتخزين</string>
-    <string name="dialog_error_storage_message">التخزين الخارجي غير متوفر، ربما تمت إزالة بطاقة SD، أو أنها تالفة أو نظام الملفات للقراءة فقط. افحصه أو راسلنا على support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">التخزين الخارجي غير متوفر، ربما تمت إزالة بطاقة SD، أو أنها تالفة أو نظام الملفات للقراءة فقط. افحصه أو راسلنا على support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">محاكاة التخزين السيء</string>
     <string name="core_entrance">المدخل</string>
     <string name="error_enter_correct_name">الرجاء إدخال اسم صحيح</string>
@@ -712,7 +712,7 @@
     <string name="power_managment_setting_never">أبدًا</string>
     <string name="power_managment_setting_auto">تلقائي</string>
     <string name="power_managment_setting_manual_max">توفير الطاقة الأقصى</string>
-    <string name="enable_logging_warning_message">هذا الخيار يقوم ببدأ تسجيل سجلات التطبيق لإغراض التشخيصة. يمكن أن يكون مفيدًا لفريق الدعم الخاص بنا لحل المشاكل التي تواجهكم داخل التطبيق. قم بتفعيل هذا الخيار بشكل مؤقت فقط في حالة طلب الدعم من Organic Maps.</string>
+    <string name="enable_logging_warning_message">هذا الخيار يقوم ببدأ تسجيل سجلات التطبيق لإغراض التشخيصة. يمكن أن يكون مفيدًا لفريق الدعم الخاص بنا لحل المشاكل التي تواجهكم داخل التطبيق. قم بتفعيل هذا الخيار بشكل مؤقت فقط في حالة طلب الدعم من CoMaps.</string>
     <string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
     <string name="driving_options_title">خيارات رسم المسار</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
diff --git a/android/app/src/main/res/values-ast/strings.xml b/android/app/src/main/res/values-ast/strings.xml
index 8a5b66385..98ecbcd91 100644
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -36,7 +36,7 @@
     <string name="no">Non</string>
     <string name="network">Rede: %s</string>
     <string name="export_file_gpx">Esportar GPX</string>
-    <string name="about_menu_title">Tocante a Organic Maps</string>
+    <string name="about_menu_title">Tocante a CoMaps</string>
     <string name="search_show_on_map">Ver nel mapa</string>
     <string name="instagram">Instagram</string>
     <string name="downloader_delete_map">Desaniciar mapa</string>
@@ -80,7 +80,7 @@
     <string name="editor_edit_place_name_hint">Nome del llugar</string>
     <string name="current_location_unknown_error_title">Desconózse l’allugamientu actual.</string>
     <string name="elevation_profile_ascent">Ascensu</string>
-    <string name="traffic_update_app">Anueva Organic Maps</string>
+    <string name="traffic_update_app">Anueva CoMaps</string>
     <string name="placepage_add_stop">Amestar parada</string>
     <string name="placepage_remove_stop">Desaniciar parada</string>
     <string name="privacy">Privacidá</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index ea3ee5e82..31f14cda3 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -38,7 +38,7 @@
     <string name="country_status_download_failed">Yükləmə uğursuz oldu</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Yenidən cəhd et</string>
-    <string name="about_menu_title">Organic Maps Haqqında</string>
+    <string name="about_menu_title">CoMaps Haqqında</string>
     <!-- Text in About screen -->
     <string name="about_headline">Hər kəs üçün ödənişsiz və sevgi ilə hazırlanmış xəritə</string>
     <!-- Text in About screen -->
@@ -55,7 +55,7 @@
     <string name="unsupported_phone">Tətbiq aparatla sürətləndirilmiş OpenGL tələb edir. Təəssüf ki, cihazınız dəstəklənmir.</string>
     <string name="download">Yüklə</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Organic Maps\'dan istifadə etmək üçün zəhmət olmasa USB kabeli ayırın və ya yaddaş kartı daxil edin</string>
+    <string name="disconnect_usb_cable">CoMaps\'dan istifadə etmək üçün zəhmət olmasa USB kabeli ayırın və ya yaddaş kartı daxil edin</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Tətbiqdən istifadə etmək üçün SD kartda/USB yaddaş cihazında bir qədər yer boşaldın.</string>
     <string name="download_resources">Başlamazdan əvvəl gəlin ümumi dünya xəritəsini cihazınıza endirək.
@@ -168,12 +168,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Qeydlər</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps əlfəcinləri sizinlə paylaşıldı</string>
+    <string name="share_bookmarks_email_subject">CoMaps əlfəcinləri sizinlə paylaşıldı</string>
     <string name="share_bookmarks_email_body">Salam!
 \n
-\nOrganic Maps əlfəcinlərim əlavə olunub. Zəhmət olmasa Organic Maps-da onları açın. Əgər onu quraşdırmamısınızsa, bu linkə daxil olub cihazınıza yükləyə bilərsiniz: https://omaps.app/get?kmz
+\nCoMaps əlfəcinlərim əlavə olunub. Zəhmət olmasa CoMaps-da onları açın. Əgər onu quraşdırmamısınızsa, bu linkə daxil olub cihazınıza yükləyə bilərsiniz: https://comaps.app/get?kmz
 \n
-\nOrganic Maps ilə səyahətdən həzz alın!</string>
+\nCoMaps ilə səyahətdən həzz alın!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Əlfəcinlər yüklənir</string>
     <!-- Kmz file successful loading -->
@@ -183,7 +183,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Fayl növü tətbiq tərəfindən tanınmır:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Faylı açmaq alınmadı %1$s
 \n
 \n%2$s</string>
@@ -195,13 +195,13 @@
     <string name="cant_change_this_setting">Üzr istəyirik, Xəritə Yaddaşı parametrləri hazırda deaktivdir.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Xəritənin endirilməsi hazırda davam edir.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Salam, Organic Maps\'da mənim hal-hazırda olduğum ünvanı yoxla! %1$s və ya %2$s Oflayn xəritələriniz yoxdur? Buradan endirin: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Salam, CoMaps\'da mənim hal-hazırda olduğum ünvanı yoxla! %1$s və ya %2$s Oflayn xəritələriniz yoxdur? Buradan endirin: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Salam, Organic Maps xəritəsində mənim pin kodumu yoxlayın!</string>
+    <string name="bookmark_share_email_subject">Salam, CoMaps xəritəsində mənim pin kodumu yoxlayın!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hey, Organic Maps\'da mənim hal-hazırda olduğum ünvana baxın!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hey, CoMaps\'da mənim hal-hazırda olduğum ünvana baxın!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Salam,
 \n
 \nMən hazırda bu ünvandayam: %1$s. Xəritədə yeri görmək üçün %2$s və ya %3$s üzərinə klikləyin.
@@ -264,7 +264,7 @@
     <string name="search_show_on_map">Xəritədə baxın</string>
     <!-- Text in menu -->
     <string name="website">Veb sayt</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Xəbərlər</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Rəy</string>
@@ -278,7 +278,7 @@
     <string name="donate">Bağışlamaq</string>
     <string name="already_donated">Artıq ianə edildi</string>
     <string name="remind_me_later">Daha sonra xatırlat</string>
-    <string name="support_organic_maps">Organic Maps-i dəstəkləmək</string>
+    <string name="support_organic_maps">CoMaps-i dəstəkləmək</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Bu layihəni dəstəkləyin</string>
     <!-- Button in the main Help dialog -->
@@ -537,7 +537,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operator: %s</string>
     <string name="editor_category_unsuitable_title">Uyğun kateqoriya tapa bilmirsiniz?</string>
-    <string name="editor_category_unsuitable_text">Üzvi Xəritələr yalnız sadə nöqtə kateqoriyaları əlavə etməyə imkan verir, bu o deməkdir ki, şəhərlər, yollar, göllər, bina konturları və s. yoxdur. Lütfən, belə kateqoriyaları birbaşa <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> saytına əlavə edin. Ətraflı addım-addım təlimatlar üçün <a href="https://organicmaps.app/faq/editing/advanced-map-editing">bələdçimizi</a> yoxlayın.</string>
+    <string name="editor_category_unsuitable_text">Üzvi Xəritələr yalnız sadə nöqtə kateqoriyaları əlavə etməyə imkan verir, bu o deməkdir ki, şəhərlər, yollar, göllər, bina konturları və s. yoxdur. Lütfən, belə kateqoriyaları birbaşa <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> saytına əlavə edin. Ətraflı addım-addım təlimatlar üçün <a href="https://comaps.app/faq/editing/advanced-map-editing">bələdçimizi</a> yoxlayın.</string>
     <string name="downloader_no_downloaded_maps_title">Siz heç bir xəritə endirməmisiniz</string>
     <string name="downloader_no_downloaded_maps_message">Ünvanları tapmaq və oflayn naviqasiya etmək üçün xəritələri endirin.</string>
     <string name="current_location_unknown_error_title">Cari yer məlum deyil.</string>
@@ -599,7 +599,7 @@
     <string name="mobile_data_option_ask">Həmişə Soruşun</string>
     <string name="traffic_update_maps_text">Nəqliyyat məlumatlarını göstərmək üçün xəritələr yenilənməlidir.</string>
     <string name="big_font">Xəritədə şrift ölçüsünü artırın</string>
-    <string name="traffic_update_app">Organic Maps\'i yeniləyin</string>
+    <string name="traffic_update_app">CoMaps\'i yeniləyin</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Nəqliyyat məlumatları mövcud deyil</string>
     <string name="enable_logging">Girişi aktivləşdirin</string>
@@ -625,7 +625,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Bütün xəritə redaktələrinizi avtomatik yükləmək üçün OpenStreetMap-a daxil olun. <a href="https://github.com/organicmaps/organicmaps/issues/6144">burada</a> ətraflı məlumat əldə edin.</string>
     <string name="dialog_error_storage_title">Yaddaş giriş problemi</string>
-    <string name="dialog_error_storage_message">Xarici yaddaş mövcud deyil, ola bilsin ki, SD Kart çıxarılıb, zədələnib və ya fayl sistemi yalnız oxunur. Zəhmət olmasa yoxlayın və ya support\@organicmaps.app ünvanında bizimlə əlaqə saxlayın</string>
+    <string name="dialog_error_storage_message">Xarici yaddaş mövcud deyil, ola bilsin ki, SD Kart çıxarılıb, zədələnib və ya fayl sistemi yalnız oxunur. Zəhmət olmasa yoxlayın və ya support\@comaps.app ünvanında bizimlə əlaqə saxlayın</string>
     <string name="setting_emulate_bad_storage">Zədələnmiş yaddaşı təqlid edin</string>
     <string name="core_entrance">Giriş</string>
     <string name="error_enter_correct_name">Düzgün ad daxil edin</string>
@@ -796,8 +796,8 @@
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">OpenStreetMap-dan xəritə məlumatları</string>
     <!-- Telegram group url for the "?" About page -->
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/tr/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/tr/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Tr:About</string>
     <!-- App Tip #00 -->
@@ -805,9 +805,9 @@
     <!-- App tip #04 -->
     <string name="app_tip_04">Nəyisə seçmək üçün xəritədə istənilən yerə toxunun. Gizlətmək və interfeysi geri göstərmək üçün uzun müddət toxunun.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">İndi telefon ekranında Organic Maps istifadə edirsiniz</string>
+    <string name="car_used_on_the_phone_screen">İndi telefon ekranında CoMaps istifadə edirsiniz</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Hazırda avtomobil ekranında Organic Maps istifadə edirsiniz</string>
+    <string name="car_used_on_the_car_screen">Hazırda avtomobil ekranında CoMaps istifadə edirsiniz</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Siz Android Auto-a qoşulmusunuz</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 248011c1b..a90fce371 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">Памылка спампоўкі</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Паспрабаваць зноў</string>
-    <string name="about_menu_title">Аб праграме Organic Maps</string>
+    <string name="about_menu_title">Аб праграме CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Бясплатна для ўсіх, зроблена з любоўю</string>
     <!-- Text in About screen -->
@@ -56,7 +56,7 @@
     <string name="unsupported_phone">Для працы праграмы неабходны апаратна паскораны OpenGL. Нажаль, ваша прылада не падтрымліваецца.</string>
     <string name="download">Спампаваць</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Адключыце USB кабель або ўстаўце карту памяці, каб карыстацца Organic Maps</string>
+    <string name="disconnect_usb_cable">Адключыце USB кабель або ўстаўце карту памяці, каб карыстацца CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Вызваліце месца на SD-карце/USB-сховішчы, каб карыстацца праграмай</string>
     <string name="download_resources">Перад пачаткам працы дазвольце нам спампаваць агульную мапу свету на вашу прыладу.
@@ -169,9 +169,9 @@
     <string name="share_bookmarks_email_subject">З вамі падзяліліся закладкамі Ogranic Maps</string>
     <string name="share_bookmarks_email_body">Вітаю!
 \n
-\nУ далучаным файле мае закладкі з праграмы Organic Maps. Калі ласка, адкрыйце іх, калі ў вас усталяваны Organic Maps. Калі не, спампуйце праграму для вашай прылады iOS альбо Andriod па спасылцы: https://omaps.app/get?kmz
+\nУ далучаным файле мае закладкі з праграмы CoMaps. Калі ласка, адкрыйце іх, калі ў вас усталяваны CoMaps. Калі не, спампуйце праграму для вашай прылады iOS альбо Andriod па спасылцы: https://comaps.app/get?kmz
 \n
-\nПрыемных падарожжаў з Organic Maps!</string>
+\nПрыемных падарожжаў з CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Загрузка закладак</string>
     <!-- Kmz file successful loading -->
@@ -181,7 +181,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Прыкладанне не распазнае тып файла:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Не ўдалося адкрыць файл %1$s
 \n
 \n%2$s</string>
@@ -193,13 +193,13 @@
     <string name="cant_change_this_setting">На жаль, налады сховішча мапы зараз адключаны.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Ідзе спампоўванне мапы.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Гэй, глядзі дзе я зараз на мапе! %1$s альбо %2$s Няма афлайн-мап? Спампуй тут: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Гэй, глядзі дзе я зараз на мапе! %1$s альбо %2$s Няма афлайн-мап? Спампуй тут: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Гэй, глядзі маю метку на Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Гэй, глядзі маю метку на CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Гэй, глядзі дзе я зараз на мапе Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Гэй, глядзі дзе я зараз на мапе CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Прывітанне,
 \n
 \nЯ зараз тут: %1$s. Перайдзі па гэтай %2$s або гэтай %3$s спасылцы, каб убачыць месца на мапе.
@@ -262,7 +262,7 @@
     <string name="search_show_on_map">Паглядзець на мапе</string>
     <!-- Text in menu -->
     <string name="website">Вэб-сайт</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Навіны</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Водгук</string>
@@ -276,7 +276,7 @@
     <string name="donate">Падтрымаць грашыма</string>
     <string name="already_donated">Ужо ахвяравана</string>
     <string name="remind_me_later">Нагадаць пазней</string>
-    <string name="support_organic_maps">Падтрымаць Organic Maps</string>
+    <string name="support_organic_maps">Падтрымаць CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Падтрымаць праект</string>
     <!-- Button in the main Help dialog -->
@@ -504,7 +504,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Створаныя супольнасцю даныя OpenStreetMap па стане на %s. Даведайцеся больш пра тое, як рэдагаваць і абнаўляць карту на OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) - гэта грамадскі праект па стварэнні бясплатнай і адкрытай мапы, і асноўная крыніца картаграфічных даных у Organic Maps, якая працуе падобна на Вікіпедыю. Кожны можа дадаваць або рэдагаваць месцы, якія пабачуць мільёны карыстальнікаў па ўсім свеце.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) - гэта грамадскі праект па стварэнні бясплатнай і адкрытай мапы, і асноўная крыніца картаграфічных даных у CoMaps, якая працуе падобна на Вікіпедыю. Кожны можа дадаваць або рэдагаваць месцы, якія пабачуць мільёны карыстальнікаў па ўсім свеце.
 \nДалучайцеся да супольнасці і дапамажыце зрабіць лепшую мапу для ўсіх!</string>
     <string name="login_to_make_edits_visible">Стварыце ўліковы запіс OpenStreetMap або ўвайдзіце ў сістэму, каб апублікаваць праўкі мапы ўсім на свеце.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -522,7 +522,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Заўвага для валанцёраў OpenStreetMap (неабавязкова)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Апішыце памылкі на карце ці тое, што нельга рэдагаваць з дапамогай Organic Maps</string>
+    <string name="editor_note_hint">Апішыце памылкі на карце ці тое, што нельга рэдагаваць з дапамогай CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Вашы праўкі загружаюцца ў публічную базу дадзеных <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Калі ласка, не дадавайце асабістую інфармацыю або інфармацыю, абароненую аўтарскім правам.</string>
     <string name="editor_more_about_osm">Падрабязней пра OpenStreetMap</string>
@@ -532,7 +532,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Aператар: %s</string>
     <string name="editor_category_unsuitable_title">Няма прыдатнай катэгорыі?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps дазваляе дадаваць на мапу толькі простыя тыпы аб\'ектаў, гэта значыць без гарадаў, дарог, азёр і будынкаў. Калі ласка, дадайце такія катэгорыі на сайце <a href="https://www.openstreetmap.org/">OpenStreetMap.org </a>. Мы таксама рэкамендуем азнаёміцца ​​з <a href="https://organicmaps.app/faq/editing/advanced-map-editing/">падрабязнымі інструкцыямі і іншымі прыкладаннямі для рэдагавання мапы</a>.</string>
+    <string name="editor_category_unsuitable_text">CoMaps дазваляе дадаваць на мапу толькі простыя тыпы аб\'ектаў, гэта значыць без гарадаў, дарог, азёр і будынкаў. Калі ласка, дадайце такія катэгорыі на сайце <a href="https://www.openstreetmap.org/">OpenStreetMap.org </a>. Мы таксама рэкамендуем азнаёміцца ​​з <a href="https://comaps.app/faq/editing/advanced-map-editing/">падрабязнымі інструкцыямі і іншымі прыкладаннямі для рэдагавання мапы</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Вы не спампавалі ніводнай мапы</string>
     <string name="downloader_no_downloaded_maps_message">Спампуйце мапы, каб шукаць месцы і карыстацца навігацыяй без інтэрнэту.</string>
     <string name="current_location_unknown_error_title">Месцазнаходжанне невядома.</string>
@@ -590,7 +590,7 @@
     <string name="mobile_data_option_ask">Заўсёды пытаць</string>
     <string name="traffic_update_maps_text">Для паказу інфармацыі пра рух, трэба абнавіць мапы.</string>
     <string name="big_font">Павялічыць шрыфт мапы</string>
-    <string name="traffic_update_app">Абнавіце Organic Maps</string>
+    <string name="traffic_update_app">Абнавіце CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Інфармацыі пра рух няма</string>
     <string name="enable_logging">Уключыць вядзенне журналу</string>
@@ -615,7 +615,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Калі ласка, увайдзіце ў OpenStreetMap, каб аўтаматычна загрузіць усе вашыя праўкі карты. Даведайцеся больш <a href="https://github.com/organicmaps/organicmaps/issues/6144">тут</a>.</string>
     <string name="dialog_error_storage_title">Праблема з доступам да сховішча</string>
-    <string name="dialog_error_storage_message">Знешняе сховішча недасягальнае. SD-карта можа быць вынутая, пашкоджаная, альбо файлавая сістэма даступная толькі для чытання. Праверце вашу SD-карту альбо зважыцеся за намі па адрасе support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Знешняе сховішча недасягальнае. SD-карта можа быць вынутая, пашкоджаная, альбо файлавая сістэма даступная толькі для чытання. Праверце вашу SD-карту альбо зважыцеся за намі па адрасе support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляваць дрэннае сховішча</string>
     <string name="core_entrance">Уваход</string>
     <string name="error_enter_correct_name">Калі ласка, увядзіце правільну назву</string>
@@ -782,8 +782,8 @@
     <string name="splash_subtitle">Даныя карты з OpenStreetMap</string>
     <!-- Telegram group url for the "?" About page -->
     <string name="telegram_url">https://t.me/CoMaps_RU</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/ru/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/ru/</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Дзякуй за выкарыстанне нашых карт, створаных супольнасцю!</string>
     <!-- App tip #01 -->
@@ -805,9 +805,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Наша галоўная мэта - ствараць хуткія, арыентаваныя на прыватнасць і простыя ў выкарыстанні карты, якія вам спадабаюцца.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Вы выкарыстоўваеце Organic Maps на экране тэлефона</string>
+    <string name="car_used_on_the_phone_screen">Вы выкарыстоўваеце CoMaps на экране тэлефона</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Вы выкарыстоўваеце Organic Maps на экране аўтамабіля</string>
+    <string name="car_used_on_the_car_screen">Вы выкарыстоўваеце CoMaps на экране аўтамабіля</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Вы падключаны да Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -815,11 +815,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">На экран аўто</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps патрабуе доступу да месцазнаходжання. Калі будзе бяспечна, праверце апавяшчэнне на тэлефоне.</string>
+    <string name="aa_location_permissions_request">CoMaps патрабуе доступу да месцазнаходжання. Калі будзе бяспечна, праверце апавяшчэнне на тэлефоне.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Гэтай праграме патрабуецца ваш дазвол</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Для эфектыўнай працы Organic Maps у Android Auto патрабуецца дазвол на вызначэнне месцазнаходжання</string>
+    <string name="aa_request_permission_activity_text">Для эфектыўнай працы CoMaps у Android Auto патрабуецца дазвол на вызначэнне месцазнаходжання</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Дазволiць</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -889,7 +889,7 @@
     <string name="disk_error">Немагчыма стварыць папку і перамясціць файлы на ўнутраную памяць прылады або на SD-картку</string>
     <string name="error_enter_correct_facebook_page">Увядзіце сапраўдны вэб-адрас уліковага запісу ці імя старонкі Facebook</string>
     <string name="error_enter_correct_instagram_page">Увядзіце сапраўднае імя карыстальніка або спасылку Instagram</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">Знойдзен %d файл. Вы можаце ўбачыць яго пасля пераўтварэння.</item>
         <item quantity="few">Знойдзена %d файла. Вы можаце ўбачыць іх пасля пераўтварэння.</item>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index ceb178544..255f67208 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -157,7 +157,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Бележки</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Споделени са с вас отметки за Organic Maps</string>
+    <string name="share_bookmarks_email_subject">Споделени са с вас отметки за CoMaps</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Зареждане на отметки</string>
     <!-- Kmz file successful loading -->
@@ -167,7 +167,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Типът на файла не се разпознава от приложението:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Неуспешно отваряне на файл %1$s
 \n
 \n%2$s</string>
@@ -179,13 +179,13 @@
     <string name="cant_change_this_setting">Съжаляваме, но настройките за съхранение на карти в момента са деактивирани.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Изтеглянето на картата вече е в ход.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Хей, виж текущото ми местоположение в Organic Maps! %1$s или %2$s</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Хей, виж текущото ми местоположение в CoMaps! %1$s или %2$s</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Хей, виж какво съм отбелязал в Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Хей, виж какво съм отбелязал в CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Хей, виж текущото ми местоположение на картата в Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Хей, виж текущото ми местоположение на картата в CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Здравей,
 \n
 \nСега съм тук: %1$s. Натисни върху тази връзка %2$s или тази %3$s, за да видиш мястото на картата.
@@ -247,7 +247,7 @@
     <string name="search_show_on_map">Преглед на картата</string>
     <!-- Text in menu -->
     <string name="website">Уебсайт</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Новини</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Обратна връзка</string>
@@ -261,7 +261,7 @@
     <string name="donate">Дарете</string>
     <string name="already_donated">Вече дарено</string>
     <string name="remind_me_later">Напомни по-късно</string>
-    <string name="support_organic_maps">Подкрепи Organic Maps</string>
+    <string name="support_organic_maps">Подкрепи CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Подкрепете проекта</string>
     <!-- Button in the main Help dialog -->
@@ -471,7 +471,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Създадени от общността данни от OpenStreetMap към %s. Научете повече за това как да редактирате и актуализирате картата в OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) е общностен проект за създаване на безплатна и отворена карта. Той е основният източник на картографски данни в Organic Maps и работи подобно на Wikipedia. Можете да добавяте или редактирате места и те стават достъпни за милиони потребители по целия свят.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) е общностен проект за създаване на безплатна и отворена карта. Той е основният източник на картографски данни в CoMaps и работи подобно на Wikipedia. Можете да добавяте или редактирате места и те стават достъпни за милиони потребители по целия свят.
 \nПрисъединете се към общността и помогнете за създаването на по-добра карта за всички!</string>
     <string name="login_to_make_edits_visible">Създайте акаунт в OpenStreetMap или влезте в него, за да публикувате своите редакции на картата в света.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -489,7 +489,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Забележка към доброволците на OpenStreetMap (по избор)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Описване на грешки в картата или неща, които не могат да бъдат редактирани с Organic Maps</string>
+    <string name="editor_note_hint">Описване на грешки в картата или неща, които не могат да бъдат редактирани с CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Вашите редакции се качват в публичната база данни <a href="https://wiki.openstreetmap.org/wiki/Bg:About">OpenStreetMap</a>. Моля, не добавяйте лична информация или информация, защитена с авторски права.</string>
     <string name="editor_more_about_osm">Повече за OpenStreetMap</string>
@@ -499,7 +499,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Оператор: %s</string>
     <string name="editor_category_unsuitable_title">Не можете да намерите подходяща категория?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps позволява да се добавят само прости категории точки, т.е. без градове, пътища, езера, очертания на сгради и т.н. Моля, добавяйте такива категории директно в <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Вижте нашето <a href="https://organicmaps.app/faq/editing/advanced-map-editing">ръководство</a> за подробни инструкции стъпка по стъпка.</string>
+    <string name="editor_category_unsuitable_text">CoMaps позволява да се добавят само прости категории точки, т.е. без градове, пътища, езера, очертания на сгради и т.н. Моля, добавяйте такива категории директно в <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Вижте нашето <a href="https://comaps.app/faq/editing/advanced-map-editing">ръководство</a> за подробни инструкции стъпка по стъпка.</string>
     <string name="downloader_no_downloaded_maps_title">Не сте изтеглили никакви карти</string>
     <string name="downloader_no_downloaded_maps_message">Изтеглете картите, от които се нуждаете, за да намирате места и да навигирате без интернет.</string>
     <string name="current_location_unknown_error_title">Настоящото местоположение е неизвестно.</string>
@@ -550,7 +550,7 @@
     <string name="mobile_data_option_ask">Винаги питай</string>
     <string name="traffic_update_maps_text">За да се показват данни за трафика, картите трябва да са актуализирани.</string>
     <string name="big_font">Увеличаване на размера на шрифта в картата</string>
-    <string name="traffic_update_app">Моля, актуализирайте Organic Maps</string>
+    <string name="traffic_update_app">Моля, актуализирайте CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Няма налични данни за трафика</string>
     <string name="enable_logging">Активиране на запис на дневник</string>
@@ -576,7 +576,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Моля, влезте в OpenStreetMap, за да качвате автоматично всичките си редакции на картата. Научете повече <a href="https://github.com/organicmaps/organicmaps/issues/6144">тук</a>.</string>
     <string name="dialog_error_storage_title">Проблем с достъпа до хранилището</string>
-    <string name="dialog_error_storage_message">Външната памет на устройството не е налична, SD картата може да е била извадена, повредена или файловата система е само за четене. Проверете това и се свържете с нас support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Външната памет на устройството не е налична, SD картата може да е била извадена, повредена или файловата система е само за четене. Проверете това и се свържете с нас support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулация на грешки с външна памет</string>
     <string name="core_entrance">Вход</string>
     <string name="error_enter_correct_name">Моля, въведете правилно име</string>
@@ -730,9 +730,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Нашата основна цел е да създаваме бързи, фокусирани върху поверителността, лесни за използване карти, които ще харесате.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Вече използвате Organic Maps на екрана на телефона</string>
+    <string name="car_used_on_the_phone_screen">Вече използвате CoMaps на екрана на телефона</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Вече използвате Organic Maps на екрана на автомобила</string>
+    <string name="car_used_on_the_car_screen">Вече използвате CoMaps на екрана на автомобила</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Свързани сте с Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -740,11 +740,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Към екрана на автомобила</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps се нуждае от достъп до местоположението. Когато е безопасно, проверете известието на телефона си.</string>
+    <string name="aa_location_permissions_request">CoMaps се нуждае от достъп до местоположението. Когато е безопасно, проверете известието на телефона си.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Това приложение се нуждае от вашето разрешение</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps в Android Auto се нуждае от разрешение за местоположение, за да работи ефективно</string>
+    <string name="aa_request_permission_activity_text">CoMaps в Android Auto се нуждае от разрешение за местоположение, за да работи ефективно</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Предоставяне на разрешения</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index af032bda7..57a842b37 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">La baixada ha fallat</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Torna-ho a intentar</string>
-    <string name="about_menu_title">Quant a l’Organic Maps</string>
+    <string name="about_menu_title">Quant a l’CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratuït per a tothom, fet amb amor</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">L’aplicació requereix acceleració per maquinari OpenGL. Malauradament, el vostre aparell no ho admet.</string>
     <string name="download">Baixa</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Desconnecteu el cable USB o inseriu una targeta de memòria per a usar l’Organic Maps</string>
+    <string name="disconnect_usb_cable">Desconnecteu el cable USB o inseriu una targeta de memòria per a usar l’CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Allibereu espai en la targeta SD o emmagatzematge USB per a poder usar l’aplicació</string>
     <string name="download_resources">Abans d’usar l’aplicació, cal que baixeu el mapa del món general al vostre aparell. \nUsarà %s d’emmagatzematge.</string>
@@ -164,12 +164,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Marcadors d\'Organic Maps compartits</string>
+    <string name="share_bookmarks_email_subject">Marcadors d\'CoMaps compartits</string>
     <string name="share_bookmarks_email_body">Hola!
 \n
-\nAdjunto els meus marcadors de l\'aplicació Organic Maps. Obriu-los si teniu l\'Organic Maps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre aparell iOS o Android seguint aquest enllaç: https://omaps.app/get?kmz
+\nAdjunto els meus marcadors de l\'aplicació CoMaps. Obriu-los si teniu l\'CoMaps instal·lat. O, si no teniu l\'aplicació, baixeu-la per al vostre aparell iOS o Android seguint aquest enllaç: https://comaps.app/get?kmz
 \n
-\nGaudiu viatjant amb l\'Organic Maps!</string>
+\nGaudiu viatjant amb l\'CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">S\'estan carregant els marcadors</string>
     <!-- Kmz file successful loading -->
@@ -179,7 +179,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">L\'aplicació no reconeix el tipus de fitxer:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">No s\'ha pogut obrir el fitxer %1$s
 \n
 \n%2$s</string>
@@ -191,13 +191,13 @@
     <string name="cant_change_this_setting">La configuració de l\'emmagatzematge del mapes està desactivada.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">La baixada del mapa és en curs.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Mira la meva ubicació en l\'Organic Maps! %1$s o %2$s No teniu mapes sense connexió? Baixeu-los aquí: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Mira la meva ubicació en l\'CoMaps! %1$s o %2$s No teniu mapes sense connexió? Baixeu-los aquí: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Ep, mireu el meu marcador a l\'Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Ep, mireu el meu marcador a l\'CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Ep, mireu la meva ubicació actual en el mapa de l\'Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Ep, mireu la meva ubicació actual en el mapa de l\'CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hola,
 \n
 \nSoc aquí: %1$s. Feu clic en aquest enllaç %2$s o en aquest altre %3$s per a veure el lloc en el mapa.
@@ -262,7 +262,7 @@
     <string name="menu">Menú</string>
     <!-- Text in menu -->
     <string name="website">Lloc web</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Notícies</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Comentaris</string>
@@ -276,7 +276,7 @@
     <string name="donate">Donatiu</string>
     <string name="already_donated">Ja donat</string>
     <string name="remind_me_later">Recorda més tard</string>
-    <string name="support_organic_maps">Donar suport a Organic Maps</string>
+    <string name="support_organic_maps">Donar suport a CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Donar suport al projecte</string>
     <!-- Button in the main Help dialog -->
@@ -504,7 +504,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Dades de l’OpenStreetMap creades per la comunitat a partir de %s. Obteniu més informació sobre com editar i actualitzar el mapa a OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) és un projecte comunitari per construir un mapa lliure i obert. És la font principal de dades de mapes a Organic Maps i funciona de manera similar a la Viquipèdia. Pots afegir o editar llocs i estaran disponibles per a milions d\'usuaris de tot el món.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) és un projecte comunitari per construir un mapa lliure i obert. És la font principal de dades de mapes a CoMaps i funciona de manera similar a la Viquipèdia. Pots afegir o editar llocs i estaran disponibles per a milions d\'usuaris de tot el món.
 \nUneix-te a la comunitat i ajuda a crear un mapa millor per a tothom!</string>
     <string name="login_to_make_edits_visible">Creeu un compte d\'OpenStreetMap o inicieu sessió per publicar les vostres edicions de mapes al món.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -532,7 +532,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operador: %s</string>
     <string name="editor_category_unsuitable_title">No trobeu una categoria adequada?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps només permet afegir categories de punts simples, això vol dir que no hi ha ciutats, carreteres, llacs, contorns d\'edificis, etc. Si us plau, afegiu aquestes categories directament a <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulteu la nostra <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guia</a> per obtenir instruccions detallades pas a pas.</string>
+    <string name="editor_category_unsuitable_text">CoMaps només permet afegir categories de punts simples, això vol dir que no hi ha ciutats, carreteres, llacs, contorns d\'edificis, etc. Si us plau, afegiu aquestes categories directament a <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulteu la nostra <a href="https://comaps.app/faq/editing/advanced-map-editing">guia</a> per obtenir instruccions detallades pas a pas.</string>
     <string name="downloader_no_downloaded_maps_title">No heu baixat cap mapa</string>
     <string name="downloader_no_downloaded_maps_message">Baixeu mapes per a cercar una ubicacio i usar la navegació sense connexió.</string>
     <string name="current_location_unknown_error_title">Es desconeix la ubicació actual.</string>
@@ -594,7 +594,7 @@
     <string name="mobile_data_option_ask">Demana-ho sempre</string>
     <string name="traffic_update_maps_text">Per a mostrar les dades de trànsit, els maps han d\'estar actualitzats.</string>
     <string name="big_font">Augmenta la mida de lletra del mapa</string>
-    <string name="traffic_update_app">Actualitzeu l’Organic Maps</string>
+    <string name="traffic_update_app">Actualitzeu l’CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">No hi ha dades de trànsit disponibles</string>
     <string name="enable_logging">Activa el registre</string>
@@ -620,7 +620,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Si us plau, inicieu sessió a OpenStreetMap per carregar automàticament totes les edicions de mapes. Més informació <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">S\'ha produït un problema en l\'accés a l\'emmagatzematge</string>
-    <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emula un emmagatzematge malmès</string>
     <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Introduïu un nom correcte</string>
@@ -791,8 +791,8 @@
     <string name="change_map_locale">Idioma del mapa</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Dades del mapa de l\'OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/ca/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/ca/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Ca:About</string>
     <!-- App Tip #00 -->
@@ -816,9 +816,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">El nostre objectiu principal és crear mapes ràpids, centrats en la privadesa i fàcils d\'utilitzar que us encantaran.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ara esteu utilitzant els Organic Maps a la pantalla del telèfon</string>
+    <string name="car_used_on_the_phone_screen">Ara esteu utilitzant els CoMaps a la pantalla del telèfon</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ara esteu utilitzant els Organic Maps a la pantalla del cotxe</string>
+    <string name="car_used_on_the_car_screen">Ara esteu utilitzant els CoMaps a la pantalla del cotxe</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Us heu connectat a Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -826,11 +826,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">A la pantalla del cotxe</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps necessita accés a la ubicació. Quan sigui segur, comproveu la notificació al telèfon.</string>
+    <string name="aa_location_permissions_request">CoMaps necessita accés a la ubicació. Quan sigui segur, comproveu la notificació al telèfon.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Aquesta aplicació necessita el vostre permís</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps a Android Auto necessita un permís d\'ubicació per funcionar de manera eficaç</string>
+    <string name="aa_request_permission_activity_text">CoMaps a Android Auto necessita un permís d\'ubicació per funcionar de manera eficaç</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Concedeix permisos</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 8f7a5c5a2..b65ae6c63 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Stahování selhalo</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Zkusit znovu</string>
-    <string name="about_menu_title">O aplikaci Organic Maps</string>
+    <string name="about_menu_title">O aplikaci CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Zdarma pro všechny, vyrobené s láskou</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Je vyžadována hardwarová akcelerace OpenGL. Bohužel, vaše zařízení není podporováno.</string>
     <string name="download">Stáhnout</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Prosím, odpojte USB kabel nebo vložte paměťovou kartu pro použití s Organic Maps</string>
+    <string name="disconnect_usb_cable">Prosím, odpojte USB kabel nebo vložte paměťovou kartu pro použití s CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Prosím, uvolněte nejprve místo na SD kartě/USB uložišti</string>
     <string name="download_resources">Ještě než začnete, bude třeba stáhnout obecnou mapu světa.
@@ -152,7 +152,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Poznámky</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Sdílené záložky Organic Maps</string>
+    <string name="share_bookmarks_email_subject">Sdílené záložky CoMaps</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Nahrávání záložek</string>
     <!-- Kmz file successful loading -->
@@ -162,7 +162,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Typ souboru není aplikací rozpoznán:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Nepodařilo se otevřít soubor %1$s
 \n
 \n%2$s</string>
@@ -174,13 +174,13 @@
     <string name="cant_change_this_setting">Omlouváme se, nastavení uložení map je dočasně nedostupné.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Právě probíhá stahování země.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Podívej se na mojí polohu v Organic Maps! %1$s nebo %2$s Nemáš offline mapy? Stáhni si je zde: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Podívej se na mojí polohu v CoMaps! %1$s nebo %2$s Nemáš offline mapy? Stáhni si je zde: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Koukni na mojí značku na mapě v Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Koukni na mojí značku na mapě v CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Podívej se na mou aktuální polohu na mapě v Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Podívej se na mou aktuální polohu na mapě v CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Ahoj,
 \n
 \nPrávě jsem tady: %1$s. Klepni na jeden z těchto odkazů %2$s, %3$s a uvidíš toto místo na mapě.
@@ -243,7 +243,7 @@
     <string name="search_show_on_map">Zobrazit na mapě</string>
     <!-- Text in menu -->
     <string name="website">Webové stránky</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Novinky</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Zpětná vazba</string>
@@ -257,7 +257,7 @@
     <string name="donate">Darovat</string>
     <string name="already_donated">Již darováno</string>
     <string name="remind_me_later">Připomeň později</string>
-    <string name="support_organic_maps">Podpořit Organic Maps</string>
+    <string name="support_organic_maps">Podpořit CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Podpořte projekt</string>
     <!-- Button in the main Help dialog -->
@@ -481,7 +481,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Data OpenStreetMap vytvořená komunitou ke dni %s. Další informace o tom, jak upravovat a aktualizovat mapu, najdete na stránkách OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je komunitní projekt, jehož cílem je vytvořit svobodnou a otevřenou mapu. Je hlavním zdrojem mapových dat v aplikaci Organic Maps a funguje podobně jako Wikipedie. Můžete přidávat nebo upravovat místa a ta se pak stanou dostupná milionům uživatelů po celém světě.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je komunitní projekt, jehož cílem je vytvořit svobodnou a otevřenou mapu. Je hlavním zdrojem mapových dat v aplikaci CoMaps a funguje podobně jako Wikipedie. Můžete přidávat nebo upravovat místa a ta se pak stanou dostupná milionům uživatelů po celém světě.
 \nPřipojte se ke komunitě a pomozte vytvořit lepší mapu pro všechny!</string>
     <string name="login_to_make_edits_visible">Vytvořte si účet OpenStreetMap nebo se přihlaste a zveřejněte své úpravy mapy celému světu.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -499,7 +499,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Poznámka pro dobrovolníky OpenStreetMap (nepovinné)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Popište chyby na mapě nebo věci, které nelze upravit pomocí aplikace Organic Maps</string>
+    <string name="editor_note_hint">Popište chyby na mapě nebo věci, které nelze upravit pomocí aplikace CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Vaše úpravy se nahrají do veřejné databáze <a href="https://wiki.openstreetmap.org/wiki/Cs:Co_je_OpenStreetMap">OpenStreetMap</a>. Nepřidávejte prosím osobní informace nebo informace chráněné autorskými právy.</string>
     <string name="editor_more_about_osm">Další informace o projektu OpenStreetMap</string>
@@ -509,7 +509,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Provozovatel: %s</string>
     <string name="editor_category_unsuitable_title">Nemůžete najít vhodnou kategorii?</string>
-    <string name="editor_category_unsuitable_text">Organické mapy umožňují přidávat pouze jednoduché kategorie bodů, tedy žádná města, silnice, jezera, obrysy budov atd. Takové kategorie prosím přidávejte přímo na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Podrobné pokyny krok za krokem najdete v našem <a href="https://organicmaps.app/faq/editing/advanced-map-editing">průvodci</a>.</string>
+    <string name="editor_category_unsuitable_text">Organické mapy umožňují přidávat pouze jednoduché kategorie bodů, tedy žádná města, silnice, jezera, obrysy budov atd. Takové kategorie prosím přidávejte přímo na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Podrobné pokyny krok za krokem najdete v našem <a href="https://comaps.app/faq/editing/advanced-map-editing">průvodci</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Nemáte stažené žádné mapy</string>
     <string name="downloader_no_downloaded_maps_message">Stáhněte si mapy a hledejte cestu a její cíl, i když jste offline.</string>
     <string name="current_location_unknown_error_title">Současná poloha nezjištěna.</string>
@@ -563,7 +563,7 @@
     <string name="mobile_data_option_ask">Vždy se zeptat</string>
     <string name="traffic_update_maps_text">Ke zobrazení údajů o provozu musí být aktualizovány mapy.</string>
     <string name="big_font">Zvětšit velikost písma na mapě</string>
-    <string name="traffic_update_app">Aktualizujte Organic Maps</string>
+    <string name="traffic_update_app">Aktualizujte CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Data o provozu nejsou k dispozici</string>
     <string name="enable_logging">Povolit protokolování</string>
@@ -589,7 +589,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Přihlaste se do OpenStreetMap, abyste mohli automaticky nahrávat všechny své úpravy mapy. Více informací <a href="https://github.com/organicmaps/organicmaps/issues/6144">zde</a>.</string>
     <string name="dialog_error_storage_title">Problém s přístupem k úložišti</string>
-    <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
     <string name="core_entrance">Vstup</string>
     <string name="error_enter_correct_name">Zadejte prosím správný název</string>
@@ -755,8 +755,8 @@
     <string name="change_map_locale">Jazyk mapy</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Mapová data z OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/cs/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/cs/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Cs:Co_je_OpenStreetMap</string>
     <!-- App Tip #00 -->
@@ -780,9 +780,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Naším hlavním cílem je vytvářet rychlé, na soukromí zaměřené a snadno použitelné mapy, které si zamilujete.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Na obrazovce telefonu nyní používáte aplikaci Organic Maps</string>
+    <string name="car_used_on_the_phone_screen">Na obrazovce telefonu nyní používáte aplikaci CoMaps</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Na obrazovce auta nyní používáte aplikaci Organic Maps</string>
+    <string name="car_used_on_the_car_screen">Na obrazovce auta nyní používáte aplikaci CoMaps</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Jste připojeni ke službě Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -790,11 +790,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Na obrazovku auta</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Služba Organic Maps potřebuje přístup k poloze. Když je to bezpečné, zkontrolujte oznámení v telefonu.</string>
+    <string name="aa_location_permissions_request">Služba CoMaps potřebuje přístup k poloze. Když je to bezpečné, zkontrolujte oznámení v telefonu.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Tato aplikace potřebuje vaše povolení</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps v systému Android Auto potřebují k efektivní práci povolení k poloze</string>
+    <string name="aa_request_permission_activity_text">CoMaps v systému Android Auto potřebují k efektivní práci povolení k poloze</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Udělení oprávnění</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -860,7 +860,7 @@
     <string name="error_enter_correct_twitter_page">Zadejte platné uživatelské jméno nebo webovou adresu Twitteru</string>
     <string name="twitter">X (Twitter)</string>
     <string name="maps_storage_free_size">%1$s z %2$s volných</string>
-    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš mé záložky; otevři je v aplikaci Organic Maps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://omaps.app/get?kmz \n \nUžij si cestování s Organic Maps!</string>
+    <string name="share_bookmarks_email_body">Ahoj! \n \nV příloze najdeš mé záložky; otevři je v aplikaci CoMaps. Pokud ji nemáš nainstalovanou, můžeš si ji stáhnout zde: https://comaps.app/get?kmz \n \nUžij si cestování s CoMaps!</string>
     <string name="disk_error">Nepodařilo se vytvořit složku a přesunout soubory v interní paměti zařízení nebo na SD kartě</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="error_enter_correct_vk_page">Zadejte platné uživatelské jméno nebo webovou adresu VK</string>
@@ -876,7 +876,7 @@
     <string name="maps_storage_external">Externí sdílené úložiště</string>
     <string name="telegram">Telegram</string>
     <string name="error_enter_correct_facebook_page">Zadejte platnou webovou adresu, účet nebo název stránky na Facebooku</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="disk_error_title">Chyba disku</string>
     <string name="error_enter_correct_line_page">Zadejte platné ID nebo webovou adresu LINE</string>
     <string name="move_maps_error">Chyba při přesouvání souborů mapy</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 27c191c9e..bacb45a38 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Download mislykket</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Prøv igen</string>
-    <string name="about_menu_title">Om Organic Maps</string>
+    <string name="about_menu_title">Om CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratis for alle, lavet med kærlighed</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Appen kræver hardwareaccelereret OpenGL. Din enhed er desværre ikke understøttet.</string>
     <string name="download">Download</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Frakobl venligst USB-kabel eller indsæt et hukommelseskort for at bruge Organic Maps</string>
+    <string name="disconnect_usb_cable">Frakobl venligst USB-kabel eller indsæt et hukommelseskort for at bruge CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Frigør først noget plads på dit SD-kort/USB lager for at bruge denne app</string>
     <string name="download_resources">Før du begynder at bruge appen, skal du downloade oversigtskortet over verden til din enhed. \nDet vil bruge %s lagerplads.</string>
@@ -152,7 +152,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Noter</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps bogmærker er blevet delt med dig</string>
+    <string name="share_bookmarks_email_subject">CoMaps bogmærker er blevet delt med dig</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Indlæser bogmærker</string>
     <!-- Kmz file successful loading -->
@@ -162,7 +162,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen genkendes ikke af appen:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Kunne ikke åbne filen %1$s
 \n
 \n%2$s</string>
@@ -174,13 +174,13 @@
     <string name="cant_change_this_setting">Beklager, indstillingerne for kortlagring er i øjeblikket deaktiveret.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Download af kort er i gang nu.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hey, tjek min nuværende placering på Organic Maps! %1$s eller %2$s. Har du ikke offline kort? Download her: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hey, tjek min nuværende placering på CoMaps! %1$s eller %2$s. Har du ikke offline kort? Download her: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, tjek min knappenål på Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Hey, tjek min knappenål på CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hey, tjek min nuværende placering på Organic Maps-kortet!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hey, tjek min nuværende placering på CoMaps-kortet!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hej, \n \nJeg er her nu: %1$s. Tryk på dette link %2$s eller dette %3$s for at se stedet på kortet. \n \nTak.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Del</string>
@@ -235,7 +235,7 @@
     <string name="search_show_on_map">Vis på kort</string>
     <!-- Text in menu -->
     <string name="website">Hjemmeside</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nyheder</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Feedback</string>
@@ -249,7 +249,7 @@
     <string name="donate">Doner</string>
     <string name="already_donated">Allerede doneret</string>
     <string name="remind_me_later">Påmind mig senere</string>
-    <string name="support_organic_maps">Støt Organic Maps</string>
+    <string name="support_organic_maps">Støt CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Støt projektet</string>
     <!-- Button in the main Help dialog -->
@@ -473,7 +473,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Fællesskabsskabte OpenStreetMap-data fra %s. Få mere at vide om, hvordan du redigerer og opdaterer kortet på OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) er et fællesskabsprojekt til opbygning af et gratis og åbent kort. Det er hovedkilden til kortdata i Organic Maps og fungerer på samme måde som Wikipedia. Du kan tilføje eller redigere steder, og de bliver tilgængelige for millioner af brugere over hele verden.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) er et fællesskabsprojekt til opbygning af et gratis og åbent kort. Det er hovedkilden til kortdata i CoMaps og fungerer på samme måde som Wikipedia. Du kan tilføje eller redigere steder, og de bliver tilgængelige for millioner af brugere over hele verden.
 \nSlut dig til fællesskabet og vær med til at skabe et bedre kort for alle!</string>
     <string name="login_to_make_edits_visible">Opret en OpenStreetMap-konto eller log ind for at offentliggøre dine kortredigeringer til hele verden.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -491,7 +491,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Note til OpenStreetMap-frivillige (valgfrit)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Beskriv fejl på kortet eller ting, der ikke kan redigeres med Organic Maps</string>
+    <string name="editor_note_hint">Beskriv fejl på kortet eller ting, der ikke kan redigeres med CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Dine ændringer uploades til den offentlige <a href="https://wiki.openstreetmap.org/wiki/Da:Om_OpenStreetMap">OpenStreetMap</a>-database. Tilføj venligst ikke personlige eller ophavsretligt beskyttede oplysninger.</string>
     <string name="editor_more_about_osm">Mere om OpenStreetMap</string>
@@ -501,7 +501,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operatør: %s</string>
     <string name="editor_category_unsuitable_title">Kan du ikke finde en passende kategori?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps giver kun mulighed for at tilføje simple punktkategorier, dvs. ingen byer, veje, søer, bygningsomrids osv. Tilføj sådanne kategorier direkte til <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Se vores <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guide</a> for detaljerede trin for trin-instruktioner.</string>
+    <string name="editor_category_unsuitable_text">CoMaps giver kun mulighed for at tilføje simple punktkategorier, dvs. ingen byer, veje, søer, bygningsomrids osv. Tilføj sådanne kategorier direkte til <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Se vores <a href="https://comaps.app/faq/editing/advanced-map-editing">guide</a> for detaljerede trin for trin-instruktioner.</string>
     <string name="downloader_no_downloaded_maps_title">Du har ikke downloadet nogen kort</string>
     <string name="downloader_no_downloaded_maps_message">Download kort for at søge og navigere offline.</string>
     <string name="current_location_unknown_error_title">Aktuel placering er ukendt.</string>
@@ -555,7 +555,7 @@
     <string name="mobile_data_option_ask">Spørg altid</string>
     <string name="traffic_update_maps_text">Kort skal opdateres for at vise trafikdata.</string>
     <string name="big_font">Forøg størrelsen på kortetiketter</string>
-    <string name="traffic_update_app">Opdater Organic Maps</string>
+    <string name="traffic_update_app">Opdater CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Trafikdata er ikke tilgængelige</string>
     <string name="enable_logging">Aktiver logføring</string>
@@ -579,7 +579,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Log ind på OpenStreetMap for automatisk at uploade alle dine kortredigeringer. Få mere at vide <a href="https://github.com/organicmaps/organicmaps/issues/6144">her</a>.</string>
     <string name="dialog_error_storage_title">Problem med lageradgang</string>
-    <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulér beskadiget lager</string>
     <string name="core_entrance">Indgang</string>
     <string name="error_enter_correct_name">Angiv et korrekt navn</string>
@@ -758,9 +758,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Vores hovedmål er at bygge hurtige, privatlivsfokuserede, brugervenlige kort, som du vil elske.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Du bruger nu Organic Maps på telefonens skærm</string>
+    <string name="car_used_on_the_phone_screen">Du bruger nu CoMaps på telefonens skærm</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Du bruger nu Organic Maps på bilens skærm</string>
+    <string name="car_used_on_the_car_screen">Du bruger nu CoMaps på bilens skærm</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Du er forbundet til Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -768,11 +768,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Til bilens skærm</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps har brug for placeringsadgang. Når det er sikkert, kan du tjekke notifikationen på din telefon.</string>
+    <string name="aa_location_permissions_request">CoMaps har brug for placeringsadgang. Når det er sikkert, kan du tjekke notifikationen på din telefon.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Denne app har brug for din tilladelse</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps i Android Auto har brug for placeringstilladelse for at fungere effektivt</string>
+    <string name="aa_request_permission_activity_text">CoMaps i Android Auto har brug for placeringstilladelse for at fungere effektivt</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Giv tilladelser</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -835,11 +835,11 @@
     <string name="mb">MB</string>
     <string name="twitter">X (Twitter)</string>
     <string name="error_enter_correct_twitter_page">Indtast et gyldigt Twitter-brugernavn eller en webadresse</string>
-    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine bogmærker; åbn dem venligst i Organic Maps. Hvis du ikke har den installeret, kan du downloade den her: https://omaps.app/get?kmz\n \nGod rejse med Organic Maps!</string>
+    <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine bogmærker; åbn dem venligst i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://comaps.app/get?kmz\n \nGod rejse med CoMaps!</string>
     <string name="delete_place_empty_comment_error">Angiv begrundelsen for at slette stedet</string>
     <string name="disk_error_title">Diskfejl</string>
     <string name="error_enter_correct_instagram_page">Indtast et gyldigt Instagram-brugernavn eller en webadresse</string>
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="navigation_stop_button">Stop</string>
     <string name="error_enter_correct_vk_page">Indtast et gyldigt VK-brugernavn eller en webadresse</string>
     <string name="gb">GB</string>
@@ -848,7 +848,7 @@
     <string name="maps_storage_shared">Intern delt lagerplads</string>
     <string name="maps_storage_removable">SD-kort</string>
     <string name="maps_storage_external">Ekstern delt lagerplads</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="level_value_generic">Etage: %s</string>
     <string name="closes_in">Lukker om %s</string>
     <string name="enable_show_on_lock_screen_description">Når den er aktiveret, fungerer appen på låseskærmen, selv når enheden er låst.</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index fc4903d76..c55b3bc93 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Herunterladen fehlgeschlagen</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Erneut versuchen</string>
-    <string name="about_menu_title">Über Organic Maps</string>
+    <string name="about_menu_title">Über CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Kostenlos für alle, mit Liebe gemacht</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Das Programm benötigt OpenGL, um zu funktionieren. Leider wird Ihr Gerät nicht unterstützt.</string>
     <string name="download">Herunterladen</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um Organic Maps zu verwenden</string>
+    <string name="disconnect_usb_cable">Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um CoMaps zu verwenden</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen</string>
     <string name="download_resources">Bevor Sie die App verwenden, laden Sie bitte die weltweite Übersichtskarte herunter.
@@ -165,12 +165,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notizen</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps Lesezeichen wurden mit Ihnen geteilt</string>
+    <string name="share_bookmarks_email_subject">CoMaps Lesezeichen wurden mit Ihnen geteilt</string>
     <string name="share_bookmarks_email_body">Hallo!
 \n
-\nIm Anhang sind meine Lesezeichen der Organic Maps App. Sie können sie mit Organic Maps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://omaps.app/get?kmz für iOS oder Android herunterladen.
+\nIm Anhang sind meine Lesezeichen der CoMaps App. Sie können sie mit CoMaps öffnen. Wenn Sie die App nicht installiert haben, können Sie sie von https://comaps.app/get?kmz für iOS oder Android herunterladen.
 \n
-\nViel Spaß beim Reisen mit Organic Maps!</string>
+\nViel Spaß beim Reisen mit CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Lesezeichen werden geladen</string>
     <!-- Kmz file successful loading -->
@@ -180,7 +180,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Der Dateityp wird von der App nicht erkannt:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Datei konnte nicht geöffnet werden %1$s
 \n
 \n%2$s</string>
@@ -192,13 +192,13 @@
     <string name="cant_change_this_setting">Leider sind die Einstellungen für die Kartenspeicherung deaktiviert.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Die Karte wird heruntergeladen.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hey, sieh dir meinen aktuellen Standort auf Organic Maps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hey, sieh dir meinen aktuellen Standort auf CoMaps an! %1$s oder %2$s Keine Offline-Karten installiert? Hier herunterladen: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel auf der Organic Maps-Karte an!</string>
+    <string name="bookmark_share_email_subject">Hey, sieh dir meine Stecknadel auf der CoMaps-Karte an!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der Organic Maps-Karte an!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hey, sieh dir meinen aktuellen Standort auf der CoMaps-Karte an!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hi,
 \n
 \nich bin gerade hier: %1$s. Klicke den Link %2$s oder %3$s, um den Ort auf der Karte anzuzeigen.
@@ -261,7 +261,7 @@
     <string name="search_show_on_map">Auf der Karte ansehen</string>
     <!-- Text in menu -->
     <string name="website">Webseite</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Neuigkeiten</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Feedback</string>
@@ -275,7 +275,7 @@
     <string name="donate">Spenden</string>
     <string name="already_donated">Bereits gespendet</string>
     <string name="remind_me_later">Später erinnern</string>
-    <string name="support_organic_maps">Organic Maps unterstützen</string>
+    <string name="support_organic_maps">CoMaps unterstützen</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Unterstütze das Projekt</string>
     <!-- Button in the main Help dialog -->
@@ -504,7 +504,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Von der Community erstellte OpenStreetMap-Daten (Stand: %s). Erfahre mehr darüber, wie du die Karte bearbeiten und aktualisieren kannst unter OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ist ein Gemeinschaftsprojekt zum Erstellen einer freien und offenen Karte. Es ist die Hauptquelle für Kartendaten in Organic Maps und funktioniert ähnlich wie Wikipedia. Sie können Orte hinzufügen oder bearbeiten, die dann Millionen von Nutzern auf der ganzen Welt zur Verfügung stehen.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ist ein Gemeinschaftsprojekt zum Erstellen einer freien und offenen Karte. Es ist die Hauptquelle für Kartendaten in CoMaps und funktioniert ähnlich wie Wikipedia. Sie können Orte hinzufügen oder bearbeiten, die dann Millionen von Nutzern auf der ganzen Welt zur Verfügung stehen.
 \nTreten Sie der Gemeinschaft bei und helfen Sie mit, die Karte für alle besser zu machen!</string>
     <string name="login_to_make_edits_visible">Erstellen Sie ein OpenStreetMap-Konto oder melden Sie sich an, um Ihre Kartenbearbeitungen weltweit zu veröffentlichen.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -522,7 +522,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Hinweis an Freiwillige von OpenStreetMap (optional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Beschreiben Sie Kartenfehler oder Dinge, die mit Organic Maps nicht bearbeitet werden können</string>
+    <string name="editor_note_hint">Beschreiben Sie Kartenfehler oder Dinge, die mit CoMaps nicht bearbeitet werden können</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Ihre Bearbeitungen werden in die öffentliche <a href="https://wiki.openstreetmap.org/wiki/DE:Über_OSM">OpenStreetMap</a> Datenbank hochgeladen. Bitte tragen Sie keine privaten oder urheberrechtlich geschützten Informationen ein.</string>
     <string name="editor_more_about_osm">Mehr Informationen über OpenStreetMap</string>
@@ -532,7 +532,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Betreiber: %s</string>
     <string name="editor_category_unsuitable_title">Keine passende Kategorie gefunden?</string>
-    <string name="editor_category_unsuitable_text">Mit Organic Maps kann man nur einfache Punktkategorien hinzufügen, daher keine Städte, Straßen, Seen, Gebäudeumrisse, etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://organicmaps.app/faq/editing/advanced-map-editing">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt-Anleitung.</string>
+    <string name="editor_category_unsuitable_text">Mit CoMaps kann man nur einfache Punktkategorien hinzufügen, daher keine Städte, Straßen, Seen, Gebäudeumrisse, etc. Bitte füge solche Kategorien direkt bei <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> hinzu. In unserem <a href="https://comaps.app/faq/editing/advanced-map-editing">Leitfaden</a> findest du eine detaillierte Schritt-für-Schritt-Anleitung.</string>
     <string name="downloader_no_downloaded_maps_title">Keine Karten heruntergeladen</string>
     <string name="downloader_no_downloaded_maps_message">Laden Sie Karten für die Offline-Suche und Navigation herunter.</string>
     <string name="current_location_unknown_error_title">Aktueller Standort ist unbekannt.</string>
@@ -594,7 +594,7 @@
     <string name="mobile_data_option_ask">Immer fragen</string>
     <string name="traffic_update_maps_text">Um Verkehrsdaten anzuzeigen, müssen die Karten aktualisiert werden.</string>
     <string name="big_font">Schrift auf der Karte vergrößern</string>
-    <string name="traffic_update_app">Bitte aktualisieren Sie Organic Maps</string>
+    <string name="traffic_update_app">Bitte aktualisieren Sie CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Verkehrsdaten sind nicht verfügbar</string>
     <string name="enable_logging">Protokollierung aktivieren</string>
@@ -618,7 +618,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Bitte melde dich bei OpenStreetMap an, um alle deine Kartenbearbeitungen automatisch hochzuladen. Erfahre mehr <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
     <string name="dialog_error_storage_title">Problem mit dem Zugreifen auf den Speicher</string>
-    <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
     <string name="core_entrance">Eingang</string>
     <string name="error_enter_correct_name">Bitte geben Sie einen korrekten Namen ein</string>
@@ -789,8 +789,8 @@
     <string name="change_map_locale">Karten-Sprache</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Kartendaten von OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/de/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/de/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/DE:Über_OSM</string>
     <!-- App Tip #00 -->
@@ -814,9 +814,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Unser Hauptziel ist es, schnelle, datenschutzorientierte und benutzerfreundliche Karten zu erstellen, die Sie lieben werden.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Du verwendest jetzt Organic Maps auf dem Telefondisplay</string>
+    <string name="car_used_on_the_phone_screen">Du verwendest jetzt CoMaps auf dem Telefondisplay</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Du verwendest jetzt Organic Maps auf dem Bildschirm des Autos</string>
+    <string name="car_used_on_the_car_screen">Du verwendest jetzt CoMaps auf dem Bildschirm des Autos</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Du bist mit Android Auto verbunden</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -824,11 +824,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Zum Autobildschirm</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps benötigt Zugriff auf den Standort. Wenn es sicher ist, überprüfe die Benachrichtigung auf deinem Telefon.</string>
+    <string name="aa_location_permissions_request">CoMaps benötigt Zugriff auf den Standort. Wenn es sicher ist, überprüfe die Benachrichtigung auf deinem Telefon.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Diese App braucht deine Erlaubnis</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps in Android Auto benötigt Standortberechtigungen, um effektiv zu funktionieren</string>
+    <string name="aa_request_permission_activity_text">CoMaps in Android Auto benötigt Standortberechtigungen, um effektiv zu funktionieren</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Erlaubnis erteilen</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -893,7 +893,7 @@
     <string name="mb">MB</string>
     <string name="instagram">Instagram</string>
     <string name="mastodon">Mastodon</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="facebook">Facebook</string>
 </resources>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index a07f7e1dd..fed026817 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -37,7 +37,7 @@
     <string name="country_status_download_failed">Η λήψη απέτυχε</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Δοκιμάστε ξανά</string>
-    <string name="about_menu_title">Σχετικά με το Organic Maps</string>
+    <string name="about_menu_title">Σχετικά με το CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Δωρεάν για όλους, φτιαγμένα με αγάπη</string>
     <!-- Text in About screen -->
@@ -54,7 +54,7 @@
     <string name="unsupported_phone">Η εφαρμογή απαιτεί OpenGL με επιτάχυνση υλικού. Δυστυχώς, η συσκευή σας δεν το υποστηρίζει.</string>
     <string name="download">Λήψη</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Αποσυνδέστε το καλώδιο USB ή τοποθετήστε την κάρτα μνήμης για να χρησιμοποιήσετε το Organic Maps</string>
+    <string name="disconnect_usb_cable">Αποσυνδέστε το καλώδιο USB ή τοποθετήστε την κάρτα μνήμης για να χρησιμοποιήσετε το CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Ελευθερώσετε χώρο αποθήκευσης στην SD κάρτα/USB πρώτα προκειμένου να χρησιμοποιήσετε την εφαρμογή</string>
     <string name="download_resources">Πριν ξεκινήσετε τη χρήση της εφαρμογής, επιτρέψτε μας να κατεβάσουμε το γενικό παγκόσμιο χάρτη στη συσκευή σας.
@@ -166,12 +166,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Σημειώσεις</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Κοινοποιήθηκαν τα αγαπημένα από το Organic Maps σε εσάς</string>
+    <string name="share_bookmarks_email_subject">Κοινοποιήθηκαν τα αγαπημένα από το CoMaps σε εσάς</string>
     <string name="share_bookmarks_email_body">Γειa!
 \n
-\nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξέ τα με το Organic Maps. Αν δεν το έχεις εγκαταστήσει, μπορείς να το κατεβάσεις από εδώ: https://omaps.app/get?kmz
+\nΣου επισυνάπτω τα αγαπημένα μου. Παρακαλώ άνοιξέ τα με το CoMaps. Αν δεν το έχεις εγκαταστήσει, μπορείς να το κατεβάσεις από εδώ: https://comaps.app/get?kmz
 \n
-\nΚαλή διασκέδαση ταξιδεύοντας με το Organic Maps!</string>
+\nΚαλή διασκέδαση ταξιδεύοντας με το CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Φορτώνονται τα αγαπημένα</string>
     <!-- Kmz file successful loading -->
@@ -181,7 +181,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Ο τύπος αρχείου δεν αναγνωρίζεται από την εφαρμογή:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Αποτυχία ανοίγματος του αρχείου %1$s
 \n
 \n%2$s</string>
@@ -193,13 +193,13 @@
     <string name="cant_change_this_setting">Λυπούμαστε, οι ρυθμίσεις αποθήκευσης χαρτών είναι προς το παρόν απενεργοποιημένες.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Λήψη χάρτη βρίσκεται σε εξέλιξη.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Δες την τρέχουσα τοποθεσία μου στο Organic Maps! %1$s ή %2$s Αν δεν έχεις τους χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Δες την τρέχουσα τοποθεσία μου στο CoMaps! %1$s ή %2$s Αν δεν έχεις τους χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Γεια, δες τις τοποθεσίες που έχω καρφιτσώσει στο Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Γεια, δες τις τοποθεσίες που έχω καρφιτσώσει στο CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Γεια, δες την τρέχουσα τοποθεσία μου στο χάρτη του Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Γεια, δες την τρέχουσα τοποθεσία μου στο χάρτη του CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Γεια,
 \n
 \nΑυτή τη στιγμή είμαι εδώ: %1$s. Κάνε κλικ σε αυτό το σύνδεσμο %2$s ή σε αυτόν %3$s για να δεις την τοποθεσία στο χάρτη.
@@ -264,7 +264,7 @@
     <string name="menu">Μενού</string>
     <!-- Text in menu -->
     <string name="website">Ιστότοπος</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Νέα</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Σχόλια</string>
@@ -278,7 +278,7 @@
     <string name="donate">Δωρεά</string>
     <string name="already_donated">Ήδη δωρεά</string>
     <string name="remind_me_later">Υπενθύμισε αργότερα</string>
-    <string name="support_organic_maps">Υποστήριξε το Organic Maps</string>
+    <string name="support_organic_maps">Υποστήριξε το CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Στηρίξτε αυτό το πρότζεκτ</string>
     <!-- Button in the main Help dialog -->
@@ -525,7 +525,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Σημείωση για τους εθελοντές του OpenStreetMap (προαιρετική)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Περιγράψτε λάθη στο χάρτη ή πράγματα που δεν μπορούν να επεξεργαστούν με τους Organic Maps</string>
+    <string name="editor_note_hint">Περιγράψτε λάθη στο χάρτη ή πράγματα που δεν μπορούν να επεξεργαστούν με τους CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Οι επεξεργασίες σας μεταφορτώνονται στη δημόσια βάση δεδομένων <a href="https://wiki.openstreetmap.org/wiki/El:About_OpenStreetMap">OpenStreetMap</a>. Παρακαλούμε μην προσθέτετε προσωπικές πληροφορίες ή πληροφορίες που προστατεύονται από πνευματικά δικαιώματα.</string>
     <string name="editor_more_about_osm">Περισσότερα σχετικά με το OpenStreetMap</string>
@@ -535,7 +535,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Χειριστής: %s</string>
     <string name="editor_category_unsuitable_title">Δεν μπορείτε να βρείτε την κατάλληλη κατηγορία;</string>
-    <string name="editor_category_unsuitable_text">Οι Οργανικοί Χάρτες επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Ελέγξτε τον <a href="https://organicmaps.app/faq/editing/advanced-map-editing">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.</string>
+    <string name="editor_category_unsuitable_text">Οι Οργανικοί Χάρτες επιτρέπουν την προσθήκη απλών κατηγοριών σημείων μόνο, δηλαδή όχι πόλεων, δρόμων, λιμνών, περιγραμμάτων κτιρίων κ.λπ. Παρακαλούμε προσθέστε τέτοιες κατηγορίες απευθείας στο <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Ελέγξτε τον <a href="https://comaps.app/faq/editing/advanced-map-editing">οδηγό μας</a> για λεπτομερείς οδηγίες βήμα προς βήμα.</string>
     <string name="downloader_no_downloaded_maps_title">Δεν έχετε κατεβάσει χάρτες</string>
     <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να αναζητήσετε μια τοποθεσία και να χρησιμοποιήσετε την πλοήγησης χωρίς σύνδεση.</string>
     <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη.</string>
@@ -591,7 +591,7 @@
     <string name="mobile_data_option_ask">Να γίνεται πάντα ερώτηση</string>
     <string name="traffic_update_maps_text">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες.</string>
     <string name="big_font">Αύξηση μεγέθους γραμματοσειράς στο χάρτη</string>
-    <string name="traffic_update_app">Κάντε ενημέρωση του Organic Maps</string>
+    <string name="traffic_update_app">Κάντε ενημέρωση του CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Οι πληροφορίες για την κίνηση δεν είναι διαθέσιμες</string>
     <string name="enable_logging">Ενεργοποίηση δυνατότητας καταγραφής</string>
@@ -617,7 +617,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Παρακαλούμε συνδεθείτε στο OpenStreetMap για να ανεβάσετε αυτόματα όλες τις επεξεργασίες του χάρτη σας. Μάθετε περισσότερα <a href="https://github.com/organicmaps/organicmaps/issues/6144">εδώ</a>.</string>
     <string name="dialog_error_storage_title">Πρόβλημα πρόσβασης στον αποθηκευτικό χώρο</string>
-    <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>
     <string name="core_entrance">Είσοδος</string>
     <string name="error_enter_correct_name">Εισάγετε ένα σωστό όνομα</string>
@@ -684,7 +684,7 @@
     <string name="power_managment_setting_never">Ποτέ</string>
     <string name="power_managment_setting_auto">Αυτόματα</string>
     <string name="power_managment_setting_manual_max">Πάντα</string>
-    <string name="enable_logging_warning_message">Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του Organic Maps.</string>
+    <string name="enable_logging_warning_message">Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του CoMaps.</string>
     <string name="access_rules_author_only">Online επεξεργασία</string>
     <string name="driving_options_title">Ρυθμίσεις δρομολόγησης</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -811,9 +811,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Ο κύριος στόχος μας είναι να δημιουργήσουμε γρήγορους, εύχρηστους και με σεβασμό στην ιδιωτικότητα χάρτες που θα λατρέψετε.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Αυτή τη στιγμή το Organic Maps βρίσκεται στην οθόνη του κινητού</string>
+    <string name="car_used_on_the_phone_screen">Αυτή τη στιγμή το CoMaps βρίσκεται στην οθόνη του κινητού</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Αυτή τη στιγμή το Organic Maps βρίσκεται στην οθόνη του αυτοκινήτου.</string>
+    <string name="car_used_on_the_car_screen">Αυτή τη στιγμή το CoMaps βρίσκεται στην οθόνη του αυτοκινήτου.</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Είστε συνδεδεμένοι στο Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -821,11 +821,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Προς οθόνη αυτοκ.</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Η εφαρμογή Organic Maps χρειάζεται πρόσβαση στην τοποθεσία. Όταν είναι ασφαλές, ελέγξτε την ειδοποίηση στο τηλέφωνό σας.</string>
+    <string name="aa_location_permissions_request">Η εφαρμογή CoMaps χρειάζεται πρόσβαση στην τοποθεσία. Όταν είναι ασφαλές, ελέγξτε την ειδοποίηση στο τηλέφωνό σας.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Αυτή η εφαρμογή χρειάζεται την άδειά σας</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Η εφαρμογή Organic Maps στο Android Auto χρειάζεται μια άδεια τοποθεσίας για να λειτουργήσει αποτελεσματικά</string>
+    <string name="aa_request_permission_activity_text">Η εφαρμογή CoMaps στο Android Auto χρειάζεται μια άδεια τοποθεσίας για να λειτουργήσει αποτελεσματικά</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Να επιτραπεί</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -881,11 +881,11 @@
     <string name="instagram">Instagram</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="facebook">Facebook</string>
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="github">GitHub</string>
     <string name="mastodon">Mastodon</string>
     <string name="editor_line_social_network">LINE</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="level_value_generic">Όροφος: %s</string>
     <string name="mb">MB</string>
     <string name="mi">μι</string>
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index 2e3fda484..844fc0d05 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -11,7 +11,7 @@
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
     <string name="category_water">Agua</string>
     <!-- SECTION: Other translations -->
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Fallo al abrir el archivo %1$s
 \n
 \n%2$s</string>
@@ -65,7 +65,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Inicie sesión en OpenStreetMap para cargar automáticamente todas las ediciones de su mapa. Obtenga más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
-    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible. Es posible que se haya quitado o dañado la tarjeta SD, o que el sistema de archivos solo permita la lectura. Revíselo y escríbanos a support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible. Es posible que se haya quitado o dañado la tarjeta SD, o que el sistema de archivos solo permita la lectura. Revíselo y escríbanos a support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular el almacenamiento dañado</string>
     <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Introduzca el nombre correcto</string>
@@ -125,7 +125,7 @@
     <string name="power_managment_setting_never">Nunca</string>
     <string name="power_managment_setting_auto">Automático</string>
     <string name="power_managment_setting_manual_max">Máximo ahorro de energía</string>
-    <string name="enable_logging_warning_message">Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de Organic Maps.</string>
+    <string name="enable_logging_warning_message">Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de CoMaps.</string>
     <string name="access_rules_author_only">Se edita en línea</string>
     <string name="driving_options_title">Ajustes de desvío</string>
     <string name="unable_to_calc_alert_title">No se puede construir una ruta</string>
@@ -202,13 +202,13 @@
     <!-- Description in preferences -->
     <string name="enable_keep_screen_on_description">Cuando está habilitado, la pantalla siempre estará encendida cuando se muestre el mapa.</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ahora usa Organic Maps en la pantalla del automóvil</string>
+    <string name="car_used_on_the_car_screen">Ahora usa CoMaps en la pantalla del automóvil</string>
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">A la pantalla del auto</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps necesita acceder a la ubicación. Cuando sea seguro, revise la notificación en el teléfono.</string>
+    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, revise la notificación en el teléfono.</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps en Android Auto necesita un permiso de ubicación para funcionar de manera eficaz</string>
+    <string name="aa_request_permission_activity_text">CoMaps en Android Auto necesita un permiso de ubicación para funcionar de manera eficaz</string>
     <string name="drive_through">Servicio al auto</string>
     <string name="back">Atrás</string>
     <string name="cancel">Cancelar</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index a04b1f34d..51a6582fe 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Error durante la descarga</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Intentar otra vez</string>
-    <string name="about_menu_title">Acerca de Organic Maps</string>
+    <string name="about_menu_title">Acerca de CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratis para todos, hecho con amor</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">La aplicación requiere OpenGL acelerado por hardware. Lamentablemente, su dispositivo no es compatible.</string>
     <string name="download">Descargar</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Desconecte el cable USB o inserte una tarjeta de memoria SD para usar Organic Maps</string>
+    <string name="disconnect_usb_cable">Desconecte el cable USB o inserte una tarjeta de memoria SD para usar CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Libere espacio en la memoria SD o almacenamiento USB para usar la aplicación</string>
     <string name="download_resources">Antes de comenzar, permita que descarguemos en su dispositivo un mapamundi general.
@@ -163,8 +163,8 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Marcadores de Organic Maps compartidos con usted</string>
-    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis marcadores de la aplicación Organic Maps. Por favor, ábralos si tiene instalado Organic Maps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://omaps.app/get?kmz \n\n¡Disfrute viajando con Organic Maps!</string>
+    <string name="share_bookmarks_email_subject">Marcadores de CoMaps compartidos con usted</string>
+    <string name="share_bookmarks_email_body">¡Hola! \n\nAdjunto mis marcadores de la aplicación CoMaps. Por favor, ábralos si tiene instalado CoMaps. O, si no lo tiene, descargue la aplicación para su dispositivo iOS o Android siguiendo este enlace: https://comaps.app/get?kmz \n\n¡Disfrute viajando con CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Cargando marcadores</string>
     <!-- Kmz file successful loading -->
@@ -174,7 +174,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">La aplicación no reconoce el tipo de archivo:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">No se ha podido abrir el archivo %1$s
 \n
 \n%2$s</string>
@@ -186,13 +186,13 @@
     <string name="cant_change_this_setting">Lo sentimos, la configuración del almacenamiento de mapas está desactivada.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">La descarga del mapa está en curso.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">¡Mire mi ubicación actual en Organic Maps! %1$s o %2$s ¿No tiene mapas offline? Descárguelos aquí: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">¡Mire mi ubicación actual en CoMaps! %1$s o %2$s ¿No tiene mapas offline? Descárguelos aquí: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">¡Mira mi marcador en el mapa de Organic Maps!</string>
+    <string name="bookmark_share_email_subject">¡Mira mi marcador en el mapa de CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">¡Mira mi ubicación actual en el mapa en Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">¡Mira mi ubicación actual en el mapa en CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hola:
 \n
 \nAhora estoy aquí: %1$s. Haz clic en este enlace %2$s o esta %3$s para verlo en el mapa.
@@ -257,7 +257,7 @@
     <string name="menu">Menú</string>
     <!-- Text in menu -->
     <string name="website">Sitio web</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Noticias</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Comentarios</string>
@@ -271,7 +271,7 @@
     <string name="donate">Donar</string>
     <string name="already_donated">Ya he donado</string>
     <string name="remind_me_later">Recordar más tarde</string>
-    <string name="support_organic_maps">Apoyar Organic Maps</string>
+    <string name="support_organic_maps">Apoyar CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Apoye el proyecto</string>
     <!-- Button in the main Help dialog -->
@@ -500,7 +500,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Datos de OpenStreetMap creados por la comunidad a partir de %s. Más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) es un proyecto comunitario para construir un mapa libre y abierto. Es la principal fuente de datos cartográficos de Organic Maps y funciona de forma similar a Wikipedia. Usted puede añadir o editar lugares y estos pasan a estar disponibles para millones de usuarios de todo el mundo.\n¡Únase a la comunidad y ayude a crear un mapa mejor para todos!</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) es un proyecto comunitario para construir un mapa libre y abierto. Es la principal fuente de datos cartográficos de CoMaps y funciona de forma similar a Wikipedia. Usted puede añadir o editar lugares y estos pasan a estar disponibles para millones de usuarios de todo el mundo.\n¡Únase a la comunidad y ayude a crear un mapa mejor para todos!</string>
     <string name="login_to_make_edits_visible">Cree una cuenta OpenStreetMap o inicie sesión para publicar sus ediciones de mapas en todo el mundo.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
@@ -517,7 +517,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota para los voluntarios de OpenStreetMap (opcional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Describa los errores en el mapa o las cosas que no se pueden editar con Organic Maps</string>
+    <string name="editor_note_hint">Describa los errores en el mapa o las cosas que no se pueden editar con CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Sus ediciones se cargan en la base de datos pública <a href="https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap">OpenStreetMap</a>. Por favor, no añada información personal o protegida por derechos de autor.</string>
     <string name="editor_more_about_osm">Más acerca de OpenStreetMap</string>
@@ -527,7 +527,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operador: %s</string>
     <string name="editor_category_unsuitable_title">¿No halla una categoría adecuada?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añada dichas categorías directamente a <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nuestra <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guía</a> para obtener instrucciones detalladas paso a paso.</string>
+    <string name="editor_category_unsuitable_text">CoMaps permite añadir únicamente categorías de puntos sencillos, es decir, no ciudades, carreteras, lagos, contornos de edificios, etc. Por favor, añada dichas categorías directamente a <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nuestra <a href="https://comaps.app/faq/editing/advanced-map-editing">guía</a> para obtener instrucciones detalladas paso a paso.</string>
     <string name="downloader_no_downloaded_maps_title">No ha descargado ningún mapa</string>
     <string name="downloader_no_downloaded_maps_message">Descargue mapas para encontrar la ubicación y navegar sin conexión.</string>
     <string name="current_location_unknown_error_title">Se desconoce la ubicación actual.</string>
@@ -589,7 +589,7 @@
     <string name="mobile_data_option_ask">Preguntar siempre</string>
     <string name="traffic_update_maps_text">Para mostrar los datos de tráfico, deben actualizarse los mapas.</string>
     <string name="big_font">Aumentar tamaño del texto en el mapa</string>
-    <string name="traffic_update_app">Actualice Organic Maps</string>
+    <string name="traffic_update_app">Actualice CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Los datos de tráfico no están disponibles</string>
     <string name="enable_logging">Activar registros</string>
@@ -613,7 +613,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Inicia sesión en OpenStreetMap para cargar automáticamente todas tus ediciones de mapas. Más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
-    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébelo ó escríbanos a support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébelo ó escríbanos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
     <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Por favor, introduzca el nombre correcto</string>
@@ -788,9 +788,9 @@
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Datos cartográficos de OpenStreetMap</string>
     <!-- A link to the TTS FAQ -->
-    <string name="tts_info_link">https://organicmaps.app/es/faq/instrucciones-de-voz-tts-en-android/</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/es/</string>
+    <string name="tts_info_link">https://comaps.app/es/faq/instrucciones-de-voz-tts-en-android/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/es/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap</string>
     <!-- App Tip #00 -->
@@ -814,9 +814,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar que le encantarán.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ahora usa Organic Maps en la pantalla del teléfono</string>
+    <string name="car_used_on_the_phone_screen">Ahora usa CoMaps en la pantalla del teléfono</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ahora usa Organic Maps en la pantalla del coche</string>
+    <string name="car_used_on_the_car_screen">Ahora usa CoMaps en la pantalla del coche</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Se ha conectado a Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -824,11 +824,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">A la pantalla del coche</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps necesita acceder a la ubicación. Cuando sea seguro, compruebe la notificación en el teléfono.</string>
+    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, compruebe la notificación en el teléfono.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Esta aplicación necesita su permiso</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps en Android Auto necesita permiso de ubicación para funcionar eficazmente</string>
+    <string name="aa_request_permission_activity_text">CoMaps en Android Auto necesita permiso de ubicación para funcionar eficazmente</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Conceder permisos</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index f1ec601f6..a4920b142 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Allalaadimine ei õnnestunud</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Proovi uuesti</string>
-    <string name="about_menu_title">Organic Mapsi teave</string>
+    <string name="about_menu_title">CoMapsi teave</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Ei tühjenda akut, töötab võrguühenduseta</string>
     <!-- Text in About screen -->
@@ -47,7 +47,7 @@
     <string name="unsupported_phone">Rakendus vajab riistvaralist OpenGLi tuge. Kahjuks sinu nutiseade ei ole toetatud.</string>
     <string name="download">Laadi alla</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Organic Maps kasutamiseks palun ühenda USB kaabel lahti või sisesta mälukaart</string>
+    <string name="disconnect_usb_cable">CoMaps kasutamiseks palun ühenda USB kaabel lahti või sisesta mälukaart</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Rakenduse kasutamiseks palun vabasta kõigepealt piisavalt ruumi mälukaardil/USB salvestusseadmel</string>
     <string name="download_resources">Enne rakenduse kasutamise alustamist luba meil laadida seadmesse alla maailma üldkaart. \nSee kasutab %s mälumahtu.</string>
@@ -157,8 +157,8 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Märkmed</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps järjehoidjaid jagati Sinuga</string>
-    <string name="share_bookmarks_email_body">Tere! \n\nManuses on minu järjehoidjad rakendusest Organic Maps. Palun ava need kui Sul on Organic Maps paigaldatud. Või kui ei ole, laadi rakendus alla oma iOSi või Androidi seadmesse, järgides seda linki: https:omaps.appget?kmz \n \nNaudi reisimist Organic Mapsiga!</string>
+    <string name="share_bookmarks_email_subject">CoMaps järjehoidjaid jagati Sinuga</string>
+    <string name="share_bookmarks_email_body">Tere! \n\nManuses on minu järjehoidjad rakendusest CoMaps. Palun ava need kui Sul on CoMaps paigaldatud. Või kui ei ole, laadi rakendus alla oma iOSi või Androidi seadmesse, järgides seda linki: https://comaps.app/get?kmz \n \nNaudi reisimist CoMapsiga!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Järjehoidjate laadimine</string>
     <!-- Kmz file successful loading -->
@@ -168,7 +168,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Rakendus ei tunnista failitüüpi:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Faili avamine ei õnnestunud %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
     <string name="edit">Muuda</string>
@@ -178,13 +178,13 @@
     <string name="cant_change_this_setting">Vabandust, kaardi salvestuse seadistused on hetkel keelatud.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Kaardi allalaadimine on hetkel käimas.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hei, vaata minu praegust asukohta Organic Mapsi kaardil! %1$s või %2$s Võrguühenduseta kaardid puuduvad? Laadi siit: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hei, vaata minu praegust asukohta CoMapsi kaardil! %1$s või %2$s Võrguühenduseta kaardid puuduvad? Laadi siit: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hei, vaata minu asukoha märget Organic Mapsi kaardil!</string>
+    <string name="bookmark_share_email_subject">Hei, vaata minu asukoha märget CoMapsi kaardil!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hei, vaata minu praegust asukohta Organic Mapsi kaardil!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hei, vaata minu praegust asukohta CoMapsi kaardil!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Tere,
 \n
 \nOlen praegu siin: %1$s. Ava see link %2$s või see %3$s, et näha seda kohta kaardil.
@@ -247,7 +247,7 @@
     <string name="search_show_on_map">Vaata kaardil</string>
     <!-- Text in menu -->
     <string name="website">Veebisait</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Uudised</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Tagasiside</string>
@@ -261,7 +261,7 @@
     <string name="donate">Anneta</string>
     <string name="already_donated">Juba annetasin</string>
     <string name="remind_me_later">Meenuta hiljem</string>
-    <string name="support_organic_maps">Toeta Organic Mapsi</string>
+    <string name="support_organic_maps">Toeta CoMapsi</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Toeta meie projekti</string>
     <!-- Button in the main Help dialog -->
@@ -490,7 +490,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Kogukonna loodud OpenStreetMapi andmed seisuga %s. Lisateavet kaardi muutmise ja uuendamise kohta leiad OpenStreetMap.org saidist</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) on kogukonna projekt, mille eesmärk on luua tasuta ja avatud kaart. See on Organic Mapsi peamine kaardiandmete allikas ja toimib sarnaselt Vikipeediaga. Saad lisada või muuta kohti ja need muutuvad kättesaadavaks miljonitele kasutajatele üle kogu maailma.\nLiitu kogukonnaga ja aita luua kõigi jaoks paremat kaarti!</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) on kogukonna projekt, mille eesmärk on luua tasuta ja avatud kaart. See on CoMapsi peamine kaardiandmete allikas ja toimib sarnaselt Vikipeediaga. Saad lisada või muuta kohti ja need muutuvad kättesaadavaks miljonitele kasutajatele üle kogu maailma.\nLiitu kogukonnaga ja aita luua kõigi jaoks paremat kaarti!</string>
     <string name="login_to_make_edits_visible">Loo OpenStreetMapi konto või logi sisse, et avaldada oma kaardimuudatused kogu maailmale.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d/%2$d</string>
@@ -507,7 +507,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Märkus OpenStreetMapi vabatahtlikele (valikuline)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Kirjelda kaardil olevaid vigu või objekte, mida ei saa Organic Mapsiga muuta</string>
+    <string name="editor_note_hint">Kirjelda kaardil olevaid vigu või objekte, mida ei saa CoMapsiga muuta</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Sinu muudatused laaditakse üles avalikku <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> andmebaasi. Palun ära lisa isiklikku või autoriõigusega kaitstud teavet.</string>
     <string name="editor_more_about_osm">Lisateave OpenStreetMapi kohta</string>
@@ -517,7 +517,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Käitaja: %s</string>
     <string name="editor_category_unsuitable_title">Ei leia sobivat kategooriat?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps võimaldab lisada ainult lihtsaid huvipunkte, see tähendab, et ei mingeid linnu, teid, järvi, hoonete piirjooni jne. Palun lisa sellised kategooriad otse <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> saidis. Vaata meie <a href="https://organicmaps.app/faq/editing/advanced-map-editing">juhendit</a> üksikasjalike samm-sammuliste juhiste saamiseks.</string>
+    <string name="editor_category_unsuitable_text">CoMaps võimaldab lisada ainult lihtsaid huvipunkte, see tähendab, et ei mingeid linnu, teid, järvi, hoonete piirjooni jne. Palun lisa sellised kategooriad otse <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> saidis. Vaata meie <a href="https://comaps.app/faq/editing/advanced-map-editing">juhendit</a> üksikasjalike samm-sammuliste juhiste saamiseks.</string>
     <string name="downloader_no_downloaded_maps_title">Sa ei ole kaarte alla laadinud</string>
     <string name="downloader_no_downloaded_maps_message">Laadi alla kaardid asukoha otsimiseks ja võrguühenduseta tee juhatamiseks.</string>
     <string name="current_location_unknown_error_title">Hetkeasukoht on teadmata.</string>
@@ -579,7 +579,7 @@
     <string name="mobile_data_option_ask">Küsi alati</string>
     <string name="traffic_update_maps_text">Liiklusinfo kuvamiseks palun uuenda kaardid.</string>
     <string name="big_font">Suurenda teksti suurust kaardil</string>
-    <string name="traffic_update_app">Palun uuenda Organic Mapsi rakendust</string>
+    <string name="traffic_update_app">Palun uuenda CoMapsi rakendust</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Liiklusinfo ei ole saadaval</string>
     <string name="enable_logging">Luba logimine</string>
@@ -603,7 +603,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Oma kaastöö automaatseks üleslaadimiseks palun logi OpenStreetMappi sisse. Lisateave <a href="https://github.com/organicmaps/organicmaps/issues/6144">leidub siin</a>.</string>
     <string name="dialog_error_storage_title">Andmeruumi ligipääsu probleem</string>
-    <string name="dialog_error_storage_message">Väline andmeruum pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrolli oma SD-kaarti või võta meiega ühendust aadressil support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Väline andmeruum pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrolli oma SD-kaarti või võta meiega ühendust aadressil support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imiteeri vigast andmeruumi</string>
     <string name="core_entrance">Sissepääs</string>
     <string name="error_enter_correct_name">Palun sisesta korrektne nimi</string>
@@ -795,9 +795,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Meie põhieesmärk on luua kiireid, privaatsusele keskenduvaid ja hõlpsasti kasutatavaid kaarte, mis sulle meeldivad.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Nüüd kasutad telefoni ekraanil Organic Mapsi</string>
+    <string name="car_used_on_the_phone_screen">Nüüd kasutad telefoni ekraanil CoMapsi</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Nüüd kasutad auto ekraanil Organic Mapsi</string>
+    <string name="car_used_on_the_car_screen">Nüüd kasutad auto ekraanil CoMapsi</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Oled ühendatud Android Auto\'ga</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -805,11 +805,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Auto ekraanile</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps vajab juurdepääsu asukohale. Kui see on turvaline, kontrolli oma telefonis olevat teadet.</string>
+    <string name="aa_location_permissions_request">CoMaps vajab juurdepääsu asukohale. Kui see on turvaline, kontrolli oma telefonis olevat teadet.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">See rakendus vajab sinu luba</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Android Auto liidestusega Organic Maps vajavab tõhusaks tööks luba asukoha tuvastamiseks</string>
+    <string name="aa_request_permission_activity_text">Android Auto liidestusega CoMaps vajavab tõhusaks tööks luba asukoha tuvastamiseks</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Anna luba</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -878,8 +878,8 @@
     <string name="vk">VK</string>
     <string name="facebook">Facebook</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="about_developed_by_enthusiasts">Huviliste ja vabatahtlike poolt loodud avatud lähtekoodil põhinev rakendus.</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 aa3e35d30..60f774349 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Deskargak huts egin du</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Saiatu berriro</string>
-    <string name="about_menu_title">Organic Maps-i buruz</string>
+    <string name="about_menu_title">CoMaps-i buruz</string>
     <!-- Text in About screen -->
     <string name="about_headline">Denontzat doan, maitasunez egina</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Aplikazioak hardwarez azeleratutako OpenGL behar du. Zoritxarrez, zure gailuak ez du hau eskaintzen.</string>
     <string name="download">Deskargatu</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Mesedez, deskonektatu USB kablea edo sartu SD memoria Organic Maps erabiltzeko</string>
+    <string name="disconnect_usb_cable">Mesedez, deskonektatu USB kablea edo sartu SD memoria CoMaps erabiltzeko</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Mesedez, egin lekua SD memorian/USB biltegian aplikazioa erabiltzeko</string>
     <string name="download_resources">Hasi aurretik deskargatu mesedez mundu-mapa orokorra zure gailura.
@@ -167,11 +167,11 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Oharrak</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps markagailuak zurekin partekatu dira</string>
+    <string name="share_bookmarks_email_subject">CoMaps markagailuak zurekin partekatu dira</string>
     <string name="share_bookmarks_email_body">Kaixo!
-\nNire markagailuak Organic Maps aplikazioan erantsi ditut. Mesedez, ireki itzazu Organic Maps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://omaps.app/get?kmz
+\nNire markagailuak CoMaps aplikazioan erantsi ditut. Mesedez, ireki itzazu CoMaps instalatuta baduzu. Edo, ez baduzu, deskargatu aplikazioa zure iOS edo Android gailurako esteka hau jarraituz: https://comaps.app/get?kmz
 \n
-\nGozatu bidaiatzen Organic Maps-ekin!</string>
+\nGozatu bidaiatzen CoMaps-ekin!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Markagailuak kargatzen</string>
     <!-- Kmz file successful loading -->
@@ -181,7 +181,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Aplikazioak ez du fitxategi mota ezagutzen:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Ezin izan da fitxategia ireki %1$s
 \n
 \n%2$s</string>
@@ -193,13 +193,13 @@
     <string name="cant_change_this_setting">Barkatu, mapa biltegiratzeko ezarpena desgaituta dago.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Mapak deskargatzen ari dira.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Ikusi nire uneko kokapena Organic Maps-en! %1$s edo %2$s Ez al duzu lineaz kanpoko maparik? Deskargatu hemendik: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Ikusi nire uneko kokapena CoMaps-en! %1$s edo %2$s Ez al duzu lineaz kanpoko maparik? Deskargatu hemendik: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Begiratu nire markagailua Organic Maps mapan!</string>
+    <string name="bookmark_share_email_subject">Begiratu nire markagailua CoMaps mapan!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Ikusi nire uneko kokapena Organic Maps mapan!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Ikusi nire uneko kokapena CoMaps mapan!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Kaixo:
 \n
 \nOrain hemen nago: %1$s. Egin klik esteka honetan %2$s edo %3$s honetan mapan ikusteko.
@@ -264,7 +264,7 @@
     <string name="menu">Menua</string>
     <!-- Text in menu -->
     <string name="website">Webgunea</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Albisteak</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Iruzkinak</string>
@@ -278,7 +278,7 @@
     <string name="donate">Dohaintza eman</string>
     <string name="already_donated">Dohaintza jada emana</string>
     <string name="remind_me_later">Gogoratu geroago</string>
-    <string name="support_organic_maps">Sustatu Organic Maps</string>
+    <string name="support_organic_maps">Sustatu CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Proiektuari laguntza eman</string>
     <!-- Button in the main Help dialog -->
@@ -507,7 +507,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Komunitateak sortutako OpenStreetMap datuak %s-tik aurrera. Lortu informazio gehiago mapa editatu eta eguneratzeari buruz OpenStreetMap.org helbidean</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) mapa libre eta irekia eraikitzeko komunitateko proiektu bat da. Organic Maps-en mapen datuen iturri nagusia da eta Wikipediaren antzera funtzionatzen du. Tokiak gehitu edo edita ditzakezu eta mundu osoko milioika erabiltzailerentzat eskuragarri egongo dira.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) mapa libre eta irekia eraikitzeko komunitateko proiektu bat da. CoMaps-en mapen datuen iturri nagusia da eta Wikipediaren antzera funtzionatzen du. Tokiak gehitu edo edita ditzakezu eta mundu osoko milioika erabiltzailerentzat eskuragarri egongo dira.
 \nSartu komunitatean eta lagundu mapa hobea egiten guztiontzat!</string>
     <string name="login_to_make_edits_visible">Sortu OpenStreetMap kontu bat edo hasi saioa zure maparen aldaketak munduan argitaratzeko.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -535,7 +535,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operadorea: %s</string>
     <string name="editor_category_unsuitable_title">Ezin duzu kategoria egokirik aurkitu?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps-ek puntu kategoria soilak gehitzeko aukera ematen du, hau da, ez da herririk, errepiderik, lakurik, eraikinen eskemarik, etab. Gehitu kategoria horiek zuzenean <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Begiratu gure <a href="https://organicmaps.app/faq/editing/advanced-map-editing">gida</a> urratsez urrats argibide zehatzak lortzeko.</string>
+    <string name="editor_category_unsuitable_text">CoMaps-ek puntu kategoria soilak gehitzeko aukera ematen du, hau da, ez da herririk, errepiderik, lakurik, eraikinen eskemarik, etab. Gehitu kategoria horiek zuzenean <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Begiratu gure <a href="https://comaps.app/faq/editing/advanced-map-editing">gida</a> urratsez urrats argibide zehatzak lortzeko.</string>
     <string name="downloader_no_downloaded_maps_title">Ez duzu maparik deskargatu</string>
     <string name="downloader_no_downloaded_maps_message">Deskargatu mapak kokapena aurkitzeko eta lineaz kanpo nabigatzeko.</string>
     <string name="current_location_unknown_error_title">Uneko kokapena ezezaguna da.</string>
@@ -597,7 +597,7 @@
     <string name="mobile_data_option_ask">Galdetu beti</string>
     <string name="traffic_update_maps_text">Trafiko datuak bistaratzeko, mapak eguneratu behar dira.</string>
     <string name="big_font">Handitu letra tamaina mapan</string>
-    <string name="traffic_update_app">Eguneratu Organic Maps</string>
+    <string name="traffic_update_app">Eguneratu CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Trafiko datuak ez daude eskuragarri</string>
     <string name="enable_logging">Historia gaitu</string>
@@ -621,7 +621,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Hasi saioa OpenStreetMap-en zure mapen aldaketa guztiak automatikoki kargatzeko. Lortu informazio gehiago <a href="https://github.com/organicmaps/organicmaps/issues/6144">hemen</a>.</string>
     <string name="dialog_error_storage_title">Biltegiratze sarbidearen arazoa</string>
-    <string name="dialog_error_storage_message">Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support\@organicmaps.app helbidera</string>
+    <string name="dialog_error_storage_message">Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support\@comaps.app helbidera</string>
     <string name="setting_emulate_bad_storage">Emulatu kaltetutako biltegiratzea</string>
     <string name="core_entrance">Sarrera</string>
     <string name="error_enter_correct_name">Mesedez, idatzi baliozko izen bat</string>
@@ -688,7 +688,7 @@
     <string name="power_managment_setting_never">Inoiz ez</string>
     <string name="power_managment_setting_auto">Automatikoa</string>
     <string name="power_managment_setting_manual_max">Energia aurrezpen handiena</string>
-    <string name="enable_logging_warning_message">Aukera hau diagnostiko helburua duten erregistro ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera Organic Maps laguntzari eskatuta soilik.</string>
+    <string name="enable_logging_warning_message">Aukera hau diagnostiko helburua duten erregistro ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera CoMaps laguntzari eskatuta soilik.</string>
     <string name="access_rules_author_only">Sarean editatzen</string>
     <string name="driving_options_title">Bideratzeko aukerak</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -793,8 +793,8 @@
     <string name="change_map_locale">Maparen hizkuntza</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">OpenStreetMap-eko mapa-datuak</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/eu/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/eu/</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Eskerrik asko gure komunitateak eraikitako mapak erabiltzeagatik!</string>
     <!-- App tip #01 -->
@@ -816,9 +816,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Gure helburu nagusia maite dituzun mapa azkarrak, pribatutasunari begira eta erabilerrazak sortzea da.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Organic Maps telefonoaren pantailan erabiltzen ari zara</string>
+    <string name="car_used_on_the_phone_screen">CoMaps telefonoaren pantailan erabiltzen ari zara</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Organic Maps autoaren pantailan erabiltzen ari zara</string>
+    <string name="car_used_on_the_car_screen">CoMaps autoaren pantailan erabiltzen ari zara</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Android Auto-ra konektatuta zaude</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -826,11 +826,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Autoaren pantailara</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps-ek kokapenerako sarbidea behar du. Seguru dagoenean, egiaztatu zure telefonoko jakinarazpena.</string>
+    <string name="aa_location_permissions_request">CoMaps-ek kokapenerako sarbidea behar du. Seguru dagoenean, egiaztatu zure telefonoko jakinarazpena.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Aplikazio honek zure baimena behar du</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Android Auto-ko Organic Maps-ek kokapen-baimena behar du eraginkortasunez funtzionatzeko</string>
+    <string name="aa_request_permission_activity_text">Android Auto-ko CoMaps-ek kokapen-baimena behar du eraginkortasunez funtzionatzeko</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Eman baimenak</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 0959a8cd3..107263f0e 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">دانلود با شکست مواجه شد</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">تلاش مجدد</string>
-    <string name="about_menu_title">Organic Maps درباره‌ی</string>
+    <string name="about_menu_title">CoMaps درباره‌ی</string>
     <!-- Text in About screen -->
     <string name="about_headline">رایگان برای همه ، ساخته شده با عشق</string>
     <!-- Text in About screen -->
@@ -162,7 +162,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">نوع فایل توسط برنامه تشخیص داده نمی شود:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">فایل باز نشد %1$s
 \n
 \n%2$s</string>
@@ -231,7 +231,7 @@
     <string name="search_show_on_map">مشاهده بر روی نقشه</string>
     <!-- Text in menu -->
     <string name="website">وب سایت</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">اخبار</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">بازخورد</string>
@@ -245,7 +245,7 @@
     <string name="donate">حمایت مالی</string>
     <string name="already_donated">قبلاً اهدا شده</string>
     <string name="remind_me_later">بعداً یادآوری کن</string>
-    <string name="support_organic_maps">پشتیبانی از Organic Maps</string>
+    <string name="support_organic_maps">پشتیبانی از CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">ﺪﯿﻨﮐ ﺖﯾﺎﻤﺣ ﻩﮊﻭﺮﭘ ﺯﺍ</string>
     <!-- Button in the main Help dialog -->
@@ -501,7 +501,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">اپراتور: %s</string>
     <string name="editor_category_unsuitable_title">آیا نمی توانید یک دسته بندی مناسب پیدا کنید؟</string>
-    <string name="editor_category_unsuitable_text">Organic Maps اجازه میu200cدهد فقط دستهu200cهای نقطهu200cای ساده را اضافه کند، یعنی هیچ شهر، جاده، دریاچه، طرح کلی ساختمان و غیره وجود ندارد. لطفاً این دستهu200cها را مستقیماً به <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> اضافه کنید. برای دستورالعملu200cهای گام به گام، <a href="https://organicmaps.app/faq/editing/advanced-map-editing">راهنمای</a> ما را بررسی کنید.</string>
+    <string name="editor_category_unsuitable_text">CoMaps اجازه میu200cدهد فقط دستهu200cهای نقطهu200cای ساده را اضافه کند، یعنی هیچ شهر، جاده، دریاچه، طرح کلی ساختمان و غیره وجود ندارد. لطفاً این دستهu200cها را مستقیماً به <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> اضافه کنید. برای دستورالعملu200cهای گام به گام، <a href="https://comaps.app/faq/editing/advanced-map-editing">راهنمای</a> ما را بررسی کنید.</string>
     <string name="downloader_no_downloaded_maps_title">شما هیچ نقشه دانلود شده ای ندارید</string>
     <string name="downloader_no_downloaded_maps_message">برای جست وجو یک مکان و استفاده از قابلیت ناوبری، نقشه‌ها را دانلود کنید.</string>
     <string name="current_location_unknown_error_title">مکان فعلیتان ناشناس است.</string>
@@ -556,7 +556,7 @@
     <string name="mobile_data_option_ask">همیشه بپرس</string>
     <string name="traffic_update_maps_text">برای نمایش ترافیک، نقشه می بایستی بروزرسانی شود.</string>
     <string name="big_font">افزایش اندازه متن بر روی نقشه</string>
-    <string name="traffic_update_app">لطفا Organic Maps را بروزرسانی کنید</string>
+    <string name="traffic_update_app">لطفا CoMaps را بروزرسانی کنید</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">اطلاعات ترافیکی موجود نیست</string>
     <string name="enable_logging">ورود به سیستم را فعال کنید</string>
@@ -581,7 +581,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">لطفاً به OpenStreetMap وارد شوید تا به طور خودکار تمام ویرایش های نقشه خود را آپلود کنید. <a href="https://github.com/organicmaps/organicmaps/issues/6144">اینجا</a> بیشتر بیاموزید.</string>
     <string name="dialog_error_storage_title">مشکل دسترسی به ذخیره‌سازی</string>
-    <string name="dialog_error_storage_message">ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support\@organicmaps.app تماس بگیرید</string>
+    <string name="dialog_error_storage_message">ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support\@comaps.app تماس بگیرید</string>
     <string name="setting_emulate_bad_storage">شبیه سازی ذخیره سازی بد</string>
     <string name="core_entrance">ورودی</string>
     <string name="error_enter_correct_name">لطفا نام صحیح را وارد کنید</string>
@@ -648,7 +648,7 @@
     <string name="power_managment_setting_never">هرگز</string>
     <string name="power_managment_setting_auto">خودکار</string>
     <string name="power_managment_setting_manual_max">حداکثر ذخیره انرژی</string>
-    <string name="enable_logging_warning_message">این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی Organic Maps فعال کنید.</string>
+    <string name="enable_logging_warning_message">این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی CoMaps فعال کنید.</string>
     <string name="access_rules_author_only">ویرایش آنلاین</string>
     <string name="driving_options_title">گزینه‌های رانندگی</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -772,7 +772,7 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">به صفحه ماشین</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps به دسترسی به مکان نیاز دارد. وقتی ایمن است، اعلان گوشی خود را بررسی کنید.</string>
+    <string name="aa_location_permissions_request">CoMaps به دسترسی به مکان نیاز دارد. وقتی ایمن است، اعلان گوشی خود را بررسی کنید.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">این برنامه به اجازه شما نیاز دارد</string>
     <!-- The text in the activity for location permission request. -->
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index b5c3818d7..aa0131a02 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">Lataus epäonnistui</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Yritä uudelleen</string>
-    <string name="about_menu_title">Tietoa Organic Maps:stä</string>
+    <string name="about_menu_title">Tietoa CoMaps:stä</string>
     <!-- Text in About screen -->
     <string name="about_headline">Ilmainen kaikille, tehty rakkaudella</string>
     <!-- Text in About screen -->
@@ -56,7 +56,7 @@
     <string name="unsupported_phone">Laitteistokiihdytetty OpenGL vaaditaan. Valitettavasti laitteesi ei ole tuettu.</string>
     <string name="download">Lataa</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Irrota USB-kaapeli tai syötä muistikortti käyttääksesi Organic Maps -sovellusta</string>
+    <string name="disconnect_usb_cable">Irrota USB-kaapeli tai syötä muistikortti käyttääksesi CoMaps -sovellusta</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Vapauta ensin tilaa SD-kortilta/USB-massamuistilta käyttääksesi sovellusta</string>
     <string name="download_resources">Ennen aloitusta laitteelle tulee ladata yleinen maailmankartta.
@@ -167,7 +167,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Muistiinpanot</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Jaetut Organic Maps-kirjanmerkit</string>
+    <string name="share_bookmarks_email_subject">Jaetut CoMaps-kirjanmerkit</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Ladataan kirjanmerkkejä</string>
     <!-- Kmz file successful loading -->
@@ -177,7 +177,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Sovellus ei tunnista tiedostotyyppiä:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Tiedostoa ei onnistuttu avaamaan %1$s
 \n
 \n%2$s</string>
@@ -189,13 +189,13 @@
     <string name="cant_change_this_setting">Valitettavasti karttatallennusasetukset ovat pois päältä.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Karttaa ladataan parhaillaan.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hei, katso sijaintini Organic Maps-sovelluksessa! %1$s tai %2$s Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hei, katso sijaintini CoMaps-sovelluksessa! %1$s tai %2$s Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hei, katso merkintäni Organic Maps-kartalla!</string>
+    <string name="bookmark_share_email_subject">Hei, katso merkintäni CoMaps-kartalla!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hei, kurkkaa tämänhetkinen sijaintini Organic Maps:n kartalla!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hei, kurkkaa tämänhetkinen sijaintini CoMaps:n kartalla!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hei,
 \n
 \nOlen nyt täällä: %1$s. Klikkaa linkkiä %2$s tai %3$s nähdäksesi paikan kartalla.
@@ -260,7 +260,7 @@
     <string name="menu">Menu</string>
     <!-- Text in menu -->
     <string name="website">Kotisivut</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Uutiset</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Palaute</string>
@@ -274,7 +274,7 @@
     <string name="donate">Lahjoita</string>
     <string name="already_donated">Jo lahjoitettu</string>
     <string name="remind_me_later">Muistuta myöhemmin</string>
-    <string name="support_organic_maps">Tukea Organic Maps</string>
+    <string name="support_organic_maps">Tukea CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Tue projektia</string>
     <!-- Button in the main Help dialog -->
@@ -503,7 +503,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Yhteisön luomat OpenStreetMap-tiedot %s:sta alkaen. Lisätietoja kartan muokkaamisesta ja päivittämisestä osoitteessa OpenStreetMap.org.</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) on yhteisöprojekti, jonka tarkoituksena on rakentaa ilmainen ja avoin kartta. Se on Organic Mapsin tärkein karttatietojen lähde ja toimii samalla tavalla kuin Wikipedia. Voit lisätä tai muokata paikkoja, ja ne tulevat miljoonien käyttäjien saataville kaikkialla maailmassa.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) on yhteisöprojekti, jonka tarkoituksena on rakentaa ilmainen ja avoin kartta. Se on CoMapsin tärkein karttatietojen lähde ja toimii samalla tavalla kuin Wikipedia. Voit lisätä tai muokata paikkoja, ja ne tulevat miljoonien käyttäjien saataville kaikkialla maailmassa.
 \nLiity yhteisöön ja auta tekemään parempi kartta kaikille!</string>
     <string name="login_to_make_edits_visible">Luo OpenStreetMap-tili tai kirjaudu sisään, jotta voit julkaista karttamuokkauksesi maailmalle.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -521,7 +521,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Huomautus OpenStreetMapin vapaaehtoisille (valinnainen)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Kuvaile kartassa olevia virheitä tai asioita, joita ei voi muokata Organic Mapsilla.</string>
+    <string name="editor_note_hint">Kuvaile kartassa olevia virheitä tai asioita, joita ei voi muokata CoMapsilla.</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Muokkauksesi ladataan julkiseen <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>-tietokantaan. Älä lisää henkilökohtaisia tai tekijänoikeudella suojattuja tietoja.</string>
     <string name="editor_more_about_osm">Lisätietoja OpenStreetMap:sta</string>
@@ -531,7 +531,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operaattori: %s</string>
     <string name="editor_category_unsuitable_title">Etkö löydä sopivaa luokkaa?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps mahdollistaa vain yksinkertaisten pisteluokkien lisäämisen, eli ei kaupunkeja, teitä, järviä, rakennusten ääriviivoja jne. Lisää tällaiset luokat suoraan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Tarkista <a href="https://organicmaps.app/faq/editing/advanced-map-editing">oppaastamme</a> yksityiskohtaiset ohjeet vaihe vaiheelta.</string>
+    <string name="editor_category_unsuitable_text">CoMaps mahdollistaa vain yksinkertaisten pisteluokkien lisäämisen, eli ei kaupunkeja, teitä, järviä, rakennusten ääriviivoja jne. Lisää tällaiset luokat suoraan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Tarkista <a href="https://comaps.app/faq/editing/advanced-map-editing">oppaastamme</a> yksityiskohtaiset ohjeet vaihe vaiheelta.</string>
     <string name="downloader_no_downloaded_maps_title">Et ole ladannut yhtään karttaa</string>
     <string name="downloader_no_downloaded_maps_message">Lataa karttoja löytääksesi paikkoja ja navigoidaksesi offline-tilassa.</string>
     <string name="current_location_unknown_error_title">Nykyinen sijainti on tuntematon.</string>
@@ -593,7 +593,7 @@
     <string name="mobile_data_option_ask">Kysy aina</string>
     <string name="traffic_update_maps_text">Liikennetietojen näyttämiseksi kartat on päivitettävä.</string>
     <string name="big_font">Suurenna fonttikokoa kartalla</string>
-    <string name="traffic_update_app">Päivitä Organic Maps</string>
+    <string name="traffic_update_app">Päivitä CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Liikennetietoja ei ole saatavilla</string>
     <string name="enable_logging">Ota loki käyttöön</string>
@@ -617,7 +617,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Kirjaudu sisään OpenStreetMapiin, jotta voit ladata kaikki karttamuutoksesi automaattisesti. Lisätietoja <a href="https://github.com/organicmaps/organicmaps/issues/6144">täältä</a>.</string>
     <string name="dialog_error_storage_title">Ongelma tallennustilan käyttämisessä</string>
-    <string name="dialog_error_storage_message">Ulkoinen tallennustila ei ole käytettävissä, SD-kortti on luultavasti poistettu tai vahingoittunut tai tiedostojärjestelmä on vain luku -tilassa. Tarkista SD-kortin toiminta tai ota yhteyttä osoitteeseen support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Ulkoinen tallennustila ei ole käytettävissä, SD-kortti on luultavasti poistettu tai vahingoittunut tai tiedostojärjestelmä on vain luku -tilassa. Tarkista SD-kortin toiminta tai ota yhteyttä osoitteeseen support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Jäljittele virheellistä tallennustilaa</string>
     <string name="core_entrance">Sisäänkäynti</string>
     <string name="error_enter_correct_name">Anna oikea nimi</string>
@@ -684,7 +684,7 @@
     <string name="power_managment_setting_never">Ei koskaan</string>
     <string name="power_managment_setting_auto">Automaattinen</string>
     <string name="power_managment_setting_manual_max">Täysi virransäästö</string>
-    <string name="enable_logging_warning_message">Valinta ottaa käyttöön lokikirjaukset diagnostiikkaa varten. Se voi auttaa tukihenkilöstöämme, kun he korjaavat sovelluksen ongelmia. Ota tämä ominaisuus käyttöön vain, jos Organic Maps:n tuki pyytää.</string>
+    <string name="enable_logging_warning_message">Valinta ottaa käyttöön lokikirjaukset diagnostiikkaa varten. Se voi auttaa tukihenkilöstöämme, kun he korjaavat sovelluksen ongelmia. Ota tämä ominaisuus käyttöön vain, jos CoMaps:n tuki pyytää.</string>
     <string name="access_rules_author_only">Nettimuokkaus</string>
     <string name="driving_options_title">Reititysvalinnat</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -809,9 +809,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Päätavoitteemme on rakentaa nopeita, yksityisyyteen keskittyviä, helppokäyttöisiä karttoja, joista pidät.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Käytät nyt puhelimen näytöllä Organic Maps -palvelua.</string>
+    <string name="car_used_on_the_phone_screen">Käytät nyt puhelimen näytöllä CoMaps -palvelua.</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Käytät nyt Organic Maps auton näytöllä</string>
+    <string name="car_used_on_the_car_screen">Käytät nyt CoMaps auton näytöllä</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Olet yhteydessä Android Autoon</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -819,11 +819,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Auton näyttöön</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps tarvitsee sijaintitietoja. Kun se on turvallista, tarkista puhelimesi ilmoitus.</string>
+    <string name="aa_location_permissions_request">CoMaps tarvitsee sijaintitietoja. Kun se on turvallista, tarkista puhelimesi ilmoitus.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Tämä sovellus tarvitsee lupasi</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps tarvitsee luvan käyttää sijantia toimiakseen tehokkaasti Android Autossa</string>
+    <string name="aa_request_permission_activity_text">CoMaps tarvitsee luvan käyttää sijantia toimiakseen tehokkaasti Android Autossa</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Lupien myöntäminen</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -879,9 +879,9 @@
     <string name="vk">VK</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="level_value_generic">Kerros: %s</string>
-    <string name="share_bookmarks_email_body">Hei! \n\nLiitteenä ovat kirjamerkkini; Avaa ne Organic Maps -sovelluksessa. Mikäli sinulla ei ole vielä sovellusta asennettuna, voit ladata sen osoitteesta: https://omaps.app/get?kmz \n\nNauti matkustamisesta Organic Maps:n kanssa!</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="share_bookmarks_email_body">Hei! \n\nLiitteenä ovat kirjamerkkini; Avaa ne CoMaps -sovelluksessa. Mikäli sinulla ei ole vielä sovellusta asennettuna, voit ladata sen osoitteesta: https://comaps.app/get?kmz \n\nNauti matkustamisesta CoMaps:n kanssa!</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="telegram">Telegram</string>
     <string name="twitter">X (Twitter)</string>
     <string name="mastodon">Mastodon</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index e49267383..bac4d3f56 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -39,7 +39,7 @@
     <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 -->
     <string name="try_again">Réessayer</string>
-    <string name="about_menu_title">À propos de Organic Maps</string>
+    <string name="about_menu_title">À propos de CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratuit pour tout le monde, fait avec amour</string>
     <!-- Text in About screen -->
@@ -56,7 +56,7 @@
     <string name="unsupported_phone">L\'accélération OpenGL matérielle est exigée. Malheureusement, votre appareil n\'est pas pris en charge.</string>
     <string name="download">Télécharger</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Veuillez débrancher le câble USB ou insérer la carte SD pour utiliser Organic Maps</string>
+    <string name="disconnect_usb_cable">Veuillez débrancher le câble USB ou insérer la carte SD pour utiliser CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Veuillez d\'abord libérer de l\'espace sur la carte SD/le stockage USB afin d\'utiliser l\'appli</string>
     <string name="download_resources">Avant de commencer, permettez-nous de télécharger la carte générale du monde dans votre appareil.
@@ -168,12 +168,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Signets Organic Maps partagés</string>
+    <string name="share_bookmarks_email_subject">Signets CoMaps partagés</string>
     <string name="share_bookmarks_email_body">Bonjour !
 \n
-\nVous trouverez ci-joint mes signets de l\'appli Organic Maps. Veuillez les ouvrir si vous avez installé Organic Maps. Si vous ne l\'avez pas, téléchargez l\'application pour votre appareil iOS ou Android en suivant ce lien : https://omaps.app/get?kmz
+\nVous trouverez ci-joint mes signets de l\'appli CoMaps. Veuillez les ouvrir si vous avez installé CoMaps. Si vous ne l\'avez pas, téléchargez l\'application pour votre appareil iOS ou Android en suivant ce lien : https://comaps.app/get?kmz
 \n
-\nBon voyage avec Organic Maps !</string>
+\nBon voyage avec CoMaps !</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Chargement des signets</string>
     <!-- Kmz file successful loading -->
@@ -183,7 +183,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Le type de fichier n\'est pas reconnu par l\'appli :
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Échec de l\'ouverture du fichier %1$s
 \n
 \n%2$s</string>
@@ -195,13 +195,13 @@
     <string name="cant_change_this_setting">Désolé, les paramètres de stockage des cartes sont présentement désactivés.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Le téléchargement de la carte est en cours.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hé, regardez ma position actuelle sur Organic Maps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hé, regardez mon signet sur la carte Organic Maps !</string>
+    <string name="bookmark_share_email_subject">Hé, regardez mon signet sur la carte CoMaps !</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hé, regardez ma position actuelle sur la carte Organic Maps !</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hé, regardez ma position actuelle sur la carte CoMaps !</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Bonjour,
 \n
 \nJe suis actuellement ici : %1$s. Cliquez sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.
@@ -266,7 +266,7 @@
     <string name="menu">Menu</string>
     <!-- Text in menu -->
     <string name="website">Site internet</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nouvelles</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Feedback</string>
@@ -280,7 +280,7 @@
     <string name="donate">Faire un don</string>
     <string name="already_donated">Déjà donné</string>
     <string name="remind_me_later">Rappeler plus tard</string>
-    <string name="support_organic_maps">Soutenir Organic Maps</string>
+    <string name="support_organic_maps">Soutenir CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Soutenir le projet</string>
     <!-- Button in the main Help dialog -->
@@ -511,7 +511,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consulte le site OpenStreetMap.org.</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques d\'Organic Maps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques d\'CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier.
 \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde !</string>
     <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de cartes dans le monde entier.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -529,7 +529,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Note aux volontaires OpenStreetMap (facultatif)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Décrivez les erreurs sur la carte ou les éléments qui ne peuvent pas être modifiés avec Organic Maps.</string>
+    <string name="editor_note_hint">Décrivez les erreurs sur la carte ou les éléments qui ne peuvent pas être modifiés avec CoMaps.</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Vos modifications sont téléchargées dans la base de données publique <a href="https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap">OpenStreetMap</a>. Veuillez ne pas ajouter d\'informations personnelles ou protégées par le droit d\'auteur.</string>
     <string name="editor_more_about_osm">En savoir plus sur OpenStreetMap</string>
@@ -539,7 +539,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Opérateur : %s</string>
     <string name="editor_category_unsuitable_title">Tu ne trouves pas de catégorie appropriée ?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps ne permet d\'ajouter que des catégories de points simples, c\'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d\'ajouter ces catégories directement sur <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte notre <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guide</a> pour obtenir des instructions détaillées étape par étape.</string>
+    <string name="editor_category_unsuitable_text">CoMaps ne permet d\'ajouter que des catégories de points simples, c\'est-à-dire pas de villes, de routes, de lacs, de contours de bâtiments, etc. Merci d\'ajouter ces catégories directement sur <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte notre <a href="https://comaps.app/faq/editing/advanced-map-editing">guide</a> pour obtenir des instructions détaillées étape par étape.</string>
     <string name="downloader_no_downloaded_maps_title">Vous n\'avez téléchargé aucune carte</string>
     <string name="downloader_no_downloaded_maps_message">Téléchargez des cartes pour rechercher un lieu et utiliser la navigation hors ligne</string>
     <string name="current_location_unknown_error_title">L\'emplacement actuel est inconnu.</string>
@@ -600,7 +600,7 @@
     <string name="mobile_data_option_ask">Toujours demander</string>
     <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être actualisées.</string>
     <string name="big_font">Augmenter la taille de police sur la carte</string>
-    <string name="traffic_update_app">Veuillez mettre à jour Organic Maps</string>
+    <string name="traffic_update_app">Veuillez mettre à jour CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Les données de circulation ne sont pas disponibles</string>
     <string name="enable_logging">Activer le journal</string>
@@ -624,7 +624,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Connecte-toi à OpenStreetMap pour télécharger automatiquement toutes tes modifications de cartes. En savoir plus <a href="https://github.com/organicmaps/organicmaps/issues/6144">ici</a>.</string>
     <string name="dialog_error_storage_title">Problème d\'accès au stockage</string>
-    <string name="dialog_error_storage_message">Le stockage externe n\'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Le stockage externe n\'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
     <string name="core_entrance">Entrée</string>
     <string name="error_enter_correct_name">Veuillez entrer un nom correct</string>
@@ -691,7 +691,7 @@
     <string name="power_managment_setting_never">Jamais</string>
     <string name="power_managment_setting_auto">Automatique</string>
     <string name="power_managment_setting_manual_max">Économie d\'énergie maximale</string>
-    <string name="enable_logging_warning_message">Cette option est activée pour l\'identification des actions à des fins de diagnostic. Cela aide l’équipe à identifier les problèmes liés à l’application. Activez cette option uniquement à la demande du support Organic Maps.</string>
+    <string name="enable_logging_warning_message">Cette option est activée pour l\'identification des actions à des fins de diagnostic. Cela aide l’équipe à identifier les problèmes liés à l’application. Activez cette option uniquement à la demande du support CoMaps.</string>
     <string name="access_rules_author_only">Édition en ligne</string>
     <string name="driving_options_title">Paramètres des itinéraires</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -795,8 +795,8 @@
     <string name="change_map_locale">Langue de la carte</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Données cartographiques d\'OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/fr/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/fr/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap</string>
     <!-- App Tip #00 -->
@@ -820,9 +820,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Notre objectif principal est de créer des cartes rapides, axées sur la confidentialité et faciles à utiliser que vous allez adorer.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Vous utilisez maintenant Organic Maps sur le téléphone</string>
+    <string name="car_used_on_the_phone_screen">Vous utilisez maintenant CoMaps sur le téléphone</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Vous utilisez maintenant Organic Maps dans la voiture</string>
+    <string name="car_used_on_the_car_screen">Vous utilisez maintenant CoMaps dans la voiture</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Vous êtes connecté à Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -830,11 +830,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Afficher dans la voiture</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps a besoin d\'un accès à la localisation. Lorsque c\'est sûr, vérifie la notification sur ton téléphone.</string>
+    <string name="aa_location_permissions_request">CoMaps a besoin d\'un accès à la localisation. Lorsque c\'est sûr, vérifie la notification sur ton téléphone.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Cette application a besoin de ta permission</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps dans Android Auto a besoin des permissions de localisation pour fonctionner efficacement</string>
+    <string name="aa_request_permission_activity_text">CoMaps dans Android Auto a besoin des permissions de localisation pour fonctionner efficacement</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Accorder l\'accès</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -894,7 +894,7 @@
     <string name="mastodon">Mastodon</string>
     <string name="facebook">Facebook</string>
     <string name="matrix">[Matrix]</string>
-    <string name="tts_info_link">https://organicmaps.app/fr/faq/voice/synth%C3%A8se-vocale-tts-sur-android/</string>
+    <string name="tts_info_link">https://comaps.app/fr/faq/voice/synth%C3%A8se-vocale-tts-sur-android/</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="openstreetmap">OpenStreetMap</string>
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 118bc66aa..e27bd69e5 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">डाउनलोड विफल हो गया है</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">पुनः प्रयास करें</string>
-    <string name="about_menu_title">Organic Maps के बारे में</string>
+    <string name="about_menu_title">CoMaps के बारे में</string>
     <!-- Text in About screen -->
     <string name="about_headline">सभी के लिए मुफ़्त, प्यार से बनाया गया</string>
     <!-- Text in About screen -->
@@ -171,7 +171,7 @@
     <string name="description">टिप्पणियाँ</string>
     <string name="share_bookmarks_email_body">नमस्ते!
 \n
-\nमेरे बुकमार्क संलग्न हैं; कृपया उन्हें ऑर्गेनिक मानचित्र में खोलें। यदि आपने इसे इंस्टॉल नहीं किया है तो आप इसे यहां से डाउनलोड कर सकते हैं: https://omaps.app/get?kmz
+\nमेरे बुकमार्क संलग्न हैं; कृपया उन्हें ऑर्गेनिक मानचित्र में खोलें। यदि आपने इसे इंस्टॉल नहीं किया है तो आप इसे यहां से डाउनलोड कर सकते हैं: https://comaps.app/get?kmz
 \n
 \nऑर्गेनिक मैप्स के साथ यात्रा का आनंद लें!</string>
     <!-- message title of loading file -->
@@ -183,7 +183,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">फ़ाइल प्रकार ऐप द्वारा पहचाना नहीं गया है:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">फ़ाइल खोलने में असफल %1$s
 \n
 \n%2$s</string>
@@ -195,13 +195,13 @@
     <string name="cant_change_this_setting">क्षमा करें, मानचित्र संग्रहण सेटिंग वर्तमान में अक्षम हैं।</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">मानचित्र डाउनलोड अभी प्रगति पर है.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">ऑर्गेनिक मानचित्र में मेरा वर्तमान स्थान देखें! %1$s या %2$s के पास ऑफ़लाइन मानचित्र नहीं हैं? यहां डाउनलोड करें: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">ऑर्गेनिक मानचित्र में मेरा वर्तमान स्थान देखें! %1$s या %2$s के पास ऑफ़लाइन मानचित्र नहीं हैं? यहां डाउनलोड करें: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
     <string name="bookmark_share_email_subject">अरे, ऑर्गेनिक मैप्स में मेरा पिन देखें!</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">अरे, ऑर्गेनिक मैप मानचित्र पर मेरा वर्तमान स्थान देखें!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">नमस्ते,
 \n
 \nमैं अब यहाँ हूँ: %1$s. इस लिंक पर क्लिक करें %2$s या यह लिंक %3$s मानचित्र पर स्थान देखने के लिए
@@ -266,7 +266,7 @@
     <string name="menu">मेन्यू</string>
     <!-- Text in menu -->
     <string name="website">वेबसाइट</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">समाचार</string>
     <!-- Text in menu -->
     <string name="github">गिटहब</string>
@@ -290,7 +290,7 @@
     <string name="donate">दान देना</string>
     <string name="already_donated">पहले से दान</string>
     <string name="remind_me_later">बाद में याद दिलाना</string>
-    <string name="support_organic_maps">Organic Maps का समर्थन करें</string>
+    <string name="support_organic_maps">CoMaps का समर्थन करें</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">परियोजना का समर्थन करें</string>
     <!-- Button in the main Help dialog -->
@@ -413,7 +413,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">ऑपरेटर: %s</string>
     <string name="editor_category_unsuitable_title">कोई उपयुक्त श्रेणी नहीं मिल रही?</string>
-    <string name="editor_category_unsuitable_text">ऑर्गेनिक मैप्स केवल सरल बिंदु श्रेणियां जोड़ने की अनुमति देता है, जिसका अर्थ है कि शहर, सड़कें, झीलें, भवन की रूपरेखा आदि नहीं। कृपया ऐसी श्रेणियां सीधे <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> पर जोड़ें।. विस्तृत चरण-दर-चरण निर्देशों के लिए हमारी <a href="https://organicmaps.app/faq/editing/advanced-map-editing">मार्गदर्शिका</a> देखें।</string>
+    <string name="editor_category_unsuitable_text">ऑर्गेनिक मैप्स केवल सरल बिंदु श्रेणियां जोड़ने की अनुमति देता है, जिसका अर्थ है कि शहर, सड़कें, झीलें, भवन की रूपरेखा आदि नहीं। कृपया ऐसी श्रेणियां सीधे <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> पर जोड़ें।. विस्तृत चरण-दर-चरण निर्देशों के लिए हमारी <a href="https://comaps.app/faq/editing/advanced-map-editing">मार्गदर्शिका</a> देखें।</string>
     <!-- abbreviation for meters -->
     <string name="m">मी</string>
     <!-- abbreviation for kilometers -->
@@ -529,8 +529,8 @@
     <string name="enable_show_on_lock_screen_description">सक्षम होने पर, डिवाइस लॉक होने पर भी ऐप लॉकस्क्रीन पर काम करेगा।</string>
     <!-- Current language of the map! -->
     <string name="change_map_locale">मानचित्र भाषा</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/hi/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/hi/</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">हमारे समुदाय-निर्मित मानचित्रों का उपयोग करने के लिए धन्यवाद!</string>
     <!-- App tip #01 -->
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 619441dde..a2d9a638d 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Sikertelen letöltés</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Újrapróbálkozás</string>
-    <string name="about_menu_title">Az Organic Maps névjegye</string>
+    <string name="about_menu_title">Az CoMaps névjegye</string>
     <!-- Text in About screen -->
     <string name="about_headline">Mindenki számára ingyenes – szeretettel készült</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Hardveres gyorsítású OpenGL szükséges. Sajnos az Ön eszköze nem támogatott.</string>
     <string name="download">Letöltés</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Bontsa az USB-kapcsolatot vagy helyezzen be egy memóriakártyát az Organic Maps használatához</string>
+    <string name="disconnect_usb_cable">Bontsa az USB-kapcsolatot vagy helyezzen be egy memóriakártyát az CoMaps használatához</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Az alkalmazás használatához először szabadítson fel némi helyet az SD-kártyán/USB-tárolón</string>
     <string name="download_resources">Mielőtt elkezdené használni az alkalmazást, töltse le az áttekintő világtérképet az eszközre. \nEz %s tárhelyet fog igénybe venni.</string>
@@ -162,7 +162,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Jegyzetek</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Egy Organic Maps könyvjelzőt osztottak meg Önnel</string>
+    <string name="share_bookmarks_email_subject">Egy CoMaps könyvjelzőt osztottak meg Önnel</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Könyvjelzők betöltése</string>
     <!-- Kmz file successful loading -->
@@ -171,7 +171,7 @@
     <string name="load_kmz_failed">Nem sikerült betölteni a könyvjelzőket. A fájl sérült vagy hibás lehet.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Az alkalmazás nem ismeri fel a következő fájltípust:\n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Nem sikerült megnyitni a(z) %1$s fájlt\n\n%2$s</string>
     <!-- resource for context menu -->
     <string name="edit">Szerkesztés</string>
@@ -181,13 +181,13 @@
     <string name="cant_change_this_setting">A térképek tárolása jelenleg ki van kapcsolva.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">A térkép letöltése folyamatban van.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Tekintse meg a helyzetemet az Organic Maps alkalmazásban! %1$s vagy %2$s. Nincs offline térképe? Töltse le innen: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Tekintse meg a helyzetemet az CoMaps alkalmazásban! %1$s vagy %2$s. Nincs offline térképe? Töltse le innen: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Tekintse meg a térképjelzőmet az Organic Maps alkalmazásban!</string>
+    <string name="bookmark_share_email_subject">Tekintse meg a térképjelzőmet az CoMaps alkalmazásban!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Tekintse meg a helyzetemet az Organic Maps alkalmazásban!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Tekintse meg a helyzetemet az CoMaps alkalmazásban!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Üdvözlöm!\n\nJelenleg itt tartózkodom: %1$s. Kattintson a következő hivatkozásra: %2$s, vagy ide: %3$s, hogy megtekintse a helyzetemet a térképen.\n\nKöszönöm!</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Megosztás</string>
@@ -244,7 +244,7 @@
     <string name="search_show_on_map">Megtekintés a térképen</string>
     <!-- Text in menu -->
     <string name="website">Honlap</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Hírek</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Visszajelzés</string>
@@ -258,7 +258,7 @@
     <string name="donate">Adományozás</string>
     <string name="already_donated">Már adományozott</string>
     <string name="remind_me_later">Emlékeztessen később</string>
-    <string name="support_organic_maps">Organic Maps támogatása</string>
+    <string name="support_organic_maps">CoMaps támogatása</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">A projekt támogatása</string>
     <!-- Button in the main Help dialog -->
@@ -480,7 +480,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Közösségi OpenStreetMap adatok innen: %s. Tudjon meg többet a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az Organic Maps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!</string>
+    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!</string>
     <string name="login_to_make_edits_visible">Hozzon létre egy fiókot az OpenStreetMapen, vagy jelentkezzen be, hogy közzétehesse térképszerkesztéseit a világ számára.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d / %2$d</string>
@@ -497,7 +497,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Megjegyzés az OpenStreetMap önkénteseinek (nem kötelező)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet az Organic Maps segítségével szerkeszteni</string>
+    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet az CoMaps segítségével szerkeszteni</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">A szerkesztései feltöltődnek a nyilvános <a href="https://wiki.openstreetmap.org/wiki/Hu:Névjegy">OpenStreetMap</a> adatbázisba. Ne adjon hozzá személyes vagy szerzői jogvédelem alatt álló információkat.</string>
     <string name="editor_more_about_osm">További részletek az OpenStreetMap adatbázisról</string>
@@ -507,7 +507,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Üzemeltető: %s</string>
     <string name="editor_category_unsuitable_title">Nem találja a megfelelő kategóriát?</string>
-    <string name="editor_category_unsuitable_text">Az Organic Maps csak egyszerű pontkategóriák hozzáadását teszi lehetővé, azaz nem tartalmaz városokat, utakat, tavakat, épületek körvonalait stb., az ilyen kategóriákat közvetlenül az <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> oldalon adhatja hozzá. A részletes, lépésről lépésre történő útmutatásért tekintse meg az <a href="https://organicmaps.app/faq/editing/advanced-map-editing">útmutatónkat</a>.</string>
+    <string name="editor_category_unsuitable_text">Az CoMaps csak egyszerű pontkategóriák hozzáadását teszi lehetővé, azaz nem tartalmaz városokat, utakat, tavakat, épületek körvonalait stb., az ilyen kategóriákat közvetlenül az <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> oldalon adhatja hozzá. A részletes, lépésről lépésre történő útmutatásért tekintse meg az <a href="https://comaps.app/faq/editing/advanced-map-editing">útmutatónkat</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Még nem töltött le térképet</string>
     <string name="downloader_no_downloaded_maps_message">Térkép letöltése offline kereséshez és navigáláshoz.</string>
     <!-- abbreviation for meters -->
@@ -561,13 +561,13 @@
     <string name="mobile_data_option_ask">Mindig kérdezzen rá</string>
     <string name="traffic_update_maps_text">Forgalmi adatok megjelenítéséhez frissíteni kell a térképeket.</string>
     <string name="big_font">Betűméret növelése a térképen</string>
-    <string name="traffic_update_app">Frissítse az Organic Maps alkalmazást</string>
+    <string name="traffic_update_app">Frissítse az CoMaps alkalmazást</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Forgalmi adatok nem állnak rendelkezésre</string>
     <string name="enable_logging">Naplózás engedélyezése</string>
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Általános visszajelzés</string>
-    <string name="prefs_languages_information">Az Organic Maps TTS-rendszert használ a hangnavigációhoz. Sok androidos eszköz használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
+    <string name="prefs_languages_information">Az CoMaps TTS-rendszert használ a hangnavigációhoz. Sok androidos eszköz használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Egyes nyelveknél másik beszédszintetizátort vagy további nyelvi csomagot kell telepítenie az alkalmazás-áruházból (Google Play, Galaxy Store, App Gallery, FDroid). \nNyissa meg az eszköz beállításait → Nyelv és bevitel → Beszéd → Szöveg-beszéd átalakító kimenet. \nItt kezelheti a beszédszintézis beállításokat (például: nyelvi csomag letöltése a kapcsolat nélküli használathoz) és másik szövegfelolvasót jelölhet ki.</string>
     <string name="prefs_languages_information_off_link">További tájékoztatást találhat még ebben az útmutatóban.</string>
     <string name="transliteration_title">Átírás latin betűkre</string>
@@ -585,7 +585,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Jelentkezzen be az OpenStreetMap rendszerébe, hogy automatikusan feltölthesse az összes térképszerkesztését. További információ <a href="https://github.com/organicmaps/organicmaps/issues/6144">itt</a>.</string>
     <string name="dialog_error_storage_title">Tárhelyhozzáférési probléma</string>
-    <string name="dialog_error_storage_message">Külső tárhely nem áll rendelkezésre, valószínűleg az SD-kártyát eltávolították vagy sérült, vagy rendszerfájl csak olvasható. Ellenőrizze, és lépjen kapcsolatba velünk a support@organicmaps.app címen</string>
+    <string name="dialog_error_storage_message">Külső tárhely nem áll rendelkezésre, valószínűleg az SD-kártyát eltávolították vagy sérült, vagy rendszerfájl csak olvasható. Ellenőrizze, és lépjen kapcsolatba velünk a support@comaps.app címen</string>
     <string name="setting_emulate_bad_storage">Sérült tároló emulálása</string>
     <string name="core_entrance">Bejárat</string>
     <string name="error_enter_correct_name">Adjon meg egy érvényes nevet</string>
@@ -747,8 +747,8 @@
     <string name="change_map_locale">Térkép nyelve</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Térképadatok az OpenStreetMap adatbázisából</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/hu/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/hu/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Hu:Névjegy</string>
     <!-- App Tip #00 -->
@@ -772,9 +772,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">A fő célunk az, hogy gyors, az adatvédelemre fókuszáló, könnyen használható térképeket készítsünk, amelyeket szeretni fog.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ön most az Organic Maps alkalmazást használja a telefon képernyőjén</string>
+    <string name="car_used_on_the_phone_screen">Ön most az CoMaps alkalmazást használja a telefon képernyőjén</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ön most az Organic Maps alkalmazást használja az autó képernyőjén</string>
+    <string name="car_used_on_the_car_screen">Ön most az CoMaps alkalmazást használja az autó képernyőjén</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Ön kapcsolódik az Android Auto rendszerhez</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -782,11 +782,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Az autó képernyőjére</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Az Organic Maps alkalmazásnak szüksége van a helymeghatározáshoz való hozzáférésre. Ha biztonságos, ellenőrizze az értesítést a telefonján.</string>
+    <string name="aa_location_permissions_request">Az CoMaps alkalmazásnak szüksége van a helymeghatározáshoz való hozzáférésre. Ha biztonságos, ellenőrizze az értesítést a telefonján.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Ennek az alkalmazásnak szüksége van az Ön engedélyére</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Az Organic Maps az Android Autoban helymeghatározási engedélyeket igényel a hatékony működéshez</string>
+    <string name="aa_request_permission_activity_text">Az CoMaps az Android Autoban helymeghatározási engedélyeket igényel a hatékony működéshez</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Engedélyek megadása</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -867,8 +867,8 @@
     <string name="editor_add_phone">Telefonszám hozzáadása</string>
     <string name="download_map_title">Áttekintő világtérkép letöltése</string>
     <string name="mastodon">Mastodon</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
-    <string name="share_bookmarks_email_body">Üdvözlöm!\n\nCsatoltam a könyvjelzőimet; nyissa meg őket az Organic Maps alkalmazásban. Ha még nem telepítette, akkor innen tudja letölteni: https://omaps.app/get?kmz\n\nJó utat kívánok az Organic Maps alkalmazással!</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="share_bookmarks_email_body">Üdvözlöm!\n\nCsatoltam a könyvjelzőimet; nyissa meg őket az CoMaps alkalmazásban. Ha még nem telepítette, akkor innen tudja letölteni: https://comaps.app/get?kmz\n\nJó utat kívánok az CoMaps alkalmazással!</string>
     <string name="disconnect_usb_cable_title">USB-kábel leválasztása</string>
     <string name="error_enter_correct_facebook_page">Adjon meg egy érvényes Facebook-webcímet, fiók- vagy oldalnevet</string>
     <string name="error_enter_correct_twitter_page">Adjon meg egy érvényes X (Twitter) felhasználónevet vagy webcímet</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 36d7c204d..a1ee404a7 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -38,7 +38,7 @@
     <string name="country_status_download_failed">Sedang Mengunduh telah gagal</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Coba Lagi</string>
-    <string name="about_menu_title">Tentang Organic Maps</string>
+    <string name="about_menu_title">Tentang CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratis untuk semua orang, dibuat dengan cinta</string>
     <!-- Text in About screen -->
@@ -55,7 +55,7 @@
     <string name="unsupported_phone">OpenGL yang dipercepat oleh OpenGL diperlukan. Sayangnya, perangkat Anda tidak mendukung.</string>
     <string name="download">Unduh</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Mohon lepas kabel USB atau masukkan kartu memori untuk menggunakan Organic Maps</string>
+    <string name="disconnect_usb_cable">Mohon lepas kabel USB atau masukkan kartu memori untuk menggunakan CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Mohon bebaskan sejumlah ruang pada kartu SD/penyimpanan USB terlebih dahulu untuk menggunakan aplikasi</string>
     <string name="download_resources">Sebelum Anda mulai izinkan kami mengunduh peta dunia secara umum ke perangkat Anda.
@@ -156,7 +156,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Catatan</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Bagikan penanda Organic Maps</string>
+    <string name="share_bookmarks_email_subject">Bagikan penanda CoMaps</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Memuat Penanda</string>
     <!-- Kmz file successful loading -->
@@ -166,7 +166,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Jenis file tidak dikenali oleh aplikasi:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Gagal membuka file %1$s
 \n
 \n%2$s</string>
@@ -178,13 +178,13 @@
     <string name="cant_change_this_setting">Maaf, pengaturan Penyimpanan Peta saat ini sedang non-aktif.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Pengunduhan negara sedang berjalan.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hei, lihat lokasiku saat ini di Organic Maps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hei, lihat lokasiku saat ini di CoMaps! %1$s atau %2$s belum memiliki peta offline? Unduh di sini: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hei, lihat pinku di peta Organic Maps</string>
+    <string name="bookmark_share_email_subject">Hei, lihat pinku di peta CoMaps</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hei, lihat lokasiku saat ini di peta Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hei, lihat lokasiku saat ini di peta CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hai,
 \n
 \nSekarang saya ada di sini: %1$s. Klik tautan ini %2$s atau yang ini %3$s untuk melihat tempatnya di peta.
@@ -243,7 +243,7 @@
     <string name="search_show_on_map">Tampilkan pada peta</string>
     <!-- Text in menu -->
     <string name="website">Situs Web</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Berita</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Umpan balik</string>
@@ -257,7 +257,7 @@
     <string name="donate">Menyumbangkan</string>
     <string name="already_donated">Sudah disumbang</string>
     <string name="remind_me_later">Ingatkan nanti</string>
-    <string name="support_organic_maps">Mendukung Organic Maps</string>
+    <string name="support_organic_maps">Mendukung CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Mendukung proyek</string>
     <!-- Button in the main Help dialog -->
@@ -481,7 +481,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Data OpenStreetMap yang dibuat oleh komunitas pada tanggal %s. Pelajari lebih lanjut mengenai cara mengedit dan memperbarui peta di OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) adalah sebuah proyek komunitas untuk membuat sebuah peta yang bebas dan terbuka. OSM merupakan sumber utama data peta di Organic Maps dan berfungsi mirip dengan Wikipedia. Anda dapat menambahkan atau mengedit tempat dan tempat tersebut tersedia untuk jutaan pengguna di seluruh Dunia.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) adalah sebuah proyek komunitas untuk membuat sebuah peta yang bebas dan terbuka. OSM merupakan sumber utama data peta di CoMaps dan berfungsi mirip dengan Wikipedia. Anda dapat menambahkan atau mengedit tempat dan tempat tersebut tersedia untuk jutaan pengguna di seluruh Dunia.
 \nBergabunglah dengan komunitas dan bantu membuat peta yang lebih baik untuk semua orang!</string>
     <string name="login_to_make_edits_visible">Buat akun OpenStreetMap atau masuk untuk mempublikasikan hasil editan peta Anda ke seluruh dunia.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -509,7 +509,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operator: %s</string>
     <string name="editor_category_unsuitable_title">Tidak dapat menemukan kategori yang sesuai?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps hanya memungkinkan untuk menambahkan kategori titik sederhana, yang berarti tidak ada kota, jalan, danau, garis besar bangunan, dll. Silahkan tambahkan kategori tersebut secara langsung ke <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Lihat <a href="https://organicmaps.app/faq/editing/advanced-map-editing">panduan</a> kami untuk petunjuk langkah demi langkah yang terperinci.</string>
+    <string name="editor_category_unsuitable_text">CoMaps hanya memungkinkan untuk menambahkan kategori titik sederhana, yang berarti tidak ada kota, jalan, danau, garis besar bangunan, dll. Silahkan tambahkan kategori tersebut secara langsung ke <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Lihat <a href="https://comaps.app/faq/editing/advanced-map-editing">panduan</a> kami untuk petunjuk langkah demi langkah yang terperinci.</string>
     <string name="downloader_no_downloaded_maps_title">Tidak ada peta apa pun yang diunduh</string>
     <string name="downloader_no_downloaded_maps_message">Unduh peta untuk menemukan lokasi dan bernavigasi secara offline.</string>
     <string name="current_location_unknown_error_title">Lokasi saat ini tidak diketahui.</string>
@@ -564,7 +564,7 @@
     <string name="mobile_data_option_ask">Selalu Tanya</string>
     <string name="traffic_update_maps_text">Untuk memperlihatkan data lalu lintas, peta harus diperbarui.</string>
     <string name="big_font">Perbesar ukuran huruf pada peta</string>
-    <string name="traffic_update_app">Perbarui Organic Maps</string>
+    <string name="traffic_update_app">Perbarui CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Data lalu lintas tidak tersedia</string>
     <string name="enable_logging">Aktifkan pencatatan</string>
@@ -655,7 +655,7 @@
     <string name="power_managment_setting_never">Jangan pernah</string>
     <string name="power_managment_setting_auto">Otomatis</string>
     <string name="power_managment_setting_manual_max">Hemat daya maksimum</string>
-    <string name="enable_logging_warning_message">Opsi ini mengaktifkan pencatatan untuk tujuan diagnostik. Bisa amat membantu bagi staf dukungan kami yang memecahkan masalah dalam aplikasi. Aktifkan opsi ini hanya saat diminta oleh dukungan Organic Maps.</string>
+    <string name="enable_logging_warning_message">Opsi ini mengaktifkan pencatatan untuk tujuan diagnostik. Bisa amat membantu bagi staf dukungan kami yang memecahkan masalah dalam aplikasi. Aktifkan opsi ini hanya saat diminta oleh dukungan CoMaps.</string>
     <string name="access_rules_author_only">Pengeditan online</string>
     <string name="driving_options_title">Pilihan berkendara</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -745,8 +745,8 @@
     <string name="enable_keep_screen_on_description">Apabila diaktifkan, layar akan selalu menyala ketika menampilkan peta.</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Data peta dari OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/id/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/id/</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Terima kasih telah menggunakan peta buatan komunitas kami!</string>
     <!-- App tip #01 -->
@@ -768,9 +768,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Tujuan utama kami adalah membuat peta yang cepat, berfokus pada privasi, dan mudah digunakan yang akan Anda sukai.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Anda sekarang menggunakan Organic Maps pada layar ponsel</string>
+    <string name="car_used_on_the_phone_screen">Anda sekarang menggunakan CoMaps pada layar ponsel</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Anda sekarang menggunakan Organic Maps pada layar mobil</string>
+    <string name="car_used_on_the_car_screen">Anda sekarang menggunakan CoMaps pada layar mobil</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Anda terhubung ke Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -778,11 +778,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Ke layar mobil</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps membutuhkan akses lokasi. Jika sudah aman, periksa notifikasi di ponsel Anda.</string>
+    <string name="aa_location_permissions_request">CoMaps membutuhkan akses lokasi. Jika sudah aman, periksa notifikasi di ponsel Anda.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Aplikasi ini membutuhkan izin Anda</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps di Android Auto membutuhkan izin lokasi agar dapat bekerja secara efektif</string>
+    <string name="aa_request_permission_activity_text">CoMaps di Android Auto membutuhkan izin lokasi agar dapat bekerja secara efektif</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Memberikan Izin</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index cf2c4cd62..fc9153bd6 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -264,7 +264,7 @@
     <string name="download_map_title">Sækja heims-yfirlitskortið</string>
     <string name="already_donated">Hef þegar styrkt verkefnið</string>
     <string name="remind_me_later">Áminna mig síðar</string>
-    <string name="support_organic_maps">Styddu við Organic Maps</string>
+    <string name="support_organic_maps">Styddu við CoMaps</string>
     <string name="how_to_support_us">Styddu við verkefnið</string>
     <string name="osm_log_out_confirmation">Ertu viss um að þú viljir skrá þig út af OpenStreetMap-aðgangnum þínum?</string>
     <string name="telegram">Telegram</string>
@@ -301,7 +301,7 @@
     <string name="download_has_failed">Mistókst að sækja. Ýttu til að reyna aftur.</string>
     <string name="search_map">Leita á korti</string>
     <string name="try_again">Reyndu aftur</string>
-    <string name="about_menu_title">Um Organic Maps</string>
+    <string name="about_menu_title">Um CoMaps</string>
     <string name="about_headline">Ókeypis fyrir alla, unnið af alúð</string>
     <string name="location_settings">Staðsetningarstillingar</string>
     <string name="download_resources_continue">Fara á kort</string>
@@ -336,8 +336,8 @@
     <string name="disconnect_usb_cable_title">Aftengja USB-kapal</string>
     <string name="enable_keep_screen_on">Halda kveiktu á skjánum</string>
     <string name="enable_show_on_lock_screen">Birta á læsiskjánum</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
     <string name="browser_not_available">Vafri er ekki tiltækur</string>
     <string name="open_in_app">Opna í öðru forriti</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 8df4b657d..62a288380 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Download fallito</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Riprova</string>
-    <string name="about_menu_title">Informazioni su Organic Maps</string>
+    <string name="about_menu_title">Informazioni su CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratuita per tutti, fatta con amore</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">L\'app necessita di OpenGL con accelerazione hardware. Purtroppo, il tuo dispositivo non è supportato.</string>
     <string name="download">Scarica</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda di memoria per poter utilizzare Organic Maps</string>
+    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda di memoria per poter utilizzare CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Libera prima dello spazio sulla scheda SD/ memoria USB per utilizzare l\'app</string>
     <string name="download_resources">Prima di iniziare è necessario scaricare la mappa generale del mondo sul tuo dispositivo.
@@ -152,8 +152,8 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Informazioni</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Questi sono i miei luoghi preferiti su Organic Maps</string>
-    <string name="share_bookmarks_email_body">Ciao! \n \nIn allegato ci sono i miei luoghi preferiti; li puoi aprire con Organic Maps. Oppure, se non ce l\'hai, scarica l\'app per iOS o Android seguendo questo link: https://omaps.app/ \n \nDivertiti a viaggiare con Organic Maps!</string>
+    <string name="share_bookmarks_email_subject">Questi sono i miei luoghi preferiti su CoMaps</string>
+    <string name="share_bookmarks_email_body">Ciao! \n \nIn allegato ci sono i miei luoghi preferiti; li puoi aprire con CoMaps. Oppure, se non ce l\'hai, scarica l\'app per iOS o Android seguendo questo link: https://comaps.app/ \n \nDivertiti a viaggiare con CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Caricamento luoghi preferiti</string>
     <!-- Kmz file successful loading -->
@@ -162,7 +162,7 @@
     <string name="load_kmz_failed">Caricamento dei luoghi preferiti fallito. Il file potrebbe essere corrotto o difettoso.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Questo formato di file non è riconosciuto dall\'app: \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Impossibile aprire il file %1$s
 \n
 \n%2$s</string>
@@ -174,13 +174,13 @@
     <string name="cant_change_this_setting">Le impostazioni di archiviazione delle mappe sono disabilitate al momento.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Il download della mappa è in corso.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Guarda la mia posizione in Organic Maps! %1$s o %2$s Non hai scaricato l\'app? La puoi scaricare da qui: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Guarda la mia posizione in CoMaps! %1$s o %2$s Non hai scaricato l\'app? La puoi scaricare da qui: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Dai un\'occhiata a questo posto su Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Dai un\'occhiata a questo posto su CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Guarda dove mi trovo ora su Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Guarda dove mi trovo ora su CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Ciao,
 \n
 \nSono qui adesso: %1$s. Clicca su questo link %2$s oppure su questo %3$s per vedere il posto sulla mappa.
@@ -243,7 +243,7 @@
     <string name="search_show_on_map">Visualizza sulla mappa</string>
     <!-- Text in menu -->
     <string name="website">Sito web</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Notizie</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Feedback</string>
@@ -257,7 +257,7 @@
     <string name="donate">Dona</string>
     <string name="already_donated">Già donato</string>
     <string name="remind_me_later">Ricorda più tardi</string>
-    <string name="support_organic_maps">Supporta Organic Maps</string>
+    <string name="support_organic_maps">Supporta CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Sostieni il progetto</string>
     <!-- Button in the main Help dialog -->
@@ -486,7 +486,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Dati OpenStreetMap creati dalla comunità aggiornati al %s. Per saperne di più su come modificare e aggiornare la mappa, visita OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) è un progetto comunitario per creare una mappa libera e aperta. È la principale fonte di dati cartografici di Organic Maps e funziona in modo simile a Wikipedia. Puoi aggiungere o modificare luoghi che diventano disponibili per milioni di utenti in tutto il mondo. \nEntra a far parte della comunità e contribuisci a creare una mappa migliore per tutti!</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) è un progetto comunitario per creare una mappa libera e aperta. È la principale fonte di dati cartografici di CoMaps e funziona in modo simile a Wikipedia. Puoi aggiungere o modificare luoghi che diventano disponibili per milioni di utenti in tutto il mondo. \nEntra a far parte della comunità e contribuisci a creare una mappa migliore per tutti!</string>
     <string name="login_to_make_edits_visible">Crea un account OpenStreetMap o effettua il login per pubblicare le tue modifiche alla mappa in tutto il mondo.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d su %2$d</string>
@@ -503,7 +503,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota per i volontari di OpenStreetMap (opzionale)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Descrivi gli errori sulla mappa o le cose che non possono essere modificate con Organic Maps</string>
+    <string name="editor_note_hint">Descrivi gli errori sulla mappa o le cose che non possono essere modificate con CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Le tue modifiche vengono caricate nel database pubblico <a href="https://wiki.openstreetmap.org/wiki/IT:About">OpenStreetMap</a>. Per favore, non aggiungere informazioni personali o protette da copyright.</string>
     <string name="editor_more_about_osm">Informazioni su OpenStreetMap</string>
@@ -513,7 +513,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Gestore: %s</string>
     <string name="editor_category_unsuitable_title">Non riesci a trovare una categoria adatta?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps consente di aggiungere solo punti semplici, escludendo p.es. città, strade, laghi, planimetria edifici ecc. È possibile aggiungere tali categorie direttamente su <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulta la nostra <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guida</a> per istruzioni dettagliate.</string>
+    <string name="editor_category_unsuitable_text">CoMaps consente di aggiungere solo punti semplici, escludendo p.es. città, strade, laghi, planimetria edifici ecc. È possibile aggiungere tali categorie direttamente su <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulta la nostra <a href="https://comaps.app/faq/editing/advanced-map-editing">guida</a> per istruzioni dettagliate.</string>
     <string name="downloader_no_downloaded_maps_title">Non hai scaricato mappe</string>
     <string name="downloader_no_downloaded_maps_message">Scarica mappe per trovare luoghi e navigare offline.</string>
     <string name="current_location_unknown_error_title">Posizione attuale sconosciuta.</string>
@@ -572,7 +572,7 @@
     <string name="mobile_data_option_ask">Chiedi sempre</string>
     <string name="traffic_update_maps_text">Per visualizzare i dati sul traffico, le mappe devono essere aggiornate.</string>
     <string name="big_font">Aumenta dimensione caratteri sulla mappa</string>
-    <string name="traffic_update_app">Aggiorna Organic Maps</string>
+    <string name="traffic_update_app">Aggiorna CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Dati sul traffico non disponibili</string>
     <string name="enable_logging">Abilita il logging</string>
@@ -598,7 +598,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Accedi a OpenStreetMap per caricare automaticamente tutte le tue modifiche alla mappa. Per saperne di più clicca <a href="https://github.com/organicmaps/organicmaps/issues/6144">qui</a>.</string>
     <string name="dialog_error_storage_title">Problema di accesso alla memoria</string>
-    <string name="dialog_error_storage_message">Memoria esterna non disponibile. Probabilmente la scheda SD è stata rimossa, danneggiata o il file system è di sola lettura. Controlla la tua scheda SD o contattaci a support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Memoria esterna non disponibile. Probabilmente la scheda SD è stata rimossa, danneggiata o il file system è di sola lettura. Controlla la tua scheda SD o contattaci a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simula memoria danneggiata</string>
     <string name="core_entrance">Ingresso</string>
     <string name="error_enter_correct_name">Inserire un nome corretto</string>
@@ -767,9 +767,9 @@
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Dati della mappa da OpenStreetMap</string>
     <!-- A link to the TTS FAQ -->
-    <string name="tts_info_link">https://organicmaps.app/it/faq/sintesi-vocale-tts-su-android/</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/it/</string>
+    <string name="tts_info_link">https://comaps.app/it/faq/sintesi-vocale-tts-su-android/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/it/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/IT:About</string>
     <!-- App Tip #00 -->
@@ -793,9 +793,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Il nostro obiettivo principale è creare mappe veloci, incentrate sulla privacy e facili da usare che adorerai.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ora stai utilizzando Organic Maps sullo schermo del telefono</string>
+    <string name="car_used_on_the_phone_screen">Ora stai utilizzando CoMaps sullo schermo del telefono</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ora stai utilizzando Organic Maps sullo schermo dell\'auto</string>
+    <string name="car_used_on_the_car_screen">Ora stai utilizzando CoMaps sullo schermo dell\'auto</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Sei connesso ad Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -803,11 +803,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Passa al display dell\'auto</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps ha bisogno di accedere alla posizione. Quando puoi farlo in sicurezza, controlla la notifica sul tuo telefono.</string>
+    <string name="aa_location_permissions_request">CoMaps ha bisogno di accedere alla posizione. Quando puoi farlo in sicurezza, controlla la notifica sul tuo telefono.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Questa app ha bisogno della tua autorizzazione</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps in Android Auto ha bisogno di accedere alla posizione per funzionare efficacemente</string>
+    <string name="aa_request_permission_activity_text">CoMaps in Android Auto ha bisogno di accedere alla posizione per funzionare efficacemente</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Concedi l\'autorizzazione</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index c60897b99..19e9214c4 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">ההורדה נכשלה</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">נסה שוב</string>
-    <string name="about_menu_title">אודות Organic Maps</string>
+    <string name="about_menu_title">אודות CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">חינם לכולם, מיוצרים באהבה</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">נדרש מאיץ חומרה OpenGL. לצערינו מכשיר זה אינו נתמך.</string>
     <string name="download">הורדה</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">אנא נתק כבל USB או הכנס כרטיס זכרון כדי להשתמש ב-Organic Maps.</string>
+    <string name="disconnect_usb_cable">אנא נתק כבל USB או הכנס כרטיס זכרון כדי להשתמש ב-CoMaps.</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">אנא פנה שטח אחסון בכרטיס הזיכרון או בכונן USB כדי להשתמש בישום</string>
     <string name="download_resources">תחילה, נוריד למכשירך מפה כללית של העולם.
@@ -165,12 +165,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">הערות</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">סימניות של Organic Maps שותפו איתך</string>
+    <string name="share_bookmarks_email_subject">סימניות של CoMaps שותפו איתך</string>
     <string name="share_bookmarks_email_body">שלום!
 \n
-\nמצורפות הסימניות שלי, אפשר לפתוח אותן ב-Organic Maps. אם צריך, ניתן להוריד את האפליקצייה מכאן: https://omaps.app/get?kmz
+\nמצורפות הסימניות שלי, אפשר לפתוח אותן ב-CoMaps. אם צריך, ניתן להוריד את האפליקצייה מכאן: https://comaps.app/get?kmz
 \n
-\nתהנו לנווט עם Organic Maps!</string>
+\nתהנו לנווט עם CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">טוען סימניות</string>
     <!-- Kmz file successful loading -->
@@ -180,7 +180,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">סוג הקובץ אינו מזוהה על ידי האפליקציה:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">נכשל בפתיחת הקובץ %1$s
 \n
 \n%2$s</string>
@@ -192,15 +192,15 @@
     <string name="cant_change_this_setting">מצטערים, הגדרות שמירת מפה אינן זמינות כרגע.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">הורדת מפת המדינה מתבצעת כעת.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">קבלו את המיקום שלי ב-Organic Maps!
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">קבלו את המיקום שלי ב-CoMaps!
 \n%1$s או %2$s
-\nאין לך מפות בלי אינטרנט? להוריד כאן: https://omaps.app/get</string>
+\nאין לך מפות בלי אינטרנט? להוריד כאן: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">היי, בדוק את הסיכה שלי במפה של Organic Maps!</string>
+    <string name="bookmark_share_email_subject">היי, בדוק את הסיכה שלי במפה של CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">היי, בדקו את המיקום הנוכחי שלי במפה של Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">היי, בדקו את המיקום הנוכחי שלי במפה של CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">היי,
 \n
 \nאני כאן: %1$s. הקש על הלינק %2$s או על %3$s כדי לראות את המקום על המפה.
@@ -265,7 +265,7 @@
     <string name="menu">תפריט</string>
     <!-- Text in menu -->
     <string name="website">אתר</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">חדשות</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">משוב</string>
@@ -279,7 +279,7 @@
     <string name="donate">לתרום</string>
     <string name="already_donated">כבר נתרם</string>
     <string name="remind_me_later">הזכר מאוחר יותר</string>
-    <string name="support_organic_maps">לתמוך ב-Organic Maps</string>
+    <string name="support_organic_maps">לתמוך ב-CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">תמכו בפרויקט</string>
     <!-- Button in the main Help dialog -->
@@ -504,7 +504,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">נתוני OpenStreetMap שנוצרו על ידי הקהילה החל מ-%s. למידע נוסף על איך לערוך ולעדכן את המפה ב-OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">\u200FOpenStreetMap.org (OSM) הוא פרויקט קהילתי לבניית מפה חופשית ופתוחה. זהו המקור העיקרי לנתוני מפות ב-Organic Maps והוא פועל בדומה לוויקיפדיה. ניתן להוסיף או לערוך מקומות והם הופכים לזמינים למיליוני משתמשים בכל רחבי העולם.
+    <string name="login_osm_presentation">\u200FOpenStreetMap.org (OSM) הוא פרויקט קהילתי לבניית מפה חופשית ופתוחה. זהו המקור העיקרי לנתוני מפות ב-CoMaps והוא פועל בדומה לוויקיפדיה. ניתן להוסיף או לערוך מקומות והם הופכים לזמינים למיליוני משתמשים בכל רחבי העולם.
 \nהצטרף לקהילה ועזור ליצור מפה טובה יותר לכולם!</string>
     <string name="login_to_make_edits_visible">צור חשבון OpenStreetMap או היכנס כדי לפרסם את עריכות המפה שלך לעולם.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -522,7 +522,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">הערה למתנדבי OpenStreetMap (אופציונלי)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">תארו שגיאות במפה או דברים שלא ניתן לערוך באמצעות Organic Maps</string>
+    <string name="editor_note_hint">תארו שגיאות במפה או דברים שלא ניתן לערוך באמצעות CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">העריכות שלך מועלות למסד הנתונים הציבורי של <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. נא לא להוסיף מידע אישי או מוגן בזכויות יוצרים.</string>
     <string name="editor_more_about_osm">עוד על OpenStreetMap</string>
@@ -532,7 +532,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">מַפעִיל: %s</string>
     <string name="editor_category_unsuitable_title">לא מוצאים קטגוריה מתאימה?</string>
-    <string name="editor_category_unsuitable_text">באמצעות Organic Maps ניתן להוסיף קטגוריות נקודה פשוטות בלבד, כלומר לא ניתן להוסיף עיירות, כבישים, אגמים, מבנים וכו\'. אנא הוסיפו קטגוריות כאלה ישירות ל-<a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. עיינו <a href="https://organicmaps.app/faq/editing/advanced-map-editing">במדריך</a> שלנו לקבלת הוראות מפורטות.</string>
+    <string name="editor_category_unsuitable_text">באמצעות CoMaps ניתן להוסיף קטגוריות נקודה פשוטות בלבד, כלומר לא ניתן להוסיף עיירות, כבישים, אגמים, מבנים וכו\'. אנא הוסיפו קטגוריות כאלה ישירות ל-<a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. עיינו <a href="https://comaps.app/faq/editing/advanced-map-editing">במדריך</a> שלנו לקבלת הוראות מפורטות.</string>
     <string name="downloader_no_downloaded_maps_title">לא הורדת אף מפה</string>
     <string name="downloader_no_downloaded_maps_message">הורד מפה כדי לחפש ולנווט ללא חיבור לאינטרנט.</string>
     <string name="current_location_unknown_error_title">המיקום הנוכחי לא ידוע.</string>
@@ -594,7 +594,7 @@
     <string name="mobile_data_option_ask">שאל תמיד</string>
     <string name="traffic_update_maps_text">כדי להציג מידע על עומס תנועה, יש לעדכן את המפות.</string>
     <string name="big_font">הגדל תגיות במפה</string>
-    <string name="traffic_update_app">נא לעדכן את Organic Maps</string>
+    <string name="traffic_update_app">נא לעדכן את CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">מידע על עומס תנועה לא זמין.</string>
     <string name="enable_logging">הפעל logging</string>
@@ -617,7 +617,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">התחבר ל-OpenStreetMap כדי להעלות אוטומטית את כל עריכות המפה שלך. למידע נוסף <a href="https://github.com/organicmaps/organicmaps/issues/6144">כאן</a>.</string>
     <string name="dialog_error_storage_title">בעיית גישה לאחסון</string>
-    <string name="dialog_error_storage_message">לא ניתן לגשת לאחסון החיצוני. ייתכן כי כרטיס הזיכרון הוסר, נפגם, או שמערכת הקבצים היא לקריאה בלבד. נא לבדוק את כרטיס הזיכרון או ליצור איתנו קשר בכתובת support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">לא ניתן לגשת לאחסון החיצוני. ייתכן כי כרטיס הזיכרון הוסר, נפגם, או שמערכת הקבצים היא לקריאה בלבד. נא לבדוק את כרטיס הזיכרון או ליצור איתנו קשר בכתובת support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">בצע אמולציה לאחסון רע</string>
     <string name="core_entrance">כניסה</string>
     <string name="error_enter_correct_name">נא להזין שם תקין</string>
@@ -810,9 +810,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">המטרה העיקרית שלנו היא לבנות מפות מהירות, ממוקדות פרטיות, קלות לשימוש שתאהבו.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">אתה משתמש כעת ב-Organic Maps במסך הטלפון</string>
+    <string name="car_used_on_the_phone_screen">אתה משתמש כעת ב-CoMaps במסך הטלפון</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">אתה משתמש כעת ב-Organic Maps במסך המכונית</string>
+    <string name="car_used_on_the_car_screen">אתה משתמש כעת ב-CoMaps במסך המכונית</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">אתה מחובר ל-Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index b00616b4c..6d9fc4978 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">ダウンロードに失敗しました</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">再実行</string>
-    <string name="about_menu_title">Organic Mapsについて</string>
+    <string name="about_menu_title">CoMapsについて</string>
     <!-- Text in About screen -->
     <string name="about_headline">すべての人のために無料で、愛を込めて作られています</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">ハードウェアアクセラレーションされたOpenGLが必要です。残念ながらご利用中のデバイスではサポートされていません。</string>
     <string name="download">ダウンロード</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Organic Mapsを利用するにはUSBケーブルを抜くかメモリーカードを挿入してください</string>
+    <string name="disconnect_usb_cable">CoMapsを利用するにはUSBケーブルを抜くかメモリーカードを挿入してください</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">アプリを起動するにはSDカード/USBストレージの空き容量を確保する必要があります</string>
     <string name="download_resources">利用を開始する前におおまかな世界地図をダウンロードします。これには%sの空き容量が必要です。</string>
@@ -164,12 +164,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">メモ</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Mapsのお気に入りリストが共有されました</string>
+    <string name="share_bookmarks_email_subject">CoMapsのお気に入りリストが共有されました</string>
     <string name="share_bookmarks_email_body">こんにちは！
 \n
-\n添付ファイルOrganic Mapsのお気に入りリストです。もしインストールされていない場合はここからダウンロードができます： https://omaps.app/get?kmz
+\n添付ファイルCoMapsのお気に入りリストです。もしインストールされていない場合はここからダウンロードができます： https://comaps.app/get?kmz
 \n
-\n旅行を楽しむときはOrganic Mapsを使用してください!</string>
+\n旅行を楽しむときはCoMapsを使用してください!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">お気に入りをロード中</string>
     <!-- Kmz file successful loading -->
@@ -179,7 +179,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">ファイルタイプがアプリに認識されない：
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">ファイルを開けなかった %1$s
 \n
 \n%2$s</string>
@@ -191,13 +191,13 @@
     <string name="cant_change_this_setting">恐れ入りますが、マップストレージ設定が無効になっています。</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">ダウンロード中です</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Organic Maps で私の現在地が見れます！%1$s または %2$s オフラインマップはまだインストールしていないですか？ここからダウンロード： https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">CoMaps で私の現在地が見れます！%1$s または %2$s オフラインマップはまだインストールしていないですか？ここからダウンロード： https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Organic Mapsでピン情報を確認</string>
+    <string name="bookmark_share_email_subject">CoMapsでピン情報を確認</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Organic Mapsで現在地を確認</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">CoMapsで現在地を確認</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">私の現在地はここ: %1$s
 \n
 \nリンクをクリックすると詳細がマップに表示されます。
@@ -264,7 +264,7 @@
     <string name="menu">メニュー</string>
     <!-- Text in menu -->
     <string name="website">ウェブサイト</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">ニュース</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">フィードバック</string>
@@ -278,7 +278,7 @@
     <string name="donate">寄付</string>
     <string name="already_donated">寄付済み</string>
     <string name="remind_me_later">後でリマインド</string>
-    <string name="support_organic_maps">Organic Maps を支援</string>
+    <string name="support_organic_maps">CoMaps を支援</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">プロジェクトを支援する</string>
     <!-- Button in the main Help dialog -->
@@ -509,7 +509,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">コミュニティが作成した%s時点の OpenStreetMap のデータ。地図の編集や更新の方法については、OpenStreetMap.org を参照してください。</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org(OSM)は、フリーでオープンな地図を構築するコミュニティ・プロジェクトです。OSMは、Organic Mapsの地図データの主要なソースであり、ウィキペディアと同じように機能します。あなたが場所を追加したり編集したりすると、世界中の何百万人ものユーザーがその場所を利用できるようになります！</string>
+    <string name="login_osm_presentation">OpenStreetMap.org(OSM)は、フリーでオープンな地図を構築するコミュニティ・プロジェクトです。OSMは、CoMapsの地図データの主要なソースであり、ウィキペディアと同じように機能します。あなたが場所を追加したり編集したりすると、世界中の何百万人ものユーザーがその場所を利用できるようになります！</string>
     <string name="login_to_make_edits_visible">OpenStreetMapのアカウントを作成するかログインして、あなたの地図編集を世界中に公開しましょう。</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%2$dのうち%1$d</string>
@@ -526,7 +526,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMapボランティアへの注意（オプション）</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">地図上のエラーやOrganic Mapsで編集できないものについて説明します。</string>
+    <string name="editor_note_hint">地図上のエラーやCoMapsで編集できないものについて説明します。</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">あなたの編集は公開されている<a href="https://wiki.openstreetmap.org/wiki/JA:参加する">OpenStreetMap</a>データベースにアップロードされます。個人情報や著作権のある情報は追加しないでください。</string>
     <string name="editor_more_about_osm">OpenStreetMapについての詳細</string>
@@ -536,7 +536,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">運営者: %s</string>
     <string name="editor_category_unsuitable_title">適切なカテゴリーが見つからない？</string>
-    <string name="editor_category_unsuitable_text">つまり、町、道路、湖、建物の輪郭などは追加できない。そのようなカテゴリーは<a href="https://www.openstreetmap.org">OpenStreetMap.org</a>に直接追加してほしい。私たちの<a href="https://organicmaps.app/faq/editing/advanced-map-editing">ガイド</a>のステップバイステップの詳細な手順をチェックする。</string>
+    <string name="editor_category_unsuitable_text">つまり、町、道路、湖、建物の輪郭などは追加できない。そのようなカテゴリーは<a href="https://www.openstreetmap.org">OpenStreetMap.org</a>に直接追加してほしい。私たちの<a href="https://comaps.app/faq/editing/advanced-map-editing">ガイド</a>のステップバイステップの詳細な手順をチェックする。</string>
     <string name="downloader_no_downloaded_maps_title">マップをダウンロードしていません</string>
     <string name="downloader_no_downloaded_maps_message">ロケーションの検索とオフラインナビゲートのためにマップをダウンロードしてください。</string>
     <string name="current_location_unknown_error_title">現在地は不明です。</string>
@@ -598,7 +598,7 @@
     <string name="mobile_data_option_ask">常に確認</string>
     <string name="traffic_update_maps_text">交通データを表示するには、地図を更新する必要があります。</string>
     <string name="big_font">地図上のフォントサイズを大きくする</string>
-    <string name="traffic_update_app">Organic Maps をアップデートしてください</string>
+    <string name="traffic_update_app">CoMaps をアップデートしてください</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">交通データは利用できません</string>
     <string name="enable_logging">ログを有効化</string>
@@ -622,7 +622,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">すべてのマップ編集を自動的にアップロードするには、OpenStreetMapにログインしてください。詳しくは <a href="https://github.com/organicmaps/organicmaps/issues/6144">こちら</a>.</string>
     <string name="dialog_error_storage_title">ストレージアクセスの問題</string>
-    <string name="dialog_error_storage_message">外部ストレージは使用できません。おそらく SD カードが取り外されたか、破損しているか、あるいはファイルシステムが読み取り専用になっています。SD カードを確認するか、support@organicmaps.app までご連絡ください。</string>
+    <string name="dialog_error_storage_message">外部ストレージは使用できません。おそらく SD カードが取り外されたか、破損しているか、あるいはファイルシステムが読み取り専用になっています。SD カードを確認するか、support@comaps.app までご連絡ください。</string>
     <string name="setting_emulate_bad_storage">壊れたストレージをシミュレートする</string>
     <string name="core_entrance">入口</string>
     <string name="error_enter_correct_name">正しい名前を入力してください</string>
@@ -688,7 +688,7 @@
     <string name="power_managment_setting_never">無効</string>
     <string name="power_managment_setting_auto">自動</string>
     <string name="power_managment_setting_manual_max">最大電力節約</string>
-    <string name="enable_logging_warning_message">このオプションは診断目的でのデータ記録を有効にします。これはこのアプリケーションのトラブルシューティングを担当する当社のサポートスタッフの助けになります。このオプションはOrganic Mapsにリクエストされた場合にのみ有効にしてください。</string>
+    <string name="enable_logging_warning_message">このオプションは診断目的でのデータ記録を有効にします。これはこのアプリケーションのトラブルシューティングを担当する当社のサポートスタッフの助けになります。このオプションはCoMapsにリクエストされた場合にのみ有効にしてください。</string>
     <string name="access_rules_author_only">オンライン編集</string>
     <string name="driving_options_title">経路オプション</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -815,7 +815,7 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">私たちの主な目標は、ユーザーに気に入っていただける、プライバシーを重視した使いやすいマップを高速に構築することです。</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">端末の画面でOrganic Mapsを使用している</string>
+    <string name="car_used_on_the_phone_screen">端末の画面でCoMapsを使用している</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
     <string name="car_used_on_the_car_screen">あなたは今、車の画面でオーガニック・マップを使用している</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
@@ -829,7 +829,7 @@
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">このアプリはあなたの許可を必要とする</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Android AutoのOrganic Mapsを有効に機能させるには、位置情報の許可が必要です</string>
+    <string name="aa_request_permission_activity_text">Android AutoのCoMapsを有効に機能させるには、位置情報の許可が必要です</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">許可を与える</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index cced6d094..d37794a0b 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">다운로드에 실패하였습니다</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">다시 시도</string>
-    <string name="about_menu_title">Organic Maps 정보</string>
+    <string name="about_menu_title">CoMaps 정보</string>
     <!-- Text in About screen -->
     <string name="about_headline">사랑으로 만든 모든 사람에게 무료</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">하드웨어 촉진 OpenGL이 요구됩니다. 애석하게도 귀하의 장치는 지원되지 않습니다.</string>
     <string name="download">다운로드</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Organic Maps를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오</string>
+    <string name="disconnect_usb_cable">CoMaps를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">앱을 사용하려면 먼저 SD 카드/USB 저장소의 여유 공간을 확보하세요</string>
     <string name="download_resources">시작하시기 전에 일반 세계 지도를 귀하의 장치로 다운로드하겠습니다.
@@ -152,7 +152,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">메모</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">귀하와 공유된 Organic Maps 즐겨찾기</string>
+    <string name="share_bookmarks_email_subject">귀하와 공유된 CoMaps 즐겨찾기</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">즐겨찾기 로드</string>
     <!-- Kmz file successful loading -->
@@ -162,7 +162,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">파일 형식이 앱에서 인식되지 않습니다:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">파일을 열지 못했습니다 %1$s
 \n
 \n%2$s</string>
@@ -174,13 +174,13 @@
     <string name="cant_change_this_setting">죄송합니다, 지도 스토리지 설정이 비활성화되어 있습니다.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">국가 다운로드가 지금 진행 중입니다.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">현재 위치를 알아 보십시오. %1$s 또는 %2$s 열기</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Organic Maps 지도에서 내 핀 보기</string>
+    <string name="bookmark_share_email_subject">CoMaps 지도에서 내 핀 보기</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Organic Maps 지도에서 제 현재 위치를 살펴 보시기 바랍니다</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">CoMaps 지도에서 제 현재 위치를 살펴 보시기 바랍니다</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">안녕하세요.
 \n
 \n지금 다음 위치에 있습니다: %1$s. %2$s 또는 %3$s 링크를 클릭하여 지도상에서 해당 장소를 살펴보시기 바랍니다.
@@ -239,7 +239,7 @@
     <string name="search_show_on_map">지도 보기</string>
     <!-- Text in menu -->
     <string name="website">웹사이트</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">소식</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">피드백</string>
@@ -253,7 +253,7 @@
     <string name="donate">기부</string>
     <string name="already_donated">기부완료</string>
     <string name="remind_me_later">나중에 알림</string>
-    <string name="support_organic_maps">Organic Maps 지원하기</string>
+    <string name="support_organic_maps">CoMaps 지원하기</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">프로젝트 지원</string>
     <!-- Button in the main Help dialog -->
@@ -503,7 +503,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">연산자: %s</string>
     <string name="editor_category_unsuitable_title">적합한 카테고리를 찾을 수 없나요?</string>
-    <string name="editor_category_unsuitable_text">오가닉 지도에서는 단순한 포인트 카테고리만 추가할 수 있으므로 도시, 도로, 호수, 건물 윤곽선 등은 추가할 수 없습니다. 이러한 카테고리는 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 에 직접 추가하세요. 자세한 단계별 지침은 <a href="https://organicmaps.app/faq/editing/advanced-map-editing">가이드</a>를 참조하세요.</string>
+    <string name="editor_category_unsuitable_text">오가닉 지도에서는 단순한 포인트 카테고리만 추가할 수 있으므로 도시, 도로, 호수, 건물 윤곽선 등은 추가할 수 없습니다. 이러한 카테고리는 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 에 직접 추가하세요. 자세한 단계별 지침은 <a href="https://comaps.app/faq/editing/advanced-map-editing">가이드</a>를 참조하세요.</string>
     <string name="downloader_no_downloaded_maps_title">지도를 다운로드하지 않았습니다</string>
     <string name="downloader_no_downloaded_maps_message">오프라인으로 위치를 검색하려면 지도를 다운로드하세요.</string>
     <string name="current_location_unknown_error_title">현재 위치를 알 수 없습니다.</string>
@@ -558,7 +558,7 @@
     <string name="mobile_data_option_ask">항상 표시</string>
     <string name="traffic_update_maps_text">교통 데이터를 표시하려면 지도를 업데이트해야 합니다.</string>
     <string name="big_font">지도에서 글꼴 크기 늘리기</string>
-    <string name="traffic_update_app">Organic Maps를 업데이트하세요.</string>
+    <string name="traffic_update_app">CoMaps를 업데이트하세요.</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">교통 데이터를 사용할 수 없습니다</string>
     <string name="enable_logging">로깅 사용</string>
@@ -584,7 +584,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">모든 지도 편집 내용을 자동으로 업로드하려면 오픈스트리트맵에 로그인하세요. 자세히 알아보기 <a href="https://github.com/organicmaps/organicmaps/issues/6144">여기</a>.</string>
     <string name="dialog_error_storage_title">저장소 액세스 문제</string>
-    <string name="dialog_error_storage_message">외부 저장소를 사용할 수 없습니다. SD 카드가 제거되었거나 손상되었거나 파일 시스템이 읽기 전용일 수 있습니다. 확인 후 support\@organicmaps.app로 문의하세요.</string>
+    <string name="dialog_error_storage_message">외부 저장소를 사용할 수 없습니다. SD 카드가 제거되었거나 손상되었거나 파일 시스템이 읽기 전용일 수 있습니다. 확인 후 support\@comaps.app로 문의하세요.</string>
     <string name="setting_emulate_bad_storage">불량 저장소 에뮬레이션</string>
     <string name="core_entrance">입구</string>
     <string name="error_enter_correct_name">올바른 이름을 입력하세요.</string>
@@ -649,7 +649,7 @@
     <string name="power_managment_setting_never">안함</string>
     <string name="power_managment_setting_auto">자동</string>
     <string name="power_managment_setting_manual_max">최대 전력 절약</string>
-    <string name="enable_logging_warning_message">이 옵션은 진단을 목적으로 로그를 엽니다 이를 통해 앱에 대한 문제를 분석하는 우리의 스탭을 도울 수 있습니다 이 옵션은 오직 Organic Maps 지원 요청에서만 가능합니다.</string>
+    <string name="enable_logging_warning_message">이 옵션은 진단을 목적으로 로그를 엽니다 이를 통해 앱에 대한 문제를 분석하는 우리의 스탭을 도울 수 있습니다 이 옵션은 오직 CoMaps 지원 요청에서만 가능합니다.</string>
     <string name="access_rules_author_only">온라인 수정</string>
     <string name="driving_options_title">운전 옵션</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index 718387a54..348ffcd6f 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">Atsiuntimas nepavyko</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Bandyti dar kartą</string>
-    <string name="about_menu_title">Apie „Organic Maps“</string>
+    <string name="about_menu_title">Apie „CoMaps“</string>
     <!-- Text in About screen -->
     <string name="about_headline">Nemokama visiems, sukurta su meile</string>
     <!-- Text in About screen -->
@@ -54,7 +54,7 @@
     <string name="unsupported_phone">Šiai programėlei reikia aparatinio „OpenGL“ spartinimo. Deja, jūsų įrenginys nepalaikomas.</string>
     <string name="download">Atsiųsti</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Jeigu norite naudotis „Organic Maps“, atjunkite USB kabelį arba įdėkite atminties kortelę</string>
+    <string name="disconnect_usb_cable">Jeigu norite naudotis „CoMaps“, atjunkite USB kabelį arba įdėkite atminties kortelę</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Jeigu norite naudotis programėle, atlaisvinkite vietos SD kortelėje ar USB atmintinėje</string>
     <string name="download_resources">Prieš pradėdami naudotis programėle, leiskite atsiųsti bendrąjį pasaulio žemėlapį į jūsų įrenginį. \nJis užims %s vietos saugykloje.</string>
@@ -158,8 +158,8 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Pastabos</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Su jumis bendrinamas „Organic Maps“ žymių sąrašas</string>
-    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano žymių sąrašas iš „Organic Maps“ programėlės. Jei jos neturi, gali ją parsisiųsti iš https://omaps.app/get?kmz \n \nSmagių kelionių su „Organic Maps“!</string>
+    <string name="share_bookmarks_email_subject">Su jumis bendrinamas „CoMaps“ žymių sąrašas</string>
+    <string name="share_bookmarks_email_body">Labas! \n \nČia prisegtas mano žymių sąrašas iš „CoMaps“ programėlės. Jei jos neturi, gali ją parsisiųsti iš https://comaps.app/get?kmz \n \nSmagių kelionių su „CoMaps“!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Žymių sąrašas įkeliamas</string>
     <!-- Kmz file successful loading -->
@@ -168,7 +168,7 @@
     <string name="load_kmz_failed">Žymių sąrašo nepavyko įkelti. Gali būti, kad failas sugadintas.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Programėlė neatpažįsta failo tipo: \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Nepavyko atverti failo %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
     <string name="edit">Taisyti</string>
@@ -178,13 +178,13 @@
     <string name="cant_change_this_setting">Deja, šiuo metu žemėlapio saugyklos nustatymai negalimi.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Vyksta žemėlapio atsiuntimas.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Pažiūrėk, kur dabar esu „Organic Maps“ autonominių žemėlapių programėlėje! %1$s arba %2$s . Neturi jos? Atsisiųsk čia: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Pažiūrėk, kur dabar esu „CoMaps“ autonominių žemėlapių programėlėje! %1$s arba %2$s . Neturi jos? Atsisiųsk čia: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Labas, pažvelk, ką aš pasižymėjau „Organic Maps“ žemėlapyje!</string>
+    <string name="bookmark_share_email_subject">Labas, pažvelk, ką aš pasižymėjau „CoMaps“ žemėlapyje!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Žvilgtelk, kur dabar esu, „Organic Maps“ žemėlapyje!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Žvilgtelk, kur dabar esu, „CoMaps“ žemėlapyje!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Labas, \n\nŠiuo metu esu čia: %1$s. Spustelėk čia: %2$s, arba čia: %3$s, kad pamatytum šią vietą žemėlapyje. \n \nAčiū.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Bendrinti</string>
@@ -237,7 +237,7 @@
     <string name="menu">Meniu</string>
     <!-- Text in menu -->
     <string name="website">Svetainė</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Naujienos</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Atsiliepimas</string>
@@ -251,7 +251,7 @@
     <string name="donate">Paaukoti</string>
     <string name="already_donated">Jau paaukojau</string>
     <string name="remind_me_later">Priminti vėliau</string>
-    <string name="support_organic_maps">Paremti „Organic Maps“</string>
+    <string name="support_organic_maps">Paremti „CoMaps“</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Paremti projektą</string>
     <!-- Button in the main Help dialog -->
@@ -482,7 +482,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Bendruomenės surinkti „OpenStreetMap“ duomenys %s dienai. Sužinokite, kaip redaguoti ir atnaujinti žemėlapį, apsilankydami OpenStreetMap.org svetainėje</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) – tai bendruomenės projektas, kuriuo siekiama sukurti laisvą ir atvirą žemėlapį. Tai – pagrindinis „Organic Maps“ žemėlapių duomenų šaltinis, veikiantis panašiu principu, kaip „Vikipedija“. Galite pridėti ar taisyti vietas, o jos tampa prieinamos milijonams naudotojų visame pasaulyje. \nPrisijunkite prie bendruomenės ir padėkite kurti geresnį žemėlapį visiems!</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) – tai bendruomenės projektas, kuriuo siekiama sukurti laisvą ir atvirą žemėlapį. Tai – pagrindinis „CoMaps“ žemėlapių duomenų šaltinis, veikiantis panašiu principu, kaip „Vikipedija“. Galite pridėti ar taisyti vietas, o jos tampa prieinamos milijonams naudotojų visame pasaulyje. \nPrisijunkite prie bendruomenės ir padėkite kurti geresnį žemėlapį visiems!</string>
     <string name="login_to_make_edits_visible">Susikurkite „OpenStreetMap“ paskyrą arba prisijunkite, kad galėtumėte skelbti savo žemėlapio pakeitimus pasauliui.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d iš %2$d</string>
@@ -499,7 +499,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Pastaba „OpenStreetMap“ talkininkams (neprivaloma)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Aprašykite žemėlapyje esančias klaidas arba dalykus, kurių negalite redaguoti, naudodamiesi „Organic Maps“</string>
+    <string name="editor_note_hint">Aprašykite žemėlapyje esančias klaidas arba dalykus, kurių negalite redaguoti, naudodamiesi „CoMaps“</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Jūsų pakeitimai įkeliami į viešą <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">„OpenStreetMap“</a> duomenų bazę. Prašome nedėti asmeninės ar autorių teisėmis apsaugotos informacijos.</string>
     <string name="editor_more_about_osm">Plačiau apie „OpenStreetMap“</string>
@@ -509,7 +509,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operatorius: %s</string>
     <string name="editor_category_unsuitable_title">Nerandate tinkamos kategorijos?</string>
-    <string name="editor_category_unsuitable_text">„Organic Maps“ leidžia pridėti tik paprastų kategorijas taškus – jokių miestų, kelių, ežerų, pastatų kontūrų ir pan. šia programėle pridėti negalima. Šių kategorijų objektus pridėkite naudodamiesi <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> svetaine. Žvilgtelėkite į mūsų <a href="https://organicmaps.app/faq/editing/advanced-map-editing">vadovą</a>, kuriame rasite išsamias pažingsnines instrukcijas.</string>
+    <string name="editor_category_unsuitable_text">„CoMaps“ leidžia pridėti tik paprastų kategorijas taškus – jokių miestų, kelių, ežerų, pastatų kontūrų ir pan. šia programėle pridėti negalima. Šių kategorijų objektus pridėkite naudodamiesi <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> svetaine. Žvilgtelėkite į mūsų <a href="https://comaps.app/faq/editing/advanced-map-editing">vadovą</a>, kuriame rasite išsamias pažingsnines instrukcijas.</string>
     <string name="downloader_no_downloaded_maps_title">Nesate atsiuntę jokių žemėlapių</string>
     <string name="downloader_no_downloaded_maps_message">Atsiųskite žemėlapius, kad galėtumėte ieškoti vietų ir keliauti neprisijungę prie tinklo.</string>
     <string name="current_location_unknown_error_title">Dabartinė vieta nežinoma.</string>
@@ -571,7 +571,7 @@
     <string name="mobile_data_option_ask">Visada klausti</string>
     <string name="traffic_update_maps_text">Jeigu norite matyti eismo duomenis, reikia atnaujinti žemėlapius.</string>
     <string name="big_font">Padidinti žemėlapio užrašų šrifto dydį</string>
-    <string name="traffic_update_app">Atnaujinkite „Organic Maps“</string>
+    <string name="traffic_update_app">Atnaujinkite „CoMaps“</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Eismo duomenys neprieinami</string>
     <string name="enable_logging">Įgalinti derinimo žurnalą</string>
@@ -595,7 +595,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Prisijunkite prie „OpenStreetMap“, kad galėtumėte automatiškai įkelti visus savo žemėlapio pakeitimus. Išsamesnė informacija – <a href="https://github.com/organicmaps/organicmaps/issues/6144">čia</a>.</string>
     <string name="dialog_error_storage_title">Prieigos prie saugyklos problema</string>
-    <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliuoti blogą saugyklą</string>
     <string name="core_entrance">Įėjimas</string>
     <string name="error_enter_correct_name">Įveskite teisingą pavadinimą</string>
@@ -751,11 +751,11 @@
     <!-- App tip #04 -->
     <string name="app_tip_04">Bakstelėkite bet kurį žemėlapio tašką norimam objektui pasirinkti. Bakstelėkite ir palaikykite, kad paslėptumėte ar vėl pamatytumėte programėlės sąsają.</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">„Organic Maps“ programėlei reikia prieigos prie vietos . Kai bus saugu, patikrinkite pranešimą savo telefone.</string>
+    <string name="aa_location_permissions_request">„CoMaps“ programėlei reikia prieigos prie vietos . Kai bus saugu, patikrinkite pranešimą savo telefone.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Šiai programėlei reikia jūsų leidimo</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Kad „Android Auto“ sistemoje „Organic Maps“ veiktų efektyviai, reikia leidimo nustatyti buvimo vietą</string>
+    <string name="aa_request_permission_activity_text">Kad „Android Auto“ sistemoje „CoMaps“ veiktų efektyviai, reikia leidimo nustatyti buvimo vietą</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
     <string name="button_layer_outdoor">Žygiai pėsčiomis</string>
     <!-- Text displayed when a webview or a browser are disabled, and external links can't be opened. -->
@@ -831,15 +831,15 @@
     <string name="avoid_tolls">Vengti mokamų kelių</string>
     <string name="avoid_motorways">Vengti greitkelių</string>
     <string name="enable_keep_screen_on">Laikyti ekraną įjungtą</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="app_tip_00">Dėkojame, kad naudojatės mūsų bendruomenės sukurtais žemėlapiais!</string>
     <string name="app_tip_02">Patinka šį programėlė? Paremkite, paaukodami jos vystymui! Dar ne? Papasakokite mums, kodėl, ir mes pasistengsime tai pataisyti!</string>
     <string name="app_tip_05">Ar žinote, jog galite pasirinkti savo dabartinę vietą žemėlapyje?</string>
     <string name="app_tip_06">Galite padėti išversti šią programėlę į savo kalbą.</string>
     <string name="app_tip_08">Galite pataisyti ar papildyti žemėlapio duomenis.</string>
     <string name="app_tip_09">Mūsų pagrindinis tikslas – sukurti spartų, privatų ir paprastą naudotis žemėlapį, kuris patiktų visiems.</string>
-    <string name="car_used_on_the_phone_screen">Dabar naudojatės „Organic Maps“ telefono ekrane</string>
-    <string name="car_used_on_the_car_screen">Dabar naudojatės „Organic Maps“ automobilio ekrane</string>
+    <string name="car_used_on_the_phone_screen">Dabar naudojatės „CoMaps“ telefono ekrane</string>
+    <string name="car_used_on_the_car_screen">Dabar naudojatės „CoMaps“ automobilio ekrane</string>
     <plurals name="bookmarks_places">
         <item quantity="one">%d žymė</item>
         <item quantity="few">%d žymės</item>
@@ -860,5 +860,5 @@
     <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="aa_grant_permissions">Suteikti leidimą</string>
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
 </resources>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index a838bf001..66f2a68eb 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Lejupielāde neizdevās</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Mēģināt vēlreiz</string>
-    <string name="about_menu_title">Par „Organic Maps“</string>
+    <string name="about_menu_title">Par „CoMaps“</string>
     <!-- Text in About screen -->
     <string name="about_headline">Bezmaksas, pieejama visiem un veidota ar mīlestību</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Lietotnei nepieciešams „OpenGL“ aparatūras paātrinājums, bet diemžēl Jūsu ierīce to neatbalsta.</string>
     <string name="download">Lejupielādēt</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Lai lietotu „Organic Maps“, atvienojiet USB kabeli vai ievietojiet atmiņas karti.</string>
+    <string name="disconnect_usb_cable">Lai lietotu „CoMaps“, atvienojiet USB kabeli vai ievietojiet atmiņas karti.</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Lietotnes izmantošanai atbrīvojiet vietu ierīces krātuvē</string>
     <string name="download_resources">Pirms sākt izmantot lietotni lejupielādējiet pasaules pārskata karti.
@@ -168,7 +168,7 @@
     <string name="share_bookmarks_email_subject">Ar jums kopīgoja „Oranic Maps“ grāmatzīmes</string>
     <string name="share_bookmarks_email_body">Sveiki!
 \n
-\nPielikumā ir grāmatzīmes. Lūdzu, atveriet tās „Organic Maps“ lietotnē. Ja Jums tā nav instalēta, instalējiet to te: https://omaps.app/get?kmz
+\nPielikumā ir grāmatzīmes. Lūdzu, atveriet tās „CoMaps“ lietotnē. Ja Jums tā nav instalēta, instalējiet to te: https://comaps.app/get?kmz
 \n
 \nBaudiet ceļošanu ar „Oranic Maps“!</string>
     <!-- message title of loading file -->
@@ -180,7 +180,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Lietotne neatpazīst datnes tipu:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Neizdevās atvērt datni %1$s
 \n
 \n%2$s</string>
@@ -192,13 +192,13 @@
     <string name="cant_change_this_setting">Atvainojamies, bet kartes saglabāšanas iestatījumi šobrīd ir izslēgti.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Notiek kartes lejupielāde.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Apskatiet manu atrašanās vietu „Organic Maps“ lietotnē! %1$s vai %2$s Vai Jums nav nesaistes kartes? Lejupielādējiet to: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Apskatiet manu atrašanās vietu „CoMaps“ lietotnē! %1$s vai %2$s Vai Jums nav nesaistes kartes? Lejupielādējiet to: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hei, apskatiet manu grāmatzīmi Organic Maps kartē!</string>
+    <string name="bookmark_share_email_subject">Hei, apskatiet manu grāmatzīmi CoMaps kartē!</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Hei, apskati manu atrašanās vietu „Oganic Maps“ kartē!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hei, \n \nŠobrīd atrodos te: %1$s. Spied uz šīs %2$s vai šīs %3$s saites, lai kartē redzētu manu atrašanās vietu. \n \nPaldies.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Kopīgot</string>
@@ -259,7 +259,7 @@
     <string name="menu">Izvēlne</string>
     <!-- Text in menu -->
     <string name="website">Tīmekļa vietne</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Jaunumi</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Atsauksmes</string>
@@ -272,7 +272,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Ziedot</string>
     <string name="remind_me_later">Atgādināt vēlāk</string>
-    <string name="support_organic_maps">Atbalstīt Organic Maps</string>
+    <string name="support_organic_maps">Atbalstīt CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Atbalstiet projektu</string>
     <!-- Button in the main Help dialog -->
@@ -503,7 +503,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Kopienas veidotie „OpenStreetMap“ dati, %s. Uzziniet vairāk par to, kā piedalīties kartes rediģēšanā un uzlabošanā vietnē „OpenStreetMap.org“.</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ir kopienas projekts, kura mērķis ir izveidot atvērtajos datos balstītu karti, kura ir pieejama bez maksas. Tas ir Organic Maps galvenais karšu datu avots un darbojas līdzīgi kā Vikipēdija. Jūs varat pievienot vai rediģēt vietas, un tās kļūst pieejamas miljoniem lietotāju visā pasaulē.\nPievienojieties kopienai, lai palīdzētu izveidot labāku karti visiem!</string>
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) ir kopienas projekts, kura mērķis ir izveidot atvērtajos datos balstītu karti, kura ir pieejama bez maksas. Tas ir CoMaps galvenais karšu datu avots un darbojas līdzīgi kā Vikipēdija. Jūs varat pievienot vai rediģēt vietas, un tās kļūst pieejamas miljoniem lietotāju visā pasaulē.\nPievienojieties kopienai, lai palīdzētu izveidot labāku karti visiem!</string>
     <string name="login_to_make_edits_visible">Izveidojiet OpenStreetMap kontu vai piesakieties, lai publicētu savas kartes rediģējumus visā pasaulē.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d no %2$d</string>
@@ -522,7 +522,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operators: %s</string>
     <string name="editor_category_unsuitable_title">Vai neatrodat atbilstošu kategoriju?</string>
-    <string name="editor_category_unsuitable_text">„Organic Maps“ ļauj pievienot tikai vienkāršu punktu kategorijas, proti, nevarat pievienot pilsētas, ceļus, ezerus, ēku aprises u.tml. Šādas kategorijas lūdzam pievienot tiešā veidā <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Lai uzzinātu, kā to izdarīt, sekojiet norādēm <a href="https://organicmaps.app/faq/editing/advanced-map-editing">rokasgrāmatā</a>.</string>
+    <string name="editor_category_unsuitable_text">„CoMaps“ ļauj pievienot tikai vienkāršu punktu kategorijas, proti, nevarat pievienot pilsētas, ceļus, ezerus, ēku aprises u.tml. Šādas kategorijas lūdzam pievienot tiešā veidā <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Lai uzzinātu, kā to izdarīt, sekojiet norādēm <a href="https://comaps.app/faq/editing/advanced-map-editing">rokasgrāmatā</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Ierīcē nav lejupielādētu karšu</string>
     <string name="downloader_no_downloaded_maps_message">Lai darbotos nesaistes navigācija un meklēšana, lejupielādējiet kartes.</string>
     <string name="current_location_unknown_error_title">Pašreizējā vieta nav zināma.</string>
@@ -584,7 +584,7 @@
     <string name="mobile_data_option_ask">Jautāt vienmēr</string>
     <string name="traffic_update_maps_text">Lai parādītu satiksmes datus, kartes ir jāatjaunina.</string>
     <string name="big_font">Palielināt fonta lielumu kartē</string>
-    <string name="traffic_update_app">Atjauniniet „Organic Maps“</string>
+    <string name="traffic_update_app">Atjauniniet „CoMaps“</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Satiksmes dati nav pieejami</string>
     <string name="enable_logging">Ieslēgt žurnalēšanu</string>
@@ -610,7 +610,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Ierakstieties „OpenStreetMap“, lai automātiski augšupielādētu visus kartes rediģējumus. Uzziniet vairāk <a href="https://github.com/organicmaps/organicmaps/issues/6144">te</a>.</string>
     <string name="dialog_error_storage_title">Krātuves pieejas problēma</string>
-    <string name="dialog_error_storage_message">Ārējā krātuve nav pieejama. Iespējams, ir izņemta vai bojāta SD karte, vai arī datņu sistēma ir tikai lasāma. Pārbaudiet savu SD karti vai sazinieties ar mums, rakstot uz support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Ārējā krātuve nav pieejama. Iespējams, ir izņemta vai bojāta SD karte, vai arī datņu sistēma ir tikai lasāma. Pārbaudiet savu SD karti vai sazinieties ar mums, rakstot uz support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulēt bojātu krātuvi</string>
     <string name="core_entrance">Ieeja</string>
     <string name="error_enter_correct_name">Ierakstiet pareizu nosaukumu</string>
@@ -787,7 +787,7 @@
     <!-- App tip #01 -->
     <string name="app_tip_01">Ar jūsu ziedojumiem un atbalstu varam izveidot pasaulē labākās kartes!</string>
     <!-- App tip #02 -->
-    <string name="app_tip_02">Vai jums patīk mūsu lietotne? Lūdzam ziedot tās attīstībai! Varbūt tā nepatīk? Tādā gadījumā lūdzam mums pastāstīt, kas tajā nepatīk, lai varam „Organic Maps“ uzlabot!</string>
+    <string name="app_tip_02">Vai jums patīk mūsu lietotne? Lūdzam ziedot tās attīstībai! Varbūt tā nepatīk? Tādā gadījumā lūdzam mums pastāstīt, kas tajā nepatīk, lai varam „CoMaps“ uzlabot!</string>
     <!-- App tip #03 -->
     <string name="app_tip_03">Ja pazīstat kādu programmatūras izstrādātāju, varat viņam vai viņai palūgt ieviest funkciju, kas jums pietrūkst.</string>
     <!-- App tip #05 -->
@@ -801,9 +801,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Mūsu mērķis ir izveidot viegli lietojamas kartes, kas respektē jūsu privātumu un kuras jums patiks.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Tagad „Organic Maps“ izmantojat tālruņa ekrānā</string>
+    <string name="car_used_on_the_phone_screen">Tagad „CoMaps“ izmantojat tālruņa ekrānā</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Tagad „Organic Maps“ izmantojat automobiļa ekrānā</string>
+    <string name="car_used_on_the_car_screen">Tagad „CoMaps“ izmantojat automobiļa ekrānā</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Savienojās ar „Android Audio“</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -854,7 +854,7 @@
     <string name="stop_without_saving">Pārtraukt ierakstīšanu</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="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="continue_recording">Turpināt ierakstīt</string>
     <string name="track_recording_alert_title">Saglabāt ceļu grāmatzīmju sadaļā?</string>
     <string name="editor_other_info">Piezīme OpenStreetMap brīvprātigajiem (nav obligāts)</string>
@@ -864,8 +864,8 @@
     <string name="aa_request_permission_notification">Šai lietotnei ir nepieciešama jūsu atļauja</string>
     <string name="editor_about_osm">Jūsu labojumi tiek augšupielādēti sabiedriskajā <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> datubāzē. Lūdzu, nepievienojiet personisku vai ar autortiesībām aizsargātu informāciju.</string>
     <string name="gb">GB</string>
-    <string name="aa_location_permissions_request">Organic Maps lietotnes darbībai ir nepieciešama piekļuve jūsu atrašanās vietai. Kad tas ir droši, pārbaudiet paziņojumu savā tālrunī.</string>
-    <string name="editor_note_hint">Aprakstiet kļūdas kartē vai lietas, ko nevar rediģēt, izmantojot Organic Maps</string>
+    <string name="aa_location_permissions_request">CoMaps lietotnes darbībai ir nepieciešama piekļuve jūsu atrašanās vietai. Kad tas ir droši, pārbaudiet paziņojumu savā tālrunī.</string>
+    <string name="editor_note_hint">Aprakstiet kļūdas kartē vai lietas, ko nevar rediģēt, izmantojot CoMaps</string>
     <string name="mb">MB</string>
-    <string name="aa_request_permission_activity_text">Organic Maps lietotnei ir nepieciešama atrašanās vietas atļauja sekmīgai Android Auto darbībai</string>
+    <string name="aa_request_permission_activity_text">CoMaps lietotnei ir nepieciešama atrašanās vietas atļauja sekmīgai Android Auto darbībai</string>
 </resources>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index eb956b292..a957077f0 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">डाउनलोड अयशस्वी</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">पुन्हा प्रयत्न करा</string>
-    <string name="about_menu_title">Organic Maps बद्दल</string>
+    <string name="about_menu_title">CoMaps बद्दल</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• बॅटरी संपत नाही, ऑफलाइन कार्य करते</string>
     <!-- Text in About screen -->
@@ -47,7 +47,7 @@
     <string name="unsupported_phone">ह्या ऍपला हार्डवेअर प्रवेगक OpenGL आवश्यक आहे. दुर्दैवाने, तुमच्या उपकरणाला ह्याचा आधार नाही.</string>
     <string name="download">डाउनलोड करा</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Organic Maps वापरण्यासाठी कृपया USB केबल काढून टाका किंवा मेमरी कार्ड घाला</string>
+    <string name="disconnect_usb_cable">CoMaps वापरण्यासाठी कृपया USB केबल काढून टाका किंवा मेमरी कार्ड घाला</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">कृपया ऍप वापरण्यासाठी प्रथम SD कार्ड/USB स्टोरेजवरील काही जागा मोकळी करा</string>
     <string name="download_resources">ऍपचा वापर सुरू करण्यापूर्वी, आम्हाला तुमच्या उपकरणावर जगाचा सामान्य नकाशा डाउनलोड करण्याची परवानगी द्या.
@@ -143,12 +143,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">चिठ्ठया</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps द्वारे तुम्हाला खूणपत्रे सामायिक केले</string>
+    <string name="share_bookmarks_email_subject">CoMaps द्वारे तुम्हाला खूणपत्रे सामायिक केले</string>
     <string name="share_bookmarks_email_body">नमस्कार!
 \n
-\nOrganic Maps ऍप मधील माझे खूणपत्रे संलग्न केले आहेत. तुम्ही Organic Maps इन्स्टॉल केले असल्यास हे खूणपत्रे उघडा. इन्स्टॉल केले नसल्यास, पुढील दुव्यावर जाऊन तुमच्या iOS किंवा अँड्रॉइड उपकरणावर हे डाउनलोड करा: https://omaps.app/get?kmz
+\nCoMaps ऍप मधील माझे खूणपत्रे संलग्न केले आहेत. तुम्ही CoMaps इन्स्टॉल केले असल्यास हे खूणपत्रे उघडा. इन्स्टॉल केले नसल्यास, पुढील दुव्यावर जाऊन तुमच्या iOS किंवा अँड्रॉइड उपकरणावर हे डाउनलोड करा: https://comaps.app/get?kmz
 \n
-\nOrganic Maps सह प्रवासाचा आनंद घ्या!</string>
+\nCoMaps सह प्रवासाचा आनंद घ्या!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">खूणपत्रे वाचत आहे</string>
     <!-- Kmz file successful loading -->
@@ -158,7 +158,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">फाइल प्रकार ॲपद्वारे ओळखला जात नाही:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">फाइल उघडण्यात अयशस्वी%1$s
 \n
 \n%2$s</string>
@@ -170,13 +170,13 @@
     <string name="cant_change_this_setting">क्षमस्व, नकाशा साठवायचे सेटिंग सध्या बंद आहेत.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">नकाशा डाउनलोड होत आहे</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">मी आता इथे आहे %1$s किंवा %2$s Organic Maps डाउनलोड करा: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">मी आता इथे आहे %1$s किंवा %2$s CoMaps डाउनलोड करा: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Organic Maps द्वारे एक खूणपत्र पाठवत आहे!</string>
+    <string name="bookmark_share_email_subject">CoMaps द्वारे एक खूणपत्र पाठवत आहे!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Organic Maps द्वारे माझे वर्तमान स्थान पाठवत आहे!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">CoMaps द्वारे माझे वर्तमान स्थान पाठवत आहे!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">नमस्कार,
 \n
 \nमी आता इथे आहे: %1$s. नकाशावर ठिकाण पाहण्यासाठी या %2$s किंवा या %3$s वर क्लिक करा.
@@ -235,7 +235,7 @@
     <string name="search_show_on_map">नकाशावर पहा</string>
     <!-- Text in menu -->
     <string name="website">संकेतस्थळ</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">बातम्या</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">अभिप्राय</string>
@@ -247,7 +247,7 @@
     <string name="faq">वारंवार विचारलेले प्रश्न</string>
     <string name="already_donated">आधीच दान केले</string>
     <string name="remind_me_later">नंतर आठवण करून द्या</string>
-    <string name="support_organic_maps">Organic Maps ला समर्थन द्या</string>
+    <string name="support_organic_maps">CoMaps ला समर्थन द्या</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">प्रकल्पाला पाठठिंबा द्या</string>
     <!-- Button in the main Help dialog -->
@@ -501,7 +501,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">ऑपरेटर: %s</string>
     <string name="editor_category_unsuitable_title">योग्य श्रेणी शोधू शकत नाही?</string>
-    <string name="editor_category_unsuitable_text">ऑरगॅनिक नकाशे फक्त साध्या बिंदू श्रेणी जोडण्याची परवानगी देतात, म्हणजे शहरे, रस्ते, तलाव, इमारत बाह्यरेखा इ. कृपया अशा श्रेणी थेट <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> वर जोडा. तपशीलवार चरण-दर-चरण सूचनांसाठी आमचे <a href="https://organicmaps.app/faq/editing/advanced-map-editing">मार्गदर्शक</a> पहा.</string>
+    <string name="editor_category_unsuitable_text">ऑरगॅनिक नकाशे फक्त साध्या बिंदू श्रेणी जोडण्याची परवानगी देतात, म्हणजे शहरे, रस्ते, तलाव, इमारत बाह्यरेखा इ. कृपया अशा श्रेणी थेट <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> वर जोडा. तपशीलवार चरण-दर-चरण सूचनांसाठी आमचे <a href="https://comaps.app/faq/editing/advanced-map-editing">मार्गदर्शक</a> पहा.</string>
     <string name="downloader_no_downloaded_maps_title">तुम्ही कोणतेही नकाशे डाउनलोड केलेले नाहीत</string>
     <string name="downloader_no_downloaded_maps_message">स्थान शोधण्यासाठी नकाशे डाउनलोड करा आणि ऑफलाइन मार्गनिर्देशन वापरा.</string>
     <string name="current_location_unknown_error_title">वर्तमान स्थान अज्ञात आहे.</string>
@@ -560,7 +560,7 @@
     <string name="mobile_data_option_ask">नेहमी विचारा</string>
     <string name="traffic_update_maps_text">वाहतूक माहिती दाखवण्यासाठी नकाशे अद्ययावत करणे आवश्यक आहे.</string>
     <string name="big_font">नकाशावर अक्षरांचा आकार वाढवा</string>
-    <string name="traffic_update_app">कृपया Organic Maps अद्ययावत करा</string>
+    <string name="traffic_update_app">कृपया CoMaps अद्ययावत करा</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">वाहतूक माहिती उपलब्ध नाही</string>
     <string name="enable_logging">लॉग चालू करा</string>
@@ -586,7 +586,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">तुमची सर्व नकाशा संपादने स्वयंचलितपणे अपलोड करण्यासाठी कृपया OpenStreetMap वर लॉग इन करा. <a href="https://github.com/organicmaps/organicmaps/issues/6144">येथे</a> अधिक जाणून घ्या.</string>
     <string name="dialog_error_storage_title">स्टोरेज प्रवेश समस्या</string>
-    <string name="dialog_error_storage_message">बाह्य साठ्याचा प्रवेश अपयशी. SD कार्ड कदाचित काढले गेले असेल, खराब झाले असेल किंवा फाइल सिस्टम ही केवळ-वाचनीय असावी. कृपया, तुमचे SD कार्ड तपासा किंवा support\@organicmaps.app वर आमच्याशी संपर्क साधा</string>
+    <string name="dialog_error_storage_message">बाह्य साठ्याचा प्रवेश अपयशी. SD कार्ड कदाचित काढले गेले असेल, खराब झाले असेल किंवा फाइल सिस्टम ही केवळ-वाचनीय असावी. कृपया, तुमचे SD कार्ड तपासा किंवा support\@comaps.app वर आमच्याशी संपर्क साधा</string>
     <string name="setting_emulate_bad_storage">खराब साठ्याचे अनुकरण करा</string>
     <string name="core_entrance">प्रवेशद्वार</string>
     <string name="error_enter_correct_name">कृपया योग्य नाव प्रविष्ट करा</string>
@@ -755,8 +755,8 @@
     <string name="enable_show_on_lock_screen_description">चालू असल्यास, ऍप चालू असताना प्रत्येक वेळी तुम्हाला तुमचे उपकरण अनलॉक करण्याची आवश्यकता नाही.</string>
     <!-- Current language of the map! -->
     <string name="change_map_locale">नकाशाची भाषा</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/mr/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/mr/</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">आमचे समुदाय-निर्मित नकाशे वापरल्याबद्दल धन्यवाद!</string>
     <!-- App tip #01 -->
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index ae96e0aa9..5ed6c45ea 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -32,7 +32,7 @@
     <string name="country_status_download_failed">It-tniżżil falla</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Erġa prova</string>
-    <string name="about_menu_title">Dwar Organic Maps</string>
+    <string name="about_menu_title">Dwar CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">B\' xejn għal kulħadd, magħmul bl-imħabba</string>
     <!-- Text in About screen -->
@@ -49,7 +49,7 @@
     <string name="unsupported_phone">L-applikazzjoni għanda bżonn \'hardware accelerated OpenGL\'. Sfortunatament, l-apparat tiegħek ma jappoġġjax dan.</string>
     <string name="download">Niżżel</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Jekk jogħġbok neħħi il-USB kejbil jew daħħal karta tal-memorja biex tuża Organic Maps</string>
+    <string name="disconnect_usb_cable">Jekk jogħġbok neħħi il-USB kejbil jew daħħal karta tal-memorja biex tuża CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Jekk jogħġbok żid ftit spazju fuq il-karta tal-memorja jew il-ħażna tal-USB biex tkun tista tuża l-applikazzjoni</string>
     <string name="download_resources">Qabel ma tibda tuża l-applikazzjoni, niżżel il-mappa ġenerali tad-dinja fuq l-apparat. 
@@ -153,12 +153,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Noti</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps bookmarks maqsuma miegħek</string>
+    <string name="share_bookmarks_email_subject">CoMaps bookmarks maqsuma miegħek</string>
     <string name="share_bookmarks_email_body">Helow!
 \n
-\nMehmuża huma il-bookmarks; iftaħhom ġo Organic Maps. Jekk mhuwiex installat tista tniżżlu min hawn: https://omaps.app/get?kmz
+\nMehmuża huma il-bookmarks; iftaħhom ġo CoMaps. Jekk mhuwiex installat tista tniżżlu min hawn: https://comaps.app/get?kmz
 \n
-\nĦu pjaċir ivvjaġġa ġo Organic Maps!</string>
+\nĦu pjaċir ivvjaġġa ġo CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Tgħobijja tal-bookmarks</string>
     <!-- Kmz file successful loading -->
@@ -168,7 +168,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">It-tip tal-fajl mhuwiex rikonoxxut mill-applikazzjoni:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Il-fajl falla biex jiftaħ %1$s
 \n
 \n%2$s</string>
@@ -180,13 +180,13 @@
     <string name="cant_change_this_setting">Jiddispjaċini, is-settings tal-Ħażna tal-Mappa huma mitfija bħalissa.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">It-tniżżil tal-mappa għaddej bħalissa.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Ara il-lokażżjoni kurrenti tiegħi ġo Organic Maps! %1$s or %2$s M\'għandekx mapep offlajn? Niżżel hawn: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Ara il-lokażżjoni kurrenti tiegħi ġo CoMaps! %1$s or %2$s M\'għandekx mapep offlajn? Niżżel hawn: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Merħba, ara il-pin tiegħi fuq Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Merħba, ara il-pin tiegħi fuq CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Merħba, ara il-lokażżjoni kurrenti tiegħi fuq il-mappa ta\'Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Merħba, ara il-lokażżjoni kurrenti tiegħi fuq il-mappa ta\'CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Merħba, 
 \n
 \nJien qiegħed hawn: %1$s. Għaffas din il-link %2$s jew fuq din %3$s biex tara il-post fuq il-mappa.
@@ -230,7 +230,7 @@
     <string name="faq">Mistoqsijiet Frekwenti</string>
     <string name="already_donated">Ġa mogħtija id-donazzjoni</string>
     <string name="remind_me_later">Fakkar aktar tard</string>
-    <string name="support_organic_maps">Appoġġja lill-Organic Maps</string>
+    <string name="support_organic_maps">Appoġġja lill-CoMaps</string>
     <string name="how_to_support_us">Appoġġja lill-proġett</string>
     <string name="copyright">Drittijiet tal-awtur</string>
     <string name="report_a_bug">Irrapporta problemi bl-app</string>
@@ -394,7 +394,7 @@
     <string name="mobile_data_option_ask">Staqsi Dejjem</string>
     <string name="traffic_update_maps_text">Biex tintwera d-dejta dwar it-traffiku, il-mapep iridu jiġu aġġornati.</string>
     <string name="big_font">Żid id-daqs għat-tikketti tal-mapep</string>
-    <string name="traffic_update_app">Aġġorna Organic Maps</string>
+    <string name="traffic_update_app">Aġġorna CoMaps</string>
     <string name="enable_logging">Attiva l-illoggjar</string>
     <string name="prefs_languages_information_off_link">Għal aktar informazzjoni jekk jogħġbok iċċekkja din il-gwida.</string>
     <string name="core_exit">Oħroġ</string>
@@ -403,7 +403,7 @@
     <string name="button_plan">Pjan</string>
     <string name="placepage_add_stop">Żid Waqfa</string>
     <string name="dialog_error_storage_title">Problema tal-aċċess għall-ħażna</string>
-    <string name="dialog_error_storage_message">Il-ħżin estern mhuwiex aċċessibbli. Il-kard tal-SD setgħet tneħħiet, saritilha l-ħsara, jew is-sistema tal-fajl tinqara biss. Jekk jogħġbok, iċċekkja l-karta tal-SD tiegħek jew ikkuntattjana fuq support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Il-ħżin estern mhuwiex aċċessibbli. Il-kard tal-SD setgħet tneħħiet, saritilha l-ħsara, jew is-sistema tal-fajl tinqara biss. Jekk jogħġbok, iċċekkja l-karta tal-SD tiegħek jew ikkuntattjana fuq support@comaps.app</string>
     <string name="core_entrance">Daħla</string>
     <string name="error_enter_correct_name">Daħħal isem korrett</string>
     <string name="bookmark_lists">Listi</string>
@@ -477,7 +477,7 @@
     <string name="app_tip_02">Togħġbok l-app tagħna? Jekk jogħġbok agħti donazzjoni biex tappoġġja l-iżvilupp! Għadha ma togħġbokx? Jekk jogħġbok għidilna għaliex, u nirranġawha!</string>
     <string name="app_tip_03">Jekk taf żviluppatur tas-softwer, tista’ titolbu jimplimenta il-karatteristika li għandek bżonn.</string>
     <string name="app_tip_06">Tista’ tgħin sabiex tittraduċi l-applikazzjoni tagħna fil-lingwa tiegħek.</string>
-    <string name="aa_request_permission_activity_text">organic Maps ġo\' Android Auto jeħtieġ permessi tal-post biex jaħdem b ’mod effettiv</string>
+    <string name="aa_request_permission_activity_text">CoMaps ġo\' Android Auto jeħtieġ permessi tal-post biex jaħdem b ’mod effettiv</string>
     <string name="aa_grant_permissions">Għati Permess</string>
     <string name="volume">Volum</string>
     <string name="bookmarks_export">Esporta l-bookmarks u l-korsiji kollha</string>
@@ -530,7 +530,7 @@
     <string name="enable_show_on_lock_screen_description">Meta tkun attivata, l-applikazzjoni taħdem fuq il-lockscreen anki meta t-tagħmir ikun imsakkar.</string>
     <string name="editor_comment_hint">Kumment…</string>
     <string name="editor_about_osm">L-editjar tiegħek jittella’ fid-database pubblika <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">ta’ OpenStreetMap</a>. Jekk jogħġbok iżżidx informazzjoni personali jew bid-drittijiet tal-awtur.</string>
-    <string name="editor_category_unsuitable_text">Organic Maps jippermetti li jiżdiedu kategoriji punti sempliċi biss, li jfisser l-ebda bliet, toroq, lagi, linji ġenerali tal-bini, eċċ. Jekk jogħġbok żid dawn il-kategoriji direttament mal-<a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Iċċekkja l-<a href="https://organicmaps.app/faq/editing/advanced-map-editing">gwida</a> tagħna għal struzzjonijiet dettaljati.</string>
+    <string name="editor_category_unsuitable_text">CoMaps jippermetti li jiżdiedu kategoriji punti sempliċi biss, li jfisser l-ebda bliet, toroq, lagi, linji ġenerali tal-bini, eċċ. Jekk jogħġbok żid dawn il-kategoriji direttament mal-<a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Iċċekkja l-<a href="https://comaps.app/faq/editing/advanced-map-editing">gwida</a> tagħna għal struzzjonijiet dettaljati.</string>
     <string name="learn_more">Tgħallem iktar</string>
     <string name="editor_share_to_all_dialog_message_1">Kun ċert li ma daħħalt l-ebda informazzjoni privata jew personali.</string>
     <string name="error_enter_correct_instagram_page">Daħħal isem l-utent jew indirizz tal-web validu ta’ Instagram</string>
@@ -577,7 +577,7 @@
     <string name="editor_default_language_hint">Kif inhi miktuba bil-lingwa lokali</string>
     <string name="layers_title">Stili u Saffi tal-Mapep</string>
     <string name="fuel_places">Stazzjonijiet tal-Gass</string>
-    <string name="editor_note_hint">Iddeskrivi l-iżbalji fuq il-mappa jew l-affarijiet li ma jistgħux jiġu editjati ġewwa Organic Maps</string>
+    <string name="editor_note_hint">Iddeskrivi l-iżbalji fuq il-mappa jew l-affarijiet li ma jistgħux jiġu editjati ġewwa CoMaps</string>
     <string name="placepage_remove_stop">Neħħi l-Waqfa</string>
     <string name="enable_logging_warning_message">Attiva din l-għażla biex tirrekordja u tibgħat manwalment dijanjostiċi dettaljati dwar il-kwistjoni tiegħek lilna billi tuża “Irrapporta problemi” fid-djalogu għajnuna. Ir-reġistri jistgħu jinkludu informazzjoni dwar il-post.</string>
     <string name="trip_finished">Wasalt!</string>
@@ -656,12 +656,12 @@
     <string name="start_track_recording">Rekord Track</string>
     <string name="enable_keep_screen_on">Żomm l-iskrin mixgħul</string>
     <string name="app_tip_00">Grazzi talli użajtu l-mapep tagħna mibnija mill-komunita’!</string>
-    <string name="car_used_on_the_car_screen">Issa qed tuża Organic Maps fuq l-iskrin tal-karozza</string>
+    <string name="car_used_on_the_car_screen">Issa qed tuża CoMaps fuq l-iskrin tal-karozza</string>
     <string name="app_tip_09">L-għan ewlieni tagħna huwa li nibnu mapep veloċi, iffukati fuq il-privatezza, u faċli biex jintużaw li se jinħabbu.</string>
     <string name="app_tip_05">Kont taf li l-post attwali tiegħek fuq il-mappa jista’ jintgħażel?</string>
     <string name="select_option">Agħżel l-għażla</string>
     <string name="app_tip_08">Tista’ faċilment tirranġa u ttejjeb l-informazzjoni tal-mappa.</string>
-    <string name="car_used_on_the_phone_screen">Issa qed tuża Organic Maps fuq l-iskrin tat-telefown</string>
+    <string name="car_used_on_the_phone_screen">Issa qed tuża CoMaps fuq l-iskrin tat-telefown</string>
     <string name="uri_open_location_failed">Ebda applikazzjoni installata li tista’ tiftaħ il-post</string>
     <string name="aa_connected_title">Int imqabbad ma’ Android Auto</string>
     <string name="car_continue_in_the_car">Lejn l-iskrin tal-karozza</string>
@@ -671,7 +671,7 @@
     <string name="error_no_file_manager_app">Ma jistax juri d-djalogu tal-għażla tal-fowlder għax l-ebda applikazzjoni xierqa mhi installata fuq it-tagħmir tiegħek. Installa applikazzjoni tal-maniġer tal-fajl u erġa ’pprova.</string>
     <string name="browser_not_available">Brawżer tal-web mhux disponibbli</string>
     <string name="view_menu">Ara l-Menu</string>
-    <string name="aa_location_permissions_request">Organic Maps teħtieġ aċċess għall-post. Meta jkun sigur, iċċekkja n-notifika fuq il-mowbajl tiegħek.</string>
+    <string name="aa_location_permissions_request">CoMaps teħtieġ aċċess għall-post. Meta jkun sigur, iċċekkja n-notifika fuq il-mowbajl tiegħek.</string>
     <string name="pref_tts_no_system_tts">Is-settings tas-Sinteżi tad-diskors ma nstabux, żgur li t-tagħmir tiegħek jappoġġjah?</string>
     <string name="track_recording_alert_title">Issejvja fil-Bookmarks u l-Korsiji?</string>
     <string name="settings">Settings</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 7a8a00a28..2b8b358d8 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -38,7 +38,7 @@
     <string name="country_status_download_failed">Laster ned mislyktes</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Prøv på nytt</string>
-    <string name="about_menu_title">Om Organic Maps</string>
+    <string name="about_menu_title">Om CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratis for alle, laget med kjærlighet</string>
     <!-- Text in About screen -->
@@ -55,7 +55,7 @@
     <string name="unsupported_phone">En maskinvareakselerert OpenGL kreves. Dessverre støttes ikke enheten din.</string>
     <string name="download">Last ned</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Koble fra USB-kabelen eller sett inn minnekortet for å bruke Organic Maps</string>
+    <string name="disconnect_usb_cable">Koble fra USB-kabelen eller sett inn minnekortet for å bruke CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Frigjør plass på SD-kortet/USB-enheten først for å bruke appen</string>
     <string name="download_resources">Før du begynner, la oss laste ned det generelle verdenskartet til enheten. Det trengs %s med data.</string>
@@ -167,12 +167,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Merknader</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Delte Organic Maps-bokmerker</string>
+    <string name="share_bookmarks_email_subject">Delte CoMaps-bokmerker</string>
     <string name="share_bookmarks_email_body">Hei!
 \n
-\nVedlagt er mine bokmerker fra Organic Maps-appen. Åpne de dersom du har Organic Maps installert. Har du ikke har det, last ned appen til iOS eller Android ved å trykke på denne linken: https://omaps.app/get?kmz
+\nVedlagt er mine bokmerker fra CoMaps-appen. Åpne de dersom du har CoMaps installert. Har du ikke har det, last ned appen til iOS eller Android ved å trykke på denne linken: https://comaps.app/get?kmz
 \n
-\nNyt reisen med Organic Maps!</string>
+\nNyt reisen med CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Laster inn bokmerker</string>
     <!-- Kmz file successful loading -->
@@ -182,7 +182,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen gjenkjennes ikke av appen:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Kunne ikke åpne filen %1$s
 \n
 \n%2$s</string>
@@ -194,13 +194,13 @@
     <string name="cant_change_this_setting">Beklager, innstillingene for kartlagring er for øyeblikket deaktivert.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Nedlasting av land pågår nå.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hei, se posisjonen min på Organic Maps! %1$s eller %2$s Har du ikke offline-kart? Last dem ned her: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hei, se posisjonen min på CoMaps! %1$s eller %2$s Har du ikke offline-kart? Last dem ned her: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hei, se merket mitt på Organic Maps-kartet</string>
+    <string name="bookmark_share_email_subject">Hei, se merket mitt på CoMaps-kartet</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hei, se posisjonen min på Organic Maps-kartet!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hei, se posisjonen min på CoMaps-kartet!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hei,Jeg er her nå: %1$s. Klikk på denne koblingen %2$s eller denne %3$s for å se stedet på kartet.
 \n
 \nTakk.</string>
@@ -263,7 +263,7 @@
     <string name="menu">Meny</string>
     <!-- Text in menu -->
     <string name="website">Nettside</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nyheter</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Tilbakemelding</string>
@@ -277,7 +277,7 @@
     <string name="donate">Donere</string>
     <string name="already_donated">Allerede donert</string>
     <string name="remind_me_later">Påminn senere</string>
-    <string name="support_organic_maps">Støtte Organic Maps</string>
+    <string name="support_organic_maps">Støtte CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Støtt prosjektet</string>
     <!-- Button in the main Help dialog -->
@@ -506,7 +506,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Fellesskapsopprettede OpenStreetMap-data fra %s. Les mer om hvordan du redigerer og oppdaterer kartet på OpenStreetMap.org.</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) er et fellesskapsprosjekt for å bygge et gratis og åpent kart. Det er hovedkilden til kartdata i Organic Maps og fungerer på samme måte som Wikipedia. Du kan legge til eller redigere steder, og de blir tilgjengelige for millioner av brukere over hele verden. 
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) er et fellesskapsprosjekt for å bygge et gratis og åpent kart. Det er hovedkilden til kartdata i CoMaps og fungerer på samme måte som Wikipedia. Du kan legge til eller redigere steder, og de blir tilgjengelige for millioner av brukere over hele verden. 
 \nBli med i fellesskapet og bidra til å lage et bedre kart for alle!</string>
     <string name="login_to_make_edits_visible">Opprett en OpenStreetMap-konto eller logg inn for å publisere kartredigeringene dine til hele verden.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -524,7 +524,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Merknad til OpenStreetMap-frivillige (valgfritt)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Beskriv feil på kartet eller ting som ikke kan redigeres med Organic Maps</string>
+    <string name="editor_note_hint">Beskriv feil på kartet eller ting som ikke kan redigeres med CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Dine endringer lastes opp til den offentlige <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>-databasen. Vennligst ikke legg til personlig eller opphavsrettsbeskyttet informasjon.</string>
     <string name="editor_more_about_osm">Mer om OpenStreetMap</string>
@@ -534,7 +534,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operatør: %s</string>
     <string name="editor_category_unsuitable_title">Finner du ikke en passende kategori?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps tillater kun å legge til enkle punktkategorier, det vil si ingen byer, veier, innsjøer, bygningsomriss osv. Vennligst legg til slike kategorier direkte til <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Sjekk vår <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guide</a> for detaljerte trinnvise instruksjoner.</string>
+    <string name="editor_category_unsuitable_text">CoMaps tillater kun å legge til enkle punktkategorier, det vil si ingen byer, veier, innsjøer, bygningsomriss osv. Vennligst legg til slike kategorier direkte til <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Sjekk vår <a href="https://comaps.app/faq/editing/advanced-map-editing">guide</a> for detaljerte trinnvise instruksjoner.</string>
     <string name="downloader_no_downloaded_maps_title">Du har ikke lastet ned noen kart</string>
     <string name="downloader_no_downloaded_maps_message">Last ned kart for å finne plasseringen og navigere frakoblet.</string>
     <string name="current_location_unknown_error_title">Gjeldende plassering er ukjent.</string>
@@ -596,7 +596,7 @@
     <string name="mobile_data_option_ask">Alltid spør</string>
     <string name="traffic_update_maps_text">For å vise trafikkdata må kartene i appen være oppdaterte.</string>
     <string name="big_font">Forstørr skriften på kartet</string>
-    <string name="traffic_update_app">Vennligst oppdater Organic Maps</string>
+    <string name="traffic_update_app">Vennligst oppdater CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Trafikkdata er ikke tilgjengelig</string>
     <string name="enable_logging">Aktiver loggføring</string>
@@ -622,7 +622,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Logg inn på OpenStreetMap for automatisk å laste opp alle kartredigeringene dine. Finn ut mer <a href="https://github.com/organicmaps/organicmaps/issues/6144">her</a>.</string>
     <string name="dialog_error_storage_title">Problemer med tilgang til lagring</string>
-    <string name="dialog_error_storage_message">Ekstern lagring er ikke tilgjengelig. Sannsynligvis er SD-kortet fjernet eller skadet eller så er filsystemet skrivebeskyttet. Undersøk og kontakt oss på support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Ekstern lagring er ikke tilgjengelig. Sannsynligvis er SD-kortet fjernet eller skadet eller så er filsystemet skrivebeskyttet. Undersøk og kontakt oss på support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulere skadet lagring</string>
     <string name="core_entrance">Inngang</string>
     <string name="error_enter_correct_name">Skriv inn korrekt navn</string>
@@ -689,7 +689,7 @@
     <string name="power_managment_setting_never">Aldri</string>
     <string name="power_managment_setting_auto">Automatisk</string>
     <string name="power_managment_setting_manual_max">Maksimum strømsparing</string>
-    <string name="enable_logging_warning_message">Alternativet slår på logging for diagnostiske formål. Det kan være nyttig for våre supportpersonale som feilsøker problemer med appen. Aktiver dette alternativet bare på forespørsel fra Organic Maps-brukerstøtte.</string>
+    <string name="enable_logging_warning_message">Alternativet slår på logging for diagnostiske formål. Det kan være nyttig for våre supportpersonale som feilsøker problemer med appen. Aktiver dette alternativet bare på forespørsel fra CoMaps-brukerstøtte.</string>
     <string name="access_rules_author_only">Redigering på nett</string>
     <string name="driving_options_title">Kjørealternativer</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -815,9 +815,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Vårt hovedmål er å bygge raske, personvernfokuserte, brukervennlige kart som du vil elske.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Du bruker nå Organic Maps på telefonskjermen</string>
+    <string name="car_used_on_the_phone_screen">Du bruker nå CoMaps på telefonskjermen</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Du bruker nå Organic Maps på bilskjermen</string>
+    <string name="car_used_on_the_car_screen">Du bruker nå CoMaps på bilskjermen</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Du er koblet til Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -825,11 +825,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Til bilens skjerm</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps trenger posisjonstilgang. Når det er trygt, kan du sjekke varslingen på telefonen.</string>
+    <string name="aa_location_permissions_request">CoMaps trenger posisjonstilgang. Når det er trygt, kan du sjekke varslingen på telefonen.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Denne appen trenger din tillatelse</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps i Android Auto trenger en posisjonstillatelse for å fungere effektivt</string>
+    <string name="aa_request_permission_activity_text">CoMaps i Android Auto trenger en posisjonstillatelse for å fungere effektivt</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Gi tillatelser</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 4e64368bc..88af540da 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Downloaden is mislukt</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Probeer opnieuw</string>
-    <string name="about_menu_title">Over Organic Maps</string>
+    <string name="about_menu_title">Over CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratis voor iedereen, met liefde gemaakt</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Een hardware geaccellereerde OpenGL is nodig. Jammer genoeg wordt uw apparaat niet ondersteund.</string>
     <string name="download">Download</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Verwijder de USB-kabel of plaats een geheugenkaart om Organic Maps te gebruiken</string>
+    <string name="disconnect_usb_cable">Verwijder de USB-kabel of plaats een geheugenkaart om CoMaps te gebruiken</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Maak eerst ruimte vrij op de SD-kaart/USB-opslag om de app te gebruiken</string>
     <string name="download_resources">Voordat u start, laten we de algemene wereldkaart naar uw apparaat downloaden.
@@ -167,12 +167,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Bladwijzers van Organic Maps zijn met u gedeeld</string>
+    <string name="share_bookmarks_email_subject">Bladwijzers van CoMaps zijn met u gedeeld</string>
     <string name="share_bookmarks_email_body">Hallo!
 \n
-\nBijgesloten zijn mijn bladwijzers uit de Organic Maps app. Open ze als je Organic Maps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://omaps.app/get?kmz
+\nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://comaps.app/get?kmz
 \n
-\nGeniet van het reizen met Organic Maps!</string>
+\nGeniet van het reizen met CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Bladwijzers worden geladen</string>
     <!-- Kmz file successful loading -->
@@ -182,7 +182,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Bestand openen mislukt %1$s
 \n
 \n%2$s</string>
@@ -194,13 +194,13 @@
     <string name="cant_change_this_setting">Sorry, instellingen voor kaartopslag zijn momenteel uitgeschakeld.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">De kaart wordt nu gedownload.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hey, kijk naar mijn huidige locatie op Organic Maps! %1$s of %2$s Heeft u geen offline-kaarten? Download ze hier: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hey, kijk naar mijn huidige locatie op CoMaps! %1$s of %2$s Heeft u geen offline-kaarten? Download ze hier: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, bekijk mijn pin op Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Hey, bekijk mijn pin op CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hey, bekijk mijn huidige locatie op Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hey, bekijk mijn huidige locatie op CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hoi,
 \n
 \nMomenteel ben ik hier: %1$s. Klik op deze %2$s link of deze %3$s link om de plaats op de kaart te zien.
@@ -263,7 +263,7 @@
     <string name="search_show_on_map">Bekijk op de kaart</string>
     <!-- Text in menu -->
     <string name="website">Website</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nieuws</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Feedback</string>
@@ -277,7 +277,7 @@
     <string name="donate">Doneer</string>
     <string name="already_donated">Reeds gedoneerd</string>
     <string name="remind_me_later">Herinner later</string>
-    <string name="support_organic_maps">Ondersteun Organic Maps</string>
+    <string name="support_organic_maps">Ondersteun CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Steun het project</string>
     <!-- Button in the main Help dialog -->
@@ -506,7 +506,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %s. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) is een gemeenschapsproject om een vrije en open kaart te bouwen. Het is de belangrijkste bron van kaartgegevens in Organic Maps en werkt ongeveer hetzelfde als Wikipedia. U kunt plaatsen toevoegen of bewerken en deze worden dan beschikbaar voor miljoenen gebruikers over de hele wereld.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) is een gemeenschapsproject om een vrije en open kaart te bouwen. Het is de belangrijkste bron van kaartgegevens in CoMaps en werkt ongeveer hetzelfde als Wikipedia. U kunt plaatsen toevoegen of bewerken en deze worden dan beschikbaar voor miljoenen gebruikers over de hele wereld.
 \nSluit u aan bij de gemeenschap en help mee om een betere kaart voor iedereen te maken!</string>
     <string name="login_to_make_edits_visible">Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -524,7 +524,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Opmerking voor OpenStreetMap vrijwilligers (optioneel)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Beschrijf fouten op de kaart of dingen die niet bewerkt kunnen worden met Organic Maps</string>
+    <string name="editor_note_hint">Beschrijf fouten op de kaart of dingen die niet bewerkt kunnen worden met CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Uw bewerkingen worden geüpload naar de openbare <a href="https://wiki.openstreetmap.org/wiki/NL:About">OpenStreetMap</a> database. Voeg geen persoonlijke of auteursrechtelijk beschermde informatie toe.</string>
     <string name="editor_more_about_osm">Meer over OpenStreetMap</string>
@@ -534,7 +534,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Exploitant: %s</string>
     <string name="editor_category_unsuitable_title">Kun je geen geschikte categorie vinden?</string>
-    <string name="editor_category_unsuitable_text">Met Organic Maps kun je alleen eenvoudige puntcategorieën toevoegen, dus geen steden, wegen, meren, contouren van gebouwen, enzovoort. Voeg zulke categorieën direct toe aan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Bekijk onze <a href="https://organicmaps.app/faq/editing/advanced-map-editing">gids</a> voor gedetailleerde stap voor stap instructies.</string>
+    <string name="editor_category_unsuitable_text">Met CoMaps kun je alleen eenvoudige puntcategorieën toevoegen, dus geen steden, wegen, meren, contouren van gebouwen, enzovoort. Voeg zulke categorieën direct toe aan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Bekijk onze <a href="https://comaps.app/faq/editing/advanced-map-editing">gids</a> voor gedetailleerde stap voor stap instructies.</string>
     <string name="downloader_no_downloaded_maps_title">U hebt geen kaarten gedownload</string>
     <string name="downloader_no_downloaded_maps_message">Download kaarten om een locatie te zoeken en offline te navigeren.</string>
     <string name="current_location_unknown_error_title">Huidige locatie is onbekend.</string>
@@ -596,7 +596,7 @@
     <string name="mobile_data_option_ask">Vraag altijd</string>
     <string name="traffic_update_maps_text">Om verkeersgegevens weer te geven, moeten de kaarten bijgewerkt worden.</string>
     <string name="big_font">Vergroot lettergrootte op de kaart</string>
-    <string name="traffic_update_app">Gelieve Organic Maps bij te werken</string>
+    <string name="traffic_update_app">Gelieve CoMaps bij te werken</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Verkeersgegevens zijn niet beschikbaar</string>
     <string name="enable_logging">Logboekregistratie inschakelen</string>
@@ -622,7 +622,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Log in op OpenStreetMap om al je kaartbewerkingen automatisch te uploaden. Meer informatie <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
     <string name="dialog_error_storage_title">Probleem met opslagtoegang</string>
-    <string name="dialog_error_storage_message">Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve dit te controleren en ons te contacteren via support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve dit te controleren en ons te contacteren via support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Slechte opslag emuleren</string>
     <string name="core_entrance">Ingang</string>
     <string name="error_enter_correct_name">Voer een geldige naam in</string>
@@ -689,7 +689,7 @@
     <string name="power_managment_setting_never">Nooit</string>
     <string name="power_managment_setting_auto">Wanneer batterij bijna leeg is</string>
     <string name="power_managment_setting_manual_max">Maximale energiebesparing</string>
-    <string name="enable_logging_warning_message">Deze optie is ingeschakeld voor logboekregistraties voor diagnostische doeleinden. Het helpt bij het identificeren van problemen met de applicatie. Schakel de optie alleen in op verzoek van Organic Maps-ondersteuning.</string>
+    <string name="enable_logging_warning_message">Deze optie is ingeschakeld voor logboekregistraties voor diagnostische doeleinden. Het helpt bij het identificeren van problemen met de applicatie. Schakel de optie alleen in op verzoek van CoMaps-ondersteuning.</string>
     <string name="access_rules_author_only">Wordt online bewerkt</string>
     <string name="driving_options_title">Route-instellingen</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -794,8 +794,8 @@
     <string name="change_map_locale">Kaarttaal</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Kaartgegevens van OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/nl/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/nl/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/NL:Wat_is_OpenStreetMap%3F</string>
     <!-- App Tip #00 -->
@@ -819,9 +819,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Ons belangrijkste doel is om snelle, op privacy gerichte, gebruiksvriendelijke kaarten te maken waar u dol op zult zijn.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Je gebruikt nu Organic Maps op het telefoonscherm</string>
+    <string name="car_used_on_the_phone_screen">Je gebruikt nu CoMaps op het telefoonscherm</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Je gebruikt nu Organic Maps op het autoscherm</string>
+    <string name="car_used_on_the_car_screen">Je gebruikt nu CoMaps op het autoscherm</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Je bent verbonden met Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -829,11 +829,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Naar het autoscherm</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps heeft locatietoegang nodig. Als het veilig is, controleer je de melding op je telefoon.</string>
+    <string name="aa_location_permissions_request">CoMaps heeft locatietoegang nodig. Als het veilig is, controleer je de melding op je telefoon.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Deze app heeft je toestemming nodig</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps in Android Auto heeft een locatie toestemming nodig om effectief te werken</string>
+    <string name="aa_request_permission_activity_text">CoMaps in Android Auto heeft een locatie toestemming nodig om effectief te werken</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Geef toestemming</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index cd04a94c3..36c67ba48 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Nie udało się pobrać</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Spróbuj ponownie</string>
-    <string name="about_menu_title">O aplikacji Organic Maps</string>
+    <string name="about_menu_title">O aplikacji CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Darmowa dla wszystkich, wykonana z miłością</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Wymagana jest sprzętowa akceleracja OpenGL. Aktualne urządzenie nie jest obsługiwane.</string>
     <string name="download">Pobierz</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Proszę odłączyć kabel USB albo włożyć kartę pamięci, aby korzystać z Organic Maps</string>
+    <string name="disconnect_usb_cable">Proszę odłączyć kabel USB albo włożyć kartę pamięci, aby korzystać z CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Proszę zwolnić trochę pamięci na karcie SD/pamięci USB, aby korzystać z aplikacji</string>
     <string name="download_resources">Przed rozpoczęciem prosimy o pobranie ogólnej mapy świata na urządzenie.
@@ -167,12 +167,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notatki</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Udostępnione zakładki z Organic Maps</string>
+    <string name="share_bookmarks_email_subject">Udostępnione zakładki z CoMaps</string>
     <string name="share_bookmarks_email_body">Cześć!
 \n
-\nZałączam moje zakładki z aplikacji Organic Maps. Proszę otwórz je jeżeli masz zaintalowane Organic Maps. Lub, jeżeli nie masz, pobierz aplikację na swoje urządzenie iOS/Android za pomocą tego linka: https://omaps.app/get?kmz
+\nZałączam moje zakładki z aplikacji CoMaps. Proszę otwórz je jeżeli masz zaintalowane CoMaps. Lub, jeżeli nie masz, pobierz aplikację na swoje urządzenie iOS/Android za pomocą tego linka: https://comaps.app/get?kmz
 \n
-\nMiłego podróżowania z Organic Maps!</string>
+\nMiłego podróżowania z CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Wczytywanie zakładek</string>
     <!-- Kmz file successful loading -->
@@ -182,7 +182,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Typ pliku nie jest rozpoznawany przez aplikację:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Nie udało się otworzyć pliku %1$s
 \n
 \n%2$s</string>
@@ -194,13 +194,13 @@
     <string name="cant_change_this_setting">Przepraszamy, ustawienia pamięci mapy są aktualnie wyłączone.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Trwa pobieranie mapy kraju.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hej, spójrz na moją aktualną lokalizację w Organic Maps! %1$s lub %2$s Nie masz map offline? Pobierz tutaj: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hej, spójrz na moją aktualną lokalizację w CoMaps! %1$s lub %2$s Nie masz map offline? Pobierz tutaj: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hej, spójrz na mój znacznik w Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Hej, spójrz na mój znacznik w CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Zobacz moją aktualną lokalizację na mapie przy użyciu Organic Maps</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Zobacz moją aktualną lokalizację na mapie przy użyciu CoMaps</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Cześć,
 \n
 \nJestem teraz tutaj: %1$s. Naciśnij na ten link %2$s lub ten %3$s, aby zobaczyć to miejsce na mapie.
@@ -265,7 +265,7 @@
     <string name="menu">Menu</string>
     <!-- Text in menu -->
     <string name="website">Strona internetowa</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Wiadomości</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Opinia</string>
@@ -279,7 +279,7 @@
     <string name="donate">Wspomóż</string>
     <string name="already_donated">Już przekazano</string>
     <string name="remind_me_later">Przypomnij później</string>
-    <string name="support_organic_maps">Wspierać Organic Maps</string>
+    <string name="support_organic_maps">Wspierać CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Wesprzyj projekt</string>
     <!-- Button in the main Help dialog -->
@@ -510,7 +510,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Dane OpenStreetMap stworzone przez społeczność na dzień %s. Dowiedz się więcej o tym, jak edytować i aktualizować mapę na stronie OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) to projekt społecznościowy mający na celu stworzenie darmowej i otwartej mapy. Jest to główne źródło danych mapowych w Organic Maps i działa podobnie do Wikipedii. Można dodawać lub edytować miejsca, które stają się dostępne dla milionów użytkowników na całym świecie.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) to projekt społecznościowy mający na celu stworzenie darmowej i otwartej mapy. Jest to główne źródło danych mapowych w CoMaps i działa podobnie do Wikipedii. Można dodawać lub edytować miejsca, które stają się dostępne dla milionów użytkowników na całym świecie.
 \nDołącz do społeczności i pomóż stworzyć lepszą mapę dla wszystkich!</string>
     <string name="login_to_make_edits_visible">Proszę utworzyć konto OpenStreetMap lub zalogować się, aby opublikować swoje zmiany na mapie.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -528,7 +528,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Uwaga dla wolontariuszy OpenStreetMap (opcjonalnie)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Proszę opisać błędy na mapie lub rzeczy, których nie można edytować za pomocą Organic Maps.</string>
+    <string name="editor_note_hint">Proszę opisać błędy na mapie lub rzeczy, których nie można edytować za pomocą CoMaps.</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Państwa zmiany są przesyłane do publicznej bazy danych <a href="https://wiki.openstreetmap.org/wiki/Pl:Wstęp">OpenStreetMap</a>. Prosimy nie dodawać informacji osobistych lub chronionych prawem autorskim.</string>
     <string name="editor_more_about_osm">Więcej o OpenStreetMap</string>
@@ -538,7 +538,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operator: %s</string>
     <string name="editor_category_unsuitable_title">Nie możesz znaleźć odpowiedniej kategorii?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps pozwala na dodawanie tylko prostych kategorii punktów, co oznacza brak miast, dróg, jezior, obrysów budynków itp. Dodaj takie kategorie bezpośrednio do <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Sprawdź nasz <a href="https://organicmaps.app/faq/editing/advanced-map-editing">przewodnik</a>, aby uzyskać szczegółowe instrukcje krok po kroku.</string>
+    <string name="editor_category_unsuitable_text">CoMaps pozwala na dodawanie tylko prostych kategorii punktów, co oznacza brak miast, dróg, jezior, obrysów budynków itp. Dodaj takie kategorie bezpośrednio do <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Sprawdź nasz <a href="https://comaps.app/faq/editing/advanced-map-editing">przewodnik</a>, aby uzyskać szczegółowe instrukcje krok po kroku.</string>
     <string name="downloader_no_downloaded_maps_title">Nie pobrano żadnych map</string>
     <string name="downloader_no_downloaded_maps_message">Aby znajdować miejsca i nawigować bez połączenia z internetem, musisz pobrać mapy.</string>
     <string name="current_location_unknown_error_title">Aktualna lokalizacja jest nieznana.</string>
@@ -599,7 +599,7 @@
     <string name="mobile_data_option_ask">Zawsze pytaj</string>
     <string name="traffic_update_maps_text">Aby wyświetlić dane o ruchu, muszą zostać zaktualizowane mapy.</string>
     <string name="big_font">Powiększ rozmiar czcionki na mapie</string>
-    <string name="traffic_update_app">Zaktualizuj Organic Maps</string>
+    <string name="traffic_update_app">Zaktualizuj CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Dane o ruchu są niedostępne</string>
     <string name="enable_logging">Włącz zbieranie danych</string>
@@ -624,7 +624,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Zaloguj się do OpenStreetMap, aby automatycznie przesyłać wszystkie zmiany na mapie. Dowiedz się więcej <a href="https://github.com/organicmaps/organicmaps/issues/6144">tutaj</a>.</string>
     <string name="dialog_error_storage_title">Problem z dostępem do pamięci masowej</string>
-    <string name="dialog_error_storage_message">Zewnętrzny nośnik pamięci masowej jest niedostępny. Prawdopodobnie usunięto lub uszkodzono kartę SD bądź jej system plików służy tylko do odczytu. Zweryfikuj to i skontaktuj się z nami pod adresem support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Zewnętrzny nośnik pamięci masowej jest niedostępny. Prawdopodobnie usunięto lub uszkodzono kartę SD bądź jej system plików służy tylko do odczytu. Zweryfikuj to i skontaktuj się z nami pod adresem support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuluj wadliwą pamięć masową</string>
     <string name="core_entrance">Wejście</string>
     <string name="error_enter_correct_name">Wprowadź poprawną nazwę</string>
@@ -694,7 +694,7 @@
     <string name="power_managment_setting_never">Nigdy</string>
     <string name="power_managment_setting_auto">Automatycznie</string>
     <string name="power_managment_setting_manual_max">Maksymalna oszczędność energii</string>
-    <string name="enable_logging_warning_message">Ta opcja zostaje włączona do zbierania danych działań w celach diagnostycznych. Pomaga to zespołowi zidentyfikować problemy z aplikacją. Włączaj opcję tylko na żądanie wsparcia technicznego Organic Maps.</string>
+    <string name="enable_logging_warning_message">Ta opcja zostaje włączona do zbierania danych działań w celach diagnostycznych. Pomaga to zespołowi zidentyfikować problemy z aplikacją. Włączaj opcję tylko na żądanie wsparcia technicznego CoMaps.</string>
     <string name="access_rules_author_only">Edytowane online</string>
     <string name="driving_options_title">Ustawienia nawigacji</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -799,8 +799,8 @@
     <string name="change_map_locale">Język mapy</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Dane mapy z OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/pl/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/pl/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Pl:Wstęp</string>
     <!-- App Tip #00 -->
@@ -824,9 +824,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Naszym głównym celem jest tworzenie szybkich, zapewniających prywatność i łatwych w użyciu map, które pokochasz.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Korzystasz teraz z Organic Maps na ekranie telefonu</string>
+    <string name="car_used_on_the_phone_screen">Korzystasz teraz z CoMaps na ekranie telefonu</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Korzystasz teraz z Organic Maps na ekranie samochodu</string>
+    <string name="car_used_on_the_car_screen">Korzystasz teraz z CoMaps na ekranie samochodu</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Jesteś połączony z Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -834,11 +834,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Do ekranu samochodu</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Aplikacja Organic Maps wymaga dostępu do lokalizacji. Gdy będzie to bezpieczne, sprawdź powiadomienie w telefonie.</string>
+    <string name="aa_location_permissions_request">Aplikacja CoMaps wymaga dostępu do lokalizacji. Gdy będzie to bezpieczne, sprawdź powiadomienie w telefonie.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Ta aplikacja wymaga Twojej zgody</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps w Android Auto wymagają uprawnień do lokalizacji, aby działać efektywnie</string>
+    <string name="aa_request_permission_activity_text">CoMaps w Android Auto wymagają uprawnień do lokalizacji, aby działać efektywnie</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Przyznaj uprawnienia</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index c7b452e10..e6c6cd5c5 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -34,7 +34,7 @@
     <string name="country_status_download_failed">O download falhou</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Tentar novamente</string>
-    <string name="about_menu_title">Sobre o Organic Maps</string>
+    <string name="about_menu_title">Sobre o CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Grátis para todos, feito com amor</string>
     <!-- Text in About screen -->
@@ -47,7 +47,7 @@
     <string name="unsupported_phone">É necessário OpenGL acelerado por hardware. Infelizmente o seu dispositivo não é compatível.</string>
     <string name="download">Baixar</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Por favor desconecte o cabo USB ou insira um cartão de memória para utilizar o Organic Maps</string>
+    <string name="disconnect_usb_cable">Por favor desconecte o cabo USB ou insira um cartão de memória para utilizar o CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Por favor libere primeiro algum espaço no cartão SD/armazenamento USB para utilizar o app</string>
     <string name="download_resources">Antes de começar, vamos baixar a visão geral mundial para o seu dispositivo.
@@ -159,12 +159,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Anotações</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Favoritos do Organic Maps foram compartilhados com você</string>
+    <string name="share_bookmarks_email_subject">Favoritos do CoMaps foram compartilhados com você</string>
     <string name="share_bookmarks_email_body">Olá!
 \n
-\nSegue em anexo meus favoritos do app Organic Maps. Se tiver instalado o Organic Maps, pode abri-los agora. Caso não tenha, baixe o app para o seu dispositivo iOS ou Android via o link https://omaps.app/get?kmz
+\nSegue em anexo meus favoritos do app CoMaps. Se tiver instalado o CoMaps, pode abri-los agora. Caso não tenha, baixe o app para o seu dispositivo iOS ou Android via o link https://comaps.app/get?kmz
 \n
-\nDisfrute viajar com o Organic Maps!</string>
+\nDisfrute viajar com o CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Carregando favoritos</string>
     <!-- Kmz file successful loading -->
@@ -174,7 +174,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">O tipo de arquivo não é reconhecido pelo aplicativo:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Falha ao abrir o arquivo %1$s
 \n
 \n%2$s</string>
@@ -186,13 +186,13 @@
     <string name="cant_change_this_setting">Lamentamos, as configurações do armazenamento do mapa estão desativadas.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">O download do país está atualmente em progresso.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Veja onde estou agora. Abra o link: %1$s ou %2$s Não tem mapas offline instalados? Baixe aqui: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Veja onde estou agora. Abra o link: %1$s ou %2$s Não tem mapas offline instalados? Baixe aqui: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Veja o meu marcador no mapa do Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Veja o meu marcador no mapa do CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Veja no mapa a minha localização atual via Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Veja no mapa a minha localização atual via CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Olá,
 \n
 \nEstou aqui agora: %1$s. Clique neste link %2$s ou neste %3$s para ver o local no mapa.
@@ -453,7 +453,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Dados do OpenStreetMap criados pela comunidade a partir de %s. Saiba mais sobre como editar e atualizar o mapa em OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">O OpenStreetMap (OSM) é um projeto comunitário aberto para construir um mapa gratuito. O OSM é a principal fonte de dados de mapas do Organic Maps e funciona de forma semelhante à Wikipédia. Você pode adicionar ou editar lugares e eles ficam disponíveis para milhões de usuários no mundo todo.
+    <string name="login_osm_presentation">O OpenStreetMap (OSM) é um projeto comunitário aberto para construir um mapa gratuito. O OSM é a principal fonte de dados de mapas do CoMaps e funciona de forma semelhante à Wikipédia. Você pode adicionar ou editar lugares e eles ficam disponíveis para milhões de usuários no mundo todo.
 \nJunte-se à comunidade e ajude a criar um mapa melhor para todos!</string>
     <string name="login_to_make_edits_visible">Crie uma conta no OpenStreetMap ou faça login para publicar suas edições de mapas para o mundo.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -474,7 +474,7 @@
     <string name="editor_osm_history">Seu histórico de edição</string>
     <string name="editor_osm_notes">Suas notas de dados do mapa</string>
     <string name="editor_category_unsuitable_title">Você não encontra uma categoria adequada?</string>
-    <string name="editor_category_unsuitable_text">O Organic Maps permite que você adicione apenas categorias de pontos simples, o que significa que não há cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente no <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nosso <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guia</a> para obter instruções detalhadas passo a passo.</string>
+    <string name="editor_category_unsuitable_text">O CoMaps permite que você adicione apenas categorias de pontos simples, o que significa que não há cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente no <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nosso <a href="https://comaps.app/faq/editing/advanced-map-editing">guia</a> para obter instruções detalhadas passo a passo.</string>
     <string name="downloader_no_downloaded_maps_title">Você não fez o download de nenhum mapa</string>
     <string name="downloader_no_downloaded_maps_message">Baixe mapas para pesquisar locais e usar navegação offline.</string>
     <string name="current_location_unknown_error_title">A localização atual é desconhecida.</string>
@@ -530,7 +530,7 @@
     <string name="mobile_data_option_ask">Perguntar sempre</string>
     <string name="traffic_update_maps_text">Para ver os dados de tráfego, os mapas devem ser atualizados.</string>
     <string name="big_font">Aumentar tamanho da fonte no mapa</string>
-    <string name="traffic_update_app">Atualize o Organic Maps</string>
+    <string name="traffic_update_app">Atualize o CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Não existem dados de tráfego</string>
     <string name="enable_logging">Ativar o histórico</string>
@@ -553,7 +553,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Faça login no OpenStreetMap para carregar automaticamente todas as edições de mapas que você fizer. Saiba mais <a href="https://github.com/organicmaps/organicmaps/issues/6144">aqui</a>.</string>
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
-    <string name="dialog_error_storage_message">O armazenamento externo não está disponível, é provável que o cartão SD tenha sido removido, danificado ou o sistema de arquivo seja apenas para leitura. Verifique e entre em contato conosco em support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">O armazenamento externo não está disponível, é provável que o cartão SD tenha sido removido, danificado ou o sistema de arquivo seja apenas para leitura. Verifique e entre em contato conosco em support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular memória ruim</string>
     <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Por favor, digite um nome correto</string>
@@ -613,7 +613,7 @@
     <string name="power_managment_setting_never">Nunca</string>
     <string name="power_managment_setting_auto">Automático</string>
     <string name="power_managment_setting_manual_max">Máxima economia de energia</string>
-    <string name="enable_logging_warning_message">A opção ativa logging para realizar diagnósticos. Pode ser útil para nossa equipe de suporte que estão solucionando problemas com o aplicativo. Ative esta opção apenas ao ser solicitado pelo suporte do Organic Maps.</string>
+    <string name="enable_logging_warning_message">A opção ativa logging para realizar diagnósticos. Pode ser útil para nossa equipe de suporte que estão solucionando problemas com o aplicativo. Ative esta opção apenas ao ser solicitado pelo suporte do CoMaps.</string>
     <string name="access_rules_author_only">Edição online</string>
     <string name="driving_options_title">Opções de trajeto</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -708,8 +708,8 @@
     <string name="change_map_locale">Idioma do mapa</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Dados do mapa do OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/pt-BR/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/pt-BR/</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Obrigado por você usar nossos mapas criados pela comunidade!</string>
     <!-- App tip #01 -->
@@ -731,9 +731,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Nosso principal objetivo é construir mapas rápidos, focados na privacidade e fáceis de usar que você vai adorar.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Agora você está usando o Organic Maps na tela do telefone</string>
+    <string name="car_used_on_the_phone_screen">Agora você está usando o CoMaps na tela do telefone</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Agora você está usando o Organic Maps na tela do carro</string>
+    <string name="car_used_on_the_car_screen">Agora você está usando o CoMaps na tela do carro</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Você está conectado ao Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -741,11 +741,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Para tela do carro</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">O Organic Maps precisa de acesso à localização. Quando for seguro, verifique a notificação em seu telefone.</string>
+    <string name="aa_location_permissions_request">O CoMaps precisa de acesso à localização. Quando for seguro, verifique a notificação em seu telefone.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Este aplicativo precisa da sua permissão</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">O Organic Maps no Android Auto precisa de uma permissão de localização para funcionar efetivamente</string>
+    <string name="aa_request_permission_activity_text">O CoMaps no Android Auto precisa de uma permissão de localização para funcionar efetivamente</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Conceder permissão</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 8e5e54673..f26122d33 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">O descarregamento falhou</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Tentar novamente</string>
-    <string name="about_menu_title">Sobre o Organic Maps</string>
+    <string name="about_menu_title">Sobre o CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Grátis para todos, feito com amor</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">É necessário a acelaração OpenGL por hardware. Infelizmente o seu dispositivo não é compatível.</string>
     <string name="download">Descarregar</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Por favor desligue o cabo USB ou introduza um cartão de memória para utilizar o Organic Maps</string>
+    <string name="disconnect_usb_cable">Por favor desligue o cabo USB ou introduza um cartão de memória para utilizar o CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Por favor liberte primeiro algum espaço no cartão SD ou armazenamento USB para utilizar a aplicação</string>
     <string name="download_resources">Antes de começar, é recomendável descarregar a visão geral mundial para o seu dispositivo.
@@ -155,12 +155,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notas</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Os favoritos do Organic Maps foram partilhados consigo</string>
+    <string name="share_bookmarks_email_subject">Os favoritos do CoMaps foram partilhados consigo</string>
     <string name="share_bookmarks_email_body">Olá!
 \n
-\nSegue em anexo os meus favoritos da aplicação Organic Maps. Por favor abra-os se tiver o Organic Maps instalado. Caso não tenha, descarregue a aplicação para o seu dispositivo iOS ou Android com a hiperligação https://omaps.app/get?kmz
+\nSegue em anexo os meus favoritos da aplicação CoMaps. Por favor abra-os se tiver o CoMaps instalado. Caso não tenha, descarregue a aplicação para o seu dispositivo iOS ou Android com a hiperligação https://comaps.app/get?kmz
 \n
-\nDivirta-se a viajar com o Organic Maps!</string>
+\nDivirta-se a viajar com o CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">A carregar favoritos</string>
     <!-- Kmz file successful loading -->
@@ -170,7 +170,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">O tipo de ficheiro não é reconhecido pela aplicação:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Falha ao abrir o ficheiro %1$s
 \n
 \n%2$s</string>
@@ -182,13 +182,13 @@
     <string name="cant_change_this_setting">Lamentamos, as definições do armazenamento do mapa estão atualmente desativadas.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">O descarregamento do país está a ser feito neste momento.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Veja onde estou agora. Abra a hiperligação: %1$s ou %2$s Não tem um mapa offline instalado? Descarregue em https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Veja onde estou agora. Abra a hiperligação: %1$s ou %2$s Não tem um mapa offline instalado? Descarregue em https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Veja o meu marcador no mapa do Organic Maps.</string>
+    <string name="bookmark_share_email_subject">Veja o meu marcador no mapa do CoMaps.</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Veja a minha localização atual no mapa Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Veja a minha localização atual no mapa CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Olá,
 \n
 \nEstou neste momento aqui: %1$s. Clique nesta ligação %2$s ou nesta %3$s para ver o local no mapa.
@@ -251,7 +251,7 @@
     <string name="search_show_on_map">Ver no mapa</string>
     <!-- Text in menu -->
     <string name="website">Site</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Notícias</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Comentários</string>
@@ -265,7 +265,7 @@
     <string name="donate">Doar</string>
     <string name="already_donated">Já doei</string>
     <string name="remind_me_later">Lembre-me mais tarde</string>
-    <string name="support_organic_maps">Apoie o Organic Maps</string>
+    <string name="support_organic_maps">Apoie o CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Apoie o projeto</string>
     <!-- Button in the main Help dialog -->
@@ -491,7 +491,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Dados do OpenStreetMap criados pela comunidade a partir de %s. Sabe mais sobre como editar e atualizar o mapa em OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">O OpenStreetMap.org (OSM) é um projeto comunitário aberto para construir um mapa gratuito. O OSM é a principal fonte de dados de mapas do Organic Maps e funciona de forma semelhante à Wikipedia. Pode adicionar ou editar locais e estes ficam disponíveis para milhões de utilizadores no mundo todo.
+    <string name="login_osm_presentation">O OpenStreetMap.org (OSM) é um projeto comunitário aberto para construir um mapa gratuito. O OSM é a principal fonte de dados de mapas do CoMaps e funciona de forma semelhante à Wikipedia. Pode adicionar ou editar locais e estes ficam disponíveis para milhões de utilizadores no mundo todo.
 \nJunte-se à comunidade e ajude a criar um mapa melhor para todos!</string>
     <string name="login_to_make_edits_visible">Crie uma conta OpenStreetMap ou inicie sessão para publicar as suas edições de mapas para o mundo.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -509,7 +509,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota para os voluntários do OpenStreetMap (opcional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Descreva erros no mapa ou coisas que não podem ser editadas com o Organic Maps</string>
+    <string name="editor_note_hint">Descreva erros no mapa ou coisas que não podem ser editadas com o CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">As suas edições são carregadas para a base de dados pública <a href="https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap">OpenStreetMap</a>. Por favor, não adicione informações pessoais ou protegidas por direitos de autor.</string>
     <string name="editor_more_about_osm">Mais sobre o OpenStreetMap</string>
@@ -519,7 +519,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operador: %s</string>
     <string name="editor_category_unsuitable_title">Não encontra uma categoria adequada?</string>
-    <string name="editor_category_unsuitable_text">O Organic Maps permite-lhe adicionar apenas categorias de pontos simples, ou seja, nada de cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente ao <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte o nosso <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guia</a> para instruções detalhadas passo a passo.</string>
+    <string name="editor_category_unsuitable_text">O CoMaps permite-lhe adicionar apenas categorias de pontos simples, ou seja, nada de cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente ao <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte o nosso <a href="https://comaps.app/faq/editing/advanced-map-editing">guia</a> para instruções detalhadas passo a passo.</string>
     <string name="downloader_no_downloaded_maps_title">Não descarregou quaisquer mapas</string>
     <string name="downloader_no_downloaded_maps_message">Descarregar mapas para encontrar a localização e navegar offline.</string>
     <string name="current_location_unknown_error_title">A localização atual é desconhecida.</string>
@@ -574,7 +574,7 @@
     <string name="mobile_data_option_ask">Perguntar sempre</string>
     <string name="traffic_update_maps_text">Para ver os dados de tráfego, os mapas têm de ser atualizados.</string>
     <string name="big_font">Aumentar tamanho da fonte no mapa</string>
-    <string name="traffic_update_app">Atualize o Organic Maps</string>
+    <string name="traffic_update_app">Atualize o CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Os dados de tráfego não estão disponíveis</string>
     <string name="enable_logging">Ativar o histórico</string>
@@ -598,7 +598,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Por favor, faz o login no OpenStreetMap para carregar automaticamente todas as tuas edições de mapas. Sabe mais <a href="https://github.com/organicmaps/organicmaps/issues/6144">aqui</a>.</string>
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
-    <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
     <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Introduza um nome correto</string>
@@ -665,7 +665,7 @@
     <string name="power_managment_setting_never">Nunca</string>
     <string name="power_managment_setting_auto">Automático</string>
     <string name="power_managment_setting_manual_max">Máxima economia de energia</string>
-    <string name="enable_logging_warning_message">Esta opção ativa o registo das ações para diagnóstico. Pode ser útil para os programadores descobrirem o problema na aplicação. Ative esta opção apenas a pedido dos programadores do Organic Maps.</string>
+    <string name="enable_logging_warning_message">Esta opção ativa o registo das ações para diagnóstico. Pode ser útil para os programadores descobrirem o problema na aplicação. Ative esta opção apenas a pedido dos programadores do CoMaps.</string>
     <string name="access_rules_author_only">Edição online</string>
     <string name="driving_options_title">Configurações de direção</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -781,9 +781,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Nosso principal objetivo é construir mapas rápidos, focados na privacidade e fáceis de usar que vai adorar.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Está agora a utilizar o Organic Maps no ecrã do telemóvel</string>
+    <string name="car_used_on_the_phone_screen">Está agora a utilizar o CoMaps no ecrã do telemóvel</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Está agora a utilizar o Organic Maps no ecrã do automóvel</string>
+    <string name="car_used_on_the_car_screen">Está agora a utilizar o CoMaps no ecrã do automóvel</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Está ligado ao Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -791,11 +791,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Para ecrã do carro</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">O Organic Maps precisa de acesso à localização. Quando for seguro, verifica a notificação no teu telemóvel.</string>
+    <string name="aa_location_permissions_request">O CoMaps precisa de acesso à localização. Quando for seguro, verifica a notificação no teu telemóvel.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Esta aplicação precisa da tua autorização</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Os Organic Maps no Android Auto precisam de uma permissão de localização para funcionarem eficazmente</string>
+    <string name="aa_request_permission_activity_text">Os CoMaps no Android Auto precisam de uma permissão de localização para funcionarem eficazmente</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Conceder permissão</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index 257584aac..dfdbada75 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Descărcarea a eșuat</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Mai încearcă</string>
-    <string name="about_menu_title">Despre Organic Maps</string>
+    <string name="about_menu_title">Despre CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratuit pentru toată lumea, făcut cu dragoste</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Această aplicație necesită accelerarea hardware OpenGL. Din păcate, dispozitivul tău nu este compatibil.</string>
     <string name="download">Descarcă</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Deconectează cablul USB sau introdu un card de memorie pentru a utiliza Organic Maps</string>
+    <string name="disconnect_usb_cable">Deconectează cablul USB sau introdu un card de memorie pentru a utiliza CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Spațiul de stocare de pe cardul SD/memoria USB este insuficient pentru a putea utiliza aplicația</string>
     <string name="download_resources">Înainte de a începe, trebuie descărcată harta generală a lumii în dispozitivul tău.
@@ -155,10 +155,10 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Detalii</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Îți trimit locurile mele preferate din Organic Maps</string>
+    <string name="share_bookmarks_email_subject">Îți trimit locurile mele preferate din CoMaps</string>
     <string name="share_bookmarks_email_body">Bună!
 \n
-\nȚi-am atașat locurile mele preferate din aplicația Organic Maps. Deschide-le dacă ai instalată Organic Maps. Dacă nu, o poți descărca pentru iOS sau Android de aici: https://organicmaps.app/</string>
+\nȚi-am atașat locurile mele preferate din aplicația CoMaps. Deschide-le dacă ai instalată CoMaps. Dacă nu, o poți descărca pentru iOS sau Android de aici: https://comaps.app/</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Se încarcă locurile preferate</string>
     <!-- Kmz file successful loading -->
@@ -168,7 +168,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Tipul de fișier nu este recunoscut de aplicație:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Nu a reușit să deschidă fișierul %1$s
 \n
 \n%2$s</string>
@@ -180,13 +180,13 @@
     <string name="cant_change_this_setting">Opțiunile pentru stocarea hărților sunt dezactivate în acest moment.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Harta este în curs de descărcare.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Poți vedea poziția mea pe harta Organic Maps! %1$s sau %2$s Nu ai descărcat aplicația? O poți descărca de aici: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Poți vedea poziția mea pe harta CoMaps! %1$s sau %2$s Nu ai descărcat aplicația? O poți descărca de aici: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Poți vedea locul meu preferat pe harta Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Poți vedea locul meu preferat pe harta CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Poți vedea poziția mea pe harta Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Poți vedea poziția mea pe harta CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Bună,
 \n
 \nAcum sunt aici: %1$s. Apasă pe adresa %2$s sau pe %3$s pentru a vedea locul pe hartă.
@@ -249,7 +249,7 @@
     <string name="search_show_on_map">Vezi pe hartă</string>
     <!-- Text in menu -->
     <string name="website">Site web</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Știri</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Părere</string>
@@ -263,7 +263,7 @@
     <string name="donate">Donează</string>
     <string name="already_donated">Deja donat</string>
     <string name="remind_me_later">Amintește mai târziu</string>
-    <string name="support_organic_maps">Susține Organic Maps</string>
+    <string name="support_organic_maps">Susține CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Susține proiectul</string>
     <!-- Button in the main Help dialog -->
@@ -494,7 +494,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Date OpenStreetMap create de comunitate la data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în Organic Maps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în CoMaps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume.
 \nAlăturați-vă comunității și ajutați la crearea unei hărți mai bune pentru toată lumea!</string>
     <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -512,7 +512,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Notă pentru voluntarii OpenStreetMap (opțional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Descrieți erorile de pe hartă sau lucrurile care nu pot fi editate cu Organic Maps</string>
+    <string name="editor_note_hint">Descrieți erorile de pe hartă sau lucrurile care nu pot fi editate cu CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Edițiile dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
     <string name="editor_more_about_osm">Mai multe despre OpenStreetMap</string>
@@ -522,7 +522,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operator: %s</string>
     <string name="editor_category_unsuitable_title">Nu găsiți o categorie potrivită?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps permite adăugarea doar a unor categorii de puncte simple, ceea ce înseamnă că nu există orașe, drumuri, lacuri, contururi de clădiri, etc. Vă rugăm să adăugați astfel de categorii direct la <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consultați <a href="https://organicmaps.app/faq/editing/advanced-map-editing">ghidul nostru</a> pentru instrucțiuni detaliate pas cu pas.</string>
+    <string name="editor_category_unsuitable_text">CoMaps permite adăugarea doar a unor categorii de puncte simple, ceea ce înseamnă că nu există orașe, drumuri, lacuri, contururi de clădiri, etc. Vă rugăm să adăugați astfel de categorii direct la <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consultați <a href="https://comaps.app/faq/editing/advanced-map-editing">ghidul nostru</a> pentru instrucțiuni detaliate pas cu pas.</string>
     <string name="downloader_no_downloaded_maps_title">Nu ai descărcat nicio hartă</string>
     <string name="downloader_no_downloaded_maps_message">Descarcă hărți pentru a căuta un loc și a naviga fără conectare la internet.</string>
     <string name="current_location_unknown_error_title">Poziția actuală este necunoscută.</string>
@@ -582,7 +582,7 @@
     <string name="mobile_data_option_ask">Întreabă întotdeauna</string>
     <string name="traffic_update_maps_text">Pentru a afișa datele privind traficul, hărțile trebuie actualizate.</string>
     <string name="big_font">Mărește dimensiunea literelor pe hartă</string>
-    <string name="traffic_update_app">Actualizează Organic Maps</string>
+    <string name="traffic_update_app">Actualizează CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Datele privind traficul nu sunt disponibile</string>
     <string name="enable_logging">Activează jurnalizarea</string>
@@ -608,7 +608,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Vă rugăm să vă conectați la OpenStreetMap pentru a încărca automat toate modificările aduse hărții. Aflați mai multe <a href="https://github.com/organicmaps/organicmaps/issues/6144">aici</a>.</string>
     <string name="dialog_error_storage_title">Problemă de acces la spațiul de stocare</string>
-    <string name="dialog_error_storage_message">Spațiul de stocare extern nu este disponibil. Probabil cardul SD nu este introdus, este deteriorat sau sistemul de fișiere este doar pentru citire. Verifică sau contactează-ne la support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Spațiul de stocare extern nu este disponibil. Probabil cardul SD nu este introdus, este deteriorat sau sistemul de fișiere este doar pentru citire. Verifică sau contactează-ne la support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulare arhivă deteriorată</string>
     <string name="core_entrance">Intrare</string>
     <string name="error_enter_correct_name">Introdu un nume corect</string>
@@ -797,9 +797,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Scopul nostru principal este să construim hărți rapide, axate pe confidențialitate și ușor de utilizat, care să vă placă.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Acum utilizați Organic Maps pe ecranul telefonului</string>
+    <string name="car_used_on_the_phone_screen">Acum utilizați CoMaps pe ecranul telefonului</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Acum utilizați Organic Maps pe ecranul mașinii</string>
+    <string name="car_used_on_the_car_screen">Acum utilizați CoMaps pe ecranul mașinii</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Sunteți conectat la Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -807,11 +807,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">La ecranul mașinii</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps are nevoie de acces la locație. Când este sigur, verificați notificarea de pe telefon.</string>
+    <string name="aa_location_permissions_request">CoMaps are nevoie de acces la locație. Când este sigur, verificați notificarea de pe telefon.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Această aplicație are nevoie de permisiunea dvs.</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps din Android Auto are nevoie de o permisiune de localizare pentru a funcționa eficient</string>
+    <string name="aa_request_permission_activity_text">CoMaps din Android Auto are nevoie de o permisiune de localizare pentru a funcționa eficient</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Acordarea de permisiuni</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 5b2603216..779df57c2 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">Ошибка загрузки</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Попробуйте ещё раз</string>
-    <string name="about_menu_title">Про Organic Maps</string>
+    <string name="about_menu_title">Про CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Бесплатно для всех, сделано с любовью</string>
     <!-- Text in About screen -->
@@ -168,10 +168,10 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Примечание</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">С вами поделились метками Organic Maps</string>
+    <string name="share_bookmarks_email_subject">С вами поделились метками CoMaps</string>
     <string name="share_bookmarks_email_body">Здравствуйте!
 \n
-\nВ прикреплённом файле мои метки из офлайновых карт Organic Maps. Для того чтобы открыть этот файл, вам потребуется приложение Organic Maps, которое можно установить по ссылке: https://omaps.app/get?kmz
+\nВ прикреплённом файле мои метки из офлайновых карт CoMaps. Для того чтобы открыть этот файл, вам потребуется приложение CoMaps, которое можно установить по ссылке: https://comaps.app/get?kmz
 \n
 \nСпасибо!</string>
     <!-- message title of loading file -->
@@ -183,7 +183,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Тип файла не поддерживается приложением:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Не удалось открыть файл %1$s
 \n
 \n%2$s</string>
@@ -195,16 +195,16 @@
     <string name="cant_change_this_setting">Извините, настройки места хранения карт сейчас недоступны.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Идет процесс загрузки карт.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Смотри где я сейчас. Жми %1$s или %2$s</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Смотри мою метку на карте Organic Maps</string>
+    <string name="bookmark_share_email_subject">Смотри мою метку на карте CoMaps</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Посмотри на карте Organic Maps, где я сейчас нахожусь</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Посмотри на карте CoMaps, где я сейчас нахожусь</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Привет!
 \n
-\nЯ сейчас здесь: %1$s. Чтобы увидеть это место на карте Organic Maps, открой эту ссылку %2$s или эту %3$s
+\nЯ сейчас здесь: %1$s. Чтобы увидеть это место на карте CoMaps, открой эту ссылку %2$s или эту %3$s
 \n
 \nСпасибо.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
@@ -266,7 +266,7 @@
     <string name="menu">Меню</string>
     <!-- Text in menu -->
     <string name="website">Вебсайт</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Новости</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Связаться с нами</string>
@@ -280,7 +280,7 @@
     <string name="donate">Поддержать деньгами</string>
     <string name="already_donated">Уже пожертвовано</string>
     <string name="remind_me_later">Напомнить позже</string>
-    <string name="support_organic_maps">Поддержать Organic Maps</string>
+    <string name="support_organic_maps">Поддержать CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Помочь проекту</string>
     <!-- Button in the main Help dialog -->
@@ -511,7 +511,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Созданные сообществом данные OpenStreetMap по состоянию на %s. Узнайте больше о том, как редактировать и обновлять карту, на сайте OpenStreetMap.org.</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) - это открытый проект сообщества по созданию бесплатной карты. Он является основным источником картографических данных в Organic Maps и работает как Википедия. Кто угодно может добавлять или редактировать места, которые позже увидят миллионы пользователей по всему миру.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) - это открытый проект сообщества по созданию бесплатной карты. Он является основным источником картографических данных в CoMaps и работает как Википедия. Кто угодно может добавлять или редактировать места, которые позже увидят миллионы пользователей по всему миру.
 \nПрисоединяйтесь к сообществу и помогите сделать лучшую карту для всех!</string>
     <string name="login_to_make_edits_visible">Создайте учетную запись OpenStreetMap или войдите в нее, чтобы опубликовать свои правки на карте для всего мира.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -529,7 +529,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Примечание для волонтеров OpenStreetMap (необязательно)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Опишите ошибки на карте или то, что нельзя редактировать с помощью Organic Maps</string>
+    <string name="editor_note_hint">Опишите ошибки на карте или то, что нельзя редактировать с помощью CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Ваши правки будут загружены в общедоступную базу данных <a href="https://wiki.openstreetmap.org/wiki/RU:О_проекте">OpenStreetMap</a>. Пожалуйста, не добавляйте личную информацию или информацию, защищенную авторским правом.</string>
     <string name="editor_more_about_osm">Подробнее об OpenStreetMap</string>
@@ -539,7 +539,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Оператор: %s</string>
     <string name="editor_category_unsuitable_title">Нет подходящей категории?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps позволяет добавлять на карту только простые типы объектов, то есть никаких городов, дорог, озер, контуров зданий. Пожалуйста, добавляйте такие категории на сайте <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Также рекомендуем ознакомиться с нашими <a href="https://organicmaps.app/faq/editing/advanced-map-editing">подробными пошаговыми инструкциями и другими приложениями для редактирования карты</a>.</string>
+    <string name="editor_category_unsuitable_text">CoMaps позволяет добавлять на карту только простые типы объектов, то есть никаких городов, дорог, озер, контуров зданий. Пожалуйста, добавляйте такие категории на сайте <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Также рекомендуем ознакомиться с нашими <a href="https://comaps.app/faq/editing/advanced-map-editing">подробными пошаговыми инструкциями и другими приложениями для редактирования карты</a>.</string>
     <string name="downloader_no_downloaded_maps_title">У вас нет загруженных карт</string>
     <string name="downloader_no_downloaded_maps_message">Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета.</string>
     <string name="current_location_unknown_error_title">Местоположение не найдено.</string>
@@ -601,7 +601,7 @@
     <string name="mobile_data_option_ask">Всегда спрашивать</string>
     <string name="traffic_update_maps_text">Для отображения пробок необходимо обновить карты.</string>
     <string name="big_font">Увеличить шрифт на карте</string>
-    <string name="traffic_update_app">Обновите Organic Maps</string>
+    <string name="traffic_update_app">Обновите CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Данные о пробках недоступны</string>
     <string name="enable_logging">Включить запись логов</string>
@@ -627,7 +627,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Пожалуйста войдите в аккаунт OpenStreetMap.org, чтобы публиковать ваши изменения карты. Подробности по <a href="https://github.com/organicmaps/organicmaps/issues/6144">ссылке</a>.</string>
     <string name="dialog_error_storage_title">Проблема с доступом к хранилищу</string>
-    <string name="dialog_error_storage_message">Внешняя память устройства недоступна, возможно SD карта была удалена, повреждена или файловая система доступна только для чтения. Проверьте это и свяжитесь, пожалуйста, с нами support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Внешняя память устройства недоступна, возможно SD карта была удалена, повреждена или файловая система доступна только для чтения. Проверьте это и свяжитесь, пожалуйста, с нами support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляция ошибки с внешней памятью</string>
     <string name="core_entrance">Вход</string>
     <string name="error_enter_correct_name">Пожалуйста, введите название правильно</string>
@@ -804,9 +804,9 @@
     <!-- Telegram group url for the "?" About page -->
     <string name="telegram_url">https://t.me/CoMaps_RU</string>
     <!-- A link to the TTS FAQ -->
-    <string name="tts_info_link">https://organicmaps.app/ru/faq/синтез-речи-tts-на-android/</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/ru/</string>
+    <string name="tts_info_link">https://comaps.app/ru/faq/синтез-речи-tts-на-android/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/ru/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/RU:О_проекте</string>
     <!-- App Tip #00 -->
@@ -830,9 +830,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Наша главная цель — создать быстрые, конфиденциальные и простые в использовании карты, которые вам понравятся.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Сейчас Вы используете Organic Maps на экране телефона</string>
+    <string name="car_used_on_the_phone_screen">Сейчас Вы используете CoMaps на экране телефона</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Сейчас Вы используете Organic Maps на экране автомобиля</string>
+    <string name="car_used_on_the_car_screen">Сейчас Вы используете CoMaps на экране автомобиля</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Вы подключены к Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -840,11 +840,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Продолжить в авто</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps нужен доступ к местоположению. Когда будет безопасно, проверьте уведомление на телефоне.</string>
+    <string name="aa_location_permissions_request">CoMaps нужен доступ к местоположению. Когда будет безопасно, проверьте уведомление на телефоне.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Этому приложению нужно ваше разрешение</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps в Android Auto для эффективной работы необходимо разрешение на определение местоположения</string>
+    <string name="aa_request_permission_activity_text">CoMaps в Android Auto для эффективной работы необходимо разрешение на определение местоположения</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Разрешить</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 55bb8219f..9656ddeb0 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Sťahovanie zlyhalo</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Skúsiť znova</string>
-    <string name="about_menu_title">O aplikácii Organic Maps</string>
+    <string name="about_menu_title">O aplikácii CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Zadarmo pre každého, vyrobené s láskou</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Je vyžadovaná hardwarová akcelerácia OpenGL. Bohužial, vaše zariadenie nie je podporované.</string>
     <string name="download">Stiahnuť</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Prosím, odpojte USB kábel alebo vložte pamäťovú kartu pre použitie s Organic Maps</string>
+    <string name="disconnect_usb_cable">Prosím, odpojte USB kábel alebo vložte pamäťovú kartu pre použitie s CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Prosím, uvoľnite najprv miesto na SD karte/USB úložisku</string>
     <string name="download_resources">Skôr ako začnete, bude treba stiahnuť základnú mapu sveta.
@@ -167,12 +167,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Poznámky</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Zdielané záložky Organic Maps</string>
+    <string name="share_bookmarks_email_subject">Zdielané záložky CoMaps</string>
     <string name="share_bookmarks_email_body">Ahoj!
 \n
-\nV prílohe sú moje záložky z aplikácie Organic Maps. Ak ju nemáš nainštalovanú, môžeš si ju stiahnuť tu: https://omaps.app/get?kmz
+\nV prílohe sú moje záložky z aplikácie CoMaps. Ak ju nemáš nainštalovanú, môžeš si ju stiahnuť tu: https://comaps.app/get?kmz
 \n
-\nPrajem šťastnú cestu s Organic Maps!</string>
+\nPrajem šťastnú cestu s CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Načítavanie záložiek</string>
     <!-- Kmz file successful loading -->
@@ -182,7 +182,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Aplikácia nerozpoznáva typ súboru:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Nepodarilo sa otvoriť súbor %1$s
 \n
 \n%2$s</string>
@@ -194,13 +194,13 @@
     <string name="cant_change_this_setting">Prepáčte, nastavenie uloženia máp je dočasne nedostupné.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Práve prebieha sťahovanie krajiny.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Pozri kde som. Otvor odkaz: %1$s alebo %2$s</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Pozri na moju značku na mape Organic Maps</string>
+    <string name="bookmark_share_email_subject">Pozri na moju značku na mape CoMaps</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Pozrite si moju aktuálnu polohu na mape Organic Maps</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Pozrite si moju aktuálnu polohu na mape CoMaps</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Ahoj,
 \n
 \nPráve som tu: %1$s. Stlačte jeden z týchto odkazov %2$s, %3$s a uvidíte toto miesto na mape.
@@ -263,7 +263,7 @@
     <string name="search_show_on_map">Zobraziť na mape</string>
     <!-- Text in menu -->
     <string name="website">Webové stránky</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Správy</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Spätná väzba</string>
@@ -277,7 +277,7 @@
     <string name="donate">Darovať</string>
     <string name="already_donated">Už darované</string>
     <string name="remind_me_later">Pripomeň neskôr</string>
-    <string name="support_organic_maps">Podporiť Organic Maps</string>
+    <string name="support_organic_maps">Podporiť CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Podporte projekt</string>
     <!-- Button in the main Help dialog -->
@@ -508,7 +508,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Údaje OpenStreetMap vytvorené komunitou od %s. Viac informácií o tom, ako upravovať a aktualizovať mapu, nájdete na stránke OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je komunitný projekt na vytvorenie bezplatnej a otvorenej mapy. Je hlavným zdrojom mapových údajov v službe Organic Maps a funguje podobne ako Wikipédia. Môžete pridávať alebo upravovať miesta a tie sa stanú dostupnými pre milióny používateľov na celom svete.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) je komunitný projekt na vytvorenie bezplatnej a otvorenej mapy. Je hlavným zdrojom mapových údajov v službe CoMaps a funguje podobne ako Wikipédia. Môžete pridávať alebo upravovať miesta a tie sa stanú dostupnými pre milióny používateľov na celom svete.
 \nPridajte sa ku komunite a pomôžte vytvoriť lepšiu mapu pre všetkých!</string>
     <string name="login_to_make_edits_visible">Vytvorte si účet OpenStreetMap alebo sa prihláste a zverejnite svoje úpravy mapy na celom svete.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -526,7 +526,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Poznámka pre dobrovoľníkov OpenStreetMap (nepovinné)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Popíšte chyby na mape alebo veci, ktoré sa nedajú upraviť pomocou aplikácie Mapy Organic</string>
+    <string name="editor_note_hint">Popíšte chyby na mape alebo veci, ktoré sa nedajú upraviť pomocou aplikácie CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Vaše úpravy sa nahrajú do verejnej databázy <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Prosím, nepridávajte osobné informácie alebo informácie chránené autorskými právami.</string>
     <string name="editor_more_about_osm">Viac o OpenStreetMap</string>
@@ -536,7 +536,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Prevádzkovateľ: %s</string>
     <string name="editor_category_unsuitable_title">Nemôžete nájsť vhodnú kategóriu?</string>
-    <string name="editor_category_unsuitable_text">Organické mapy umožňujú pridávať len jednoduché kategórie bodov, teda žiadne mestá, cesty, jazerá, obrysy budov atď. Takéto kategórie pridávajte priamo na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Pozrite si náš <a href="https://organicmaps.app/faq/editing/advanced-map-editing">príručku</a>, kde nájdete podrobné pokyny krok za krokom.</string>
+    <string name="editor_category_unsuitable_text">Organické mapy umožňujú pridávať len jednoduché kategórie bodov, teda žiadne mestá, cesty, jazerá, obrysy budov atď. Takéto kategórie pridávajte priamo na <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Pozrite si náš <a href="https://comaps.app/faq/editing/advanced-map-editing">príručku</a>, kde nájdete podrobné pokyny krok za krokom.</string>
     <string name="downloader_no_downloaded_maps_title">Neprevzali ste žiadne mapy</string>
     <string name="downloader_no_downloaded_maps_message">Prevziať mapy na nájdenie pozície a navigovanie off-line.</string>
     <string name="current_location_unknown_error_title">Súčasná pozícia je neznáma.</string>
@@ -597,7 +597,7 @@
     <string name="mobile_data_option_ask">Vždy sa opýtať</string>
     <string name="traffic_update_maps_text">Na zobrazenie dopravných informácií je potrebné aktualizovať mapy.</string>
     <string name="big_font">Zväčšiť veľkosť písma na mape</string>
-    <string name="traffic_update_app">Aktualizujte si aplikáciu Organic Maps</string>
+    <string name="traffic_update_app">Aktualizujte si aplikáciu CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Dopravné informácie nie sú k dispozícii</string>
     <string name="enable_logging">Zapnúť zaznamenávanie</string>
@@ -621,7 +621,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Prihláste sa do OpenStreetMap, aby ste mohli automaticky nahrať všetky svoje úpravy mapy. Viac informácií sa dozviete <a href="https://github.com/organicmaps/organicmaps/issues/6144">tade</a>.</string>
     <string name="dialog_error_storage_title">Problém s prístupom k úložisku</string>
-    <string name="dialog_error_storage_message">Externý úložný priestor nie je dostupný, pravdepodobne je vytiahnutá alebo poškodená SD karta alebo je systém súborov určený iba na čítanie. Skontrolujte to, prosím, a kontaktujte nás na support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Externý úložný priestor nie je dostupný, pravdepodobne je vytiahnutá alebo poškodená SD karta alebo je systém súborov určený iba na čítanie. Skontrolujte to, prosím, a kontaktujte nás na support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imitovať poškodené úložisko</string>
     <string name="core_entrance">Vchod | vjazd</string>
     <string name="error_enter_correct_name">Prosím, zadajte správne meno</string>
@@ -813,9 +813,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Naším hlavným cieľom je vytvárať rýchle, na súkromie, ľahko použiteľné mapy, ktoré si zamilujete.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Na obrazovke telefónu teraz používate službu Organic Maps</string>
+    <string name="car_used_on_the_phone_screen">Na obrazovke telefónu teraz používate službu CoMaps</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Na obrazovke auta teraz používate službu Organic Maps</string>
+    <string name="car_used_on_the_car_screen">Na obrazovke auta teraz používate službu CoMaps</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Ste pripojení k službe Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -823,11 +823,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Na obrazovku auta</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Služba Organic Maps potrebuje prístup k polohe. Keď je to bezpečné, skontrolujte oznámenie na telefóne.</string>
+    <string name="aa_location_permissions_request">Služba CoMaps potrebuje prístup k polohe. Keď je to bezpečné, skontrolujte oznámenie na telefóne.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Táto aplikácia potrebuje vaše povolenie</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps v službe Android Auto potrebujú na efektívnu prácu povolenie na určenie polohy</string>
+    <string name="aa_request_permission_activity_text">CoMaps v službe Android Auto potrebujú na efektívnu prácu povolenie na určenie polohy</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Udelenie oprávnení</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index 487b00a06..e7df8ce44 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -32,7 +32,7 @@
     <string name="country_status_download_failed">Преузимање није успело</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Покушај поново</string>
-    <string name="about_menu_title">О апликацији Organic Maps</string>
+    <string name="about_menu_title">О апликацији CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Слободна за све, направљена с љубављу</string>
     <!-- Text in About screen -->
@@ -49,7 +49,7 @@
     <string name="unsupported_phone">Ова апликација захтева хардверски-убрзан OpenGL. На жалост, ваш уређај није подржан.</string>
     <string name="download">Преузми</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Молим вас откачите USB кабл, или убаците меморијску картицу да бисте користили Organic Maps</string>
+    <string name="disconnect_usb_cable">Молим вас откачите USB кабл, или убаците меморијску картицу да бисте користили CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Молим вас, прво ослободите нешто простора на SD картици или на USB меморији да бисте користили апликацију</string>
     <string name="download_resources">Пре него што почнете да користите апликацију, прво преузмите на ваш уређај општу мапу света.
@@ -161,12 +161,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Напомене</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps маркери су подељени са вама</string>
+    <string name="share_bookmarks_email_subject">CoMaps маркери су подељени са вама</string>
     <string name="share_bookmarks_email_body">Здраво!
 \n
-\nУ прилогу су моји маркери; молим те да их отвориш у Organic Maps-у. Ако га немаш већ инсталираног, можеш да га преузмеш одавде: https://omaps.app/get?kmz
+\nУ прилогу су моји маркери; молим те да их отвориш у CoMaps-у. Ако га немаш већ инсталираног, можеш да га преузмеш одавде: https://comaps.app/get?kmz
 \n
-\nУживај у путовању са Organic Maps-ом!</string>
+\nУживај у путовању са CoMaps-ом!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Учитавање маркера</string>
     <!-- Kmz file successful loading -->
@@ -176,7 +176,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Апликација не препознаје ову врсту фајла:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Отварање фајла %1$s није успело
 \n
 \n%2$s</string>
@@ -188,13 +188,13 @@
     <string name="cant_change_this_setting">Извините, подешавање локације за чување мапа је тренутно онемогућено.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Преузимање мапа је у току.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Види моју тренутну локацију у Organic Maps-у! %1$s или %2$s Још не користиш offline мапе? Преузми их овде: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Види моју тренутну локацију у CoMaps-у! %1$s или %2$s Још не користиш offline мапе? Преузми их овде: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Хеј, види мој маркер у Organic Maps-у!</string>
+    <string name="bookmark_share_email_subject">Хеј, види мој маркер у CoMaps-у!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Хеј, види моју тренутну локацију на Organic Maps мапи!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Хеј, види моју тренутну локацију на CoMaps мапи!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Здраво,
 \n
 \nЈа сам овде: %1$s. Кликни на овај %2$s или овај линк %3$s да би видео то место на мапи.
@@ -259,7 +259,7 @@
     <string name="menu">Мени</string>
     <!-- Text in menu -->
     <string name="website">Веб-сајт</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Новости</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Повратне информације</string>
@@ -497,7 +497,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Подаци са OpenStreetMap-а које је креирала заједница до %s. Научите више о томе како да мењате и ажурирате мапу на OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) је пројекат заједнице који има за циљ прављење бесплатне, слободне и отворене мапе. OSM је главни извор података за мапе у Organic Maps-у и функционише на сличан начин као Википедија. Можете додати или променити места и ваше промене постају видљиве милионима корисника широм света.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) је пројекат заједнице који има за циљ прављење бесплатне, слободне и отворене мапе. OSM је главни извор података за мапе у CoMaps-у и функционише на сличан начин као Википедија. Можете додати или променити места и ваше промене постају видљиве милионима корисника широм света.
 \nПридружите се заједници и помозите да направимо бољу мапу која је доступна свима!</string>
     <string name="login_to_make_edits_visible">Пријавите се на openstreetmap.org да бисте објавили ваше промене остатку света.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -513,7 +513,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Напомена за OpenStreetMap волонтере (није обавезна)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Опишите грешке на мапи или ствари које се не могу променити помоћу Organic Maps-а</string>
+    <string name="editor_note_hint">Опишите грешке на мапи или ствари које се не могу променити помоћу CoMaps-а</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Ваше промене су послате у јавну <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> базу података. Молимо Вас да не додајете личне податке или податке заштићене ауторским правима.</string>
     <string name="editor_more_about_osm">Више о OpenStreetMap-у</string>
@@ -521,7 +521,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Оператор: %s</string>
     <string name="editor_category_unsuitable_title">Не можете да пронађете одговарајућу категорију?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps омогућава додавање једноставних категорија за тачке на мапи, што искључује градове, путеве, језера, тлоцрте зграда, итд. Молимо Вас да такве категорије додате директно на <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Прочитајте наше <a href="https://organicmaps.app/faq/editing/advanced-map-editing">упутство</a> за детаљне инструкције, корак-по-корак.</string>
+    <string name="editor_category_unsuitable_text">CoMaps омогућава додавање једноставних категорија за тачке на мапи, што искључује градове, путеве, језера, тлоцрте зграда, итд. Молимо Вас да такве категорије додате директно на <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Прочитајте наше <a href="https://comaps.app/faq/editing/advanced-map-editing">упутство</a> за детаљне инструкције, корак-по-корак.</string>
     <string name="downloader_no_downloaded_maps_title">Нисте преузели ни једну мапу</string>
     <string name="downloader_no_downloaded_maps_message">Преузмите мапе да бисте претраживали и користили навигацију без интернета.</string>
     <string name="current_location_unknown_error_title">Тренутна локација није позната.</string>
@@ -582,7 +582,7 @@
     <string name="mobile_data_option_ask">Увек ме питај</string>
     <string name="traffic_update_maps_text">Да би се приказали подаци о саобраћају, мапа мора да се ажурира.</string>
     <string name="big_font">Увећана слова на мапи</string>
-    <string name="traffic_update_app">Молим Вас да ажурирате Organic Maps</string>
+    <string name="traffic_update_app">Молим Вас да ажурирате CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Подаци о саобраћају нису доступни</string>
     <string name="enable_logging">Снимање лог фајлова</string>
@@ -608,7 +608,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Молим Вас да се пријавите на OpenStreetMap да бисте аутоматски послали своје промене на мапи. Сазнајте више о томе <a href="https://github.com/organicmaps/organicmaps/issues/6144">овде</a>.</string>
     <string name="dialog_error_storage_title">Проблем са приступом меморији</string>
-    <string name="dialog_error_storage_message">Екстерна меморија није доступна. SD картица је можда уклоњена, оштећена, или је фајл систем само за читање. Молим Вас, проверите Вашу SD картицу или нас контактирајте на support\\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Екстерна меморија није доступна. SD картица је можда уклоњена, оштећена, или је фајл систем само за читање. Молим Вас, проверите Вашу SD картицу или нас контактирајте на support\\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Симулирај неисправну меморију</string>
     <string name="core_entrance">Улаз</string>
     <string name="error_enter_correct_name">Молим Вас да унесете исправан назив</string>
@@ -801,9 +801,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Наш главни циљ је да направимо брзу апликацију за мапе, једноставну за коришћење, оријентисану на приватност, коју ћете волети.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ви сада користите Organic Maps на екрану телефона</string>
+    <string name="car_used_on_the_phone_screen">Ви сада користите CoMaps на екрану телефона</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ви сада користите Organic Maps на екрану аутомобила</string>
+    <string name="car_used_on_the_car_screen">Ви сада користите CoMaps на екрану аутомобила</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Повезани сте на Андроид Ауто</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -871,7 +871,7 @@
     <string name="elevation_profile_max_elevation">Максимална висина</string>
     <string name="elevation_profile_min_elevation">Минимална висина</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
-    <string name="aa_location_permissions_request">Organic Maps је потребан локацијски приступ. Када је сигурно, проверите обавештење на свом телефону.</string>
+    <string name="aa_location_permissions_request">CoMaps је потребан локацијски приступ. Када је сигурно, проверите обавештење на свом телефону.</string>
     <string name="aa_request_permission_notification">Ова апликација је потребна ваша дозвола</string>
     <string name="copyright">Copyright</string>
     <string name="vk">VK</string>
@@ -882,14 +882,14 @@
     <string name="editor_focus_map_on_location">Превуците мапу да поставите крст на локацију места или посла.</string>
     <string name="precise_location_is_disabled_long_text">Да би се осигурала тачна навигација омогућите прецизну локацију у подешавањима.</string>
     <string name="mb">МБ</string>
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="already_donated">Већ је донирано</string>
     <string name="remind_me_later">Подсећати касније</string>
-    <string name="support_organic_maps">Подршка Organic Maps</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="support_organic_maps">Подршка CoMaps</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="editor_osm_history">Ваша историја уређивања</string>
     <string name="editor_osm_notes">Ваши подаци о мапи</string>
-    <string name="aa_request_permission_activity_text">Organic Maps у Android Auto-у је потребна дозвола за локацију да ефикасно раде</string>
+    <string name="aa_request_permission_activity_text">CoMaps у Android Auto-у је потребна дозвола за локацију да ефикасно раде</string>
     <string name="placepage_personal_notes_hint">Личне белешке (текст или хтмл)</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="social_media">Друштвени медији</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 83d19f498..4d4564c82 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Nedladdningen misslyckades</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Försök igen</string>
-    <string name="about_menu_title">Om Organic Maps</string>
+    <string name="about_menu_title">Om CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Gratis för alla, skapad med kärlek</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Hårdvaruaccelererad OpenGL krävs. Din enhet stöds tyvärr inte.</string>
     <string name="download">Ladda ner</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Vänligen koppla ifrån USB-kabeln eller sätt in ett minneskort för att använda Organic Maps</string>
+    <string name="disconnect_usb_cable">Vänligen koppla ifrån USB-kabeln eller sätt in ett minneskort för att använda CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Vänligen frigör utrymme på SD-kortet/USB-lagringen först för att använda appen.</string>
     <string name="download_resources">Innan du startar, låt oss ladda ner den allmäna världskartan på din enhet.
@@ -153,7 +153,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Anteckningar</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps bokmärken har delats med dig</string>
+    <string name="share_bookmarks_email_subject">CoMaps bokmärken har delats med dig</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Läser in bokmärken</string>
     <!-- Kmz file successful loading -->
@@ -163,7 +163,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Filtypen känns inte igen av appen:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Det gick inte att öppna filen %1$s
 \n
 \n%2$s</string>
@@ -175,13 +175,13 @@
     <string name="cant_change_this_setting">Tyvärr, kartlagring är inaktiverat i inställningar</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Kartan har börjat laddas ner.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hej, kolla på min nuvarande position på Organic Maps! %1$s eller %2$s Har du inte offline-kartor? Ladda ner här: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hej, kolla på min nuvarande position på CoMaps! %1$s eller %2$s Har du inte offline-kartor? Ladda ner här: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hej, kolla min kartnål på Organic Maps kartan</string>
+    <string name="bookmark_share_email_subject">Hej, kolla min kartnål på CoMaps kartan</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hej, kolla på min nuvarande position på Organic Maps kartan!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hej, kolla på min nuvarande position på CoMaps kartan!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hej,
 \n
 \nJag är här nu: %1$s. Klicka på länken %2$s eller här %3$s för att se platsen på kartan.
@@ -240,7 +240,7 @@
     <string name="search_show_on_map">Visa på kartan</string>
     <!-- Text in menu -->
     <string name="website">Webbplats</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nyheter</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Feedback</string>
@@ -254,7 +254,7 @@
     <string name="donate">Donera</string>
     <string name="already_donated">Redan donerat</string>
     <string name="remind_me_later">Påminn senare</string>
-    <string name="support_organic_maps">Stödja Organic Maps</string>
+    <string name="support_organic_maps">Stödja CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Stöd projektet</string>
     <!-- Button in the main Help dialog -->
@@ -478,7 +478,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Community-skapade OpenStreetMap-data från och med %s. Läs mer om hur du redigerar och uppdaterar kartan på OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) är ett community-projekt för att bygga en fri och öppen karta. Det är den huvudsakliga källan till kartdata i Organic Maps och fungerar på samma sätt som Wikipedia. Du kan lägga till eller redigera platser och de blir tillgängliga för miljontals användare över hela världen.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) är ett community-projekt för att bygga en fri och öppen karta. Det är den huvudsakliga källan till kartdata i CoMaps och fungerar på samma sätt som Wikipedia. Du kan lägga till eller redigera platser och de blir tillgängliga för miljontals användare över hela världen.
 \nGå med i samhället och hjälp till att skapa en bättre karta för alla!</string>
     <string name="login_to_make_edits_visible">Skapa ett OpenStreetMap-konto eller logga in för att publicera dina kartredigeringar till hela världen.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -496,7 +496,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Meddelande till OpenStreetMap-volontärer (valfritt)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Beskriv fel på kartan eller saker som inte kan redigeras med Organic Maps</string>
+    <string name="editor_note_hint">Beskriv fel på kartan eller saker som inte kan redigeras med CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Dina redigeringar laddas upp till den offentliga <a href="https://wiki.openstreetmap.org/wiki/Sv:Om_OpenStreetMap">OpenStreetMap</a>-databasen. Lägg inte till personlig eller upphovsrättsskyddad information.</string>
     <string name="editor_more_about_osm">Mer om OpenStreetMap</string>
@@ -506,7 +506,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operatör: %s</string>
     <string name="editor_category_unsuitable_title">Hittar du ingen lämplig kategori?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps tillåter endast att lägga till enkla punktkategorier, det betyder inga städer, vägar, sjöar, byggnadskonturer etc. Lägg till sådana kategorier direkt till <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Kontrollera vår <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guide</a> för detaljerade steg-för-steg-instruktioner.</string>
+    <string name="editor_category_unsuitable_text">CoMaps tillåter endast att lägga till enkla punktkategorier, det betyder inga städer, vägar, sjöar, byggnadskonturer etc. Lägg till sådana kategorier direkt till <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Kontrollera vår <a href="https://comaps.app/faq/editing/advanced-map-editing">guide</a> för detaljerade steg-för-steg-instruktioner.</string>
     <string name="downloader_no_downloaded_maps_title">Du har inte laddat ner några kartor</string>
     <string name="downloader_no_downloaded_maps_message">Ladda ner kartor för att hitta platsen och navigera offline.</string>
     <string name="current_location_unknown_error_title">Den nuvarande platsen är okänd.</string>
@@ -561,7 +561,7 @@
     <string name="mobile_data_option_ask">Fråga alltid</string>
     <string name="traffic_update_maps_text">Kartor måste uppdateras för att visa trafikdata.</string>
     <string name="big_font">Öka teckenstorlek på kartan</string>
-    <string name="traffic_update_app">Uppdatera Organic Maps</string>
+    <string name="traffic_update_app">Uppdatera CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Trafikdata är inte tillgänglig</string>
     <string name="enable_logging">Aktivera loggning</string>
@@ -587,7 +587,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Logga in på OpenStreetMap för att automatiskt ladda upp alla dina kartredigeringar. Läs mer <a href="https://github.com/organicmaps/organicmaps/issues/6144">här</a>.</string>
     <string name="dialog_error_storage_title">Lagringsåtkomstproblem</string>
-    <string name="dialog_error_storage_message">Extern lagring är inte tillgänglig. SD-kortet är borttaget, skadat eller så är filsystemet skrivskyddat. Kontrollera det och kontakta oss på support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Extern lagring är inte tillgänglig. SD-kortet är borttaget, skadat eller så är filsystemet skrivskyddat. Kontrollera det och kontakta oss på support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulera dålig lagring</string>
     <string name="core_entrance">Ingång</string>
     <string name="error_enter_correct_name">Ange ett korrekt namn</string>
@@ -653,7 +653,7 @@
     <string name="power_managment_setting_never">Aldrig</string>
     <string name="power_managment_setting_auto">Vid lågt batteri</string>
     <string name="power_managment_setting_manual_max">Alltid</string>
-    <string name="enable_logging_warning_message">Aktivera denna funktion för att logga detaljer för diagnostiska ändamål. Detta hjälper utvecklarna att identifiera problem med appen. Slå på funktionen endast på begäran av Organic Maps supporttjänst.</string>
+    <string name="enable_logging_warning_message">Aktivera denna funktion för att logga detaljer för diagnostiska ändamål. Detta hjälper utvecklarna att identifiera problem med appen. Slå på funktionen endast på begäran av CoMaps supporttjänst.</string>
     <string name="access_rules_author_only">Redigeras online</string>
     <string name="driving_options_title">Ruttinställningar</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -743,8 +743,8 @@
     <string name="enable_keep_screen_on_description">Vid aktivering kommer skärmen alltid att vara på när kartan visas.</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Kartdata från OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/sv/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/sv/</string>
     <!-- App Tip #00 -->
     <string name="app_tip_00">Tack för att du använder våra community-byggda kartor!</string>
     <!-- App tip #01 -->
@@ -766,9 +766,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Vårt huvudmål är att bygga snabba, integritetsfokuserade, lättanvända kartor som du kommer att älska.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Du använder nu Organic Maps på telefonens skärm</string>
+    <string name="car_used_on_the_phone_screen">Du använder nu CoMaps på telefonens skärm</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Du använder nu Organic Maps på bilskärmen</string>
+    <string name="car_used_on_the_car_screen">Du använder nu CoMaps på bilskärmen</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Du är ansluten till Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -776,11 +776,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Till bilens skärm</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps behöver platsåtkomst. När det är säkert kan du kontrollera aviseringen på din telefon.</string>
+    <string name="aa_location_permissions_request">CoMaps behöver platsåtkomst. När det är säkert kan du kontrollera aviseringen på din telefon.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Denna app behöver ditt tillstånd</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps i Android Auto behöver ett platstillstånd för att fungera effektivt</string>
+    <string name="aa_request_permission_activity_text">CoMaps i Android Auto behöver ett platstillstånd för att fungera effektivt</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Tilldela behörigheter</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 2f277bf84..727e64710 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -46,7 +46,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Aina ya faili haitambuliwi na programu:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Imeshindwa kufungua faili %1$s
 \n
 \n%2$s</string>
@@ -68,7 +68,7 @@
     <string name="pref_tts_test_voice_title">Jaribu maelekezo ya sauti (TTS, maandishi-kwa-hotuba)</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Angalia mipangilio ya sauti au ya mfumo ya kubadilisha maandishi-hadi-hotuba ikiwa husikii sauti sasa.</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Habari</string>
     <!-- Button in the main Help dialog -->
     <string name="faq">Maswali na majibu</string>
@@ -76,7 +76,7 @@
     <string name="donate">Changia</string>
     <string name="already_donated">Tayari kutoa</string>
     <string name="remind_me_later">Kumbusha baadaye</string>
-    <string name="support_organic_maps">Kuunga mkono Organic Maps</string>
+    <string name="support_organic_maps">Kuunga mkono CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Saidia mradi</string>
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
@@ -139,7 +139,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Mwendeshaji: %s</string>
     <string name="editor_category_unsuitable_title">Je, huwezi kupata aina inayofaa?</string>
-    <string name="editor_category_unsuitable_text">Ramani za Kikaboni huruhusu kuongeza kategoria rahisi pekee, hiyo inamaanisha hakuna miji, barabara, maziwa, muhtasari wa majengo, n.k. Tafadhali ongeza kategoria kama hizo moja kwa moja kwenye <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Angalia <a href="https://organicmaps.app/faq/editing/advanced-map-editing">mwongozo wetu</a> kwa maagizo ya kina ya hatua kwa hatua.</string>
+    <string name="editor_category_unsuitable_text">Ramani za Kikaboni huruhusu kuongeza kategoria rahisi pekee, hiyo inamaanisha hakuna miji, barabara, maziwa, muhtasari wa majengo, n.k. Tafadhali ongeza kategoria kama hizo moja kwa moja kwenye <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Angalia <a href="https://comaps.app/faq/editing/advanced-map-editing">mwongozo wetu</a> kwa maagizo ya kina ya hatua kwa hatua.</string>
     <string name="placepage_personal_notes_hint">Vidokezo vya kibinafsi (maandishi au HTML)</string>
     <string name="placepage_add_place_button">Ongeza Mahali kwa OpenStreetMap</string>
     <string name="editor_share_to_all_dialog_message_2">Wahariri wa OpenStreetMap watakagua mabadiliko na kuwasiliana nawe ikiwa wana maswali yoyote.</string>
@@ -167,7 +167,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Tafadhali ingia kwenye OpenStreetMap ili kupakia kiotomatiki hariri zako zote za ramani. Pata maelezo zaidi <a href="https://github.com/organicmaps/organicmaps/issues/6144">hapa</a>.</string>
     <string name="dialog_error_storage_title">Tatizo la kufikia hifadhi</string>
-    <string name="dialog_error_storage_message">Hifadhi ya nje haipatikani, pengine Kadi ya SD imeondolewa, imeharibika au mfumo wa faili ni wa kusoma pekee. Tafadhali ikague na uwasiliane nasi kwa kutumia support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Hifadhi ya nje haipatikani, pengine Kadi ya SD imeondolewa, imeharibika au mfumo wa faili ni wa kusoma pekee. Tafadhali ikague na uwasiliane nasi kwa kutumia support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Onyeshana hifadhi mbaya</string>
     <string name="core_entrance">Kiingilio</string>
     <string name="error_enter_correct_name">Tafadhali, weka jina sahihi</string>
@@ -232,7 +232,7 @@
     <string name="power_managment_setting_never">Kamwe</string>
     <string name="power_managment_setting_auto">Kiotomatiki</string>
     <string name="power_managment_setting_manual_max">Upeo wa kuhifadhi nishati</string>
-    <string name="enable_logging_warning_message">Chaguo huwasha data kwa madhumuni ya uchunguzi. Itakuwa muhimu kwa wafanyakazi wetu ambao wanatatua matatizo ya programu. Washa chaguo hili kwa maombi ya mhudumu wa Organic Maps tu.</string>
+    <string name="enable_logging_warning_message">Chaguo huwasha data kwa madhumuni ya uchunguzi. Itakuwa muhimu kwa wafanyakazi wetu ambao wanatatua matatizo ya programu. Washa chaguo hili kwa maombi ya mhudumu wa CoMaps tu.</string>
     <string name="access_rules_author_only">Uhariri mtandaoni</string>
     <string name="driving_options_title">Machaguo ya njia</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
@@ -353,11 +353,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Kwa skrini ya gari</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps zinahitaji ufikiaji wa eneo. Ikiwa salama, angalia arifa kwenye simu yako.</string>
+    <string name="aa_location_permissions_request">CoMaps zinahitaji ufikiaji wa eneo. Ikiwa salama, angalia arifa kwenye simu yako.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Programu hii inahitaji idhini yako</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps katika Android Auto zinahitaji ruhusa ya eneo ili kufanya kazi kwa ufanisi</string>
+    <string name="aa_request_permission_activity_text">CoMaps katika Android Auto zinahitaji ruhusa ya eneo ili kufanya kazi kwa ufanisi</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Ruhusa za ruzuku</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 0db51c3a8..005558163 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -38,7 +38,7 @@
     <string name="country_status_download_failed">การดาวน์โหลดล้มเหลว</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">ลองอีกครั้ง</string>
-    <string name="about_menu_title">เกี่ยวกับ Organic Maps</string>
+    <string name="about_menu_title">เกี่ยวกับ CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">ฟรีสำหรับทุกคนทำด้วยความรัก</string>
     <!-- Text in About screen -->
@@ -55,7 +55,7 @@
     <string name="unsupported_phone">จำเป็นต้องใช้ฮาร์ดแวร์ที่เพิ่มความเร็ว OpenGL โชคไม่ดีที่อุปกรณ์ของคุณไม่รองรับ</string>
     <string name="download">ดาวน์โหลด</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">โปรดยกเลิกการเชื่อมต่อสาย USB หรือใส่การ์ดหน่วยความจำเพื่อใช้ Organic Maps</string>
+    <string name="disconnect_usb_cable">โปรดยกเลิกการเชื่อมต่อสาย USB หรือใส่การ์ดหน่วยความจำเพื่อใช้ CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">โปรดเพิ่มพื้นที่บางส่วนบนการ์ด SD /พื้นที่จัดเก็บ USB ก่อนเพื่อใช้แอป</string>
     <string name="download_resources">ก่อนที่คุณจะเริ่มต้น โปรดให้เราดาวน์โหลดแผนที่โลกลงในอุปกรณ์ของคุณ
@@ -157,7 +157,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">บันทึก</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">แชร์บุ๊กมาร์กของ Organic Maps แล้ว</string>
+    <string name="share_bookmarks_email_subject">แชร์บุ๊กมาร์กของ CoMaps แล้ว</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">กำลังโหลดบุ๊กมาร์ก</string>
     <!-- Kmz file successful loading -->
@@ -167,7 +167,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">แอปไม่รู้จักประเภทไฟล์:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">ไม่สามารถเปิดไฟล์ได้ %1$s
 \n
 \n%2$s</string>
@@ -179,13 +179,13 @@
     <string name="cant_change_this_setting">ขออภัย ไม่มีการเปิดใช้งานการตั้งค่าพื้นที่จัดเก็บแผนที่ในปัจจุบัน</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">กำลังดำเนินการดาวน์โหลดประเทศในตอนนี้</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ Organic Maps! %1$s หรือ %2$s ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ CoMaps! %1$s หรือ %2$s ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">เฮ้ ตรวจสอบหมุดของฉันที่ แผนที่ Organic Maps!</string>
+    <string name="bookmark_share_email_subject">เฮ้ ตรวจสอบหมุดของฉันที่ แผนที่ CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">นี่ มาดูตำแหน่งปัจจุบันของฉันที่แผนที่ Organic Maps สิ!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">นี่ มาดูตำแหน่งปัจจุบันของฉันที่แผนที่ CoMaps สิ!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">หวัดดี
 \n
 \nฉันอยู่ที่นี่ตอนนี้: %1$s. คลิกลิงก์นี้ %2$s หรือลิงก์นี้ %3$s เพื่อดูสถานที่บนแผนที่
@@ -244,7 +244,7 @@
     <string name="search_show_on_map">ดูบนแผนที่</string>
     <!-- Text in menu -->
     <string name="website">เว็บไซต์</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">ข่าว</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">ข้อเสนอแนะ</string>
@@ -258,7 +258,7 @@
     <string name="donate">บริจาค</string>
     <string name="already_donated">บริจาคแล้ว</string>
     <string name="remind_me_later">เตือนภายหลัง</string>
-    <string name="support_organic_maps">สนับสนุน Organic Maps</string>
+    <string name="support_organic_maps">สนับสนุน CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">สนับสนุนโครงการ</string>
     <!-- Button in the main Help dialog -->
@@ -510,7 +510,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">ตัวดำเนินการ: %s</string>
     <string name="editor_category_unsuitable_title">ไม่พบหมวดหมู่ที่เหมาะสมใช่ไหม?</string>
-    <string name="editor_category_unsuitable_text">แผนที่ทั่วไปอนุญาตให้เพิ่มหมวดหมู่จุดธรรมดาเท่านั้น ซึ่งหมายความว่าไม่มีเมือง ถนน ทะเลสาบ โครงร่างอาคาร ฯลฯ โปรดเพิ่มหมวดหมู่ดังกล่าวลงใน <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. ดู<a href="https://organicmaps.app/faq/editing/advanced-map-editing">คำแนะนำ</a> ของเราเพื่อดูคำแนะนำโดยละเอียดทีละขั้นตอน</string>
+    <string name="editor_category_unsuitable_text">แผนที่ทั่วไปอนุญาตให้เพิ่มหมวดหมู่จุดธรรมดาเท่านั้น ซึ่งหมายความว่าไม่มีเมือง ถนน ทะเลสาบ โครงร่างอาคาร ฯลฯ โปรดเพิ่มหมวดหมู่ดังกล่าวลงใน <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. ดู<a href="https://comaps.app/faq/editing/advanced-map-editing">คำแนะนำ</a> ของเราเพื่อดูคำแนะนำโดยละเอียดทีละขั้นตอน</string>
     <string name="downloader_no_downloaded_maps_title">คุณยังไม่ได้ดาวน์โหลดแผนที่</string>
     <string name="downloader_no_downloaded_maps_message">ดาวน์โหลดแผนที่เพื่อค้นหาสถานที่ และนำทางแบบออฟไลน์</string>
     <string name="current_location_unknown_error_title">ไม่ทราบชื่อของที่ตั้งปัจจุบัน</string>
@@ -565,7 +565,7 @@
     <string name="mobile_data_option_ask">ถามก่อนเสมอ</string>
     <string name="traffic_update_maps_text">ต้องอัปเดตแผนที่เพื่อแสดงข้อมูลการจราจร</string>
     <string name="big_font">เพิ่มขนาดฟอนต์บนแผนที่</string>
-    <string name="traffic_update_app">กรุณาอัปเดต Organic Maps</string>
+    <string name="traffic_update_app">กรุณาอัปเดต CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">ไม่มีข้อมูลการจราจร</string>
     <string name="enable_logging">เปิดใช้งานการเก็บล็อก</string>
@@ -591,7 +591,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">กรุณาเข้าสู่ระบบ OpenStreetMap เพื่ออัปโหลดการแก้ไขแผนที่ทั้งหมดของคุณโดยอัตโนมัติ เรียนรู้เพิ่มเติม<a href="https://github.com/organicmaps/organicmaps/issues/6144">ที่นี่</a></string>
     <string name="dialog_error_storage_title">ปัญหาการเข้าถึงที่เก็บข้อมูล</string>
-    <string name="dialog_error_storage_message">ที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน อาจเป็นเพราะการ์ด SD ถูกถอดออกไป ได้รับความเสียหาย หรือระบบไฟล์ให้เขียนได้อย่างเดียว กรุณาตรวจสอบและติดต่อเราได้ที่ support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">ที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน อาจเป็นเพราะการ์ด SD ถูกถอดออกไป ได้รับความเสียหาย หรือระบบไฟล์ให้เขียนได้อย่างเดียว กรุณาตรวจสอบและติดต่อเราได้ที่ support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">จำลองแบบที่เก็บข้อมูลที่ไม่ดี</string>
     <string name="core_entrance">ทางเข้า</string>
     <string name="error_enter_correct_name">กรุณาใส่ชื่อที่ถูกต้อง</string>
@@ -657,7 +657,7 @@
     <string name="power_managment_setting_never">ไม่ใช้</string>
     <string name="power_managment_setting_auto">อัตโนมัติ</string>
     <string name="power_managment_setting_manual_max">ประหยัดพลังงานสูงสุด</string>
-    <string name="enable_logging_warning_message">ออปชันเพื่อเปิดการบันทึกประวัติการทำงานเพื่อการวินิจฉัย ประวัติดังกล่าวอาจเป็นประโยชน์กับทีมงานช่วยเหลือของเราที่คอยจัดการกับปัญหาที่เจอระหว่างแอปทำงาน โปรดเปิดออปชันดังกล่าวจากการร้องข้อการสนับสนุนจาก Organic Maps เท่านั้น</string>
+    <string name="enable_logging_warning_message">ออปชันเพื่อเปิดการบันทึกประวัติการทำงานเพื่อการวินิจฉัย ประวัติดังกล่าวอาจเป็นประโยชน์กับทีมงานช่วยเหลือของเราที่คอยจัดการกับปัญหาที่เจอระหว่างแอปทำงาน โปรดเปิดออปชันดังกล่าวจากการร้องข้อการสนับสนุนจาก CoMaps เท่านั้น</string>
     <string name="access_rules_author_only">การแก้ไขทางออนไลน์</string>
     <string name="driving_options_title">ทางเลือกเส้นทางขับขี่</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index e00c19040..4767a81d9 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -38,7 +38,7 @@
     <string name="country_status_download_failed">İndirme başarısız oldu</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Tekrar Dene</string>
-    <string name="about_menu_title">Organic Maps Hakkında</string>
+    <string name="about_menu_title">CoMaps Hakkında</string>
     <!-- Text in About screen -->
     <string name="about_headline">Sevgiyle yapılmış, herkes için ücretsiz harita</string>
     <!-- Text in About screen -->
@@ -55,7 +55,7 @@
     <string name="unsupported_phone">Hızlı donanıma sahip bir OpenGL gerekli. Ne yazık ki cihazınız desteklenmiyor.</string>
     <string name="download">İndir</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Organic Maps’i kullanabilmek için lütfen USB kablosunun bağlantısını kesin veya hafıza kartı takın</string>
+    <string name="disconnect_usb_cable">CoMaps’i kullanabilmek için lütfen USB kablosunun bağlantısını kesin veya hafıza kartı takın</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Uygulamayı kullanabilmek için lütfen SD kart/USB depolama aygıtında biraz alan boşaltın</string>
     <string name="download_resources">Başlamadan önce cihazınıza genel dünya haritasını indirelim.
@@ -169,12 +169,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notlar</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Seninle paylaşılan Organic Maps yer imleri</string>
+    <string name="share_bookmarks_email_subject">Seninle paylaşılan CoMaps yer imleri</string>
     <string name="share_bookmarks_email_body">Merhaba!
 \n
-\nEktekiler benim Organic Maps yer imlerim. Eğer Organic Maps\'i yüklediyseniz lütfen ektekileri açın. Eğer yüklemediyseniz, bu bağlantıyı takip ederek iOS ve Android cihazınız için uygulamayı yükleyebilirsiniz: https://omaps.app/get?kmz
+\nEktekiler benim CoMaps yer imlerim. Eğer CoMaps\'i yüklediyseniz lütfen ektekileri açın. Eğer yüklemediyseniz, bu bağlantıyı takip ederek iOS ve Android cihazınız için uygulamayı yükleyebilirsiniz: https://comaps.app/get?kmz
 \n
-\nOrganic Maps ile seyahat etmenin keyfini çıkarın!</string>
+\nCoMaps ile seyahat etmenin keyfini çıkarın!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Yer İmleri Yükleniyor</string>
     <!-- Kmz file successful loading -->
@@ -184,7 +184,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Dosya türü uygulama tarafından tanınmıyor:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Dosya açılamadı %1$s
 \n
 \n%2$s</string>
@@ -196,13 +196,13 @@
     <string name="cant_change_this_setting">Üzgünüz, Harita Depolama ayarları şu anda devre dışı.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Harita indirme işlemi şu anda sürüyor.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Hey, Organic Maps’te geçerli konumumu incele! %1$s veya %2$s Çevrimdışı haritalar sende yok mu? Buradan indir: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Hey, CoMaps’te geçerli konumumu incele! %1$s veya %2$s Çevrimdışı haritalar sende yok mu? Buradan indir: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, Organic Maps haritasında raptiyemi incele!</string>
+    <string name="bookmark_share_email_subject">Hey, CoMaps haritasında raptiyemi incele!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hey, Organic Maps’te geçerli konumumu incele!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hey, CoMaps’te geçerli konumumu incele!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Merhaba,
 \n
 \nŞu anda bulunduğum yer: %1$s. Yeri haritada görmek için %2$s veya %3$s bağlantısına tıkla.
@@ -265,7 +265,7 @@
     <string name="search_show_on_map">Haritada görüntüle</string>
     <!-- Text in menu -->
     <string name="website">Web Sitesi</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Haberler</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Geri Bildirim</string>
@@ -279,7 +279,7 @@
     <string name="donate">Bağış yapın</string>
     <string name="already_donated">Zaten bağış yaptım</string>
     <string name="remind_me_later">Sonra hatırlat</string>
-    <string name="support_organic_maps">Organic Maps’i Destekleyin</string>
+    <string name="support_organic_maps">CoMaps’i Destekleyin</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Bu projeyi destekleyin</string>
     <!-- Button in the main Help dialog -->
@@ -512,7 +512,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">%s tarihine ait topluluk tarafından oluşturulmuş OpenStreetMap verilerini kullanıyorsunuz. OpenStreetMap.org adresinden haritayı nasıl düzenleyebileceğiniz hakkında bilgi edinebilirsiniz</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM), ücretsiz ve açık harita oluşturmayı amaçlayan bir topluluk projesidir. OSM, Organic Maps\'teki harita verilerinin ana kaynağıdır ve Vikipedi\'ye benzer şekilde çalışır. Haritadaki yerleri ekleyebilir veya düzenleyebilirsiniz ve bunlar tüm dünyadaki milyonlarca kullanıcı tarafından kullanılabilir hale gelir.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM), ücretsiz ve açık harita oluşturmayı amaçlayan bir topluluk projesidir. OSM, CoMaps\'teki harita verilerinin ana kaynağıdır ve Vikipedi\'ye benzer şekilde çalışır. Haritadaki yerleri ekleyebilir veya düzenleyebilirsiniz ve bunlar tüm dünyadaki milyonlarca kullanıcı tarafından kullanılabilir hale gelir.
 \nTopluluğa katılın ve herkes için daha iyi bir harita oluşturmaya yardımcı olun!</string>
     <string name="login_to_make_edits_visible">Harita düzenlemelerinizin herkese ulaşabilmesi için bir OpenStreetMap hesabı oluşturun veya oturum açın.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -540,7 +540,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operatör: %s</string>
     <string name="editor_category_unsuitable_title">Uygun bir kategori bulamıyor musunuz?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps yalnızca basit nokta kategorilerini eklemeye izin verir. Yani kasaba, yol, göl, bina vb. çizgi/alan verisi ekleme desteği yoktur. Lütfen bu tür kategorileri doğrudan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> üzerinden ekleyin. Adım adım ayrıntılı yönergeler için <a href="https://organicmaps.app/faq/editing/advanced-map-editing">rehberimize</a> göz atabilirsiniz.</string>
+    <string name="editor_category_unsuitable_text">CoMaps yalnızca basit nokta kategorilerini eklemeye izin verir. Yani kasaba, yol, göl, bina vb. çizgi/alan verisi ekleme desteği yoktur. Lütfen bu tür kategorileri doğrudan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> üzerinden ekleyin. Adım adım ayrıntılı yönergeler için <a href="https://comaps.app/faq/editing/advanced-map-editing">rehberimize</a> göz atabilirsiniz.</string>
     <string name="downloader_no_downloaded_maps_title">Hiç harita indirmediniz</string>
     <string name="downloader_no_downloaded_maps_message">Çevrimdışı olarak adres bulmak ve gezinmek için haritaları indirin.</string>
     <string name="current_location_unknown_error_title">Geçerli konum bilinmiyor.</string>
@@ -602,7 +602,7 @@
     <string name="mobile_data_option_ask">Her Zaman Sor</string>
     <string name="traffic_update_maps_text">Trafik verilerini görüntülemek için haritaların güncellenmesi gerekiyor.</string>
     <string name="big_font">Haritadaki yazı tipi boyutunu artır</string>
-    <string name="traffic_update_app">Lütfen Organic Maps\'i güncelleyin</string>
+    <string name="traffic_update_app">Lütfen CoMaps\'i güncelleyin</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Trafik verileri kullanılamıyor</string>
     <string name="enable_logging">Günlüğü etkinleştir</string>
@@ -626,7 +626,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Tüm harita düzenlemelerinizi otomatik olarak yüklemek için lütfen OpenStreetMap\'e giriş yapın. Daha fazla bilgi <a href="https://github.com/organicmaps/organicmaps/issues/6144">burada</a>.</string>
     <string name="dialog_error_storage_title">Depolama alanı erişim sorunu</string>
-    <string name="dialog_error_storage_message">Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin veya support\@organicmaps.app adresinden bizimle iletişime geçin</string>
+    <string name="dialog_error_storage_message">Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin veya support\@comaps.app adresinden bizimle iletişime geçin</string>
     <string name="setting_emulate_bad_storage">Bozuk depolama alanını taklit et</string>
     <string name="core_entrance">Giriş</string>
     <string name="error_enter_correct_name">Lütfen doğru bir isim girin</string>
@@ -800,8 +800,8 @@
     <string name="splash_subtitle">Harita verileri OpenStreetMap\'ten</string>
     <!-- Telegram group url for the "?" About page -->
     <!-- Instagram account url for the "?" About page -->
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/tr/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/tr/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Tr:About</string>
     <!-- App Tip #00 -->
@@ -825,9 +825,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Temel amacımız hızlı, gizlilik odaklı, kullanımı kolay, seveceğiniz bir harita uygulaması oluşturmaktır.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Artık Organic Maps\'i telefon ekranında kullanıyorsunuz</string>
+    <string name="car_used_on_the_phone_screen">Artık CoMaps\'i telefon ekranında kullanıyorsunuz</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Şu anda araç ekranında Organic Maps kullanıyorsunuz</string>
+    <string name="car_used_on_the_car_screen">Şu anda araç ekranında CoMaps kullanıyorsunuz</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Android Auto\'ya bağlandınız</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -835,11 +835,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Arabada göster</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps konum erişimine ihtiyacı vardır. Güvenli olduğunda, telefonunuzdaki bildirimi kontrol edin.</string>
+    <string name="aa_location_permissions_request">CoMaps konum erişimine ihtiyacı vardır. Güvenli olduğunda, telefonunuzdaki bildirimi kontrol edin.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Bu uygulamanın izninize ihtiyacı var</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Android Auto\'daki Organic Maps etkin bir şekilde çalışması için konum izni gerekiyor</string>
+    <string name="aa_request_permission_activity_text">Android Auto\'daki CoMaps etkin bir şekilde çalışması için konum izni gerekiyor</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">İzinleri Verin</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index d57f5f196..919ff1ecc 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">Помилка завантаження</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Спробуйте ще раз</string>
-    <string name="about_menu_title">Про Organic Maps</string>
+    <string name="about_menu_title">Про CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Безкоштовно для всіх, зроблене з любов\'ю</string>
     <!-- Text in About screen -->
@@ -167,12 +167,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Примітка</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">З вами поділилися мiтками Organic Maps</string>
+    <string name="share_bookmarks_email_subject">З вами поділилися мiтками CoMaps</string>
     <string name="share_bookmarks_email_body">Привіт!
 \n
-\nДодаю мої мiтки; відкрийте їх у Organic Maps. Якщо застосунок не встановлено, ви можете завантажити його тут: https://omaps.app/get?kmz
+\nДодаю мої мiтки; відкрийте їх у CoMaps. Якщо застосунок не встановлено, ви можете завантажити його тут: https://comaps.app/get?kmz
 \n
-\nНасолоджуйтесь подорожами з Organic Maps!</string>
+\nНасолоджуйтесь подорожами з CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Завантаження мiток</string>
     <!-- Kmz file successful loading -->
@@ -182,7 +182,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Тип файлу не розпізнається програмою:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Не вдалося відкрити файл %1$s
 \n
 \n%2$s</string>
@@ -194,13 +194,13 @@
     <string name="cant_change_this_setting">Вибачте, налаштування папки з мапами зараз недоступні.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Зараз відбувається завантаження країни.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Глянь де я зараз. Іди %1$s або %2$s</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Поглянь на мою мiтку на мапі Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Поглянь на мою мiтку на мапі CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Поглянь на моє поточне розташування на мапі Organic Maps!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Поглянь на моє поточне розташування на мапі CoMaps!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Привіт,
 \n
 \nЯ зараз тут: %1$s. Натисни на це посилання %2$s або на це посилання %3$s щоб побачити місце на мапі.
@@ -265,7 +265,7 @@
     <string name="menu">Меню</string>
     <!-- Text in menu -->
     <string name="website">Вебсайт</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Новини</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Відгук</string>
@@ -279,7 +279,7 @@
     <string name="donate">Підтримати грошима</string>
     <string name="already_donated">Вже пожертвувано</string>
     <string name="remind_me_later">Нагадати пізніше</string>
-    <string name="support_organic_maps">Підтримати Organic Maps</string>
+    <string name="support_organic_maps">Підтримати CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Підтримайте проект</string>
     <!-- Button in the main Help dialog -->
@@ -507,7 +507,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Дані OpenStreetMap, створені спільнотою, станом на %s. Дізнайтеся більше про те, як редагувати та оновлювати мапу на OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) - це громадський проект зі створення вільної та відкритої мапи. Це основне джерело картографічних даних в Organic Maps і працює подібно до Вікіпедії. Ви можете додавати або редагувати місця, і вони стають доступними мільйонам користувачів по всьому світу.
+    <string name="login_osm_presentation">OpenStreetMap.org (OSM) - це громадський проект зі створення вільної та відкритої мапи. Це основне джерело картографічних даних в CoMaps і працює подібно до Вікіпедії. Ви можете додавати або редагувати місця, і вони стають доступними мільйонам користувачів по всьому світу.
 \nПриєднуйтесь до спільноти і допоможіть зробити мапу кращою для всіх!</string>
     <string name="login_to_make_edits_visible">Створіть обліковий запис OpenStreetMap або увійдіть до нього, щоб опублікувати свої редагування мапи для всього світу.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -525,7 +525,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Примітка для волонтерів OpenStreetMap (необов\'язково)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Опишіть помилки на карті або те, що не можна редагувати за допомогою Organic Maps</string>
+    <string name="editor_note_hint">Опишіть помилки на карті або те, що не можна редагувати за допомогою CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Ваші правки завантажуються до публічної бази даних <a href="https://wiki.openstreetmap.org/wiki/Uk:Про_проект">OpenStreetMap</a>. Будь ласка, не додавайте особисту або захищену авторським правом інформацію.</string>
     <string name="editor_more_about_osm">Більше про OpenStreetMap</string>
@@ -535,7 +535,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Оператор: %s</string>
     <string name="editor_category_unsuitable_title">Не можете знайти відповідну категорію?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps дозволяють додавати до мапи лише прості типи об\'єктів, тобто без міст, доріг, озер та контурів будівель. Будь ласка, додайте такі категорії на сайті <a href="https://www.openstreetmap.org/">OpenStreetMap.org</a>. Ми також рекомендуємо ознайомитися із <a href="https://organicmaps.app/faq/editing/advanced-map-editing/">детальними інструкціями та іншими додатками для редагування карти</a>.</string>
+    <string name="editor_category_unsuitable_text">CoMaps дозволяють додавати до мапи лише прості типи об\'єктів, тобто без міст, доріг, озер та контурів будівель. Будь ласка, додайте такі категорії на сайті <a href="https://www.openstreetmap.org/">OpenStreetMap.org</a>. Ми також рекомендуємо ознайомитися із <a href="https://comaps.app/faq/editing/advanced-map-editing/">детальними інструкціями та іншими додатками для редагування карти</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Ви не маєте завантажених мап</string>
     <string name="downloader_no_downloaded_maps_message">Завантажте необхідні мапи, щоб знаходити місця та користуватися навігацією без iнтернету.</string>
     <string name="current_location_unknown_error_title">Місцезнаходження не знайдено.</string>
@@ -597,7 +597,7 @@
     <string name="mobile_data_option_ask">Завжди питати</string>
     <string name="traffic_update_maps_text">Для відображення інформації про трафік необхідно оновити мапи.</string>
     <string name="big_font">Збільшити розмір шрифту на мапі</string>
-    <string name="traffic_update_app">Будь ласка, встановіть оновлення Organic Maps</string>
+    <string name="traffic_update_app">Будь ласка, встановіть оновлення CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Дані про трафік недоступні</string>
     <string name="enable_logging">Включити логіювання</string>
@@ -623,7 +623,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Будь ласка увійдіть в акаунт OpenStreetMap.org, щоб автоматично публікувати зміни до мапи. Подробиці за <a href="https://github.com/organicmaps/organicmaps/issues/6144">посиланням</a>.</string>
     <string name="dialog_error_storage_title">Не вдалося отримати доступ до сховища</string>
-    <string name="dialog_error_storage_message">Зовнішнє сховище не доступно. Ймовірно, SD-картку пам\'яті було вилучено, пошкоджено, або система файлів доступна тільки для читання. Перевірте та зв\'яжіться з нами, написавши на поштову адресу support@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Зовнішнє сховище не доступно. Ймовірно, SD-картку пам\'яті було вилучено, пошкоджено, або система файлів доступна тільки для читання. Перевірте та зв\'яжіться з нами, написавши на поштову адресу support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулювати проблемне сховище</string>
     <string name="core_entrance">Вхід</string>
     <string name="error_enter_correct_name">Будь ласка, введіть коректне ім\'я</string>
@@ -800,8 +800,8 @@
     <string name="change_map_locale">Мова карти</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Картографічні дані з OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/uk/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/uk/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Uk:Про_проект</string>
     <!-- App Tip #00 -->
@@ -825,9 +825,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Наша головна мета – створити швидкі, конфіденційні та прості у використанні карти, які вам сподобаються.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Зараз ви використовуєте Organic Maps на екрані телефону</string>
+    <string name="car_used_on_the_phone_screen">Зараз ви використовуєте CoMaps на екрані телефону</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ви використовуєте Organic Maps на екрані автомобіля</string>
+    <string name="car_used_on_the_car_screen">Ви використовуєте CoMaps на екрані автомобіля</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Ви підключені до Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -835,11 +835,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">На екран автомобіля</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Для роботи Organic Maps потрібен доступ до місцезнаходження. Коли це буде безпечно, перевірте сповіщення на телефоні.</string>
+    <string name="aa_location_permissions_request">Для роботи CoMaps потрібен доступ до місцезнаходження. Коли це буде безпечно, перевірте сповіщення на телефоні.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">Ця програма потребує вашого дозволу</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Для ефективної роботи Organic Maps в Android Auto потрібні дозвіли на розташування</string>
+    <string name="aa_request_permission_activity_text">Для ефективної роботи CoMaps в Android Auto потрібні дозвіли на розташування</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Надавати дозволи</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
@@ -901,7 +901,7 @@
     <string name="vk">VK</string>
     <string name="instagram">Instagram</string>
     <string name="level_value_generic">Поверх: %s</string>
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
     <string name="editor_add_phone">Додати телефон</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index a1ed54f53..6cb7e92a3 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -36,7 +36,7 @@
     <string name="country_status_download_failed">Tải xuống đã thất bại</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Thử lại</string>
-    <string name="about_menu_title">Giới thiệu về Organic Maps</string>
+    <string name="about_menu_title">Giới thiệu về CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Miễn phí cho mọi người, được làm bằng tình yêu</string>
     <!-- Text in About screen -->
@@ -53,7 +53,7 @@
     <string name="unsupported_phone">Cần có OpenGL được tăng tốc phần cứng. Thật không may, thiết bị của bạn không được hỗ trợ.</string>
     <string name="download">Tải xuống</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Bạn vui lòng tháo cáp USB hoặc lắp thẻ nhớ vào để sử dụng Organic Maps</string>
+    <string name="disconnect_usb_cable">Bạn vui lòng tháo cáp USB hoặc lắp thẻ nhớ vào để sử dụng CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Bạn vui lòng giải phóng dung lượng trên ổ lưu trữ thẻ SD/USB để có thể sử dụng ứng dụng</string>
     <string name="download_resources">Trước khi bạn bắt đầu, hãy để chúng tôi tải bản đồ thế giới vào thiết bị của bạn.
@@ -155,7 +155,7 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Ghi chú</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Điểm đánh dấu Organic Maps được chia sẻ</string>
+    <string name="share_bookmarks_email_subject">Điểm đánh dấu CoMaps được chia sẻ</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Tải Điểm đánh dấu</string>
     <!-- Kmz file successful loading -->
@@ -165,7 +165,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Loại tệp không được ứng dụng nhận dạng:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Không thể mở tập tin %1$s
 \n
 \n%2$s</string>
@@ -177,13 +177,13 @@
     <string name="cant_change_this_setting">Rất tiếc, cài đặt Lưu trữ Bản đồ hiện đã bị tắt.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Hiện đang tải xuống quốc gia.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Này, hãy xem vị trí hiện tại của tôi tại Organic Maps! %1$s hoặc %2$s Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Này, hãy xem vị trí hiện tại của tôi tại CoMaps! %1$s hoặc %2$s Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Này, hãy xem ghim của tôi tại Organic Maps map</string>
+    <string name="bookmark_share_email_subject">Này, hãy xem ghim của tôi tại CoMaps map</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Này, hãy xem vị trí hiện tại của tôi tại Organic Maps map!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Này, hãy xem vị trí hiện tại của tôi tại CoMaps map!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Chào,
 \n
 \nTôi hiện đang ở đây: %1$s. Hãy nhấn vào liên kết này %2$s hoặc liên kết này %3$s để xem địa điểm trên bản đồ.
@@ -242,7 +242,7 @@
     <string name="search_show_on_map">Xem trên bản đồ</string>
     <!-- Text in menu -->
     <string name="website">Trang web</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Tin tức</string>
     <!-- Settings: Send feedback button and dialog title -->
     <string name="feedback">Phản hồi</string>
@@ -256,7 +256,7 @@
     <string name="donate">Quyên tặng</string>
     <string name="already_donated">Đã quyên góp</string>
     <string name="remind_me_later">Nhắc sau</string>
-    <string name="support_organic_maps">Hỗ trợ Organic Maps</string>
+    <string name="support_organic_maps">Hỗ trợ CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Hỗ trợ dự án</string>
     <!-- Button in the main Help dialog -->
@@ -508,7 +508,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Toán tử: %s</string>
     <string name="editor_category_unsuitable_title">Không thể tìm thấy một danh mục phù hợp?</string>
-    <string name="editor_category_unsuitable_text">Bản đồ không phải trả tiền chỉ cho phép thêm các danh mục điểm đơn giản, nghĩa là không có thị trấn, đường, hồ, đường viền tòa nhà, v.v. Vui lòng thêm các danh mục đó trực tiếp vào <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Hãy xem <a href="https://organicmaps.app/faq/editing/advanced-map-editing">hướng dẫn</a> của chúng tôi để biết hướng dẫn chi tiết từng bước.</string>
+    <string name="editor_category_unsuitable_text">Bản đồ không phải trả tiền chỉ cho phép thêm các danh mục điểm đơn giản, nghĩa là không có thị trấn, đường, hồ, đường viền tòa nhà, v.v. Vui lòng thêm các danh mục đó trực tiếp vào <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Hãy xem <a href="https://comaps.app/faq/editing/advanced-map-editing">hướng dẫn</a> của chúng tôi để biết hướng dẫn chi tiết từng bước.</string>
     <string name="downloader_no_downloaded_maps_title">Bạn chưa tải về bất kỳ bản đồ nào</string>
     <string name="downloader_no_downloaded_maps_message">Tải về bản đồ để tìm địa điểm và định hướng ngoại tuyến.</string>
     <string name="current_location_unknown_error_title">Chưa biết địa điểm hiện tại.</string>
@@ -563,7 +563,7 @@
     <string name="mobile_data_option_ask">Luôn Hỏi</string>
     <string name="traffic_update_maps_text">Để hiển thị dữ liệu giao thông, cần cập nhật bản đồ.</string>
     <string name="big_font">Tăng kích cỡ phông chữ trên bản đồ</string>
-    <string name="traffic_update_app">Vui lòng cập nhật Organic Maps</string>
+    <string name="traffic_update_app">Vui lòng cập nhật CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Dữ liệu giao thông không khả dụng</string>
     <string name="enable_logging">Bật nhật ký</string>
@@ -589,7 +589,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Vui lòng đăng nhập vào OpenStreetMap để tự động tải lên tất cả các chỉnh sửa bản đồ của bạn. Tìm hiểu thêm <a href="https://github.com/organicmaps/organicmaps/issues/6144">tại đây</a>.</string>
     <string name="dialog_error_storage_title">Vấn đề truy cập ổ lưu trữ</string>
-    <string name="dialog_error_storage_message">Ổ lưu trữ bên ngoài không khả dụng, có thể Thẻ SD đã bị tháo, bị hỏng hoặc hệ thống tập tin được thiết lập chỉ đọc. Hãy kiểm tra và liên hệ với chúng tôi qua support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">Ổ lưu trữ bên ngoài không khả dụng, có thể Thẻ SD đã bị tháo, bị hỏng hoặc hệ thống tập tin được thiết lập chỉ đọc. Hãy kiểm tra và liên hệ với chúng tôi qua support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Giả lập ổ lưu trữ hỏng</string>
     <string name="core_entrance">Lối vào</string>
     <string name="error_enter_correct_name">Vui lòng nhập một tên chính xác</string>
@@ -651,7 +651,7 @@
     <string name="power_managment_setting_never">Không bao giờ</string>
     <string name="power_managment_setting_auto">Tự động</string>
     <string name="power_managment_setting_manual_max">Tiết kiệm năng lượng tối đa</string>
-    <string name="enable_logging_warning_message">Tùy chọn này được kích hoạt để ghi nhật ký đăng nhập cho mục đích chẩn đoán. Điều này sẽ giúp nhóm chúng tôi làm rõ các vấn đề liên quan đến ứng dụng. Hãy bật tùy chọn này chỉ khi nào có yêu cầu hỗ trợ từ Organic Maps.</string>
+    <string name="enable_logging_warning_message">Tùy chọn này được kích hoạt để ghi nhật ký đăng nhập cho mục đích chẩn đoán. Điều này sẽ giúp nhóm chúng tôi làm rõ các vấn đề liên quan đến ứng dụng. Hãy bật tùy chọn này chỉ khi nào có yêu cầu hỗ trợ từ CoMaps.</string>
     <string name="access_rules_author_only">Chỉnh sửa trực tuyến</string>
     <string name="driving_options_title">Thiết lập đi vòng</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
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 9f04b5788..b430bf495 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">下載失敗</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">再試一次</string>
-    <string name="about_menu_title">關於 Organic Maps</string>
+    <string name="about_menu_title">關於 CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">對每個人都免費，用愛製成</string>
     <!-- Text in About screen -->
@@ -56,14 +56,12 @@
     <string name="unsupported_phone">該應用程式需要硬體加速的 OpenGL。很遺憾，您的裝置不受支援。</string>
     <string name="download">下載</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">請拔除 USB 線或插入 SD 卡以使用 Organic Maps</string>
+    <string name="disconnect_usb_cable">請拔除 USB 線或插入 SD 卡以使用 CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">請先釋放一些 SD 卡 / USB 儲存空間以使用 Organic Maps。</string>
-    <string name="download_resources">在您開始使用此應用程式之前，請下載全球地圖到您的裝置。
-\n它將使用 %s 的儲存空間。</string>
+    <string name="not_enough_free_space_on_sdcard">請先釋放一些 SD 卡 / USB 儲存空間以使用 CoMaps。</string>
+    <string name="download_resources">在您開始使用此應用程式之前，請下載全球地圖到您的裝置\n它將使用 %s 的儲存空間。</string>
     <string name="download_resources_continue">前往地圖</string>
-    <string name="downloading_country_can_proceed">正在下載%s。您現在可以
-\n繼續查看地圖。</string>
+    <string name="downloading_country_can_proceed">正在下載%s。您現在可以\n繼續查看地圖。</string>
     <string name="download_country_ask">下載%s的地圖嗎？</string>
     <string name="update_country_ask">更新%s的地圖嗎？</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
@@ -111,8 +109,7 @@
     <!-- Error moving map files from one storage to another -->
     <string name="move_maps_error">移動地圖檔案時出錯</string>
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
-    <string name="wait_several_minutes">這可能需要幾分鐘的時間
-\n請稍候…</string>
+    <string name="wait_several_minutes">這可能需要幾分鐘的時間\n請稍候…</string>
     <!-- Measurement units title in settings activity -->
     <string name="measurement_units">測量單位</string>
     <!-- Detailed description of Measurement Units settings button -->
@@ -170,12 +167,8 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">註釋</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">已與您分享 Organic Maps 書籤</string>
-    <string name="share_bookmarks_email_body">您好！
-\n
-\n附件是我的書籤，請在 Organic Maps 中打開。如果您沒有安裝 Organic Maps，可以在這裡下載: https://omaps.app/get?kmz
-\n
-\n祝您使用 Organic Maps 旅行愉快！</string>
+    <string name="share_bookmarks_email_subject">已與您分享 CoMaps 書籤</string>
+    <string name="share_bookmarks_email_body">您好！\n附件是我的書籤，請在 CoMaps 中打開。如果您沒有安裝 CoMaps，可以在這裡下載: https://comaps.app/get?kmz\n祝您使用 CoMaps 旅行愉快！</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">正在載入書籤…</string>
     <!-- Kmz file successful loading -->
@@ -183,12 +176,9 @@
     <!-- Kml file loading failed -->
     <string name="load_kmz_failed">書籤載入失敗，檔案可能已損壞或不完整。</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
-    <string name="unknown_file_type">應用程式無法識別該文件類型：
-\n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
-    <string name="failed_to_open_file">無法打開檔案 %1$s
-\n
-\n%2$s</string>
+    <string name="unknown_file_type">應用程式無法識別該文件類型：\n%1$s</string>
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
+    <string name="failed_to_open_file">無法打開檔案 %1$s\n%2$s</string>
     <!-- resource for context menu -->
     <string name="edit">編輯</string>
     <!-- Warning message when doing search around current position -->
@@ -197,18 +187,14 @@
     <string name="cant_change_this_setting">很抱歉，地圖儲存設定目前已停用。</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">地圖下載進行中。</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">嘿，在 Organic Maps 查看我的目前的位置吧！請打開 %1$s 或 %2$s 鏈接，還沒安裝離線地圖？在此下載: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">嘿，在 CoMaps 查看我的目前的位置吧！請打開 %1$s 或 %2$s 鏈接，還沒安裝離線地圖？在此下載: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">嘿，看看我在 Organic Maps 上標記的圖釘吧！</string>
+    <string name="bookmark_share_email_subject">嘿，看看我在 CoMaps 上標記的圖釘吧！</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">嗨，到 Organic Maps 查看我目前的位置！</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
-    <string name="my_position_share_email">嗨，
-\n
-\n我現在在這：%1$s。點擊此連結 %2$s 或此連結 %3$s 來查看在地圖上的位置。
-\n
-\n謝謝。</string>
+    <string name="my_position_share_email_subject">嗨，到 CoMaps 查看我目前的位置！</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email">嗨，\n我現在在這：%1$s。點擊此連結 %2$s 或此連結 %3$s 來查看在地圖上的位置。\n謝謝。</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">分享</string>
     <!-- Share by email button text, also used in editor and About. -->
@@ -268,7 +254,7 @@
     <string name="menu">菜單</string>
     <!-- Text in menu -->
     <string name="website">網站</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">新聞</string>
     <!-- Text in menu -->
     <string name="facebook">Facebook</string>
@@ -286,7 +272,7 @@
     <string name="donate">捐助我們</string>
     <string name="already_donated">已捐贈</string>
     <string name="remind_me_later">稍後提醒</string>
-    <string name="support_organic_maps">支持 Organic Maps</string>
+    <string name="support_organic_maps">支持 CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">支持本項目</string>
     <!-- Button in the main Help dialog -->
@@ -548,7 +534,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">操作員: %s</string>
     <string name="editor_category_unsuitable_title">找不到合適的類別？</string>
-    <string name="editor_category_unsuitable_text">Organic Maps 只允許添加簡單的點類別，即無法添加城鎮、道路、湖泊、建築輪廓等類別。請直接向 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 新增此類類別。請查看我們的<a href="https://organicmaps.app/faq/editing/advanced-map-editing">指南</a>，以了解詳細的步驟說明。</string>
+    <string name="editor_category_unsuitable_text">CoMaps 只允許添加簡單的點類別，即無法添加城鎮、道路、湖泊、建築輪廓等類別。請直接向 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 新增此類類別。請查看我們的<a href="https://comaps.app/faq/editing/advanced-map-editing">指南</a>，以了解詳細的步驟說明。</string>
     <string name="downloader_no_downloaded_maps_title">您尚未下載任何地圖</string>
     <string name="downloader_no_downloaded_maps_message">下載地圖來尋找位置和離線瀏覽。</string>
     <string name="current_location_unknown_error_title">目前位置未知。</string>
@@ -610,16 +596,14 @@
     <string name="mobile_data_option_ask">一律詢問</string>
     <string name="traffic_update_maps_text">若要顯示交通資料，必須更新地圖。</string>
     <string name="big_font">增加地圖上的字體大小</string>
-    <string name="traffic_update_app">請更新 Organic Maps</string>
+    <string name="traffic_update_app">請更新 CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">交通資訊不可用</string>
     <string name="enable_logging">啟用日誌記錄</string>
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">一般反應</string>
     <string name="prefs_languages_information">我們的語音導航使用“文字轉語音”系統。許多 Android 裝置使用 Google 的文字轉語音系統，您可以從 Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) 下載或更新這一功能。</string>
-    <string name="prefs_languages_information_off">對於某些語言，您需要從應用商店（例如 Google Play Store、Galaxy Store）中安裝其他語音合成器或語言套件。
-\n打開您的裝置的設定 → 語言和輸入法 → 語音 → 文字轉語音 (TTS) 輸出。
-\n您可以在這裡管理語音合成的設定（例如，下載語言包供離線使用）和選擇其他文字轉語音引擎。</string>
+    <string name="prefs_languages_information_off">對於某些語言，您需要從應用商店（例如 Google Play Store、Galaxy Store）中安裝其他語音合成器或語言套件\n打開您的裝置的設定 → 語言和輸入法 → 語音 → 文字轉語音 (TTS) 輸出\n您可以在這裡管理語音合成的設定（例如，下載語言包供離線使用）和選擇其他文字轉語音引擎。</string>
     <string name="prefs_languages_information_off_link">如需瞭解更多資訊，請參閱此指南。</string>
     <string name="transliteration_title">拉丁字母音譯</string>
     <string name="learn_more">瞭解更多資訊</string>
@@ -636,7 +620,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">請登入 OpenStreetMap 以自動上傳您的所有地圖編輯。若要了解更多資訊請點擊<a href="https://github.com/organicmaps/organicmaps/issues/6144">這裡</a>。</string>
     <string name="dialog_error_storage_title">儲存空間存儲問題</string>
-    <string name="dialog_error_storage_message">外部儲存空間不可用，很可能是因為 SD 卡已移除、毀損，或檔案系統處於唯讀狀態。請進行檢查，然後透過 support\@organicmaps.app 聯絡我們。</string>
+    <string name="dialog_error_storage_message">外部儲存空間不可用，很可能是因為 SD 卡已移除、毀損，或檔案系統處於唯讀狀態。請進行檢查，然後透過 support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">模擬不良儲存空間</string>
     <string name="core_entrance">入口</string>
     <string name="error_enter_correct_name">請輸入正確的名稱</string>
@@ -806,8 +790,8 @@
     <string name="change_map_locale">地圖語言</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">地圖數據來自 OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/zh-Hans/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/zh-Hans/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Zh-hant:關於OpenStreetMap</string>
     <!-- App Tip #00 -->
@@ -831,9 +815,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">我們的主要目標是構建您會喜歡的快速、注重隱私、易於使用的地圖。</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">您現在正在手機螢幕上使用 Organic Maps</string>
+    <string name="car_used_on_the_phone_screen">您現在正在手機螢幕上使用 CoMaps</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">您現在正在汽車螢幕上使用 Organic Maps</string>
+    <string name="car_used_on_the_car_screen">您現在正在汽車螢幕上使用 CoMaps</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">您已連接到 Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index e94b3828d..ce71b4a4a 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -39,7 +39,7 @@
     <string name="country_status_download_failed">下载失败</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">再试一次</string>
-    <string name="about_menu_title">关于 Organic Maps</string>
+    <string name="about_menu_title">关于 CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">对每个人都免费，用爱制成</string>
     <!-- Text in About screen -->
@@ -56,9 +56,9 @@
     <string name="unsupported_phone">该应用程序需要硬件加速的 OpenGL。很遗憾，您的设备不受支持。</string>
     <string name="download">下载</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">请拔除 USB 线或插入 SD 卡以使用 Organic Maps</string>
+    <string name="disconnect_usb_cable">请拔除 USB 线或插入 SD 卡以使用 CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">请先释放一些 SD 卡 / USB 存储空间以使用 Organic Maps。</string>
+    <string name="not_enough_free_space_on_sdcard">请先释放一些 SD 卡 / USB 存储空间以使用 CoMaps。</string>
     <string name="download_resources">在您开始使用此应用程序之前，请下载全球地图到您的设备。
 \n它将使用 %s 的存储空间。</string>
     <string name="download_resources_continue">前往地图</string>
@@ -170,12 +170,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">注释</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">已与您分享 Organic Maps 书签</string>
+    <string name="share_bookmarks_email_subject">已与您分享 CoMaps 书签</string>
     <string name="share_bookmarks_email_body">您好！
 \n
-\n附件是我的书签，请在 Organic Maps 中打开。如果您没有安装 Organic Maps，可以在这里下载: https://omaps.app/get?kmz
+\n附件是我的书签，请在 CoMaps 中打开。如果您没有安装 CoMaps，可以在这里下载: https://comaps.app/get?kmz
 \n
-\n祝您使用 Organic Maps 旅行愉快！</string>
+\n祝您使用 CoMaps 旅行愉快！</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">正在载入书签…</string>
     <!-- Kmz file successful loading -->
@@ -185,7 +185,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">应用程序无法识别该文件类型：
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">无法打开文件 %1$s
 \n
 \n%2$s</string>
@@ -197,13 +197,13 @@
     <string name="cant_change_this_setting">很抱歉，地图存储设置目前已停用。</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">地图下载进行中。</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">嘿，在 Organic Maps 上查看我目前的位置吧！请打开 %1$s 或 %2$s 链接，还没安装离线地图？在此下载: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">嘿，在 CoMaps 上查看我目前的位置吧！请打开 %1$s 或 %2$s 链接，还没安装离线地图？在此下载: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">嘿，看看我在 Organic Maps 上标记的图钉吧！</string>
+    <string name="bookmark_share_email_subject">嘿，看看我在 CoMaps 上标记的图钉吧！</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">嗨，到 Organic Maps 查看我当前的位置！</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">嗨，到 CoMaps 查看我当前的位置！</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">嗨，
 \n
 \n我现在在这：%1$s。点击此链接 %2$s 或此链接 %3$s 来查看在地图上的位置。
@@ -268,7 +268,7 @@
     <string name="menu">菜单</string>
     <!-- Text in menu -->
     <string name="website">网站</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">新闻</string>
     <!-- Text in menu -->
     <string name="facebook">Facebook</string>
@@ -286,7 +286,7 @@
     <string name="donate">捐助我们</string>
     <string name="already_donated">已捐赠</string>
     <string name="remind_me_later">稍后提醒</string>
-    <string name="support_organic_maps">支持 Organic Maps</string>
+    <string name="support_organic_maps">支持 CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">支持本项目</string>
     <!-- Button in the main Help dialog -->
@@ -548,7 +548,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">操作员: %s</string>
     <string name="editor_category_unsuitable_title">找不到合适的类别？</string>
-    <string name="editor_category_unsuitable_text">Organic Maps 只允许添加简单的点类别，即无法添加城镇、道路、湖泊、建筑轮廓等类别。请直接向 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 添加此类类别。请查看我们的<a href="https://organicmaps.app/faq/editing/advanced-map-editing">指南</a>，了解详细的步骤说明。</string>
+    <string name="editor_category_unsuitable_text">CoMaps 只允许添加简单的点类别，即无法添加城镇、道路、湖泊、建筑轮廓等类别。请直接向 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 添加此类类别。请查看我们的<a href="https://comaps.app/faq/editing/advanced-map-editing">指南</a>，了解详细的步骤说明。</string>
     <string name="downloader_no_downloaded_maps_title">您尚未下载任何地图</string>
     <string name="downloader_no_downloaded_maps_message">下载地图来查找位置和离线浏览。</string>
     <string name="current_location_unknown_error_title">当前位置未知。</string>
@@ -610,7 +610,7 @@
     <string name="mobile_data_option_ask">总是询问</string>
     <string name="traffic_update_maps_text">诺要显示交通数据，必须更新地图。</string>
     <string name="big_font">增大地图上的字体大小</string>
-    <string name="traffic_update_app">请更新 Organic Maps</string>
+    <string name="traffic_update_app">请更新 CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">交通数据不可用</string>
     <string name="enable_logging">启用日志记录</string>
@@ -636,7 +636,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">请登录 OpenStreetMap 以自动上传您的所有地图编辑。诺要了解更多信息请点击<a href="https://github.com/organicmaps/organicmaps/issues/6144">这里</a>。</string>
     <string name="dialog_error_storage_title">存储空间访问问题</string>
-    <string name="dialog_error_storage_message">外部存储空间不可用，很可能是因为 SD 卡已移除、损毁，或者文件系统为只读状态。请进行检查，然后通过 support\@organicmaps.app 联系我们。</string>
+    <string name="dialog_error_storage_message">外部存储空间不可用，很可能是因为 SD 卡已移除、损毁，或者文件系统为只读状态。请进行检查，然后通过 support\@comaps.app 联系我们。</string>
     <string name="setting_emulate_bad_storage">模拟不良存储空间</string>
     <string name="core_entrance">入口</string>
     <string name="error_enter_correct_name">请输入正确的名称</string>
@@ -806,8 +806,8 @@
     <string name="change_map_locale">地图语言</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">地图数据来自 OpenStreetMap</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/zh-Hans/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/zh-Hans/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Zh-hans:关于</string>
     <!-- App Tip #00 -->
@@ -831,9 +831,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">我们的主要目标是构建您会喜欢的快速、注重隐私、易于使用的地图。</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">您现在正在手机屏幕上使用 Organic Maps</string>
+    <string name="car_used_on_the_phone_screen">您现在正在手机屏幕上使用 CoMaps</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">您现在正在汽车屏幕上使用 Organic Maps</string>
+    <string name="car_used_on_the_car_screen">您现在正在汽车屏幕上使用 CoMaps</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">您已连接到 Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
diff --git a/android/app/src/main/res/values/donottranslate.xml b/android/app/src/main/res/values/donottranslate.xml
index 23913513d..e6fbd5468 100644
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -46,7 +46,7 @@
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>
 
   <!-- "Report a problem" predefined texts -->
-  <string name="problem_does_not_exist" translatable="false">The amenity has gone or never existed. This is an auto-generated note from Organic Maps application: a user reports a POI that is visible on a map (which can be a month old), but cannot be found on the ground.</string>
+  <string name="problem_does_not_exist" translatable="false">The amenity has gone or never existed. This is an auto-generated note from CoMaps application: a user reports a POI that is visible on a map (which can be a month old), but cannot be found on the ground.</string>
 
   <!-- UI themes -->
   <string name="theme_default" translatable="false">default</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index f531f478e..e5a475118 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -42,7 +42,7 @@
     <string name="country_status_download_failed">Download has failed</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Try Again</string>
-    <string name="about_menu_title">About Organic Maps</string>
+    <string name="about_menu_title">About CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Free for everyone, made with love</string>
     <!-- Text in About screen -->
@@ -59,7 +59,7 @@
     <string name="unsupported_phone">The app requires hardware accelerated OpenGL. Unfortunately, your device is not supported.</string>
     <string name="download">Download</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Please disconnect USB cable or insert memory card to use Organic Maps</string>
+    <string name="disconnect_usb_cable">Please disconnect USB cable or insert memory card to use CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Please free up some space on the SD card/USB storage first in order to use the app</string>
     <string name="download_resources">Before you start using the app, please download the world overview map to your device.
@@ -173,12 +173,12 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notes</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Organic Maps bookmarks were shared with you</string>
+    <string name="share_bookmarks_email_subject">CoMaps bookmarks were shared with you</string>
     <string name="share_bookmarks_email_body">Hello!
 \n
-\nAttached are my bookmarks; please open them in Organic Maps. If you don\'t have it installed you can download it here: https://omaps.app/get?kmz
+\nAttached are my bookmarks; please open them in CoMaps. If you don\'t have it installed you can download it here: https://comaps.app/get?kmz
 \n
-\nEnjoy travelling with Organic Maps!</string>
+\nEnjoy travelling with CoMaps!</string>
     <!-- message title of loading file -->
     <string name="load_kmz_title">Loading Bookmarks</string>
     <!-- Kmz file successful loading -->
@@ -188,7 +188,7 @@
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">The file type is not recognized by the app:
 \n%1$s</string>
-    <!-- Failed to open a bookmarks or tracks file in Organic Maps. -->
+    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Failed to open file %1$s
 \n
 \n%2$s</string>
@@ -200,13 +200,13 @@
     <string name="cant_change_this_setting">Sorry, Map Storage settings are currently disabled.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Map download is in progress now.</string>
-    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://omaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
-    <string name="my_position_share_sms">Check out my current location in Organic Maps! %1$s or %2$s Don\'t have offline maps? Download here: https://omaps.app/get</string>
+    <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
+    <string name="my_position_share_sms">Check out my current location in CoMaps! %1$s or %2$s Don\'t have offline maps? Download here: https://comaps.app/get</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hey, check out my pin in Organic Maps!</string>
+    <string name="bookmark_share_email_subject">Hey, check out my pin in CoMaps!</string>
     <!-- Subject for emailed position -->
-    <string name="my_position_share_email_subject">Hey, check out my current location on the Organic Maps map!</string>
-    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://omaps.app link WITHOUT NAME -->
+    <string name="my_position_share_email_subject">Hey, check out my current location on the CoMaps map!</string>
+    <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hi,
 \n
 \nI\'m here now: %1$s. Click this link %2$s or this one %3$s to see the place on the map.
@@ -271,7 +271,7 @@
     <string name="menu">Menu</string>
     <!-- Text in menu -->
     <string name="website">Website</string>
-    <!-- Text in About menu, opens Organic Maps news website -->
+    <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">News</string>
     <!-- Text in menu -->
     <string name="github">GitHub</string>
@@ -305,7 +305,7 @@
     <string name="donate">Donate</string>
     <string name="already_donated">Already donated</string>
     <string name="remind_me_later">Remind later</string>
-    <string name="support_organic_maps">Support Organic Maps</string>
+    <string name="support_organic_maps">Support CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Support the project</string>
     <!-- Button in the main Help dialog -->
@@ -538,7 +538,7 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Community-created OpenStreetMap data as of %s. Learn more about how to edit and update the map at OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">OpenStreetMap.org (OSM) is a community project to build a free and open map. It\'s the main source of map data in Organic Maps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.
+    <string name="login_osm_presentation">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!</string>
     <string name="login_to_make_edits_visible">Create an OpenStreetMap account or log in to publish your map edits to the world.</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
@@ -556,7 +556,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Note to OpenStreetMap volunteers (optional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Describe errors on the map or things that cannot be edited with Organic Maps</string>
+    <string name="editor_note_hint">Describe errors on the map or things that cannot be edited with CoMaps</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">Your edits are uploaded to the public <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> database. Please do not add personal or copyrighted information.</string>
     <string name="editor_more_about_osm">More about OpenStreetMap</string>
@@ -566,7 +566,7 @@
     <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
     <string name="operator">Operator: %s</string>
     <string name="editor_category_unsuitable_title">Can\'t find a suitable category?</string>
-    <string name="editor_category_unsuitable_text">Organic Maps allows to add simple point categories only, that means no towns, roads, lakes, building outlines, etc. Please add such categories directly to <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Check our <a href="https://organicmaps.app/faq/editing/advanced-map-editing">guide</a> for detailed step by step instructions.</string>
+    <string name="editor_category_unsuitable_text">CoMaps allows to add simple point categories only, that means no towns, roads, lakes, building outlines, etc. Please add such categories directly to <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Check our <a href="https://comaps.app/faq/editing/advanced-map-editing">guide</a> for detailed step by step instructions.</string>
     <string name="downloader_no_downloaded_maps_title">You haven\'t downloaded any maps</string>
     <string name="downloader_no_downloaded_maps_message">Download maps to search and navigate offline.</string>
     <string name="current_location_unknown_error_title">Current location is unknown.</string>
@@ -628,7 +628,7 @@
     <string name="mobile_data_option_ask">Always Ask</string>
     <string name="traffic_update_maps_text">To display traffic data, maps must be updated.</string>
     <string name="big_font">Increase size for map labels</string>
-    <string name="traffic_update_app">Please update Organic Maps</string>
+    <string name="traffic_update_app">Please update CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
     <string name="traffic_data_unavailable">Traffic data is not available</string>
     <string name="enable_logging">Enable logging</string>
@@ -654,7 +654,7 @@
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Please login to OpenStreetMap to automatically upload all your map edits. Learn more <a href="https://github.com/organicmaps/organicmaps/issues/6144">here</a>.</string>
     <string name="dialog_error_storage_title">Storage access problem</string>
-    <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support\@organicmaps.app</string>
+    <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support\@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulate bad storage</string>
     <string name="core_entrance">Entrance</string>
     <string name="error_enter_correct_name">Please enter a correct name</string>
@@ -831,9 +831,9 @@
     <!-- Instagram account url for the "?" About page -->
     <string name="instagram_url">https://www.instagram.com/comapscommunity</string>
     <!-- A link to the TTS FAQ -->
-    <string name="tts_info_link">https://organicmaps.app/faq/text-to-speech-android-tts/</string>
-    <!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
-    <string name="translated_om_site_url">https://organicmaps.app/</string>
+    <string name="tts_info_link">https://comaps.app/faq/text-to-speech-android-tts/</string>
+    <!-- Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
+    <string name="translated_om_site_url">https://comaps.app/</string>
     <!-- Link to OSM wiki for Editor, Profile and About pages -->
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
     <!-- A number of bookmarks and a number of tracks, separated by comma, like: 1 bookmark, 5 tracks -->
@@ -859,9 +859,9 @@
     <!-- App tip #09 -->
     <string name="app_tip_09">Our main goal is to build fast, privacy-focused, easy-to-use maps that you will love.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">You are now using Organic Maps on the phone screen</string>
+    <string name="car_used_on_the_phone_screen">You are now using CoMaps on the phone screen</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">You are now using Organic Maps on the car screen</string>
+    <string name="car_used_on_the_car_screen">You are now using CoMaps on the car screen</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">You are connected to Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -869,11 +869,11 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">To the car screen</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">Organic Maps needs location access. When it\'s safe, check the notification on your phone.</string>
+    <string name="aa_location_permissions_request">CoMaps needs location access. When it\'s safe, check the notification on your phone.</string>
     <!-- Notification title for permission request from AA. -->
     <string name="aa_request_permission_notification">This app needs your permission</string>
     <!-- The text in the activity for location permission request. -->
-    <string name="aa_request_permission_activity_text">Organic Maps in Android Auto needs location permissions to work effectively</string>
+    <string name="aa_request_permission_activity_text">CoMaps in Android Auto needs location permissions to work effectively</string>
     <!-- Grant Permissions button. -->
     <string name="aa_grant_permissions">Grant Permissions</string>
     <!-- Outdoors/hiking map style (activity) name in the Styles and Layers dialog -->
diff --git a/android/settings.gradle b/android/settings.gradle
index 46e6fb614..4a7e6b740 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -13,5 +13,5 @@ pluginManagement {
 //        mavenCentral()
 //    }
 //}
-rootProject.name = 'Organic Maps'
+rootProject.name = 'CoMaps'
 include ':app'
diff --git a/data/faq.html b/data/faq.html
index 774b2e5a2..5422a4388 100644
--- a/data/faq.html
+++ b/data/faq.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Organic Maps: Frequently Asked Questions</title>
+  <title>CoMaps: Frequently Asked Questions</title>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
   <style>
@@ -269,38 +269,38 @@
 
 
     <h4 lang="en">
-      For more information please visit our web-site <a href="https://organicmaps.app/">organicmaps.app</a>
+      For more information please visit our web-site <a href="https://comaps.app/">comaps.app</a>
     </h4>
     
     <h4 lang="ru">
-      Больше информации на нашем сайте <a href="https://organicmaps.app/ru/">organicmaps.app</a>
+      Больше информации на нашем сайте <a href="https://comaps.app/ru/">comaps.app</a>
     </h4>
     <h4 lang="de">
-      Für weitere Informationen besuchen Sie bitte unsere Website <a href="https://organicmaps.app/de/">organicmaps.app</a>
+      Für weitere Informationen besuchen Sie bitte unsere Website <a href="https://comaps.app/de/">comaps.app</a>
     </h4>
     <h4 lang="es">
-      Para más información, visite nuestro sitio web <a href="https://organicmaps.app/es/">organicmaps.app</a>
+      Para más información, visite nuestro sitio web <a href="https://comaps.app/es/">comaps.app</a>
     </h4>
     <h4 lang="fr">
-      Pour plus d&#x27;informations, veuillez visiter notre site web <a href="https://organicmaps.app/fr/">organicmaps.app</a>
+      Pour plus d&#x27;informations, veuillez visiter notre site web <a href="https://comaps.app/fr/">comaps.app</a>
     </h4>
     <h4 lang="pl">
-      Aby uzyskać więcej informacji, odwiedź naszą stronę internetową <a href="https://organicmaps.app/pl/">organicmaps.app</a>
+      Aby uzyskać więcej informacji, odwiedź naszą stronę internetową <a href="https://comaps.app/pl/">comaps.app</a>
     </h4>
     <h4 lang="pt">
-      Para mais informações, visite o nosso sítio na web <a href="https://organicmaps.app/pt/">organicmaps.app</a>
+      Para mais informações, visite o nosso sítio na web <a href="https://comaps.app/pt/">comaps.app</a>
     </h4>
     <h4 lang="pt-BR">
-      Para mais informações, visite o nosso sítio web <a href="https://organicmaps.app/pt-BR/">organicmaps.app</a>
+      Para mais informações, visite o nosso sítio web <a href="https://comaps.app/pt-BR/">comaps.app</a>
     </h4>
     <h4 lang="tr">
-      Daha fazla bilgi için lütfen web sitemizi ziyaret edin <a href="https://organicmaps.app/tr/">organicmaps.app</a>
+      Daha fazla bilgi için lütfen web sitemizi ziyaret edin <a href="https://comaps.app/tr/">comaps.app</a>
     </h4>
     <h4 lang="uk">
-      Для отримання додаткової інформації, будь ласка, відвідайте наш веб-сайт <a href="https://organicmaps.app/uk/">organicmaps.app</a>
+      Для отримання додаткової інформації, будь ласка, відвідайте наш веб-сайт <a href="https://comaps.app/uk/">comaps.app</a>
     </h4>
     <h4 lang="zh">
-      要获取更多信息，请访问我们的网站 <a href="https://organicmaps.app/zh-Hans/">organicmaps.app</a>
+      要获取更多信息，请访问我们的网站 <a href="https://comaps.app/zh-Hans/">comaps.app</a>
     </h4>
   </div>
 
@@ -483,7 +483,7 @@ You can use one of the following ways:</p>
 <p><strong>Notes:</strong></p>
 <ul>
 <li>
-<p>You can also add new places, edit existing POI and building info (addresses, opening hours, names) directly in Organic Maps. Once you log in with OSM account, your edits will be automatically uploaded to OSM. Please be careful when editing, as your edits will be visible to all other users.</p>
+<p>You can also add new places, edit existing POI and building info (addresses, opening hours, names) directly in CoMaps. Once you log in with OSM account, your edits will be automatically uploaded to OSM. Please be careful when editing, as your edits will be visible to all other users.</p>
 </li>
 <li>
 <p>The OpenStreetMap database is updated every minute. We aim to update maps in the app 1-4 times per month. If you modified something in OSM, your edits will appear in future maps updates.</p>
@@ -491,13 +491,13 @@ You can use one of the following ways:</p>
 </ul>
 </dd>
     <dd lang="ru">
-      <p>В Organic Maps мы делаем само приложение и сложные алгоритмы. Наш источник данных – <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap</a> (OSM), это открытый проект, как Википедия, только для карт.</p>
+      <p>В CoMaps мы делаем само приложение и сложные алгоритмы. Наш источник данных – <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap</a> (OSM), это открытый проект, как Википедия, только для карт.</p>
 <p>Если вы заметили неточности или увидели, что отсутствуют какие-либо детали, вы можете <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/note/new">сообщить об этом</a> редакторам OSM или <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/user/new">зарегистрироваться</a> на сайте OpenStreetMap и отредактировать карту.</p>
 <p>Чем больше небезразличных людей, тем точнее будут карты для всех нас. Мы в команде считаем, что подробные карты всей нашей планеты – это всего лишь вопрос времени.</p>
 <p><strong>Примечания:</strong></p>
 <ul>
 <li>
-<p>Вы также можете добавлять новые и редактировать уже отмеченные места (название, адресная информация, часы работы) напрямую из Organic Maps. Как только вы авторизуетесь через профиль OSM, правки будут автоматически отправлены в OSM. Пожалуйста, будьте внимательны при редактировании: ваши правки будут доступны всем остальным пользователям.</p>
+<p>Вы также можете добавлять новые и редактировать уже отмеченные места (название, адресная информация, часы работы) напрямую из CoMaps. Как только вы авторизуетесь через профиль OSM, правки будут автоматически отправлены в OSM. Пожалуйста, будьте внимательны при редактировании: ваши правки будут доступны всем остальным пользователям.</p>
 </li>
 <li>
 <p>База данных OpenStreetMap обновляется каждую минуту. Наша цель — обновлять данные в приложении 1-4 раза в месяц. Если вы что-то меняли в OSM, ваши исправления появятся в одном из следующих обновлений.</p>
@@ -511,7 +511,7 @@ You can use one of the following ways:</p>
 <p><strong>Hinweise:</strong></p>
 <ul>
 <li>
-<p>Sie können auch direkt über Organic Maps neue Orte hinzufügen oder vorhandene POI und Gebäudeinformationen (Adressen, Öffnungszeiten, Namen) bearbeiten. Sobald Sie sich mit dem OSM-Konto anmelden, werden Ihre Änderungen automatisch auf OSM hochgeladen. Bitte seien Sie vorsichtig bei der Bearbeitung, da Ihre Änderungen für alle anderen Benutzer sichtbar sind.</p>
+<p>Sie können auch direkt über CoMaps neue Orte hinzufügen oder vorhandene POI und Gebäudeinformationen (Adressen, Öffnungszeiten, Namen) bearbeiten. Sobald Sie sich mit dem OSM-Konto anmelden, werden Ihre Änderungen automatisch auf OSM hochgeladen. Bitte seien Sie vorsichtig bei der Bearbeitung, da Ihre Änderungen für alle anderen Benutzer sichtbar sind.</p>
 </li>
 <li>
 <p>Die OpenStreetMap-Datenbank wird jede Minute aktualisiert. Unser Ziel ist es, die Karten in der App 1-4 Mal pro Monat zu aktualisieren. Wenn Sie etwas in OSM geändert haben, werden Ihre Änderungen in zukünftigen Karten-Updates angezeigt.</p>
@@ -525,7 +525,7 @@ You can use one of the following ways:</p>
 <p><strong>Notas:</strong></p>
 <ul>
 <li>
-<p>También puede agregar nuevos lugares, editar los PDI existentes y la información de construcción (direcciones, horarios de apertura, nombres) directamente a través de Organic Maps. Una vez que inicie sesión con la cuenta OSM, sus ediciones se cargarán automáticamente a OSM. Tenga cuidado al editar, ya que sus ediciones serán visibles para todos los demás usuarios.</p>
+<p>También puede agregar nuevos lugares, editar los PDI existentes y la información de construcción (direcciones, horarios de apertura, nombres) directamente a través de CoMaps. Una vez que inicie sesión con la cuenta OSM, sus ediciones se cargarán automáticamente a OSM. Tenga cuidado al editar, ya que sus ediciones serán visibles para todos los demás usuarios.</p>
 </li>
 <li>
 <p>La base de datos de OpenStreetMap se actualiza cada minuto. Nuestro objetivo es actualizar los mapas en la aplicación de 1 a 4 veces al mes. Si modificó algo en OSM, sus ediciones aparecerán en futuras actualizaciones de mapas.</p>
@@ -539,7 +539,7 @@ You can use one of the following ways:</p>
 <p><strong>Remarques:</strong></p>
 <ul>
 <li>
-<p>Vous pouvez également ajouter de nouveaux lieux, modifier des POI existants et des informations sur le bâtiment (adresses, heures d'ouverture, noms) directement via Organic Maps. Une fois que vous vous êtes connecté avec un compte OSM, vos modifications seront automatiquement téléchargées vers OSM. Restez prudent lors de l'édition, vos modifications seront visibles par tous les autres utilisateurs.</p>
+<p>Vous pouvez également ajouter de nouveaux lieux, modifier des POI existants et des informations sur le bâtiment (adresses, heures d'ouverture, noms) directement via CoMaps. Une fois que vous vous êtes connecté avec un compte OSM, vos modifications seront automatiquement téléchargées vers OSM. Restez prudent lors de l'édition, vos modifications seront visibles par tous les autres utilisateurs.</p>
 </li>
 <li>
 <p>La base de données OpenStreetMap est mise à jour toutes les minutes. Nous visons à mettre à jour les cartes dans l'application 1 à 4 fois par mois. Si vous avez modifié quelque chose dans OSM, vos modifications apparaîtront dans les futures mises à jour des cartes.</p>
@@ -553,7 +553,7 @@ You can use one of the following ways:</p>
 <p><strong>Uwagi:</strong></p>
 <ul>
 <li>
-<p>Możesz także dodawać nowe miejsca, edytować istniejące punkty i informacje o budynkach (adresy, godziny otwarcia, nazwy) bezpośrednio przez Organic Maps. Po zalogowaniu się przy użyciu konta OSM, Twoje zmiany zostaną automatycznie przesłane do OSM. Zachowaj ostrożność podczas edycji, ponieważ Twoje zmiany będą widoczne dla wszystkich innych użytkowników.</p>
+<p>Możesz także dodawać nowe miejsca, edytować istniejące punkty i informacje o budynkach (adresy, godziny otwarcia, nazwy) bezpośrednio przez CoMaps. Po zalogowaniu się przy użyciu konta OSM, Twoje zmiany zostaną automatycznie przesłane do OSM. Zachowaj ostrożność podczas edycji, ponieważ Twoje zmiany będą widoczne dla wszystkich innych użytkowników.</p>
 </li>
 <li>
 <p>Baza danych OpenStreetMap jest aktualizowana co minutę. Staramy się aktualizować mapy w aplikacji 1-4 razy w miesiącu. Jeśli coś zmodyfikowałeś w OSM, Twoje zmiany pojawią się w przyszłych aktualizacjach map.</p>
@@ -567,7 +567,7 @@ You can use one of the following ways:</p>
 <p><strong>Notas:</strong></p>
 <ul>
 <li>
-<p>Também pode adicionar novos locais, editar o POI existente e adicionar informações (endereços, horário de funcionamento, nomes) diretamente no Organic Maps. Depois de se autenticar com a sua conta do OSM, as suas edições serão automaticamente enviadas para o OSM. Tenha cuidado ao editar, pois as suas edições ficarão visíveis para todos os outros utilizadores.</p>
+<p>Também pode adicionar novos locais, editar o POI existente e adicionar informações (endereços, horário de funcionamento, nomes) diretamente no CoMaps. Depois de se autenticar com a sua conta do OSM, as suas edições serão automaticamente enviadas para o OSM. Tenha cuidado ao editar, pois as suas edições ficarão visíveis para todos os outros utilizadores.</p>
 </li>
 <li>
 <p>A base de dados do OpenStreetMap é atualizada a cada minuto. O nosso objetivo é atualizar os mapas na aplicação de 1 a 4 vezes por mês. Se alterou alguma coisa no OSM, as suas edições aparecerão em futuras atualizações dos mapas.</p>
@@ -581,7 +581,7 @@ You can use one of the following ways:</p>
 <p><strong>Notas:</strong></p>
 <ul>
 <li>
-<p>Você também pode adicionar novos locais, editar o POI existente e adicionar informações (endereços, horário de funcionamento, nomes) diretamente via Organic Maps. Depois de fazer o login com a conta do OSM, suas edições serão automaticamente enviadas para o OSM. Tenha cuidado ao editar, pois suas edições ficarão visíveis para todos os outros usuários.</p>
+<p>Você também pode adicionar novos locais, editar o POI existente e adicionar informações (endereços, horário de funcionamento, nomes) diretamente via CoMaps. Depois de fazer o login com a conta do OSM, suas edições serão automaticamente enviadas para o OSM. Tenha cuidado ao editar, pois suas edições ficarão visíveis para todos os outros usuários.</p>
 </li>
 <li>
 <p>O banco de dados do OpenStreetMap é atualizado a cada minuto. Nosso objetivo é atualizar os mapas no aplicativo de 1 a 4 vezes por mês. Se você modificou algo no OSM, suas edições aparecerão em futuras atualizações de mapas.</p>
@@ -595,7 +595,7 @@ You can use one of the following ways:</p>
 <p><strong>Notlar:</strong></p>
 <ul>
 <li>
-<p>Ayrıca doğrudan Organic Maps ile yeni yerler ekleyebilir, mevcut POI (İÇN) ve yapı bilgilerini (adresler, çalışma saatleri, isimler) düzenleyebilirsiniz. Bir seferlik OSM hesabınızla giriş yaptığınızda düzenlemeleriniz otomatik olarak OSM'ye yüklenecektir. Düzenlemeleriniz diğer tüm kullanıcılar tarafından görülebileceği için lütfen düzenleme yaparken dikkatli olun.</p>
+<p>Ayrıca doğrudan CoMaps ile yeni yerler ekleyebilir, mevcut POI (İÇN) ve yapı bilgilerini (adresler, çalışma saatleri, isimler) düzenleyebilirsiniz. Bir seferlik OSM hesabınızla giriş yaptığınızda düzenlemeleriniz otomatik olarak OSM'ye yüklenecektir. Düzenlemeleriniz diğer tüm kullanıcılar tarafından görülebileceği için lütfen düzenleme yaparken dikkatli olun.</p>
 </li>
 <li>
 <p>OpenStreetMap veritabanı her dakika güncellenir. Ayda 1-4 kez uygulamadaki haritayı güncellemeyi hedefliyoruz. Eğer OSM'de herhangi bir değişiklik yaptıysanız, düzenlemeleriniz gelecekteki harita güncellemelerinde görünecektir.</p>
@@ -609,7 +609,7 @@ You can use one of the following ways:</p>
 <p><strong>Примітки:</strong></p>
 <ul>
 <li>
-<p>Ви також можете додавати нові місця, редагувати існуючі POI та інформацію про будівлі (адреси, години роботи, назви) безпосередньо в Organic Maps. Після того, як ви ввійдете за допомогою облікового запису OSM, ваші правки будуть автоматично завантажені на OSM. Будь ласка, будьте обережні при редагуванні, оскільки ваші правки будуть видимі всім іншим користувачам.</p>
+<p>Ви також можете додавати нові місця, редагувати існуючі POI та інформацію про будівлі (адреси, години роботи, назви) безпосередньо в CoMaps. Після того, як ви ввійдете за допомогою облікового запису OSM, ваші правки будуть автоматично завантажені на OSM. Будь ласка, будьте обережні при редагуванні, оскільки ваші правки будуть видимі всім іншим користувачам.</p>
 </li>
 <li>
 <p>База даних OpenStreetMap змінюється щохвилини. Ми прагнемо оновлювати карти в додатку 1-4 рази на місяць. Якщо ви змінили щось в OSM, ваші правки з'являться в наступних оновленнях мап.</p>
@@ -623,7 +623,7 @@ You can use one of the following ways:</p>
 <p><strong>请注意：</strong></p>
 <ul>
 <li>
-<p>您还可以通过 Organic Maps 直接添加新地点，编辑现有兴趣点和建筑信息（地址、营业时间、名称）。 一旦使用 OSM 账户登录，您的编辑将自动上传到OSM。请在编辑时小心，因为您的编辑将对所有其他用户可见。</p>
+<p>您还可以通过 CoMaps 直接添加新地点，编辑现有兴趣点和建筑信息（地址、营业时间、名称）。 一旦使用 OSM 账户登录，您的编辑将自动上传到OSM。请在编辑时小心，因为您的编辑将对所有其他用户可见。</p>
 </li>
 <li>
 <p>OpenStreetMap 数据库每分钟更新一次。 我们的目标是每月 1 到 4 次更新应用中的地图。 如果您在 OSM中进行了修改，您的编辑将出现在未来的地图更新中。</p>
@@ -648,17 +648,17 @@ You can use one of the following ways:</p>
     </dt>
 
     <dd lang="en">
-      <p>Please make sure your device has GPS, location services are enabled, and location permissions are given to Organic Maps.</p>
+      <p>Please make sure your device has GPS, location services are enabled, and location permissions are given to CoMaps.</p>
 <p><strong>Android</strong></p>
 <p>On your device open Settings → Location. It is better to switch on High accuracy mode, as it enables precise GPS location.</p>
 <p>If your Android device can not determine your location, enable (or disable, if enabled) “Google Play Services” option in the app settings.</p>
 <p>Note: you can see it only if you have Google Play services installed (enabled) on your Android device. Google play services are used to determine location more precisely, if you experience issues with location accuracy after you disabled the option, turn it on.</p>
 <p><strong>iOS</strong></p>
-<p>If you are an iPhone or iPad user, please check iOS settings → Privacy → Location services. Geolocation data sharing should be enabled for Organic Maps.</p>
+<p>If you are an iPhone or iPad user, please check iOS settings → Privacy → Location services. Geolocation data sharing should be enabled for CoMaps.</p>
 <p><strong>Notes:</strong></p>
 <ul>
 <li>
-<p>To avoid unwanted data while roaming, you can turn off all mobile data, activate a flight mode or disable mobile data for Organic Maps in your device settings. Android and iOS devices can use GPS in the flight mode.</p>
+<p>To avoid unwanted data while roaming, you can turn off all mobile data, activate a flight mode or disable mobile data for CoMaps in your device settings. Android and iOS devices can use GPS in the flight mode.</p>
 </li>
 <li>
 <p>Some mobile devices do not have built-in GPS receivers, such as the iPod Touch, WiFi-only iPad, Amazon Kindle Fire/Kindle Fire HD 7, and some Android tablets. On these devices, all apps will show your approximate location detected using a Wi-Fi network, as long as you are connected to the internet.</p>
@@ -675,7 +675,7 @@ You can use one of the following ways:</p>
 <p>Если настройки геолокации в порядке, убедитесь, что службы Google Play не заблокированы другими приложениями или антивирусами. Попробуйте поставить (или убрать, если стоит) галочку “Google Play Services”* в настройках приложения. На разных устройствах эта опция может давать положительный или отрицательный эффект.</p>
 <p>Примечание: опция отображается только если на устройстве установлены сервисы Google Play.</p>
 <p><strong>iOS</strong></p>
-<p>Если вы пользуетесь iPhone или iPad, проверьте, пожалуйста, настройки iOS → Конфиденциальность → Службы геолокации. Необходимо разрешить определение местоположения для Organic Maps.</p>
+<p>Если вы пользуетесь iPhone или iPad, проверьте, пожалуйста, настройки iOS → Конфиденциальность → Службы геолокации. Необходимо разрешить определение местоположения для CoMaps.</p>
 <p><strong>Примечания:</strong></p>
 <ul>
 <li>
@@ -696,11 +696,11 @@ You can use one of the following ways:</p>
 <p>Wenn Sie Schwierigkeiten haben, Ihren Standort mit GPS zu bestimmen, aktivieren Sie (oder deaktivieren Sie, wenn aktiviert) "Google Play-Dienste" in den App-Einstellungen.</p>
 <p>Hinweis: Die Einstellung können Sie nur sehen, wenn auf Ihrem Android-Gerät Google Play-Dienste installiert (und aktiviert) sind. Google Play-Dienste werden verwendet, um den Standort genauer zu bestimmen. Wenn Probleme mit der Ortsgenauigkeit auftreten, nachdem Sie die Option deaktiviert haben, aktivieren Sie sie.</p>
 <p><strong>iOS</strong></p>
-<p>Wenn Sie ein iPhone oder iPad Nutzer sind, überprüfen Sie bitte iOS-Einstellungen → Datenschutz → Standortdienste. Geolocation-Datenfreigabe sollte für Organic Maps aktiviert werden.</p>
+<p>Wenn Sie ein iPhone oder iPad Nutzer sind, überprüfen Sie bitte iOS-Einstellungen → Datenschutz → Standortdienste. Geolocation-Datenfreigabe sollte für CoMaps aktiviert werden.</p>
 <p><strong>Anmerkungen:</strong></p>
 <ul>
 <li>
-<p>Um beim Roaming unerwünschte Daten zu vermeiden, können Sie in den Geräteeinstellungen alle mobilen Daten ausschalten, einen Flugmodus aktivieren oder mobile Daten für Organic Maps deaktivieren. Android- und iOS-Geräte können GPS im Flugmodus verwenden.</p>
+<p>Um beim Roaming unerwünschte Daten zu vermeiden, können Sie in den Geräteeinstellungen alle mobilen Daten ausschalten, einen Flugmodus aktivieren oder mobile Daten für CoMaps deaktivieren. Android- und iOS-Geräte können GPS im Flugmodus verwenden.</p>
 </li>
 <li>
 <p>Einige Mobilgeräte verfügen nicht über integrierte GPS-Empfänger. Dies betrifft z.B. iPod Touch, reine Wlan-iPads, Amazon Kindle Fire, Kindle Fire HD 7 und einige Android-Tablets. Auf diesen Geräten zeigt unsere Anwendung Ihren ungefähren Standort an, solange Sie mit dem Internet verbunden sind.</p>
@@ -717,11 +717,11 @@ You can use one of the following ways:</p>
 <p>Si tiene dificultades para determinar su ubicación con GPS, habilite (deshabilite, si está habilitado) "Servicios de Google Play" en la configuración de la aplicación.</p>
 <p>Nota: puede verlo solo si tiene los servicios de Google Play instalados (habilitados) en su dispositivo Android. Los servicios de Google play se usan para determinar la ubicación de manera más precisa; si tiene problemas con la precisión de la ubicación después de deshabilitar la opción, actívela.</p>
 <p><strong>iOS</strong></p>
-<p>Si usted es un usuario de iPhone o iPad, verifique la configuración de iOS → Privacidad → Servicios de ubicación. El intercambio de datos de geolocalización debería estar habilitado para Organic Maps.</p>
+<p>Si usted es un usuario de iPhone o iPad, verifique la configuración de iOS → Privacidad → Servicios de ubicación. El intercambio de datos de geolocalización debería estar habilitado para CoMaps.</p>
 <p><strong>Notas:</strong></p>
 <ul>
 <li>
-<p>Para evitar datos no deseados durante el roaming, puede desactivar los datos móviles, activar modo avión o deshabilitar datos móviles para Organic Maps en la configuración de su dispositivo. Los dispositivos Android e iOS pueden usar el GPS en el modo avión.</p>
+<p>Para evitar datos no deseados durante el roaming, puede desactivar los datos móviles, activar modo avión o deshabilitar datos móviles para CoMaps en la configuración de su dispositivo. Los dispositivos Android e iOS pueden usar el GPS en el modo avión.</p>
 </li>
 <li>
 <p>Algunos dispositivos móviles no tienen receptores GPS incorporados, como el iPod Touch, el iPad solo WiFi, Amazon Kindle Fire / Kindle Fire HD 7 y algunas tabletas Android. En estos dispositivos, nuestra aplicación mostrará su ubicación aproximada, siempre que esté conectado a internet.</p>
@@ -738,11 +738,11 @@ You can use one of the following ways:</p>
 <p>Si vous avez des difficultés à déterminer votre position avec le GPS, activez (désactivez, si activé) "Google Play Services" dans les paramètres de l'application.</p>
 <p>Remarque : vous ne pouvez le voir que si les services Google Play sont installés (activés) sur votre ordinateur. Appareil Android Les services Google Play sont utilisés pour déterminer l'emplacement plus précisément, si vous vous rencontrez des problèmes de précision de localisation après avoir désactivé l'option, activez-la.</p>
 <p><strong>iOS</strong></p>
-<p>Si vous utilisez un iPhone ou un iPad, veuillez vérifier les paramètres iOS → Confidentialité → Services de localisation. Le partage de données de géolocalisation doit être activé pour Organic Maps.</p>
+<p>Si vous utilisez un iPhone ou un iPad, veuillez vérifier les paramètres iOS → Confidentialité → Services de localisation. Le partage de données de géolocalisation doit être activé pour CoMaps.</p>
 <p><strong>Notes:</strong></p>
 <ul>
 <li>
-<p>Pour éviter les données indésirables en itinérance, vous pouvez désactiver toutes les données mobiles, activer le mode Avion ou désactiver les données mobiles pour Organic Maps dans les paramètres de votre appareil. Les appareils Android et iOS peuvent utiliser le GPS en mode Avion.</p>
+<p>Pour éviter les données indésirables en itinérance, vous pouvez désactiver toutes les données mobiles, activer le mode Avion ou désactiver les données mobiles pour CoMaps dans les paramètres de votre appareil. Les appareils Android et iOS peuvent utiliser le GPS en mode Avion.</p>
 </li>
 <li>
 <p>Certains appareils mobiles ne disposent pas de récepteurs GPS intégrés, tels que l'iPod Touch, l'iPad WiFi uniquement, Amazon Kindle Fire / Kindle Fire HD 7 et quelques tablettes Android. Sur ces appareils, notre application montrera votre position approximative, tant que vous êtes connecté à Internet.</p>
@@ -759,11 +759,11 @@ You can use one of the following ways:</p>
 <p>Jeśli masz trudności z określeniem swojej lokalizacji za pomocą GPS, włącz (wyłącz, jeśli włączone) "Usługi Google Play" w ustawieniach aplikacji.</p>
 <p>Uwaga: możesz je zobaczyć tylko wtedy, gdy masz zainstalowane (i włączone) usługi Google Play na twoim urządzeniu z Androidem. Usługi Google Play są używane do dokładniejszego określenia lokalizacji, jeśli masz problemy z dokładnością lokalizacji po wyłączeniu opcji, włącz ją.</p>
 <p><strong>iOS</strong></p>
-<p>Jeśli jesteś użytkownikiem iPhone'a lub iPada, sprawdź ustawienia iOS → Prywatność → Usługi lokalizacji. Udostępnianie danych geolokalizacyjnych powinno być włączone dla Organic Maps.</p>
+<p>Jeśli jesteś użytkownikiem iPhone'a lub iPada, sprawdź ustawienia iOS → Prywatność → Usługi lokalizacji. Udostępnianie danych geolokalizacyjnych powinno być włączone dla CoMaps.</p>
 <p><strong>Uwagi:</strong></p>
 <ul>
 <li>
-<p>Aby uniknąć niechcianych opłat podczas roamingu, możesz wyłączyć wszystkie dane mobilne, aktywować tryb samolotowy lub wyłączyć dane mobilne dla Organic Maps w ustawieniach urządzenia. Urządzenia z Androidem i iOS mogą korzystać z GPS w trybie lotu.</p>
+<p>Aby uniknąć niechcianych opłat podczas roamingu, możesz wyłączyć wszystkie dane mobilne, aktywować tryb samolotowy lub wyłączyć dane mobilne dla CoMaps w ustawieniach urządzenia. Urządzenia z Androidem i iOS mogą korzystać z GPS w trybie lotu.</p>
 </li>
 <li>
 <p>Niektóre urządzenia mobilne nie mają wbudowanych odbiorników GPS, takich jak iPod Touch, iPad tylko z Wi-Fi, Amazon Kindle Fire / Kindle Fire HD 7 i niektóre tablety z Androidem. Na tych urządzeniach nasza aplikacja będzie pokazywać przybliżoną lokalizację, o ile jesteś podłączony do Internetu.</p>
@@ -780,11 +780,11 @@ You can use one of the following ways:</p>
 <p>Se tiver dificuldade em determinar a sua localização com o GPS, ative (ou desative, se já estiver ativado) o "Google Play Services" nas configurações da aplicação.</p>
 <p>Nota: só pode usar a localização com maior precisão ver se tiver o Google Play Services instalado (ativado) no seu dispositivo Android. Os serviços do Google são usados para determinar a localização com mais precisão. Se tiver problemas com a precisão da localização depois de desativar a opção, ative-a novamente.</p>
 <p><strong>iOS</strong></p>
-<p>Se tem um iPhone ou iPad, Por favor, verifique as configurações do iOS → Privacidade → Serviços de localização. A partilha de dados de geolocalização tem de ser ativada para o Organic Maps.</p>
+<p>Se tem um iPhone ou iPad, Por favor, verifique as configurações do iOS → Privacidade → Serviços de localização. A partilha de dados de geolocalização tem de ser ativada para o CoMaps.</p>
 <p><strong>Notas:</strong></p>
 <ul>
 <li>
-<p>Para evitar usar dados em roaming, pode desativar todos os dados móveis, ativar o modo de voo ou desativar os dados móveis do Organic Maps nas configurações do dispositivo. Os dispositivos Android e iOS podem usar o GPS no modo de voo.</p>
+<p>Para evitar usar dados em roaming, pode desativar todos os dados móveis, ativar o modo de voo ou desativar os dados móveis do CoMaps nas configurações do dispositivo. Os dispositivos Android e iOS podem usar o GPS no modo de voo.</p>
 </li>
 <li>
 <p>Alguns dispositivos móveis não têm receptores GPS integrados, como o iPod Touch, o iPad (apenas em Wi-Fi), o Kindle Fire Kindle HD 7 da Amazon e alguns tablets Android. Nesses dispositivos, a nossa aplicação mostrará a sua localização aproximada, desde que esteja ligado à Internet.</p>
@@ -801,11 +801,11 @@ You can use one of the following ways:</p>
 <p>Se tiver dificuldade em determinar a sua localização com o GPS, ative (desative, se ativada) o "Google Play Services" nas configurações da aplicação.</p>
 <p>Nota: só pode ver se tiver o Google Play Services instalado (ativado) no seu dispositivo Android. Os serviços de reprodução do Google são usados para determinar a localização com mais precisão. Se você tiver problemas com a precisão da localização depois de desativar a opção, ative-a.</p>
 <p><strong>iOS</strong></p>
-<p>Se você é um usuário de iPhone ou iPad, Por favor, verifique as configurações do iOS → Privacidade → Serviços de localização. O compartilhamento de dados de geolocalização deve ser ativado para o Organic Maps.</p>
+<p>Se você é um usuário de iPhone ou iPad, Por favor, verifique as configurações do iOS → Privacidade → Serviços de localização. O compartilhamento de dados de geolocalização deve ser ativado para o CoMaps.</p>
 <p><strong>Notas:</strong></p>
 <ul>
 <li>
-<p>Para evitar dados indesejados durante o roaming, você pode desativar todos os dados móveis, ativar um modo de voo ou desativar os dados móveis do Organic Maps nas configurações do dispositivo. Dispositivos Android e iOS podem usar GPS no modo de voo.</p>
+<p>Para evitar dados indesejados durante o roaming, você pode desativar todos os dados móveis, ativar um modo de voo ou desativar os dados móveis do CoMaps nas configurações do dispositivo. Dispositivos Android e iOS podem usar GPS no modo de voo.</p>
 </li>
 <li>
 <p>Alguns dispositivos móveis não possuem receptores GPS integrados, como o iPod Touch, o iPad apenas com WiFi, o Kindle Fire Kindle HD 7 da Amazon e alguns tablets Android. Nesses dispositivos, nosso aplicativo mostrará sua localização aproximada, desde que você esteja conectado à Internet.</p>
@@ -822,11 +822,11 @@ You can use one of the following ways:</p>
 <p>GPS ile konumunuzu belirlemekte zorluk çekiyorsanız, uygulama ayarlarından “Google Play Hizmetleri”ni etkinleştirin (etkinse kapatıp tekrar etkinleştirin).</p>
 <p>Not: bunu yalnızca Android cihazınızda Google Play hizmetleri yüklüyse (etkinse) görebilirsiniz. Google Play hizmetleri konumunuzu daha net olarak belirlemenizi sağlar. Eğer bu seçeneği kapattıktan sonra konum doğruluğu ile ilgili sorun yaşıyorsanız bu ayarı açın.</p>
 <p><strong>iOS</strong></p>
-<p>Bir iPhone veya iPad kullanıcısıysanız, lütfen iOS ayarları → Gizlilik → Konum hizmetlerini kontrol edin. Organic Maps için coğrafi konum veri paylaşımı etkinleştirilmelidir.</p>
+<p>Bir iPhone veya iPad kullanıcısıysanız, lütfen iOS ayarları → Gizlilik → Konum hizmetlerini kontrol edin. CoMaps için coğrafi konum veri paylaşımı etkinleştirilmelidir.</p>
 <p><strong>Notlar:</strong></p>
 <ul>
 <li>
-<p>Dolaşımdayken istenmeyen verileri önlemek için tüm mobil veriyi kapatabilir, uçak modunu açabilir veya cihaz ayarlarında Organic Maps için mobil veriyi devre dışı bırakabilirsiniz. Android ve iOS cihazlar uçak modunda GPS kullanabilir.</p>
+<p>Dolaşımdayken istenmeyen verileri önlemek için tüm mobil veriyi kapatabilir, uçak modunu açabilir veya cihaz ayarlarında CoMaps için mobil veriyi devre dışı bırakabilirsiniz. Android ve iOS cihazlar uçak modunda GPS kullanabilir.</p>
 </li>
 <li>
 <p>iPod Touch, sadece Wi-Fi destekli iPad, Amazon Kindle Fire/Kindle Fire HD 7 ve bazı Android tabletler gibi bazı mobil cihazlar dahili GPS alıcılarına sahip değildir. Bu cihazlarda siz internete bağlanana kadar uygulamamız yaklaşık konumunuzu gösterecektir.</p>
@@ -843,11 +843,11 @@ You can use one of the following ways:</p>
 <p>Якщо у вас виникають труднощі з визначенням вашого місцезнаходження за допомогою GPS, увімкніть (вимкніть, якщо увімкнено) "Сервіси Google Play" в налаштуваннях програми.</p>
 <p>Примітка: ви можете побачити його, лише якщо на вашому пристрої встановлені та увімкнені служби Google Play Android. Ці служби використовуються для більш точного визначення місцезнаходження. Якщо у вас виникли проблеми з точністю визначення місцезнаходження після вимкнення цієї опції, увімкніть її назад.</p>
 <p><strong>iOS</strong></p>
-<p>Якщо ви користувач iPhone або iPad, перевірте налаштування iOS → Конфіденційність → Служби визначення місцезнаходження. Обмін геолокаційними даними слід увімкнути для Organic Maps.</p>
+<p>Якщо ви користувач iPhone або iPad, перевірте налаштування iOS → Конфіденційність → Служби визначення місцезнаходження. Обмін геолокаційними даними слід увімкнути для CoMaps.</p>
 <p><strong>Примітки:</strong></p>
 <ul>
 <li>
-<p>Щоб уникнути небажаних даних у роумінгу, ви можете вимкнути всі мобільні дані, активувати режим польоту або вимкнути мобільні дані для Organic Maps у налаштуваннях вашого пристрою. Пристрої на Android та iOS можуть використовувати GPS в режимі польоту.</p>
+<p>Щоб уникнути небажаних даних у роумінгу, ви можете вимкнути всі мобільні дані, активувати режим польоту або вимкнути мобільні дані для CoMaps у налаштуваннях вашого пристрою. Пристрої на Android та iOS можуть використовувати GPS в режимі польоту.</p>
 </li>
 <li>
 <p>Деякі мобільні пристрої не мають вбудованих GPS-приймачів, наприклад iPod Touch, iPad з підтримкою Wi-Fi, Amazon Kindle Fire/Kindle Fire HD 7 та деякі планшети Android. На цих пристроях наш додаток буде показуватиме ваше приблизне місцезнаходження за умови підключення до Інтернету.</p>
@@ -867,11 +867,11 @@ You can use one of the following ways:</p>
 Google Play 服务用于更精确地确定位置，如果在禁用该选项后您遇到位置准确性问题，请将其打开。</p>
 <p><strong>iOS</strong></p>
 <p>如果您是 iPhone 或 iPad 用户，请检查 iOS 设置 → 隐私 → 位置服务。
-Organic Maps 的地理位置数据共享应该是启用的。</p>
+CoMaps 的地理位置数据共享应该是启用的。</p>
 <p><strong>请注意：</strong></p>
 <ul>
 <li>
-<p>为了避免漫游时产生不必要的数据费用，您可以在设备设置中关闭所有移动数据，激活飞行模式或为 Organic Maps 禁用移动数据。 安卓和 iOS 设备可以在飞行模式下使用 GPS。</p>
+<p>为了避免漫游时产生不必要的数据费用，您可以在设备设置中关闭所有移动数据，激活飞行模式或为 CoMaps 禁用移动数据。 安卓和 iOS 设备可以在飞行模式下使用 GPS。</p>
 </li>
 <li>
 <p>一些移动设备没有内置的 GPS 接收器，例如 iPod Touch、仅 WiFi 的 iPad、Amazon Kindle Fire / Kindle Fire HD 7 和一些安卓平板电脑。 在这些设备上，只要您连接到互联网，我们的应用程序将显示您的大致位置。</p>
@@ -913,12 +913,12 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 
     </dd><dd lang="es">
       <p>El error de la descarga puede deberse a un fallo temporal de la red o a ajustes específicos del proveedor de la red o del rúter. Inténtalo de nuevo más tarde o utiliza otro punto de acceso mediante wifi.</p>
-<p>En Android, asegúrese de haber otorgado acceso a la red para Organic Maps y Download Manager.</p>
+<p>En Android, asegúrese de haber otorgado acceso a la red para CoMaps y Download Manager.</p>
 <p>Además, si tiene mapas muy desactualizados y la aplicación no puede actualizarlos, puede ser útil eliminar los mapas desactualizados y volver a descargarlos.</p>
 
     </dd><dd lang="fr">
       <p>Votre téléchargement peut échouer suite à un problème de réseau temporaire ou de paramêtre de réseau spécifique du fournisseur/routeur. Merci de réessayer plus tard ou d'utiliser un point d'accès wifi différent. En complément, assurez vous d'avoir suffisamment d'espace disponible pour télécharger les cartes.</p>
-<p>Sur Android, assurez-vous d'avoir autorisé l'accès au réseau pour Organic Maps et Download Manager.</p>
+<p>Sur Android, assurez-vous d'avoir autorisé l'accès au réseau pour CoMaps et Download Manager.</p>
 <p>De plus, si vous avez des cartes très obsolètes et que l'application ne peut pas les mettre à jour, il peut être utile de supprimer les cartes obsolètes et de les télécharger à nouveau.</p>
 
     </dd><dd lang="pl">
@@ -928,27 +928,27 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 
     </dd><dd lang="pt">
       <p>O descarregamento pode falhar devido a um erro de rede temporário ou a configurações específicas do fornecedor da rede / router. Por favor, tente novamente mais tarde ou use outro ponto de acesso Wi-Fi. Certifique-se também que tem espaço livre suficiente para fazer o descarregamento dos mapas.</p>
-<p>Em Android, certifique-se que forneceu o acesso à rede ao Organic Maps e à aplicação do sistema Gestor de Transferências (Download Manager).</p>
+<p>Em Android, certifique-se que forneceu o acesso à rede ao CoMaps e à aplicação do sistema Gestor de Transferências (Download Manager).</p>
 <p>Além disso, se tiver mapas muito desatualizados e a aplicação não consegue atualizá-los, pode tentar eliminar os mapas desatualizados e tentar descarregá-los novamente.</p>
 
     </dd><dd lang="pt-BR">
       <p>Seu download pode falhar devido a um erro de rede temporário ou configurações específicas de provedor de rede / roteador. Por favor, tente novamente mais tarde ou use um ponto de acesso Wi-Fi diferente. Além disso, certifique-se de ter espaço livre suficiente para fazer o download dos mapas.</p>
-<p>No Android, certifique-se de ter concedido acesso à rede para Organic Maps e Download Manager.</p>
+<p>No Android, certifique-se de ter concedido acesso à rede para CoMaps e Download Manager.</p>
 <p>Além disso, se você tiver mapas muito desatualizados e o aplicativo não puder atualizá-los, pode ser útil excluir mapas desatualizados e baixá-los novamente.</p>
 
     </dd><dd lang="tr">
       <p>İndirme işleminiz geçici bir ağ hatası veya belirli ağ sağlayıcısı/yönlendirici ayarları nedeniyle başarısız olabilir. Lütfen daha sonra tekrar deneyin veya farklı bir WiFi erişim noktası kullanın. Ayrıca, haritaları indirmek için yeterli boş alana sahip olduğunuzdan emin olun.</p>
-<p>Android'de lütfen Organic Maps ve sistem İndirme Yöneticisi (İndirme Sağlayıcısı) için ağ erişimi verdiğinizden emin olun.</p>
+<p>Android'de lütfen CoMaps ve sistem İndirme Yöneticisi (İndirme Sağlayıcısı) için ağ erişimi verdiğinizden emin olun.</p>
 <p>Ayrıca, haritalarınız çok eskiyse ve uygulama bunları güncelleyemiyorsa, eski haritaları silip yeniden indirmek yardımcı olabilir.</p>
 
     </dd><dd lang="uk">
       <p>Завантаження може завершитися невдало через тимчасову помилку мережі або певні проблеми провайдера/маршрутизатора. Будь ласка, повторіть спробу пізніше або використовуйте іншу точку доступу Wi-Fi. Крім того, переконайтеся, що у вас є достатньо вільного місця для завантаження карт.</p>
-<p>На Android, будь ласка, переконайтеся, що ви надали доступ до мережі для Organic Maps і системний менеджер завантажень (провайдер завантажень).</p>
+<p>На Android, будь ласка, переконайтеся, що ви надали доступ до мережі для CoMaps і системний менеджер завантажень (провайдер завантажень).</p>
 <p>Крім того, якщо у вас дуже застарілі карти, і програма не може їх оновити, вам може допомогти видалення всіх карт і повторне їх завантаження.</p>
 
     </dd><dd lang="zh">
       <p>您的下载可能因为临时网络错误或特定网络提供商 / 路由器设置而失败。 请稍后重试或使用其它 Wi-Fi 网络。此外，请确保您有足够的存储空间来下载地图。</p>
-<p>在安卓设备上，请确保您已经为 Organic Maps 和系统下载管理器授予了网络访问权限。</p>
+<p>在安卓设备上，请确保您已经为 CoMaps 和系统下载管理器授予了网络访问权限。</p>
 <p>另外，如果您的地图非常过时且应用程序无法更新它们，删除过时的地图并重新下载可能会有帮助。</p>
 
     </dd>
@@ -971,57 +971,57 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
     <dd lang="en">
       <p>Remember that to search for a place in a specific area, you will need to download a relevant map and zoom in the map to that area, or your location should be near that area before you begin the search. For example, if you want to find a place in Vietnam and your location is somewhere else, you should download and open the map of Vietnam first, or explicitly mention the country (Vietnam) or desired city/town/village name in the search field.</p>
 <p>In addition, the place may not have been added to the map yet at <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>. If you want to help and improve the map, check <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Contribute_map_data">this guide</a> and add missing map information yourself.</p>
-<p>If the place is displayed on the map in Organic Maps, but our search cannot find it, <a href="mailto:support@organicmaps.app">report us</a> coordinates of the place and an example of your search request.</p>
+<p>If the place is displayed on the map in CoMaps, but our search cannot find it, <a href="mailto:support@comaps.app">report us</a> coordinates of the place and an example of your search request.</p>
 </dd>
     <dd lang="ru">
       <p>Для поиска места в определенной области необходимо сначала загрузить карту, а затем приблизить ее (либо местоположение должно быть рядом с этой областью). Например, если вы хотите найти место во Вьетнаме, а ваше местоположение находится в другом месте, необходимо сначала загрузить и открыть карту Вьетнама.</p>
 <p>Также искомое место может отсутствовать на карте в <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, нашем источнике данных. Если вы хотите помочь и улучшить карту, ознакомьтесь с руководством по <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Contribute_map_data">ссылке</a>.</p>
-<p>Если место отображается на карте в Organic Maps, но поиск не может его найти, <a href="mailto:support@organicmaps.app">сообщите нам</a> координаты места и пример вашего поискового запроса.</p>
+<p>Если место отображается на карте в CoMaps, но поиск не может его найти, <a href="mailto:support@comaps.app">сообщите нам</a> координаты места и пример вашего поискового запроса.</p>
 
     </dd><dd lang="de">
       <p>Zur Suche nach einem Ort in einem bestimmten Gebiet müssen Sie die Kartenregion herunterladen. Zudem sollten Sie vor Beginn der Suche entweder in der Karte zu diesem Gebiet zoomen oder Ihr GPS Standorts sollte sich in der Nähe dieses Gebiets befinden. Wenn Sie beispielsweise einen Ort in Vietnam suchen möchten und sich an einem anderen Ort befinden, sollten Sie zuerst die Karte von Vietnam herunterladen und öffnen.</p>
 <p>Außerdem wurde der Ort möglicherweise noch nicht zur Karte auf <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, unserer Kartendatenquelle, hinzugefügt. Wenn Sie helfen und die Karte verbessern möchten, lesen Sie <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Contribute_map_data">diese Anleitung</a>.</p>
-<p>Wenn der Ort auf der Karte in Organic Maps angezeigt wird, unsere Suche ihn jedoch nicht finden kann, <a href="mailto:support@organicmaps.app">schicken Sie uns</a> die Koordinaten des Ortes und ein Beispiel für Ihre Suchanfrage.</p>
+<p>Wenn der Ort auf der Karte in CoMaps angezeigt wird, unsere Suche ihn jedoch nicht finden kann, <a href="mailto:support@comaps.app">schicken Sie uns</a> die Koordinaten des Ortes und ein Beispiel für Ihre Suchanfrage.</p>
 
     </dd><dd lang="es">
       <p>Recuerde que para buscar un lugar en un área específica, deberá descargar un mapa relevante y acercar el mapa a esa área, o su ubicación debe estar cerca de esa área antes de comenzar la búsqueda. Por ejemplo, si desea encontrar un lugar en Vietnam y su ubicación está en otro lugar, primero debe descargar y abrir el mapa de Vietnam.</p>
 <p>Además, es posible que el lugar aún no se haya agregado al mapa en <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, nuestra fuente de datos de mapas. Si quieres ayudar y mejorar el mapa, consulta <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/ES:Contribuir_a_los_datos_del_mapa">esta guía</a>.</p>
-<p>Si el lugar se muestra en el mapa en Organic Maps, pero nuestra búsqueda no puede encontrarlo, <a href="mailto:support@organicmaps.app">infórmanos</a> de las coordenadas del lugar y un ejemplo de tu solicitud de búsqueda.</p>
+<p>Si el lugar se muestra en el mapa en CoMaps, pero nuestra búsqueda no puede encontrarlo, <a href="mailto:support@comaps.app">infórmanos</a> de las coordenadas del lugar y un ejemplo de tu solicitud de búsqueda.</p>
 
     </dd><dd lang="fr">
       <p>N'oubliez pas que pour rechercher un lieu dans une zone spécifique, vous devrez télécharger une carte pertinente et zoomer sur la carte vers cette zone, ou votre emplacement doit être proche de cette zone avant de commencer la recherche. Par exemple, si vous voulez trouver un endroit au Vietnam et que votre emplacement est ailleurs, vous devez d'abord télécharger et ouvrir la carte du Vietnam.</p>
 <p>De plus, le lieu n'a peut-être pas encore été ajouté à la carte sur <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, notre source de données cartographiques. Si vous souhaitez aider et améliorer la carte, consultez <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/FR:Contribuer_aux_donn%C3%A9es_cartographiques">ce guide</a>.</p>
-<p>Si le lieu est affiché sur la carte dans Organic Maps, mais que notre recherche ne le trouve pas, <a href="mailto:support@organicmaps.app">indiquez-nous</a> les coordonnées du lieu et un exemple de votre demande de recherche.</p>
+<p>Si le lieu est affiché sur la carte dans CoMaps, mais que notre recherche ne le trouve pas, <a href="mailto:support@comaps.app">indiquez-nous</a> les coordonnées du lieu et un exemple de votre demande de recherche.</p>
 
     </dd><dd lang="pl">
       <p>Pamiętaj, że aby wyszukać miejsce w określonym obszarze, musisz pobrać odpowiednią mapę i powiększyć mapę do tego obszaru lub Twoja lokalizacja powinna znajdować się w pobliżu tego obszaru przed rozpoczęciem wyszukiwania. Na przykład, jeśli chcesz znaleźć miejsce w Wietnamie, a Twoja lokalizacja znajduje się gdzie indziej, najpierw pobierz i otwórz mapę Wietnamu.</p>
 <p>Ponadto miejsce mogło nie zostać jeszcze dodane do mapy w <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, naszym źródle danych map. Jeśli chcesz pomóc i ulepszyć mapę, zajrzyj do <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Pl:Wk%C5%82ad_w_dane_mapowe">tego przewodnika</a>.</p>
-<p>Jeśli miejsce jest wyświetlane na mapie w Organic Maps, ale nasze wyszukiwanie nie może go znaleźć, <a href="mailto:support@organicmaps.app">zgłoś nam</a> współrzędne miejsca i przykład zapytania.</p>
+<p>Jeśli miejsce jest wyświetlane na mapie w CoMaps, ale nasze wyszukiwanie nie może go znaleźć, <a href="mailto:support@comaps.app">zgłoś nam</a> współrzędne miejsca i przykład zapytania.</p>
 
     </dd><dd lang="pt">
       <p>Note que para pesquisar um lugar numa área específica, irá precisar de descarregar um mapa desse local e ampliar o mapa nessa área, ou a sua localização deve estar perto dessa área antes de iniciar a pesquisa. Por exemplo, se quer encontrar um lugar no Vietname e a sua localização atual é noutro país, tem de descarregar o mapa do Vietname e abrir o mapa desse país.</p>
 <p>Além disso, o local pode ainda não ter sido adicionado ao mapa em <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, a nossa fonte de dados de mapas. Se quiser ajudar a melhorar o mapa, consulte <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Pt:Contribuir_com_dados_do_mapa">este guia</a>.</p>
-<p>Se o local aparece no mapa no Organic Maps, mas a pesquisa não o encontra, <a href="mailto:support@organicmaps.app">informe-nos</a> as coordenadas do local e as palavras que usou na pesquisa.</p>
+<p>Se o local aparece no mapa no CoMaps, mas a pesquisa não o encontra, <a href="mailto:support@comaps.app">informe-nos</a> as coordenadas do local e as palavras que usou na pesquisa.</p>
 
     </dd><dd lang="pt-BR">
       <p>Lembre-se de que para pesquisar um lugar em uma área específica, você precisará baixar um mapa desse local e ampliar o mapa para essa área, ou sua localização deve estar perto dessa área antes de iniciar a pesquisa. Por exemplo, se você deseja encontrar um lugar no Vietnã e sua localização é em outro lugar, você deve fazer o download e abrir o mapa do Vietnã primeiro.</p>
 <p>Além disso, o local pode não ter sido adicionado ao mapa ainda em <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, nossa fonte de dados de mapas. Se você quer ajudar e melhorar o mapa, consulte <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Pt:Contribuir_com_dados_do_mapa">este guia</a>.</p>
-<p>Se o local estiver exibido no mapa no Organic Maps, mas nossa pesquisa não o encontrar, <a href="mailto:support@organicmaps.app">informe-nos</a> as coordenadas do local e as palavras que usou em sua pesquisa.</p>
+<p>Se o local estiver exibido no mapa no CoMaps, mas nossa pesquisa não o encontrar, <a href="mailto:support@comaps.app">informe-nos</a> as coordenadas do local e as palavras que usou em sua pesquisa.</p>
 
     </dd><dd lang="tr">
       <p>Belirli bir bölgedeki bir yeri aramak için, ilgili yerin haritasını indirmeniz ve o bölgeye haritayı yakınlaştırmanız veya aramaya başlamadan önce bulunduğunuz yerin o bölgeye yakın olması gerektiğini unutmayın. Örneğin, Vietnam'da bir yer bulmak istiyorsanız ve konumunuz başka bir yerdeyse, önce Vietnam haritasını indirip açmalısınız.</p>
 <p>Ayrıca, aradığınız yer henüz bizim harita veri kaynağımız olan <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>'da haritaya eklenmemiş olabilir. Yardım etmek ve haritayı geliştirmek istiyorsanız, <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Contribute_map_data">bu kılavuza</a> göz atın.</p>
-<p>Yer, Organic Maps'te haritada görüntüleniyorsa ama arama sistemimiz onu bulamıyorsa, yerin koordinatlarını ve aramanızın bir örneğini <a href="mailto:support@organicmaps.app">bize bildirin</a>.</p>
+<p>Yer, CoMaps'te haritada görüntüleniyorsa ama arama sistemimiz onu bulamıyorsa, yerin koordinatlarını ve aramanızın bir örneğini <a href="mailto:support@comaps.app">bize bildirin</a>.</p>
 
     </dd><dd lang="uk">
       <p>Пам'ятайте, що для пошуку місця в певному районі вам потрібно завантажити відповідну мапу і збільшити масштаб карти до цієї області. Або ж ваше місцезнаходження має бути поблизу цієї області, перш ніж ви почнете пошук. Наприклад, якщо ви хочете знайти місце у В'єтнамі, а ваше місцезнаходження десь в іншому місці, вам слід спочатку завантажити і відкрити мапу В'єтнаму.</p>
 <p>Крім того, місце може бути ще не додано на мапу в базі <a rel="noopener" target="_blank" href="https://www.openstreetmap.org/">OpenStreetMap.org</a>, нашому джерелі картографічних даних. Якщо ви хочете допомогти і покращити мапу, перевірте <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Contribute_map_data">цей путівник</a>.</p>
-<p>Якщо місце відображається на мапі в Organic Maps, але наш пошук не може його знайти, <a href="mailto:support@organicmaps.app">повідомте нам</a> координати місця та приклад вашого пошукового запиту.</p>
+<p>Якщо місце відображається на мапі в CoMaps, але наш пошук не може його знайти, <a href="mailto:support@comaps.app">повідомте нам</a> координати місця та приклад вашого пошукового запиту.</p>
 
     </dd><dd lang="zh">
       <p>请记住，要在特定区域搜索地方，您需要下载相关地图并将地图缩放到该区域，或者在开始搜索之前，您的位置应该接近该区域。 例如，如果您想在越南找到一个地方，而您的位置在其他地方，您应该先下载并打开越南的地图。</p>
 <p>此外，该地方可能尚未添加到我们的地图数据源 <a rel="noopener" target="_blank" href="https://www.openstreetmap.org">OpenStreetMap.org</a>上。 如果您想帮助改进地图，请查看 <a rel="noopener" target="_blank" href="https://wiki.openstreetmap.org/wiki/Contribute_map_data">这份指南</a>。</p>
-<p>如果在 Organic Maps 上显示了该地方，但搜索功能却找不到它，请 <a href="mailto:support@organicmaps.app">向我们报告</a> 该地方的坐标以及您的搜索请求的示例。</p>
+<p>如果在 CoMaps 上显示了该地方，但搜索功能却找不到它，请 <a href="mailto:support@comaps.app">向我们报告</a> 该地方的坐标以及您的搜索请求的示例。</p>
 
     </dd>
   </dl><dl id="app-crash">
@@ -1048,110 +1048,110 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Format SD card and re-download maps.</li>
 <li>Buy a new SD card (recommended)</li>
 </ol>
-<p>If the app still crashes, please check <a rel="noopener" target="_blank" href="https://github.com/organicmaps/organicmaps/issues/">our GitHub</a> for similar issues, and <a href="mailto:support@organicmaps.app">contact us</a> and provide the following:</p>
+<p>If the app still crashes, please check <a rel="noopener" target="_blank" href="https://codeberg.org/comaps/comaps/issues/">our GitHub</a> for similar issues, and <a href="mailto:support@comaps.app">contact us</a> and provide the following:</p>
 <ul>
 <li>A detailed description of the issue and steps to reproduce it</li>
-<li>Organic Maps version</li>
+<li>CoMaps version</li>
 <li>Device model and OS version (Android or iOS)</li>
 </ul>
 </dd>
     <dd lang="ru">
       <p>Это, скорее всего, баг в нашем коде, и мы будем рады исправить его в следующем обновлении.</p>
 <p>На Android чаще всего эта проблема связана с плохой SD-картой. Если вы храните загруженные карты стран на SD-карте, попробуйте отформатировать ее, а лучше замените на новую. Если вы переместили само приложение на SD карту, пожалуйста, верните его назад в память устройства.</p>
-<p>Если ошибка осталась, пожалуйста, <a href="mailto:support@organicmaps.app">сообщите нам</a> о проблеме и уточните следующую информацию:</p>
+<p>Если ошибка осталась, пожалуйста, <a href="mailto:support@comaps.app">сообщите нам</a> о проблеме и уточните следующую информацию:</p>
 <ul>
 <li>краткое описание проблемы</li>
-<li>версия Organic Maps</li>
+<li>версия CoMaps</li>
 <li>модель устройства и версия ОС (Android или iOS).</li>
 </ul>
 
     </dd><dd lang="de">
       <p>Es ist wahrscheinlich unser Fehler und wir werden ihn gerne im nächsten Update beheben.</p>
 <p>Android: Wenn Sie Ihre Karten auf einer SD-Karte speichern, ist die wahrscheinlichste Ursache eine fehlerhafte SD-Karte. Sie können Ihre SD-Karte formatieren oder besser durch eine neue ersetzen. Wenn Sie die App selbst auf die SD-Karte verschoben haben, verschieben Sie sie bitte zurück in den internen (Geräte-) Speicher.</p>
-<p>Wenn das Problem weiterhin besteht, <a href="mailto:support@organicmaps.app">kontaktieren Sie uns bitte</a> und geben Sie uns:</p>
+<p>Wenn das Problem weiterhin besteht, <a href="mailto:support@comaps.app">kontaktieren Sie uns bitte</a> und geben Sie uns:</p>
 <ul>
 <li>Eine kurze Beschreibung des Problems</li>
-<li>Die Organic Maps Version</li>
+<li>Die CoMaps Version</li>
 <li>Ihr Gerätemodell und Betriebssystemversion (Android oder iOS).</li>
 </ul>
 
     </dd><dd lang="es">
       <p>Probablemente sea nuestro error y estaremos encantados de solucionarlo en la próxima actualización.</p>
 <p>Android: Si almacenas los mapas en una tarjeta SD, lo más probable es que el error se deba a un fallo de la tarjeta. Puedes formatear la tarjeta SD o, mejor aún, cambiarla por otra nueva. Si has movido la app a la tarjeta SD, muévela al almacenamiento interno (de tu dispositivo).</p>
-<p>Si el problema persiste <a href="mailto:support@organicmaps.app">ponte en contacto con nosotros</a> y especifica por favor:</p>
+<p>Si el problema persiste <a href="mailto:support@comaps.app">ponte en contacto con nosotros</a> y especifica por favor:</p>
 <ul>
 <li>la descripción corta del problema</li>
-<li>la version de Organic Maps</li>
+<li>la version de CoMaps</li>
 <li>el modelo de dispositivo y la versión de OS (Android o iOS).</li>
 </ul>
 
     </dd><dd lang="fr">
       <p>C'est probablement notre bug, et nous serons heureux de le corriger dans la prochaine mise à jour.</p>
 <p>Android: Si vous stockez les cartes sur carte SD, vous pouvez la formater, c'est la cause la plus courante. Le formatage ou le remplacement résouds le plus souvent le problème.</p>
-<p>Si le problème subsiste, merci de nous <a href="mailto:support@organicmaps.app">contacter</a> et envoyer nous:</p>
+<p>Si le problème subsiste, merci de nous <a href="mailto:support@comaps.app">contacter</a> et envoyer nous:</p>
 <ul>
 <li>un rapport d'erreur et une description du problème</li>
-<li>la version de Organic Maps</li>
+<li>la version de CoMaps</li>
 <li>Le modèle de l'appareil et la version du système d'exploitation (Android ou iOS).</li>
 </ul>
 
     </dd><dd lang="pl">
       <p>Bu muhtemelen bizim hatamız ve bir sonraki güncellemede bunu düzeltmekten mutluluk duyacağız.</p>
 <p>Android'de, haritalarınızı bir SD kartta saklarsanız, bunun en olası nedeni hatalı bir SD karttır. SD kartınızı biçimlendirebilir veya daha iyisi yenisiyle değiştirebilirsiniz. Uygulamayı SD karta taşıdıysanız, lütfen tekrar dahili (cihaz) depolama alanına taşıyın.</p>
-<p>Sorun devam ederse, lütfen <a href="mailto:support@organicmaps.app">bizimle iletişime geçin</a> ve şunları ekleyin:</p>
+<p>Sorun devam ederse, lütfen <a href="mailto:support@comaps.app">bizimle iletişime geçin</a> ve şunları ekleyin:</p>
 <ul>
 <li>sorunun kısa açıklaması</li>
-<li>Organic Maps sürümü</li>
+<li>CoMaps sürümü</li>
 <li>cihaz modeli ve İşletim Sistemi sürümü (Android veya iOS).</li>
 </ul>
 
     </dd><dd lang="pt">
       <p>É provavelmente um erro inesperado e ficaremos contentes em corrigi-lo na próxima atualização.</p>
 <p>Android: se armazena os mapas num cartão SD, a causa mais provável é ser um cartão SD defeituoso. Pode tentar formatar o cartão SD ou melhor ainda, substituí-lo por um novo. Se moveu a aplicação para o cartão SD, mova-o novamente no sentido inverso para o armazenamento interno (dispositivo).</p>
-<p>Se mesmo assim o problema persistir, por favor <a href="mailto:support@organicmaps.app">contacte-nos</a> e forneça as seguintes informações:</p>
+<p>Se mesmo assim o problema persistir, por favor <a href="mailto:support@comaps.app">contacte-nos</a> e forneça as seguintes informações:</p>
 <ul>
 <li>descrição do problema e etapas para o recriar</li>
-<li>Versão do Organic Maps</li>
+<li>Versão do CoMaps</li>
 <li>modelo do dispositivo e versão do sistema operativo (Android ou iOS).</li>
 </ul>
 
     </dd><dd lang="pt-BR">
       <p>É provavelmente o nosso bug e ficaremos felizes em corrigi-lo na próxima atualização.</p>
 <p>Android: se você armazenar seus mapas em um cartão SD, a causa mais provável é um cartão SD defeituoso. Você pode formatar seu cartão SD ou, melhor ainda, substituí-lo por um novo. Se você moveu o aplicativo para o cartão SD, mova-o de volta para o armazenamento interno (dispositivo).</p>
-<p>Se o problema persistir, entre em <a href="mailto:support@organicmaps.app">contato</a> conosco e forneça as seguintes informações:</p>
+<p>Se o problema persistir, entre em <a href="mailto:support@comaps.app">contato</a> conosco e forneça as seguintes informações:</p>
 <ul>
 <li>descrição do problema e etapas para recriá-lo</li>
-<li>Versão do Organic Maps</li>
+<li>Versão do CoMaps</li>
 <li>modelo de dispositivo e versão do sistema operacional (Android ou iOS).</li>
 </ul>
 
     </dd><dd lang="tr">
       <p>Bu muhtemelen bizim hatamız ve bir sonraki güncellemede bunu düzeltmekten mutluluk duyacağız.</p>
 <p>Android'de, haritalarınızı bir SD kartta saklarsanız, bunun en olası nedeni hatalı bir SD karttır. SD kartınızı biçimlendirebilir veya daha iyisi yenisiyle değiştirebilirsiniz. Uygulamayı SD karta taşıdıysanız, lütfen tekrar dahili (cihaz) depolama alanına taşıyın.</p>
-<p>Sorun devam ederse, lütfen <a href="mailto:support@organicmaps.app">bizimle iletişime geçin</a> ve şunları ekleyin:</p>
+<p>Sorun devam ederse, lütfen <a href="mailto:support@comaps.app">bizimle iletişime geçin</a> ve şunları ekleyin:</p>
 <ul>
 <li>sorunun kısa açıklaması</li>
-<li>Organic Maps sürümü</li>
+<li>CoMaps sürümü</li>
 <li>cihaz modeli ve İşletim Sistemi sürümü (Android veya iOS).</li>
 </ul>
 
     </dd><dd lang="uk">
       <p>Ймовірно, це наша помилка, і ми будемо раді виправити її в наступному оновленні.</p>
 <p>Для Android пристроїв, якщо ви зберігаєте карти на SD-карті, найімовірнішою причиною є несправна SD-карта. Ви можете відформатувати SD-карту, а ще краще замінити її на нову. Якщо ви перемістили саму програму на SD-карту, будь ласка, поверніть його назад у внутрішню пам'ять пристрою.</p>
-<p>Якщо проблема не зникне, будь ласка <a href="mailto:support@organicmaps.app">зв'яжіться з нами</a> і повідомте:</p>
+<p>Якщо проблема не зникне, будь ласка <a href="mailto:support@comaps.app">зв'яжіться з нами</a> і повідомте:</p>
 <ul>
 <li>короткий опис проблеми</li>
-<li>версію Organic Maps</li>
+<li>версію CoMaps</li>
 <li>модель пристрою та версія ОС (Android або iOS).</li>
 </ul>
 
     </dd><dd lang="zh">
-      <p>这可能是 Organic Maps 的 bug，我们将很乐意在下一个更新中修复。</p>
+      <p>这可能是 CoMaps 的 bug，我们将很乐意在下一个更新中修复。</p>
 <p>在安卓设备上，如果您将地图存储在 SD 卡上，最有可能的原因是 SD 卡故障。 您可以格式化 SD 卡，或者更好的办法是用新的替换。 如果您将应用本身移动到 SD 卡上，请将其移回到内部（设备）存储。</p>
-<p>如果问题仍然存在，请 <a href="mailto:support@organicmaps.app">与我们联系</a> 并提供以下信息：</p>
+<p>如果问题仍然存在，请 <a href="mailto:support@comaps.app">与我们联系</a> 并提供以下信息：</p>
 <ul>
 <li>问题的简要描述</li>
-<li>Organic Maps 的版本</li>
+<li>CoMaps 的版本</li>
 <li>设备型号和操作系统版本（安卓或 iOS）。</li>
 </ul>
 
@@ -1180,10 +1180,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Please make sure that your device's volume is not muted. You can change the volume level with your device's volume buttons. To do that, you may need to disable "Change with Buttons" option (if enabled) in the device settings → Sounds.</p>
 </li>
 <li>
-<p>Please report any Bluetooth issues with necessary details on our <a rel="noopener" target="_blank" href="https://github.com/organicmaps/organicmaps/issues">GitHub</a></p>
+<p>Please report any Bluetooth issues with necessary details on our <a rel="noopener" target="_blank" href="https://codeberg.org/comaps/comaps/issues">GitHub</a></p>
 </li>
 <li>
-<p>If you are an Android user and the option is disabled (or some of the supported languages are unavailable), please check <a href="https://organicmaps.app/faq/voice/text-to-speech-android-tts/">TTS settings</a>.</p>
+<p>If you are an Android user and the option is disabled (or some of the supported languages are unavailable), please check <a href="https://comaps.app/faq/voice/text-to-speech-android-tts/">TTS settings</a>.</p>
 </li>
 </ul>
 <p>On Android voice instructions are available in 39 languages: English, Arabic, Basque, Belarusian, Catalan, Chinese (Simplified and Traditional), Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hindi, Hungarian, Indonesian, Italian, Japanese, Korean, Marathi, Norwegian, Persian (Farsi), Polish, Portuguese, Portuguese (Brasil), Romanian, Russian, Serbian, Slovak, Spanish, Spanish (Mexico), Swahili, Swedish, Thai, Turkish, Ukrainian, Vietnamese.</p>
@@ -1198,10 +1198,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Убедитесь, что на устройстве включен звук. Изменить громкость можно с помощью кнопок громкости на устройстве. Чтобы это сделать, может потребоваться отключить опцию "Изменение кнопками" (если она включена) в настройках устройства → Звуки, тактильные сигналы.</p>
 </li>
 <li>
-<p>Если у вас включен Bluetooth, это не должно затронуть голосовые инструкции. В случае возникновения трудностей пришлите описание проблемы с подробностями через <a rel="noopener" target="_blank" href="https://github.com/organicmaps/organicmaps/issues">GitHub</a>.</p>
+<p>Если у вас включен Bluetooth, это не должно затронуть голосовые инструкции. В случае возникновения трудностей пришлите описание проблемы с подробностями через <a rel="noopener" target="_blank" href="https://codeberg.org/comaps/comaps/issues">GitHub</a>.</p>
 </li>
 <li>
-<p>Если у вас Android-устройство и опция голосовых инструкций недоступна в настройках приложения или поддерживаемые языки не отображаются в списке, пожалуйста, проверьте <a href="https://organicmaps.app/ru/faq/voice/%D1%81%D0%B8%D0%BD%D1%82%D0%B5%D0%B7-%D1%80%D0%B5%D1%87%D0%B8-tts-%D0%BD%D0%B0-android/">настройки синтеза речи</a>.</p>
+<p>Если у вас Android-устройство и опция голосовых инструкций недоступна в настройках приложения или поддерживаемые языки не отображаются в списке, пожалуйста, проверьте <a href="https://comaps.app/ru/faq/voice/%D1%81%D0%B8%D0%BD%D1%82%D0%B5%D0%B7-%D1%80%D0%B5%D1%87%D0%B8-tts-%D0%BD%D0%B0-android/">настройки синтеза речи</a>.</p>
 </li>
 </ul>
 <p>Голосовые подсказки для Android доступны на 39 языках: Русский, Беларуский, Украинский, Английский, Арабский, Баскский, Венгерский, Вьетнамский, Греческий, Датский, Индонезийский, Испанский, Испанский (Мексика), Итальнский, Каталанский, Китайский (упрощенный и традиционный), Корейский, Маратхи, Немецкий, Нидерландский, Норвежский, Персидский, Польский, Португальский, Португальский (Бразилия), Румынский, Сербский, Словацкий, Суахили, Тайский, Турецкий, Финский, Французский, Хинди, Хорватский, Чешский, Шведский, Японский</p>
@@ -1214,10 +1214,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Bitte stellen Sie sicher, dass die Lautstärke Ihres Geräts nicht stummgeschaltet ist. Sie können die Lautstärke mit den Lautstärketasten Ihres Geräts ändern. Dazu müssen Sie möglicherweise die Option "Mit Tasten ändern" (falls aktiviert) in den Geräteeinstellungen → Töne &amp; Haptik deaktivieren.</p>
 </li>
 <li>
-<p>Bitte melden Sie uns Bluetooth Probleme inklusive Problemdetails auf <a rel="noopener" target="_blank" href="https://github.com/organicmaps/organicmaps/issues">GitHub</a></p>
+<p>Bitte melden Sie uns Bluetooth Probleme inklusive Problemdetails auf <a rel="noopener" target="_blank" href="https://codeberg.org/comaps/comaps/issues">GitHub</a></p>
 </li>
 <li>
-<p>Wenn Sie Android verwenden und die Sprachanweisungs Option deaktiviert ist (oder einige der unterstützten Sprachen nicht verfügbar sind), überprüfen Sie die <a href="https://organicmaps.app/faq/voice/text-to-speech-android-tts/">System TTS Einstellungen</a>.</p>
+<p>Wenn Sie Android verwenden und die Sprachanweisungs Option deaktiviert ist (oder einige der unterstützten Sprachen nicht verfügbar sind), überprüfen Sie die <a href="https://comaps.app/faq/voice/text-to-speech-android-tts/">System TTS Einstellungen</a>.</p>
 </li>
 </ul>
 <p>Auf Android sind Sprachanweisungen in 39 Sprachen verfügbar: Arabisch, Baskisch, Chinesisch (vereinfacht und traditionell), Dänisch, <strong>Deutsch</strong>, Englisch, Finnisch, Französisch, Griechisch, Hindi, Indonesisch, Italienisch, Japanisch, Katalanisch, Koreanisch, Kroatisch, Marathi, Niederländisch, Norwegisch, Persisch (Farsi), Polnisch, Portugiesisch, Portugiesisch (Brasilien), Rumänisch, Russisch, Schwedisch, Serbisch, Slowakisch, Spanisch, Spanisch (Mexiko), Swahili, Thailändisch, Tschechisch, Türkisch, Ukrainisch, Ungarisch, Vietnamesisch, Weißrussisch.</p>
@@ -1325,10 +1325,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Переконайтеся, що на вашому пристрої не вимкнено звук. Ви можете змінити рівень гучності за допомогою кнопок гучності вашого пристрою. Щоб це зробити вам, можливо, доведеться вимкнути опцію "Змінювати кнопками" (якщо її увімкнено) у Налаштуваннях пристрою → Звуки.</p>
 </li>
 <li>
-<p>Коли ви вмикаєте Bluetooth, він не повинен вплинути на голосові інструкції. В разі виникнення труднощів надішліть детальний опис проблеми через <a rel="noopener" target="_blank" href="https://github.com/organicmaps/organicmaps/issues">GitHub</a>.</p>
+<p>Коли ви вмикаєте Bluetooth, він не повинен вплинути на голосові інструкції. В разі виникнення труднощів надішліть детальний опис проблеми через <a rel="noopener" target="_blank" href="https://codeberg.org/comaps/comaps/issues">GitHub</a>.</p>
 </li>
 <li>
-<p>Якщо ви користувач Android і ця опція вимкнена (або деякі з підтримуваних мов недоступні), перевірте <a href="https://organicmaps.app/faq/voice/text-to-speech-android-tts/">налаштування TTS</a>.</p>
+<p>Якщо ви користувач Android і ця опція вимкнена (або деякі з підтримуваних мов недоступні), перевірте <a href="https://comaps.app/faq/voice/text-to-speech-android-tts/">налаштування TTS</a>.</p>
 </li>
 </ul>
 <p>На Android голосові інструкції доступні 39 мовами: Українська, Английська, Арабська, Баскська, Беларуська, В'єтнамська, Грецька, Гінді, Данська, Каталонська, Китайська (спрощена та традиційна), Корейська, Маратхі, Норвезька, Нідерландська, Німецька, Перська, Польська, Португальська, Португальська (Бразилія), Російська, Румунська, Сербська, Словацька, Суахілі, Тайська, Турецька, Угорська, Французька, Фінська, Хорватська, Чеська, Шведська, Японська, Індонезійська, Іспанська, Іспанська (Мексика), Італійська.</p>
@@ -1439,31 +1439,31 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
     </dt>
 
     <dd lang="en">
-      <p>You can import bookmarks sent from Organic Maps or third party apps if they export bookmarks in KML, KMZ, KMB, GPX formats.</p>
+      <p>You can import bookmarks sent from CoMaps or third party apps if they export bookmarks in KML, KMZ, KMB, GPX formats.</p>
 <p>To import a single file:</p>
 <ol>
 <li>
 <p>Locate shared KML, KMZ, KMB, GPX file with bookmarks sent by email, instant messenger or cloud storage, for example, iCloud or Google Drive.</p>
 </li>
 <li>
-<p>Tap once or tap and hold the KML, KMZ, KMB, GPX file with bookmarks and choose Open with Organic Maps (Android) or "Import with Organic Maps" (iOS) in the pop-up window.</p>
+<p>Tap once or tap and hold the KML, KMZ, KMB, GPX file with bookmarks and choose Open with CoMaps (Android) or "Import with CoMaps" (iOS) in the pop-up window.</p>
 </li>
 <li>
-<p>It will be open with Organic Maps and you'll see ‘Bookmarks loaded successfully!’. You can find them on the map or in Bookmarks Menu screen.</p>
+<p>It will be open with CoMaps and you'll see ‘Bookmarks loaded successfully!’. You can find them on the map or in Bookmarks Menu screen.</p>
 </li>
 </ol>
 <p>Importing bookmarks and tracks in batch is also possible:</p>
 <ol>
 <li>
-<p>Open Organic Maps and tap star button to open list of bookmarks and tracks. Push "Import Bookmarks and Tracks" button.</p>
+<p>Open CoMaps and tap star button to open list of bookmarks and tracks. Push "Import Bookmarks and Tracks" button.</p>
 </li>
 <li>
-<p>Select a folder with KML, KMZ, KMB, GPX files. Organic Maps will scan it including subfolders and import all supported files with bookmarks and tracks. You can choose root folder to search over all storage.</p>
+<p>Select a folder with KML, KMZ, KMB, GPX files. CoMaps will scan it including subfolders and import all supported files with bookmarks and tracks. You can choose root folder to search over all storage.</p>
 </li>
 </ol>
 </dd>
     <dd lang="ru">
-      <p>Вы можете импортировать метки, отправленные из Organic Maps или сторонних приложений в форматах KML, KMZ, KMB, GPX:</p>
+      <p>Вы можете импортировать метки, отправленные из CoMaps или сторонних приложений в форматах KML, KMZ, KMB, GPX:</p>
 <ol>
 <li>
 <p>Вы можете импортировать метки из некоторых других приложений, включая Maps.Me. Откройте метки (кнопка со звёздочкой), нажмите "Импортировать метки и треки", и выберите диск или папку, где будут KML, KMZ, KMB или GPX файлы.</p>
@@ -1472,39 +1472,39 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Отправьте себе на почту файл с метками (в формате KML, KMZ, KMB, GPX). Вы также можете использовать приложения для обмена сообщениями или загрузить файл из облачного хранилища, например, iCloud или Google Диск.</p>
 </li>
 <li>
-<p>Нажмите файл и выберите "Скопировать в Organic Maps".</p>
+<p>Нажмите файл и выберите "Скопировать в CoMaps".</p>
 </li>
 <li>
-<p>Файл будет открыт в Organic Maps и вы увидете сообщение "Метки успешно загружены!". Вы можете найти их на карте и в меню меток.</p>
+<p>Файл будет открыт в CoMaps и вы увидете сообщение "Метки успешно загружены!". Вы можете найти их на карте и в меню меток.</p>
 </li>
 </ol>
 
     </dd><dd lang="de">
-      <p>Sie können Lesezeichen und Tracks importieren, die mit Organic Maps oder anderen Apps im KML, KMZ, KMB, GPX-Format geteilt oder exportiert wurden.</p>
+      <p>Sie können Lesezeichen und Tracks importieren, die mit CoMaps oder anderen Apps im KML, KMZ, KMB, GPX-Format geteilt oder exportiert wurden.</p>
 <p>So importieren Sie eine einzelne Datei:</p>
 <ol>
 <li>
 <p>Suchen Sie eine freigegebene KML-, KMZ-, KMB- oder GPX-Datei mit Lesezeichen, die per E-Mail, Instant Messenger oder Cloud-Speicher, z. B. iCloud oder Google Drive, gesendet wurde.</p>
 </li>
 <li>
-<p>Tippen Sie einmal oder tippen und halten Sie die KML-, KMZ-, KMB- oder GPX-Datei mit Lesezeichen und wählen Sie im Pop-up-Fenster „Mit Organic Maps öffnen“ (Android) oder „Mit Organic Maps importieren“ (iOS).</p>
+<p>Tippen Sie einmal oder tippen und halten Sie die KML-, KMZ-, KMB- oder GPX-Datei mit Lesezeichen und wählen Sie im Pop-up-Fenster „Mit CoMaps öffnen“ (Android) oder „Mit CoMaps importieren“ (iOS).</p>
 </li>
 <li>
-<p>Die Datei wird mit Organic Maps geöffnet und Sie sehen die Meldung „Lesezeichen erfolgreich geladen!“. Sie finden die importieren Lesezeichen und Tracks auf der Karte oder im Lesezeichen-Menü.</p>
+<p>Die Datei wird mit CoMaps geöffnet und Sie sehen die Meldung „Lesezeichen erfolgreich geladen!“. Sie finden die importieren Lesezeichen und Tracks auf der Karte oder im Lesezeichen-Menü.</p>
 </li>
 </ol>
 <p>Das Importieren von mehreren Lesezeichen und Tracks auf einmal ist ebenfalls möglich:</p>
 <ol>
 <li>
-<p>Öffnen Sie Organic Maps und tippen Sie auf das Sternsymbol, um die Lesezeichen und Tracks Übersicht zu öffnen. Drücken Sie die Schaltfläche „Lesezeichen und Tracks importieren“.</p>
+<p>Öffnen Sie CoMaps und tippen Sie auf das Sternsymbol, um die Lesezeichen und Tracks Übersicht zu öffnen. Drücken Sie die Schaltfläche „Lesezeichen und Tracks importieren“.</p>
 </li>
 <li>
-<p>Wählen Sie einen Ordner mit KML, KMZ, KMB, GPX Dateien. Organic Maps durchsucht diesen Ordner einschließlich der Unterordner und importiert alle unterstützten Dateien mit Lesezeichen und Tracks. Sie können das Stammverzeichnis wählen, um den gesamten Speicher zu durchsuchen.</p>
+<p>Wählen Sie einen Ordner mit KML, KMZ, KMB, GPX Dateien. CoMaps durchsucht diesen Ordner einschließlich der Unterordner und importiert alle unterstützten Dateien mit Lesezeichen und Tracks. Sie können das Stammverzeichnis wählen, um den gesamten Speicher zu durchsuchen.</p>
 </li>
 </ol>
 
     </dd><dd lang="es">
-      <p>Puede importar marcadores enviados desde Organic Maps o aplicaciones de terceros si exportan marcadores en formato KML, KMZ, KMB, GPX:</p>
+      <p>Puede importar marcadores enviados desde CoMaps o aplicaciones de terceros si exportan marcadores en formato KML, KMZ, KMB, GPX:</p>
 <ol>
 <li>
 <p>Puede importar marcadores desde carpetas y aplicaciones (incluido Maps.Me). Presione un botón de estrella para abrir marcadores, presione "Importar marcadores y trazas" y seleccione la unidad o carpeta con archivos KML, KMZ, KMB, GPX.</p>
@@ -1513,15 +1513,15 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Envía a ti mismo los archivos KML, KMZ, KMB, GPX por correo electrónico. También puede usar mensajería instantánea o almacenamiento en la nube, como iCloud o Google Drive.</p>
 </li>
 <li>
-<p>Pulsa un archivo y elige “Copiar en Organic Maps” (iOS) o "Abrir con Organic Maps" (Android).</p>
+<p>Pulsa un archivo y elige “Copiar en CoMaps” (iOS) o "Abrir con CoMaps" (Android).</p>
 </li>
 <li>
-<p>El archivo se abrirá con Organic Maps y verás “¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestión de favoritos.”</p>
+<p>El archivo se abrirá con CoMaps y verás “¡Los favoritos se han cargado con éxito! Puedes encontrarlos en el mapa o en la pantalla de Gestión de favoritos.”</p>
 </li>
 </ol>
 
     </dd><dd lang="fr">
-      <p>Vous pouvez importer des signets envoyés depuis Organic Maps ou des applications tierces exportés au format KML:</p>
+      <p>Vous pouvez importer des signets envoyés depuis CoMaps ou des applications tierces exportés au format KML:</p>
 <ol>
 <li>
 <p>Vous pouvez importer des favoris à partir de dossiers et d'applications (y compris Maps.Me). Appuyez sur un bouton étoile pour ouvrir les favoris, appuyez sur "Importer des signets et des parcours" et sélectionnez le lecteur ou le dossier contenant les fichiers KML, KMZ, KMB, GPX.</p>
@@ -1530,15 +1530,15 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Ouvrez un fichier KML, KMZ, KMB, GPX partagé avec des signets envoyés par e-mail, messagerie instantanée ou cloud stockage, par exemple, iCloud ou Google Drive.</p>
 </li>
 <li>
-<p>Appuyez une fois ou appuyez et maintenez le fichier KML, KMZ, KMB, GPX avec des signets et choisissez Ouvrir avec Organic Maps (Android) ou "Importer avec Organic Maps" (iOS) dans la fenêtre contextuelle.</p>
+<p>Appuyez une fois ou appuyez et maintenez le fichier KML, KMZ, KMB, GPX avec des signets et choisissez Ouvrir avec CoMaps (Android) ou "Importer avec CoMaps" (iOS) dans la fenêtre contextuelle.</p>
 </li>
 <li>
-<p>Il sera ouvert avec Organic Maps et vous verrez 'Signets chargés avec succès!'. Vous les trouverez sur la carte ou dans l'écran du menu Signets.</p>
+<p>Il sera ouvert avec CoMaps et vous verrez 'Signets chargés avec succès!'. Vous les trouverez sur la carte ou dans l'écran du menu Signets.</p>
 </li>
 </ol>
 
     </dd><dd lang="pl">
-      <p>Możesz importować zakładki wysyłane z aplikacji Organic Maps lub innych firm, jeśli eksportują zakładki w formacie KML:</p>
+      <p>Możesz importować zakładki wysyłane z aplikacji CoMaps lub innych firm, jeśli eksportują zakładki w formacie KML:</p>
 <ol>
 <li>
 <p>Możesz importować zakładki z folderów i aplikacji (w tym Maps.Me). Naciśnij przycisk gwiazdki aby otworzyć zakładki, naciśnij „Importuj zakładki i trasy” i wybierz dysk lub folder z plikami KML, KMZ, KMB, GPX.</p>
@@ -1547,15 +1547,15 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Otwórz udostępniony plik KML, KMZ, KMB, GPX z zakładkami wysyłanymi przez e-mail, komunikator lub chmurę pamięć masowa, na przykład iCloud lub Dysk Google.</p>
 </li>
 <li>
-<p>Stuknij raz lub stuknij i przytrzymaj plik KML, KMZ, KMB, GPX z zakładkami i wybierz Otwórz za pomocą Organic Maps (Android) lub „Importuj z Organic Maps” (iOS) w wyskakującym oknie.</p>
+<p>Stuknij raz lub stuknij i przytrzymaj plik KML, KMZ, KMB, GPX z zakładkami i wybierz Otwórz za pomocą CoMaps (Android) lub „Importuj z CoMaps” (iOS) w wyskakującym oknie.</p>
 </li>
 <li>
-<p>Zostanie otwarty z Organic Maps, a zobaczysz „Zakładki załadowane pomyślnie!”. Możesz znajdź je na mapie lub na ekranie menu zakładek.</p>
+<p>Zostanie otwarty z CoMaps, a zobaczysz „Zakładki załadowane pomyślnie!”. Możesz znajdź je na mapie lub na ekranie menu zakładek.</p>
 </li>
 </ol>
 
     </dd><dd lang="pt">
-      <p>Pode importar favoritos enviados do Organic Maps ou de outras aplicações, se estas exportarem favoritos no formato KML:</p>
+      <p>Pode importar favoritos enviados do CoMaps ou de outras aplicações, se estas exportarem favoritos no formato KML:</p>
 <ol>
 <li>
 <p>Pode importar favoritos de pastas e aplicações (incluindo o Maps.Me). Toque no botão da estrela para abrir os favoritos, toque em "Importar favoritos e trilhas" e selecione a unidade ou pasta com o ficheiro KML, KMZ, KMB, GPX.</p>
@@ -1564,15 +1564,15 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Abra o ficheiro KML, KMZ, KMB, GPX partilhado com favoritos enviados por e-mail, mensagens instantâneas ou armazenamento na nuvem, por exemplo, iCloud ou Google Drive.</p>
 </li>
 <li>
-<p>Toque uma vez ou toque e mantenha premido no ficheiro KML, KMZ, KMB, GPX com favoritos e escolha "Abrir com Organic Maps" (Android) ou "Importar com Organic Maps" (iOS) no menu que aparece.</p>
+<p>Toque uma vez ou toque e mantenha premido no ficheiro KML, KMZ, KMB, GPX com favoritos e escolha "Abrir com CoMaps" (Android) ou "Importar com CoMaps" (iOS) no menu que aparece.</p>
 </li>
 <li>
-<p>Ele será aberto com o Organic Maps e verá a mensagem "Favoritos carregados com sucesso!". Pode encontrar esses favoritos no mapa ou no Menu de favoritos.</p>
+<p>Ele será aberto com o CoMaps e verá a mensagem "Favoritos carregados com sucesso!". Pode encontrar esses favoritos no mapa ou no Menu de favoritos.</p>
 </li>
 </ol>
 
     </dd><dd lang="pt-BR">
-      <p>Você pode importar favoritos enviados do Organic Maps ou aplicativos de terceiros, se eles exportarem favoritos no formato KML, KMZ, KMB, GPX:</p>
+      <p>Você pode importar favoritos enviados do CoMaps ou aplicativos de terceiros, se eles exportarem favoritos no formato KML, KMZ, KMB, GPX:</p>
 <ol>
 <li>
 <p>Você pode importar favoritos de pastas e aplicativos (incluindo Maps.Me). Pressione um botão de estrela para abrir os favoritos, pressione "Importar favoritos e trilhas" e selecione a unidade ou pasta com arquivos KML, KMZ, KMB, GPX.</p>
@@ -1581,15 +1581,15 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Abra o arquivo KML, KMZ, KMB, GPX compartilhado com favoritos enviados por e-mail, mensagens instantâneas ou armazenamento na nuvem, por exemplo, iCloud ou Google Drive.</p>
 </li>
 <li>
-<p>Toque uma vez ou toque e segure o arquivo KML, KMZ, KMB, GPX com favoritos e escolha "Abrir com Organic Maps" (Android) ou "Importar com Organic Maps" (iOS) na janela pop-up.</p>
+<p>Toque uma vez ou toque e segure o arquivo KML, KMZ, KMB, GPX com favoritos e escolha "Abrir com CoMaps" (Android) ou "Importar com CoMaps" (iOS) na janela pop-up.</p>
 </li>
 <li>
-<p>Ele será aberto com o Organic Maps e você verá "Favoritos carregados com sucesso!". Você pode encontrá-los no mapa ou na tela Menu de favoritos.</p>
+<p>Ele será aberto com o CoMaps e você verá "Favoritos carregados com sucesso!". Você pode encontrá-los no mapa ou na tela Menu de favoritos.</p>
 </li>
 </ol>
 
     </dd><dd lang="tr">
-      <p>Organic Maps'ten veya yer imlerini KML, KMZ, KMB, GPX biçiminde dışa aktarıyorsa üçüncü taraf uygulamalardan gönderilen yer imlerini içe aktarabilirsiniz:</p>
+      <p>CoMaps'ten veya yer imlerini KML, KMZ, KMB, GPX biçiminde dışa aktarıyorsa üçüncü taraf uygulamalardan gönderilen yer imlerini içe aktarabilirsiniz:</p>
 <ol>
 <li>
 <p>Klasörlerden ve uygulamalardan (Maps.Me dahil) yer imlerini içe aktarabilirsiniz. Yer imlerini açmak için yıldız düğmesine basın, "Yer i̇mlerini ve parçaları i̇çe aktarma"a basın ve KML, KMZ, KMB, GPX dosyalarının bulunduğu sürücü veya klasörü seçin.</p>
@@ -1598,15 +1598,15 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>E-posta, anlık mesajlaşma ile gönderilen veya iCloud veya Google Drive gibi bulut depolama yoluyla paylaşılan KML, KMZ, KMB, GPX dosyasını açın.</p>
 </li>
 <li>
-<p>Yer imleri içeren KML, KMZ, KMB, GPX dosyasına bir kez dokunun veya basılı tutun ve açılır pencerede Organic Maps ile Aç (Android) veya "Organic Maps ile İçe Aktar" (iOS) öğesini seçin.</p>
+<p>Yer imleri içeren KML, KMZ, KMB, GPX dosyasına bir kez dokunun veya basılı tutun ve açılır pencerede CoMaps ile Aç (Android) veya "CoMaps ile İçe Aktar" (iOS) öğesini seçin.</p>
 </li>
 <li>
-<p>Organic Maps açılacak ve 'Yer imleri başarıyla yüklendi!' ifadesini göreceksiniz. Bunları haritada veya Yer İmleri Menüsü ekranında bulabilirsiniz.</p>
+<p>CoMaps açılacak ve 'Yer imleri başarıyla yüklendi!' ifadesini göreceksiniz. Bunları haritada veya Yer İmleri Menüsü ekranında bulabilirsiniz.</p>
 </li>
 </ol>
 
     </dd><dd lang="uk">
-      <p>Ви можете імпортувати мітки, надіслані з Organic Maps або зі сторонніх додатків, які підтримують експорт у формати KML, KMZ, KMB або GPX:</p>
+      <p>Ви можете імпортувати мітки, надіслані з CoMaps або зі сторонніх додатків, які підтримують експорт у формати KML, KMZ, KMB або GPX:</p>
 <ol>
 <li>
 <p>Ви можете імпортувати мітки з папок і програм (включно з Maps.Me). Натисніть кнопку із зірочкою, щоб відкрити мітки, натисніть "Імпортувати мітки та маршрути" і виберіть диск або папку з файлами KML, KMZ, KMB, GPX.</p>
@@ -1615,15 +1615,15 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Відкрийте файл KML, KMZ, KMB, GPX із мітками, який ви отримали електронною поштою, в месенджері або через хмарним сховище, наприклад, iCloud або Google Drive.</p>
 </li>
 <li>
-<p>Натисніть один раз або натисніть і утримуйте файл KML, KMZ, KMB, GPX із мітками та виберіть "Відкрити за допомогою Organic Maps" (Android) або "Імпортувати за допомогою Organic Maps" (iOS) у спливаючому вікні.</p>
+<p>Натисніть один раз або натисніть і утримуйте файл KML, KMZ, KMB, GPX із мітками та виберіть "Відкрити за допомогою CoMaps" (Android) або "Імпортувати за допомогою CoMaps" (iOS) у спливаючому вікні.</p>
 </li>
 <li>
-<p>Її буде відкрито у програмі Organic Maps, і ви побачите повідомлення "Закладки завантажено успішно!". Ви можете побачити їх на мапі або в меню Мітки на головному екрані.</p>
+<p>Її буде відкрито у програмі CoMaps, і ви побачите повідомлення "Закладки завантажено успішно!". Ви можете побачити їх на мапі або в меню Мітки на головному екрані.</p>
 </li>
 </ol>
 
     </dd><dd lang="zh">
-      <p>您可以导入从 Organic Maps 或第三方应用发送的以 KML、KMZ、KMB、GPX 格式导出的书签：</p>
+      <p>您可以导入从 CoMaps 或第三方应用发送的以 KML、KMZ、KMB、GPX 格式导出的书签：</p>
 <ol>
 <li>
 <p>您可以从文件夹和应用程序（包括 Maps.Me）导入书签。 按下星形按钮打开书签，按下“导入书签和轨迹”，然后选择带有 KML、KMZ、KMB、GPX 文件的驱动器或文件夹。</p>
@@ -1632,10 +1632,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>使用电子邮件、即时通讯或云存储（例如 iCloud 或 Google 云端硬盘）发送带有书签的 KML、KMZ、KMB、GPX 文件，然后打开。</p>
 </li>
 <li>
-<p>轻触一次或长按带有书签的 KML、KMZ、KMB、GPX 文件，并在弹出窗口中选择“使用 Organic Maps 打开”（安卓）或“在 Organic Maps 中导入”（iOS）。</p>
+<p>轻触一次或长按带有书签的 KML、KMZ、KMB、GPX 文件，并在弹出窗口中选择“使用 CoMaps 打开”（安卓）或“在 CoMaps 中导入”（iOS）。</p>
 </li>
 <li>
-<p>将会在 Organic Maps 中打开，您将看到书签成功加载的提示。您可以在地图上或在书签菜单屏幕中找到它们。</p>
+<p>将会在 CoMaps 中打开，您将看到书签成功加载的提示。您可以在地图上或在书签菜单屏幕中找到它们。</p>
 </li>
 </ol>
 
@@ -1657,7 +1657,7 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
     </dt>
 
     <dd lang="en">
-      <p>Default battery optimization settings on Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC and other devices may stop or kill Organic Maps app in the background.</p>
+      <p>Default battery optimization settings on Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC and other devices may stop or kill CoMaps app in the background.</p>
 <p>This is especially true for modern Android versions:</p>
 <ul>
 <li>Android 14</li>
@@ -1665,10 +1665,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>The exact steps on how to make Organic Maps (and other apps) work in the background are listed here: https://dontkillmyapp.com/</p>
+<p>The exact steps on how to make CoMaps (and other apps) work in the background are listed here: https://dontkillmyapp.com/</p>
 </dd>
     <dd lang="ru">
-      <p>Настройки оптимизации батареи по умолчанию на устройствах Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC и других могут остановить или закрыть приложение Organic Maps в фоновом режиме.</p>
+      <p>Настройки оптимизации батареи по умолчанию на устройствах Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC и других могут остановить или закрыть приложение CoMaps в фоновом режиме.</p>
 <p>Это особенно актуально для современных версий Android:</p>
 <ul>
 <li>Android 14</li>
@@ -1676,10 +1676,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>На этом сайте описано, как настроить работу в фоновом режиме для Organic Maps и других приложений: https://dontkillmyapp.com/</p>
+<p>На этом сайте описано, как настроить работу в фоновом режиме для CoMaps и других приложений: https://dontkillmyapp.com/</p>
 
     </dd><dd lang="de">
-      <p>Die Standardeinstellungen zur Akkuoptimierung auf Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC und anderen Geräten können die Organic Maps-App im Hintergrund stoppen oder beenden.</p>
+      <p>Die Standardeinstellungen zur Akkuoptimierung auf Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC und anderen Geräten können die CoMaps-App im Hintergrund stoppen oder beenden.</p>
 <p>Dies gilt insbesondere für moderne Android-Versionen:</p>
 <ul>
 <li>Android 14</li>
@@ -1687,10 +1687,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>Die genauen Schritte, wie man Organic Maps (und andere Apps) im Hintergrund zum Laufen bringt, sind hier aufgeführt: https://dontkillmyapp.com/</p>
+<p>Die genauen Schritte, wie man CoMaps (und andere Apps) im Hintergrund zum Laufen bringt, sind hier aufgeführt: https://dontkillmyapp.com/</p>
 
     </dd><dd lang="es">
-      <p>La configuración predeterminada de optimización de la batería en Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC y otros dispositivos puede detener o cerrar la aplicación Organic Maps en segundo plano.</p>
+      <p>La configuración predeterminada de optimización de la batería en Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC y otros dispositivos puede detener o cerrar la aplicación CoMaps en segundo plano.</p>
 <p>Esto ocurre especialmente en las versiones modernas de Android:</p>
 <ul>
 <li>Android 14</li>
@@ -1698,10 +1698,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>Los pasos exactos sobre cómo hacer que Organic Maps (y otras aplicaciones) funcionen en segundo plano se enumeran aquí (en inglés): https://dontkillmyapp.com/</p>
+<p>Los pasos exactos sobre cómo hacer que CoMaps (y otras aplicaciones) funcionen en segundo plano se enumeran aquí (en inglés): https://dontkillmyapp.com/</p>
 
     </dd><dd lang="fr">
-      <p>Les paramètres d'optimisation de la batterie par défaut sur Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC et d'autres appareils peuvent arrêter ou tuer l'application Organic Maps en arrière-plan.</p>
+      <p>Les paramètres d'optimisation de la batterie par défaut sur Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC et d'autres appareils peuvent arrêter ou tuer l'application CoMaps en arrière-plan.</p>
 <p>Cela est particulièrement vrai pour les versions modernes d'Android :</p>
 <ul>
 <li>Android 14</li>
@@ -1709,10 +1709,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>Les étapes exactes pour faire fonctionner Organic Maps (et d'autres applications) en arrière-plan sont listées ici : https://dontkillmyapp.com/</p>
+<p>Les étapes exactes pour faire fonctionner CoMaps (et d'autres applications) en arrière-plan sont listées ici : https://dontkillmyapp.com/</p>
 
     </dd><dd lang="pl">
-      <p>Domyślne ustawienia optymalizacji baterii na urządzeniach Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC i innych mogą zatrzymać lub zabić aplikację Organic Maps w tle.</p>
+      <p>Domyślne ustawienia optymalizacji baterii na urządzeniach Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC i innych mogą zatrzymać lub zabić aplikację CoMaps w tle.</p>
 <p>Dotyczy to zwłaszcza nowoczesnych wersji Androida:</p>
 <ul>
 <li>Android 14</li>
@@ -1720,10 +1720,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>Dokładne kroki, jak sprawić, by Organic Maps (i inne aplikacje) działały w tle, są wymienione tutaj: https://dontkillmyapp.com/</p>
+<p>Dokładne kroki, jak sprawić, by CoMaps (i inne aplikacje) działały w tle, są wymienione tutaj: https://dontkillmyapp.com/</p>
 
     </dd><dd lang="pt">
-      <p>As definições predefinidas de otimização da bateria na Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC e outros dispositivos podem parar ou encerrar a aplicação Organic Maps em segundo plano.</p>
+      <p>As definições predefinidas de otimização da bateria na Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC e outros dispositivos podem parar ou encerrar a aplicação CoMaps em segundo plano.</p>
 <p>Isso acontece especialmente nas versões mais modernas do Android:</p>
 <ul>
 <li>Android 14</li>
@@ -1731,10 +1731,10 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>Os passos exatos sobre como fazer com que o Organic Maps (e outras aplicações) funcionem em segundo plano estão listados aqui: https://dontkillmyapp.com/</p>
+<p>Os passos exatos sobre como fazer com que o CoMaps (e outras aplicações) funcionem em segundo plano estão listados aqui: https://dontkillmyapp.com/</p>
 
     </dd><dd lang="pt-BR">
-      <p>As configurações padrão de otimização da bateria na Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC e outros dispositivos podem interromper ou fechar o aplicativo Organic Maps em segundo plano.</p>
+      <p>As configurações padrão de otimização da bateria na Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC e outros dispositivos podem interromper ou fechar o aplicativo CoMaps em segundo plano.</p>
 <p>Isso acontece especialmente nas versões mais modernas do Android:</p>
 <ul>
 <li>Android 14</li>
@@ -1742,7 +1742,7 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>O passo-a-passo sobre como fazer o Organic Maps (e outros aplicativos) funcionar em segundo plano pode ser encontrado aqui: https://dontkillmyapp.com/</p>
+<p>O passo-a-passo sobre como fazer o CoMaps (e outros aplicativos) funcionar em segundo plano pode ser encontrado aqui: https://dontkillmyapp.com/</p>
 
     </dd><dd lang="tr">
       <p>Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC ve diğer cihazlardaki varsayılan pil optimizasyon ayarları arka planda Organik Haritalar uygulamasını durdurabilir veya öldürebilir.</p>
@@ -1756,7 +1756,7 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <p>Organik Haritalar'ın (ve diğer uygulamaların) arka planda nasıl çalışacağına ilişkin tam adımlar burada listelenmiştir: https://dontkillmyapp.com/</p>
 
     </dd><dd lang="uk">
-      <p>Стандартні налаштування оптимізації роботи акумулятора на пристроях Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC та інших пристроях можуть зупиняти або закривати додаток Organic Maps у фоновому режимі.</p>
+      <p>Стандартні налаштування оптимізації роботи акумулятора на пристроях Samsung, Huawei, Google, Xiaomi, OnePlus, Meizu, Asus, Wiko, Lenovo, Oppo, Vivo, Realme, Sony, Motorola, HTC та інших пристроях можуть зупиняти або закривати додаток CoMaps у фоновому режимі.</p>
 <p>Це особливо актуально для сучасних версій Android:</p>
 <ul>
 <li>Android 14</li>
@@ -1764,7 +1764,7 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 <li>Android 12</li>
 <li>Android 11</li>
 </ul>
-<p>На цьому сайті описано, як налаштувати роботу у фоновому режимі для Organic Maps та інших додатків: https://dontkillmyapp.com/</p>
+<p>На цьому сайті описано, як налаштувати роботу у фоновому режимі для CoMaps та інших додатків: https://dontkillmyapp.com/</p>
 
     </dd><dd lang="zh">
       <p>三星、华为、谷歌、小米、OnePlus、美图、华硕、Wiko、联想、Oppo、Vivo、Realme、索尼、摩托罗拉、HTC 和其他设备上的默认电池优化设置可能会在后台停止或杀死有机地图应用程序。</p>
@@ -1795,4 +1795,4 @@ Organic Maps 的地理位置数据共享应该是启用的。</p>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>