More rebranding including the team identifier, url scheme, and links on about screen

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2025-12-20 13:23:59 +00:00 · 2025-06-12 22:20:56 +02:00
parent d4e1d53c40
commit 074d443f0f
126 changed files with 559 additions and 276 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -187,4 +187,3 @@ tools/unix/maps/settings.sh
 # VS Code
 .vscode
 .cache
-iphone/Maps/UI/Storyboard/Welcome.storyboard
--- a/3party/bsdiff-courgette/bsdiff/bsdiff.h
+++ b/3party/bsdiff-courgette/bsdiff/bsdiff.h
@@ -35,7 +35,7 @@
 // 2013-04-10 - Added wrapper to apply a patch directly to files.
 //                --Joshua Pawlicki <waffles@chromium.org>
 // 2017-08-14 - Moved "apply" and "create" to the header file, rewrote
-//              all routines to use CoMaps readers and writers instead
+//              all routines to use OMaps readers and writers instead
 //              of Courgette streams and files.
 //                --Maxim Pimenov <m@maps.me>
 // 2019-01-24 - Got rid of the paged array. We have enough address space
--- a/drape/glyph_manager.cpp
+++ b/drape/glyph_manager.cpp
@@ -598,7 +598,7 @@ GlyphImage GlyphManager::GetGlyphImage(GlyphFontAndId key, int pixelHeight, bool

 namespace
 {
-hb_language_t CoMapsLanguageToHarfbuzzLanguage(int8_t lang)
+hb_language_t OrganicMapsLanguageToHarfbuzzLanguage(int8_t lang)
 {
  // TODO(AB): can langs be converted faster?
  auto const svLang = StringUtf8Multilang::GetLangByCode(lang);
@@ -625,7 +625,7 @@ text::TextMetrics GlyphManager::ShapeText(std::string_view utf8, int fontPixelHe
  const auto [text, segments] = harfbuzz_shaping::GetTextSegments(utf8);

  // TODO(AB): Optimize language conversion.
-  hb_language_t const hbLanguage = CoMapsLanguageToHarfbuzzLanguage(lang);
+  hb_language_t const hbLanguage = OrganicMapsLanguageToHarfbuzzLanguage(lang);

  text::TextMetrics allGlyphs;
  // For SplitText it's enough to know if the last visual (first logical) segment is RTL.
--- a/iphone/Chart/Chart.xcodeproj/project.pbxproj
+++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj
@@ -190,7 +190,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
 				LastUpgradeCheck = 1510;
-				ORGANIZATIONNAME = "Organic Maps";
+				ORGANIZATIONNAME = CoMaps;
 				TargetAttributes = {
 					47375D952420D4DB00FFCC49 = {
 						CreatedOnToolsVersion = 11.3;
@@ -359,6 +359,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.chart;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -380,6 +381,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.chart;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
--- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
+++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
@@ -598,7 +598,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
 				LastUpgradeCheck = 1510;
-				ORGANIZATIONNAME = "Organic Maps";
+				ORGANIZATIONNAME = "CoMaps";
 				TargetAttributes = {
 					470015EE2342509C00EBF03D = {
 						CreatedOnToolsVersion = 10.2;
--- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj
+++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj
@@ -149,7 +149,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
 				LastUpgradeCheck = 1510;
-				ORGANIZATIONNAME = "Organic Maps";
+				ORGANIZATIONNAME = CoMaps;
 				TargetAttributes = {
 					47A13C6424B4A86000027D4F = {
 						CreatedOnToolsVersion = 11.3;
@@ -251,6 +251,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -271,6 +272,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.comaps.datepicker;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
--- a/iphone/Maps/.gitignore
+++ b/iphone/Maps/.gitignore
@@ -1,4 +1,5 @@
 Pods
-app.organicmaps.debug
-app.organicmaps.beta
-app.organicmaps
+app.comaps.debug
+app.comaps.beta
+app.comaps
+UI/Storyboard/Welcome.storyboard
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib
@@ -8,7 +8,7 @@
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BookmarksListInfoViewController" customModule="OMaps" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BookmarksListInfoViewController" customModule="CoMaps" customModuleProvider="target">
            <connections>
                <outlet property="authorContainerView" destination="bit-FN-ytL" id="CAI-TP-A5D"/>
                <outlet property="descriptionButton" destination="cxc-pt-qei" id="zce-so-aHF"/>
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib
@@ -8,7 +8,7 @@
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BookmarksListViewController" customModule="OMaps" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BookmarksListViewController" customModule="CoMaps" customModuleProvider="target">
            <connections>
                <outlet property="moreToolbarItem" destination="Hhy-7w-Mz0" id="0bI-d2-WuP"/>
                <outlet property="sortToolbarItem" destination="BWR-ft-be3" id="iiS-BA-nqF"/>
--- a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.xib
+++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.xib
@@ -10,7 +10,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="QgU-jK-sWK" detailTextLabel="zC9-YD-CfS" rowHeight="64" style="IBUITableViewCellStyleSubtitle" id="KGk-i7-Jjw" customClass="BookmarksListCell" customModule="Organic_Maps" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="QgU-jK-sWK" detailTextLabel="zC9-YD-CfS" rowHeight="64" style="IBUITableViewCellStyleSubtitle" id="KGk-i7-Jjw" customClass="BookmarksListCell" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
--- a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib
+++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib
@@ -9,7 +9,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="iN0-l3-epB" customClass="BookmarksListSectionHeader" customModule="OMaps" customModuleProvider="target">
+        <view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="iN0-l3-epB" customClass="BookmarksListSectionHeader" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
--- a/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib
+++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib
@@ -10,14 +10,14 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="64" id="KGk-i7-Jjw" customClass="SubgroupCell" customModule="OMaps" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="64" id="KGk-i7-Jjw" customClass="SubgroupCell" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
                <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
-                    <view contentMode="scaleToFill" horizontalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mAZ-hb-J9T" customClass="Checkmark" customModule="OMaps" customModuleProvider="target">
+                    <view contentMode="scaleToFill" horizontalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mAZ-hb-J9T" customClass="Checkmark" customModule="CoMaps" customModuleProvider="target">
                        <rect key="frame" x="0.0" y="0.0" width="56" height="64"/>
                        <constraints>
                            <constraint firstAttribute="width" constant="56" id="aar-GM-DaJ"/>
--- a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib
+++ b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib
@@ -10,7 +10,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionsCell" customModule="Organic_Maps" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionsCell" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
--- a/iphone/Maps/Bookmarks/Categories/BMCActionsCreateCell.xib
+++ b/iphone/Maps/Bookmarks/Categories/BMCActionsCreateCell.xib
@@ -12,7 +12,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionsCreateCell" customModule="OMaps" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionsCreateCell" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
--- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib
+++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib
@@ -8,7 +8,7 @@
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BMCViewController" customModule="OMaps" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BMCViewController" customModule="CoMaps" customModuleProvider="target">
            <connections>
                <outlet property="actionsHeader" destination="DhR-7O-ccQ" id="PPD-Ov-b69"/>
                <outlet property="notificationsHeader" destination="G0o-Op-zPp" id="PUK-3H-1q3"/>
@@ -50,7 +50,7 @@
            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
            <point key="canvasLocation" x="483" y="-50"/>
        </view>
-        <view contentMode="scaleToFill" id="G0o-Op-zPp" customClass="BMCNotificationsHeader" customModule="OMaps" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="G0o-Op-zPp" customClass="BMCNotificationsHeader" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <subviews>
--- a/iphone/Maps/Bookmarks/Categories/BookmarksCategoriesBackupAndRestoreCell.xib
+++ b/iphone/Maps/Bookmarks/Categories/BookmarksCategoriesBackupAndRestoreCell.xib
@@ -12,7 +12,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionCell" customModule="OMaps" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionCell" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="320" height="113"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
--- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib
+++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoriesHeader.xib
@@ -10,7 +10,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="hpL-he-7N6" customClass="BMCCategoriesHeader" customModule="OMaps" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="hpL-he-7N6" customClass="BMCCategoriesHeader" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <subviews>
--- a/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib
+++ b/iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.xib
@@ -10,14 +10,14 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCCategoryCell" customModule="Organic_Maps" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCCategoryCell" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
                <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wcq-KH-q74" customClass="Checkmark" customModule="Organic_Maps" customModuleProvider="target">
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wcq-KH-q74" customClass="Checkmark" customModule="CoMaps" customModuleProvider="target">
                        <rect key="frame" x="0.0" y="0.0" width="56" height="60.5"/>
                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                        <constraints>
--- a/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib
+++ b/iphone/Maps/Bookmarks/Categories/Notifications/BMCNotificationsCell.xib
@@ -10,7 +10,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCNotificationsCell" customModule="OMaps" customModuleProvider="target" propertyAccessControl="none">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCNotificationsCell" customModule="CoMaps" customModuleProvider="target" propertyAccessControl="none">
            <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
--- a/iphone/Maps/Categories/UIKitCategories.m
+++ b/iphone/Maps/Categories/UIKitCategories.m
@@ -85,7 +85,7 @@

 - (void)rateApp
 {
-  NSString * urlString = @"https://apps.apple.com/app/id1567437057?action=write-review";
+  NSString * urlString = @"https://apps.apple.com/app/comaps/id6747180809?action=write-review";
  NSURL * url = [NSURL URLWithString:urlString];
  [self openURL:url options:@{} completionHandler:nil];
 }
--- a/iphone/Maps/Classes/CustomAlert/LocationAlert/LocationServicesDisabledAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/LocationAlert/LocationServicesDisabledAlert.xib
@@ -11,7 +11,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="WR7-Hs-CVJ" customClass="LocationServicesDisabledAlert" customModule="Organic_Maps" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="WR7-Hs-CVJ" customClass="LocationServicesDisabledAlert" customModule="CoMaps" customModuleProvider="target">
            <rect key="frame" x="0.0" y="0.0" width="539" height="770"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <subviews>
--- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib
@@ -55,7 +55,7 @@
                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                            <dataDetectorType key="dataDetectorTypes" link="YES"/>
                        </textView>
-                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="33p-SN-9fc" userLabel="login_osm" customClass="MWMButton" customModule="Organic_Maps" customModuleProvider="target">
+                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="33p-SN-9fc" userLabel="login_osm" customClass="MWMButton" customModule="CoMaps" customModuleProvider="target">
                            <rect key="frame" x="20" y="257.33333333333337" width="240" height="44"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="240" id="6Mj-n7-paj"/>
@@ -70,7 +70,7 @@
                                <action selector="osmTap" destination="OOr-tJ-QfW" eventType="touchUpInside" id="eEw-ZQ-bth"/>
                            </connections>
                        </button>
-                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OS7-Xd-HGC" userLabel="cancel" customClass="MWMButton" customModule="Organic_Maps" customModuleProvider="target">
+                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OS7-Xd-HGC" userLabel="cancel" customClass="MWMButton" customModule="CoMaps" customModuleProvider="target">
                            <rect key="frame" x="20" y="311.33333333333326" width="240" height="44"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="240" id="Bzd-Uh-BSU"/>
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib
@@ -96,7 +96,7 @@
                        <outlet property="separator" destination="pWX-NL-dy3" id="DC7-YE-KjK"/>
                    </connections>
                </view>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YYv-pG-Wkw" userLabel="Street name" customClass="NavigationStreetNameView" customModule="Organic_Maps" customModuleProvider="target">
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YYv-pG-Wkw" userLabel="Street name" customClass="NavigationStreetNameView" customModule="CoMaps" customModuleProvider="target">
                    <rect key="frame" x="-100" y="0.0" width="1224" height="65"/>
                    <subviews>
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WID-Um-Va6" userLabel="BackgroundView">
@@ -133,7 +133,7 @@
                        <constraint firstAttribute="bottom" secondItem="ShI-bz-5g8" secondAttribute="bottom" constant="10" id="w0r-Ip-f9E"/>
                    </constraints>
                </view>
-                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Aa6-N8-acP" userLabel="Turns" customClass="NavigationTurnsView" customModule="Organic_Maps" customModuleProvider="target">
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Aa6-N8-acP" userLabel="Turns" customClass="NavigationTurnsView" customModule="CoMaps" customModuleProvider="target">
                    <rect key="frame" x="0.0" y="28" width="96" height="153"/>
                    <subviews>
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wt8-EO-MKz" userLabel="First turn" customClass="SolidTouchView">
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
@@ -358,13 +358,13 @@
                            <nil key="textColor"/>
                            <nil key="highlightedColor"/>
                        </label>
-                        <collectionView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" ambiguous="YES" alwaysBounceVertical="YES" alwaysBounceHorizontal="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" canCancelContentTouches="NO" bouncesZoom="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ey-lL-uzF" customClass="TransportTransitStepsCollectionView" customModule="Organic_Maps" customModuleProvider="target">
+                        <collectionView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" ambiguous="YES" alwaysBounceVertical="YES" alwaysBounceHorizontal="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" canCancelContentTouches="NO" bouncesZoom="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ey-lL-uzF" customClass="TransportTransitStepsCollectionView" customModule="CoMaps" customModuleProvider="target">
                            <rect key="frame" x="16" y="44" width="288" height="20"/>
                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                            <constraints>
                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="4NI-xp-o3L"/>
                            </constraints>
-                            <collectionViewLayout key="collectionViewLayout" id="PJv-Hi-Xu3" customClass="TransportTransitFlowLayout" customModule="Organic_Maps" customModuleProvider="target"/>
+                            <collectionViewLayout key="collectionViewLayout" id="PJv-Hi-Xu3" customClass="TransportTransitFlowLayout" customModule="CoMaps" customModuleProvider="target"/>
                        </collectionView>
                    </subviews>
                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
@@ -411,13 +411,13 @@
                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GZd-C3-csB">
                    <rect key="frame" x="16" y="48.5" width="288" height="15.5"/>
                    <subviews>
-                        <collectionView userInteractionEnabled="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" alwaysBounceHorizontal="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" canCancelContentTouches="NO" bouncesZoom="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RVh-LF-kSn" customClass="TransportTransitStepsCollectionView" customModule="Organic_Maps" customModuleProvider="target">
+                        <collectionView userInteractionEnabled="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" alwaysBounceHorizontal="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" canCancelContentTouches="NO" bouncesZoom="NO" dataMode="none" prefetchingEnabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RVh-LF-kSn" customClass="TransportTransitStepsCollectionView" customModule="CoMaps" customModuleProvider="target">
                            <rect key="frame" x="0.0" y="0.0" width="288" height="20"/>
                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                            <constraints>
                                <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="eGu-Mr-auv"/>
                            </constraints>
-                            <collectionViewLayout key="collectionViewLayout" id="d3P-nT-IFD" customClass="TransportTransitFlowLayout" customModule="Organic_Maps" customModuleProvider="target"/>
+                            <collectionViewLayout key="collectionViewLayout" id="d3P-nT-IFD" customClass="TransportTransitFlowLayout" customModule="CoMaps" customModuleProvider="target"/>
                        </collectionView>
                    </subviews>
                    <constraints>
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerCell.xib
@@ -10,7 +10,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="RouteManagerCell" customModule="OMaps" customModuleProvider="target" propertyAccessControl="none">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="RouteManagerCell" customModule="CoMaps" customModuleProvider="target" propertyAccessControl="none">
            <rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RouteManager/RouteManagerViewController.xib
@@ -23,7 +23,7 @@
            </connections>
        </placeholder>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3y4-jh-JUF" customClass="RouteManagerDimView" customModule="OMaps" customModuleProvider="target" propertyAccessControl="none">
+        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3y4-jh-JUF" customClass="RouteManagerDimView" customModule="CoMaps" customModuleProvider="target" propertyAccessControl="none">
            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
            <subviews>
                <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TC7-xW-EwE">
@@ -100,7 +100,7 @@
                <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i5M-Pr-FkT">
                    <rect key="frame" x="0.0" y="758" width="414" height="138"/>
                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="s0L-ul-gog" customClass="RouteManagerHeaderView" customModule="OMaps" customModuleProvider="target">
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="s0L-ul-gog" customClass="RouteManagerHeaderView" customModule="CoMaps" customModuleProvider="target">
                            <rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
                            <subviews>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="760" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQh-uc-65J">
@@ -155,7 +155,7 @@
                                <outlet property="titleLabel" destination="dQh-uc-65J" id="xKP-bY-mQP"/>
                            </connections>
                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mqc-M4-MPb" customClass="RouteManagerFooterView" customModule="OMaps" customModuleProvider="target">
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mqc-M4-MPb" customClass="RouteManagerFooterView" customModule="CoMaps" customModuleProvider="target">
                            <rect key="frame" x="0.0" y="48" width="414" height="48"/>
                            <subviews>
                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="or0-Gy-0su">
@@ -225,7 +225,7 @@
                                <outlet property="separator" destination="pjx-6o-NWS" id="EKT-Ba-Lcy"/>
                            </connections>
                        </view>
-                        <tableView clipsSubviews="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="48" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Zqd-YQ-ksD" customClass="RouteManagerTableView" customModule="OMaps" customModuleProvider="target">
+                        <tableView clipsSubviews="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="48" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Zqd-YQ-ksD" customClass="RouteManagerTableView" customModule="CoMaps" customModuleProvider="target">
                            <rect key="frame" x="0.0" y="48" width="414" height="0.0"/>
                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                            <gestureRecognizers/>
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportRuler.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportRuler.xib
@@ -10,7 +10,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportRuler" customModule="Organic_Maps" customModuleProvider="target" propertyAccessControl="all">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportRuler" customModule="CoMaps" customModuleProvider="target" propertyAccessControl="all">
            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitIntermediatePoint.xib
@@ -12,7 +12,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitIntermediatePoint" customModule="OMaps" customModuleProvider="target" propertyAccessControl="all">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitIntermediatePoint" customModule="CoMaps" customModuleProvider="target" propertyAccessControl="all">
            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
            <autoresizingMask key="autoresizingMask"/>
            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitPedestrian.xib
@@ -12,7 +12,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitPedestrian" customModule="OMaps" customModuleProvider="target" propertyAccessControl="all">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitPedestrian" customModule="CoMaps" customModuleProvider="target" propertyAccessControl="all">
            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportTransitSteps/TransportTransitTrain.xib
@@ -13,7 +13,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitTrain" customModule="OMaps" customModuleProvider="target" propertyAccessControl="all">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="TransportTransitTrain" customModule="CoMaps" customModuleProvider="target" propertyAccessControl="all">
            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
--- a/iphone/Maps/CoMaps-Debug.entitlements
+++ b/iphone/Maps/CoMaps-Debug.entitlements
@@ -7,8 +7,22 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:comaps.app</string>
+		<string>applinks:comaps.at</string>
+	</array>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.app.comaps.debug</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudDocuments</string>
+		<string>CloudKit</string>
 	</array>
 	<key>com.apple.developer.ubiquity-container-identifiers</key>
-	<array/>
+	<array>
+		<string>iCloud.app.comaps.debug</string>
+	</array>
+	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
+	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 </dict>
 </plist>
--- a/iphone/Maps/CoMaps-Release.entitlements
+++ b/iphone/Maps/CoMaps-Release.entitlements
@@ -9,11 +9,20 @@
 		<string>applinks:comaps.app</string>
 		<string>applinks:comaps.at</string>
 	</array>
-	<key>com.apple.developer.carplay-maps</key>
-	<true/>
 	<key>com.apple.developer.icloud-container-identifiers</key>
-	<array/>
+	<array>
+		<string>iCloud.app.comaps</string>
+	</array>
 	<key>com.apple.developer.icloud-services</key>
-	<array/>
+	<array>
+		<string>CloudDocuments</string>
+		<string>CloudKit</string>
+	</array>
+	<key>com.apple.developer.ubiquity-container-identifiers</key>
+	<array>
+		<string>iCloud.app.comaps</string>
+	</array>
+	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
+	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 </dict>
 </plist>
--- a/iphone/Maps/CoMaps.plist
+++ b/iphone/Maps/CoMaps.plist
@@ -1,5 +1,239 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array/>
+			<key>CFBundleTypeName</key>
+			<string>GPS Exchange Format (GPX)</string>
+			<key>LSHandlerRank</key>
+			<string>Default</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.topografix.gpx</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array>
+				<string>320-pro.png</string>
+				<string>64-pro.png</string>
+				<string>44x58-pro.png</string>
+				<string>22x29-pro.png</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Google Earth KML Document</string>
+			<key>LSHandlerRank</key>
+			<string>Default</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.google.earth.kml</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array>
+				<string>320-pro.png</string>
+				<string>64-pro.png</string>
+				<string>44x58-pro.png</string>
+				<string>22x29-pro.png</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Google Earth KMZ Document</string>
+			<key>LSHandlerRank</key>
+			<string>Default</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.google.earth.kmz</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>cm</string>
+				<string>mapswithme</string>
+				<string>mapsme</string>
+				<string>ge0</string>
+				<string>geo</string>
+				<string>om</string>
+				<string>mapswithmepro</string>
+			</array>
+		</dict>
+	</array>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>mailto</string>
+		<string>comgooglemaps</string>
+		<string>osmandmaps</string>
+		<string>yandexmaps</string>
+		<string>dgis</string>
+		<string>citymapper</string>
+		<string>moovit</string>
+		<string>uber</string>
+		<string>waze</string>
+		<string>gomaposm</string>
+	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>comaps.app</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
+				<false/>
+			</dict>
+		</dict>
+	</dict>
+	<key>NSUbiquitousContainers</key>
+	<dict>
+		<key>iCloud.app.comaps</key>
+		<dict>
+			<key>NSUbiquitousContainerIsDocumentScopePublic</key>
+			<true/>
+			<key>NSUbiquitousContainerName</key>
+			<string>CoMaps</string>
+			<key>NSUbiquitousContainerSupportedFolderLevels</key>
+			<string>ANY</string>
+		</dict>
+		<key>iCloud.app.comaps.debug</key>
+		<dict>
+			<key>NSUbiquitousContainerIsDocumentScopePublic</key>
+			<true/>
+			<key>NSUbiquitousContainerName</key>
+			<string>CoMapsDEBUG</string>
+			<key>NSUbiquitousContainerSupportedFolderLevels</key>
+			<string>ANY</string>
+		</dict>
+	</dict>
+	<key>UIAppFonts</key>
+	<array>
+		<string>FredokaOne-Regular.ttf</string>
+	</array>
+	<key>UIApplicationShortcutItems</key>
+	<array>
+		<dict>
+			<key>UIApplicationShortcutItemIconFile</key>
+			<string>ic_3dtouch_search</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>search</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>app.comaps.3daction.search</string>
+		</dict>
+		<dict>
+			<key>UIApplicationShortcutItemIconFile</key>
+			<string>ic_3dtouch_bookmarks</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>bookmarks_and_tracks</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>app.comaps.3daction.bookmarks</string>
+		</dict>
+		<dict>
+			<key>UIApplicationShortcutItemIconFile</key>
+			<string>ic_3dtouch_planing_route</string>
+			<key>UIApplicationShortcutItemTitle</key>
+			<string>route</string>
+			<key>UIApplicationShortcutItemType</key>
+			<string>app.comaps.3daction.route</string>
+		</dict>
+	</array>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+		<string>fetch</string>
+		<string>location</string>
+	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>UIPrerenderedIcon</key>
+	<true/>
+	<key>UTImportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Google Earth KML Document</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.google.earth.kml</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://earth.google.com/kml/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>com.apple.ostype</key>
+				<string>GKml</string>
+				<key>public.filename-extension</key>
+				<array>
+					<string>kml</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.google-earth.kml+xml</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>com.pkware.zip-archive</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Google Earth KMZ Document</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.google.earth.kmz</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://earth.google.com/kmz/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>com.apple.ostype</key>
+				<string>GKmz</string>
+				<key>public.filename-extension</key>
+				<array>
+					<string>kmz</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.google-earth.kmz+xml</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.xml</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>GPS Exchange Format (GPX)</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.topografix.gpx</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.topografix.com/GPX/1/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>gpx</string>
+					<string>GPX</string>
+				</array>
+				<key>public.mime-type</key>
+				<array>
+					<string>application/gpx+xml</string>
+				</array>
+			</dict>
+		</dict>
+	</array>
+</dict>
 </plist>
--- a/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift
+++ b/iphone/Maps/Core/iCloud/CloudDirectoryMonitor.swift
@@ -11,7 +11,7 @@ protocol CloudDirectoryMonitorDelegate : AnyObject {
  func didReceiveCloudMonitorError(_ error: Error)
 }

-private let kUDCloudIdentityKey = "com.apple.organicmaps.UbiquityIdentityToken"
+private let kUDCloudIdentityKey = "com.apple.comaps.UbiquityIdentityToken"
 private let kDocumentsDirectoryName = "Documents"

 final class iCloudDocumentsMonitor: NSObject, CloudDirectoryMonitor {
--- a/iphone/Maps/Images.xcassets/About/ic_about_faq.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_about_faq.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "template"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_about_news.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_about_news.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "template"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_about_rate_app.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_about_rate_app.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "template"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_about_report_bug.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_about_report_bug.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "template"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_about_report_osm.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_about_report_osm.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "template"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_about_volunteer.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_about_volunteer.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "template"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_christmas_tree.imageset/Contents.json
@@ -8,5 +8,9 @@
  "info" : {
    "author" : "xcode",
    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_bluesky.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_codeberg.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_facebook.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_facebook.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_fosstodon.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_fosstodon.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_instagram.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_instagram.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_lemmy.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_linkedin.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_linkedin.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_mail.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_mail.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_matrix.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_matrix.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
-    "template-rendering-intent" : "template"
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/ic_social_media_telegram.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/ic_social_media_telegram.imageset/Contents.json
@@ -10,6 +10,7 @@
    "version" : 1
  },
  "properties" : {
+    "preserves-vector-representation" : true,
    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/Images.xcassets/About/osm_logo.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/About/osm_logo.imageset/Contents.json
@@ -8,5 +8,9 @@
  "info" : {
    "author" : "xcode",
    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
  }
 }
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Skenk om saam die beste kaarte te bou!";
 "already_donated" = "Reeds geskenk";
 "remind_me_later" = "Herinner later";
-"support_organic_maps" = "Ondersteun CoMaps";
+"support_us" = "Ondersteun CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Kopiereg";
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "منشآت للمنازل المتنقلة";
-"share_bookmarks_email_body" = "مرحباً! ْ\n\n تم إرفاق إشاراتي المرجعية من تطبيق CoMaps. الرجاء فتحهم إذا لديك تطبيق CoMaps مثبتاً. أو، إذا لم يكن مثبتاً، قم بتنزيل التطبيق لنظام iOS أو أندرويد من خلال الضغط على هذا الرابط: https://www.comaps.app/download/ \n\nاستمتع بالسفر مع Organic Maps!";
+"share_bookmarks_email_body" = "مرحباً! ْ\n\n تم إرفاق إشاراتي المرجعية من تطبيق CoMaps. الرجاء فتحهم إذا لديك تطبيق CoMaps مثبتاً. أو، إذا لم يكن مثبتاً، قم بتنزيل التطبيق لنظام iOS أو أندرويد من خلال الضغط على هذا الرابط: https://www.comaps.app/download/ \n\nاستمتع بالسفر مع CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "يتم تحميل الإشارات المرجعية";
@@ -283,7 +283,7 @@
 "donate_description" = "تبرع لبناء أفضل الخرائط معًا!";
 "already_donated" = "تم التبرع";
 "remind_me_later" = "ذكر لاحقاً";
-"support_organic_maps" = "دعم CoMaps";
+"support_us" = "دعم CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "حقوق النشر";
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Karvan qurğuları";
-"share_bookmarks_email_body" = "Salam!\n\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://www.comaps.app/download/\n\nOrganic Maps ilə səyahətdən həzz alın!";
+"share_bookmarks_email_body" = "Salam!\n\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://www.comaps.app/download/\n\nCoMaps ilə səyahətdən həzz alın!";

 /* message title of loading file */
 "load_kmz_title" = "Əlfəcinlər yüklənir";
@@ -283,7 +283,7 @@
 "donate_description" = "Ən yaxşı xəritələri birlikdə qurmaq üçün ianə edin!";
 "already_donated" = "Artıq ianə edildi";
 "remind_me_later" = "Daha sonra xatırlat";
-"support_organic_maps" = "CoMaps-i dəstəkləmək";
+"support_us" = "CoMaps-i dəstəkləmək";

 /* Button in the main Help dialog */
 "copyright" = "Müəllif hüququ";
@@ -916,7 +916,7 @@
 "track_title" = "Yol qeydi";

 /* Telegram group url for the "?" About page */
-"telegram_url" = "https://t.me/OrganicMapsTR # Probably better than Ru";
+"telegram_url" = "https://t.me/CoMaps_TR";

 /* Instagram account url for the "?" About page */
 "instagram_url" = "https://www.instagram.com/comapscommunity/";
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Для аўтадамоў";
-"share_bookmarks_email_body" = "Вітаю!\n\nУ далучаным файле мае закладкі з праграмы CoMaps. Калі ласка, адкрыйце іх, калі ў вас усталяваны CoMaps. Калі не, спампуйце праграму для вашай прылады iOS альбо Andriod па спасылцы: https://www.comaps.app/download/\n\nПрыемных падарожжаў з Organic Maps!";
+"share_bookmarks_email_body" = "Вітаю!\n\nУ далучаным файле мае закладкі з праграмы CoMaps. Калі ласка, адкрыйце іх, калі ў вас усталяваны CoMaps. Калі не, спампуйце праграму для вашай прылады iOS альбо Andriod па спасылцы: https://www.comaps.app/download/\n\nПрыемных падарожжаў з CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "Загрузка закладак";
@@ -283,7 +283,7 @@
 "donate_description" = "Падтрымайць, каб разам ствараць лепшыя карты!";
 "already_donated" = "Ужо ахвяравана";
 "remind_me_later" = "Нагадаць пазней";
-"support_organic_maps" = "Падтрымаць CoMaps";
+"support_us" = "Падтрымаць CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Аўтарскія правы";
@@ -916,7 +916,7 @@
 "track_title" = "Сцежка";

 /* Telegram group url for the "?" About page */
-"telegram_url" = "https://t.me/OrganicMapsRu";
+"telegram_url" = "https://t.me/CoMaps_RU";

 /* Instagram account url for the "?" About page */
 "instagram_url" = "https://www.instagram.com/comapscommunity/";
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Дарете, за да създадем заедно най-добрите карти!";
 "already_donated" = "Вече дарено";
 "remind_me_later" = "Напомни по-късно";
-"support_organic_maps" = "Подкрепи CoMaps";
+"support_us" = "Подкрепи CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Авторски права";
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Instal·lacions per a autocaravanes";
-"share_bookmarks_email_body" = "Hola!\n\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://www.comaps.app/download/\n\nGaudiu viatjant amb l'Organic Maps!";
+"share_bookmarks_email_body" = "Hola!\n\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://www.comaps.app/download/\n\nGaudiu viatjant amb l'CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "S'estan carregant els marcadors";
@@ -283,7 +283,7 @@
 "donate_description" = "Fes una donació per construir els millors mapes junts!";
 "already_donated" = "Ja donat";
 "remind_me_later" = "Recorda més tard";
-"support_organic_maps" = "Donar suport a CoMaps";
+"support_us" = "Donar suport a CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Drets d’autor";
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Přispějte, abychom společně vytvořili ty nejlepší mapy!";
 "already_donated" = "Již darováno";
 "remind_me_later" = "Připomeň později";
-"support_organic_maps" = "Podpořit CoMaps";
+"support_us" = "Podpořit CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Autorská práva";
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Donér for at bygge de bedste kort sammen!";
 "already_donated" = "Allerede doneret";
 "remind_me_later" = "Påmind mig senere";
-"support_organic_maps" = "Støt CoMaps";
+"support_us" = "Støt CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Copyright";
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Einrichtungen für Wohnmobile";
-"share_bookmarks_email_body" = "Hallo!\n\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://www.comaps.app/download/ für iOS oder Android herunterladen.\n\nViel Spaß beim Reisen mit Organic Maps!";
+"share_bookmarks_email_body" = "Hallo!\n\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://www.comaps.app/download/ für iOS oder Android herunterladen.\n\nViel Spaß beim Reisen mit CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "Lesezeichen werden geladen";
@@ -283,7 +283,7 @@
 "donate_description" = "Spende, um gemeinsam die besten Karten zu erstellen!";
 "already_donated" = "Bereits gespendet";
 "remind_me_later" = "Später erinnern";
-"support_organic_maps" = "CoMaps unterstützen";
+"support_us" = "CoMaps unterstützen";

 /* Button in the main Help dialog */
 "copyright" = "Copyright";
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Κάντε δωρεά για να φτιάξουμε μαζί τους καλύτερους χάρτες!";
 "already_donated" = "Ήδη δωρεά";
 "remind_me_later" = "Υπενθύμισε αργότερα";
-"support_organic_maps" = "Υποστήριξε το CoMaps";
+"support_us" = "Υποστήριξε το CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Πνευματικά δικαιώματα";
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Donate to build the best maps together!";
 "already_donated" = "Already donated";
 "remind_me_later" = "Remind later";
-"support_organic_maps" = "Support CoMaps";
+"support_us" = "Support CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Copyright";
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -295,7 +295,7 @@
 "donate_description" = "Donate to build the best maps together!";
 "already_donated" = "Already donated";
 "remind_me_later" = "Remind later";
-"support_organic_maps" = "Support CoMaps";
+"support_us" = "Support CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Copyright";
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Caravanas";
-"share_bookmarks_email_body" = "Hola!\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://www.comaps.app/download/\n¡Disfrute viajando con Organic Maps!";
+"share_bookmarks_email_body" = "Hola!\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://www.comaps.app/download/\n¡Disfrute viajando con CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "Cargando marcadores";
@@ -283,7 +283,7 @@
 "donate_description" = "¡Dona para construir los mejores mapas juntos!";
 "already_donated" = "Ya donado";
 "remind_me_later" = "Recordar más tarde";
-"support_organic_maps" = "Apoyar CoMaps";
+"support_us" = "Apoyar CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Derechos de autor";
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Haga un donativo para desarrollar juntos los mejores mapas.";
 "already_donated" = "Ya he donado";
 "remind_me_later" = "Recordar más tarde";
-"support_organic_maps" = "Apoyar CoMaps";
+"support_us" = "Apoyar CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Derechos de autor";
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Haagiselamud";
-"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 iOS või Android seadmesse, järgides seda linki: https:omaps.appget?kmz\n\nNaudi reisimist Organic Mapsiga!";
+"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 iOS või Android seadmesse, järgides seda linki: https:omaps.appget?kmz\n\nNaudi reisimist CoMapsiga!";

 /* message title of loading file */
 "load_kmz_title" = "Järjehoidjate laadimine";
@@ -283,7 +283,7 @@
 "donate_description" = "Anneta, et luua koos parimaid kaarte!";
 "already_donated" = "Juba annetasin";
 "remind_me_later" = "Meenuta hiljem";
-"support_organic_maps" = "Toeta CoMapsi";
+"support_us" = "Toeta CoMapsi";

 /* Button in the main Help dialog */
 "copyright" = "Autoriõigused";
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Karabanak";
-"share_bookmarks_email_body" = "Kaixo!\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://www.comaps.app/download/\n\nGozatu bidaiatzen Organic Maps-ekin!";
+"share_bookmarks_email_body" = "Kaixo!\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://www.comaps.app/download/\n\nGozatu bidaiatzen CoMaps-ekin!";

 /* message title of loading file */
 "load_kmz_title" = "Markagailuak kargatzen";
@@ -283,7 +283,7 @@
 "donate_description" = "Eman dohaintza elkarrekin mapa onenak eraikitzeko!";
 "already_donated" = "Dohaintza jada emana";
 "remind_me_later" = "Gogoratu geroago";
-"support_organic_maps" = "Sustatu CoMaps";
+"support_us" = "Sustatu CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Egile eskubideak";
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "کمک مالی کنید تا بهترین نقشه ها را با هم بسازید!";
 "already_donated" = "قبلاً اهدا شده";
 "remind_me_later" = "بعداً یادآوری کن";
-"support_organic_maps" = "پشتیبانی از CoMaps";
+"support_us" = "پشتیبانی از CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "حق نشر و کپی رایت";
@@ -916,7 +916,7 @@
 "track_title" = "مسیر";

 /* Telegram group url for the "?" About page */
-"telegram_url" = "https://t.me/OrganicMapsIR";
+"telegram_url" = "https://t.me/CoMaps_EN";

 /* Instagram account url for the "?" About page */
 "instagram_url" = "https://www.instagram.com/comapscommunity/";
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Lahjoittakaa, jotta voimme rakentaa parhaita karttoja yhdessä!";
 "already_donated" = "Jo lahjoitettu";
 "remind_me_later" = "Muistuta myöhemmin";
-"support_organic_maps" = "Tukea CoMaps";
+"support_us" = "Tukea CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Tekijänoikeudet";
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Aménagements pour camping-car";
-"share_bookmarks_email_body" = "Bonjour !\n\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://www.comaps.app/download/\n\nBon voyage avec Organic Maps !";
+"share_bookmarks_email_body" = "Bonjour !\n\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://www.comaps.app/download/\n\nBon voyage avec CoMaps !";

 /* message title of loading file */
 "load_kmz_title" = "Chargement des signets";
@@ -283,7 +283,7 @@
 "donate_description" = "Fais un don pour construire ensemble les meilleures cartes !";
 "already_donated" = "Déjà donné";
 "remind_me_later" = "Rappeler plus tard";
-"support_organic_maps" = "Soutenir CoMaps";
+"support_us" = "Soutenir CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Tous droits réservés";
--- a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
@@ -128,7 +128,7 @@
 "donate" = "Doar";
 "remind_me_later" = "Lembrar máis tarde";
 "already_donated" = "Xa doei";
-"support_organic_maps" = "Apoiar CoMaps";
+"support_us" = "Apoiar CoMaps";
 "copyright" = "Dereitos de autor";
 "report_a_bug" = "Informar dun fallo";
 "report_incorrect_map_bug" = "Informar ou corrixir datos de mapa incorrectos";
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "תרמו כדי לבנות יחד את המפות הטובות ביותר!";
 "already_donated" = "כבר נתרם";
 "remind_me_later" = "הזכר מאוחר יותר";
-"support_organic_maps" = "לתמוך ב-CoMaps";
+"support_us" = "לתמוך ב-CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "זכויות יוצרים";
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "एक साथ सर्वोत्तम मानचित्र बनाने के लिए दान करें!";
 "already_donated" = "पहले से दान";
 "remind_me_later" = "बाद में याद दिलाना";
-"support_organic_maps" = "CoMaps का समर्थन करें";
+"support_us" = "CoMaps का समर्थन करें";

 /* Button in the main Help dialog */
 "copyright" = "कॉपीराइट";
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Adományozzon, hogy együtt építsük a legjobb térképeket!";
 "already_donated" = "Már adományozott";
 "remind_me_later" = "Emlékeztessen később";
-"support_organic_maps" = "CoMaps támogatása";
+"support_us" = "CoMaps támogatása";

 /* Button in the main Help dialog */
 "copyright" = "Szerzői jogok";
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Donasi untuk membangun peta terbaik bersama-sama!";
 "already_donated" = "Sudah disumbang";
 "remind_me_later" = "Ingatkan nanti";
-"support_organic_maps" = "Mendukung CoMaps";
+"support_us" = "Mendukung CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Hak cipta";
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Fai una donazione per creare insieme le migliori mappe!";
 "already_donated" = "Già donato";
 "remind_me_later" = "Ricorda più tardi";
-"support_organic_maps" = "Supporta CoMaps";
+"support_us" = "Supporta CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Copyright";
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "寄付して最高の地図を一緒に作ろう！";
 "already_donated" = "寄付済み";
 "remind_me_later" = "後でリマインド";
-"support_organic_maps" = "CoMaps を支援";
+"support_us" = "CoMaps を支援";

 /* Button in the main Help dialog */
 "copyright" = "著作権";
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "기부하여 최고의 지도를 함께 만들어 보세요!";
 "already_donated" = "기부완료";
 "remind_me_later" = "나중에 알림";
-"support_organic_maps" = "CoMaps 지원하기";
+"support_us" = "CoMaps 지원하기";

 /* Button in the main Help dialog */
 "copyright" = "저작권";
--- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Paaukokite, kad kartu sukurtume geriausius žemėlapius!";
 "already_donated" = "Jau paaukojau";
 "remind_me_later" = "Priminti vėliau";
-"support_organic_maps" = "Paremti „CoMaps“";
+"support_us" = "Paremti „CoMaps“";

 /* Button in the main Help dialog */
 "copyright" = "Autorių teisės";
--- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Ziedojiet, lai kopā varam veidot vislabākās kartes!";
 "already_donated" = "Jau esmu ziedojis/usi";
 "remind_me_later" = "Atgādināt vēlāk";
-"support_organic_maps" = "Atbalstīt CoMaps";
+"support_us" = "Atbalstīt CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Autortiesības";
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "कँपिंग वाहन सोयी";
-"share_bookmarks_email_body" = "नमस्कार!\n\nCoMaps ऍप मधील माझे खूणपत्रे संलग्न केले आहेत. तुम्ही CoMaps इन्स्टॉल केले असल्यास हे खूणपत्रे उघडा. इन्स्टॉल केले नसल्यास, पुढील दुव्यावर जाऊन तुमच्या iOS किंवा अँड्रॉइड उपकरणावर हे डाउनलोड करा: https://www.comaps.app/download/\n\nOrganic Maps सह प्रवासाचा आनंद घ्या!";
+"share_bookmarks_email_body" = "नमस्कार!\n\nCoMaps ऍप मधील माझे खूणपत्रे संलग्न केले आहेत. तुम्ही CoMaps इन्स्टॉल केले असल्यास हे खूणपत्रे उघडा. इन्स्टॉल केले नसल्यास, पुढील दुव्यावर जाऊन तुमच्या iOS किंवा अँड्रॉइड उपकरणावर हे डाउनलोड करा: https://www.comaps.app/download/\n\nCoMaps सह प्रवासाचा आनंद घ्या!";

 /* message title of loading file */
 "load_kmz_title" = "खूणपत्रे वाचत आहे";
@@ -283,7 +283,7 @@
 "donate_description" = "एकत्र सर्वोत्तम नकाशे तयार करण्यासाठी देणगी द्या!";
 "already_donated" = "आधीच दान केले";
 "remind_me_later" = "नंतर आठवण करून द्या";
-"support_organic_maps" = "CoMaps ला समर्थन द्या";
+"support_us" = "CoMaps ला समर्थन द्या";

 /* Button in the main Help dialog */
 "copyright" = "प्रकाशन अधिकार (कॉपीराईट)";
--- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Agħti donazzjoni biex tibni l-aħjar mapep flimkien!";
 "already_donated" = "Ġa mogħtija id-donazzjoni";
 "remind_me_later" = "Fakkar aktar tard";
-"support_organic_maps" = "Appoġġja lill-CoMaps";
+"support_us" = "Appoġġja lill-CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Drittijiet tal-awtur";
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Bobilanlegg";
-"share_bookmarks_email_body" = "Hei!\n\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://www.comaps.app/download/\n\nNyt reisen med Organic Maps!";
+"share_bookmarks_email_body" = "Hei!\n\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://www.comaps.app/download/\n\nNyt reisen med CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "Laster inn bokmerker";
@@ -283,7 +283,7 @@
 "donate_description" = "Doner for å bygge de beste kartene sammen!";
 "already_donated" = "Allerede donert";
 "remind_me_later" = "Påminn senere";
-"support_organic_maps" = "Støtte CoMaps";
+"support_us" = "Støtte CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Opphavsrett";
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Caravanfaciliteiten";
-"share_bookmarks_email_body" = "Hallo!\n\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://www.comaps.app/download/\n\nGeniet van het reizen met Organic Maps!";
+"share_bookmarks_email_body" = "Hallo!\n\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://www.comaps.app/download/\n\nGeniet van het reizen met CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "Bladwijzers worden geladen";
@@ -283,7 +283,7 @@
 "donate_description" = "Doneer om samen de beste kaarten te bouwen!";
 "already_donated" = "Reeds gedoneerd";
 "remind_me_later" = "Herinner later";
-"support_organic_maps" = "Ondersteun CoMaps";
+"support_us" = "Ondersteun CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Auteursrechten";
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Kamper";
-"share_bookmarks_email_body" = "Cześć!\n\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://www.comaps.app/download/\n\nMiłego podróżowania z Organic Maps!";
+"share_bookmarks_email_body" = "Cześć!\n\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://www.comaps.app/download/\n\nMiłego podróżowania z CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "Wczytywanie zakładek";
@@ -283,7 +283,7 @@
 "donate_description" = "Przekaż darowiznę, aby wspólnie tworzyć najlepsze mapy!";
 "already_donated" = "Już przekazano";
 "remind_me_later" = "Przypomnij później";
-"support_organic_maps" = "Wspierać CoMaps";
+"support_us" = "Wspierać CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Prawa autorskie";
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Para trailers";
-"share_bookmarks_email_body" = "Olá!\n\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://www.comaps.app/download/\n\nDisfrute viajar com o Organic Maps!";
+"share_bookmarks_email_body" = "Olá!\n\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://www.comaps.app/download/\n\nDisfrute viajar com o CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "Carregando favoritos";
@@ -283,7 +283,7 @@
 "donate_description" = "Doe para criarmos juntos os melhores mapas!";
 "already_donated" = "Já doei";
 "remind_me_later" = "Lembre-me mais tarde";
-"support_organic_maps" = "Apoie o CoMaps";
+"support_us" = "Apoie o CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Direitos autorais";
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "Para trailers";
-"share_bookmarks_email_body" = "Olá!\n\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://www.comaps.app/download/\n\nDivirta-se a viajar com o Organic Maps!";
+"share_bookmarks_email_body" = "Olá!\n\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://www.comaps.app/download/\n\nDivirta-se a viajar com o CoMaps!";

 /* message title of loading file */
 "load_kmz_title" = "A carregar favoritos";
@@ -283,7 +283,7 @@
 "donate_description" = "Faz um donativo para construirmos juntos os melhores mapas!";
 "already_donated" = "Já doei";
 "remind_me_later" = "Lembre-me mais tarde";
-"support_organic_maps" = "Apoie o CoMaps";
+"support_us" = "Apoie o CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Direitos de autor";
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Donează pentru a construi împreună cele mai bune hărți!";
 "already_donated" = "Deja donat";
 "remind_me_later" = "Amintește mai târziu";
-"support_organic_maps" = "Susține CoMaps";
+"support_us" = "Susține CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Drepturi de autor";
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Поддержать деньгами, чтобы вместе создавать лучшие карты!";
 "already_donated" = "Уже пожертвовано";
 "remind_me_later" = "Напомнить позже";
-"support_organic_maps" = "Поддержать CoMaps";
+"support_us" = "Поддержать CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Копирайт";
@@ -916,7 +916,7 @@
 "track_title" = "Трек";

 /* Telegram group url for the "?" About page */
-"telegram_url" = "https://t.me/OrganicMapsRu";
+"telegram_url" = "https://t.me/CoMaps_RU";

 /* Instagram account url for the "?" About page */
 "instagram_url" = "https://www.instagram.com/comapscommunity/";
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Darujte, aby sme spoločne vytvorili tie najlepšie mapy!";
 "already_donated" = "Už darované";
 "remind_me_later" = "Pripomeň neskôr";
-"support_organic_maps" = "Podporiť CoMaps";
+"support_us" = "Podporiť CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Autorské práva";
--- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Донирате да бисмо заједно направили најбоље мапе!";
 "already_donated" = "Већ је донирано";
 "remind_me_later" = "Подсети ме касније";
-"support_organic_maps" = "Подршка CoMaps";
+"support_us" = "Подршка CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Copyright";
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Donera för att bygga de bästa kartorna tillsammans!";
 "already_donated" = "Redan donerat";
 "remind_me_later" = "Påminn senare";
-"support_organic_maps" = "Stödja CoMaps";
+"support_us" = "Stödja CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Upphovsrätt";
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Changia ili kuunda ramani bora pamoja!";
 "already_donated" = "Tayari kutoa";
 "remind_me_later" = "Kumbusha baadaye";
-"support_organic_maps" = "Kuunga mkono CoMaps";
+"support_us" = "Kuunga mkono CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Copyright";
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "บริจาคเพื่อสร้างแผนที่ที่ดีที่สุดด้วยกัน!";
 "already_donated" = "บริจาคแล้ว";
 "remind_me_later" = "เตือนภายหลัง";
-"support_organic_maps" = "สนับสนุน CoMaps";
+"support_us" = "สนับสนุน CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "ลิขสิทธิ์";
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "En iyi harita uygulamasını birlikte geliştirmemiz için bağış yapın!";
 "already_donated" = "Zaten bağış yaptım";
 "remind_me_later" = "Sonra hatırlat";
-"support_organic_maps" = "CoMaps’i Destekleyin";
+"support_us" = "CoMaps’i Destekleyin";

 /* Button in the main Help dialog */
 "copyright" = "Telif hakkı";
@@ -916,7 +916,7 @@
 "track_title" = "GPS İzi Kaydı";

 /* Telegram group url for the "?" About page */
-"telegram_url" = "https://t.me/OrganicMapsTR";
+"telegram_url" = "https://t.me/CoMaps_TR";

 /* Instagram account url for the "?" About page */
 "instagram_url" = "https://www.instagram.com/organicmapstr";
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Пожертвуйте, щоб разом створювати найкращі мапи!";
 "already_donated" = "Вже пожертвувано";
 "remind_me_later" = "Нагадати пізніше";
-"support_organic_maps" = "Підтримати CoMaps";
+"support_us" = "Підтримати CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Копірайт";
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -283,7 +283,7 @@
 "donate_description" = "Hãy quyên góp để cùng nhau xây dựng những bản đồ tốt nhất!";
 "already_donated" = "Đã quyên góp";
 "remind_me_later" = "Nhắc sau";
-"support_organic_maps" = "Hỗ trợ CoMaps";
+"support_us" = "Hỗ trợ CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "Bản quyền";
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -154,7 +154,7 @@

 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "房车设施";
-"share_bookmarks_email_body" = "您好！\n\n附件是我的书签，请在 CoMaps 中打开。如果您没有安装 CoMaps，可以在这里下载: https://www.comaps.app/download/\n\n祝您使用 Organic Maps 旅行愉快！";
+"share_bookmarks_email_body" = "您好！\n\n附件是我的书签，请在 CoMaps 中打开。如果您没有安装 CoMaps，可以在这里下载: https://www.comaps.app/download/\n\n祝您使用 CoMaps 旅行愉快！";

 /* message title of loading file */
 "load_kmz_title" = "正在加载书签";
@@ -283,7 +283,7 @@
 "donate_description" = "捐助，以共同打造最好的地图！";
 "already_donated" = "已捐赠";
 "remind_me_later" = "稍后提醒";
-"support_organic_maps" = "支持 CoMaps";
+"support_us" = "支持 CoMaps";

 /* Button in the main Help dialog */
 "copyright" = "版权";
--- a/Show More
+++ b/Show More