diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index be51ff90a3..8c9c5a0107 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:sharedUserId="app.omaps"
+    android:sharedUserId="com.mapswithme"
     android:sharedUserLabel="@string/shared_user_label">
 
   <!-- Mentioned MoPub dependencies use 16 API level as a min SDK version, which conflicts
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index b98b10f009..7b2706f98a 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="shared_user_label" translatable="false">OMaps</string>
+  <string name="shared_user_label" translatable="false">Maps With Me</string>
 
   <!-- Dev facebook credentials
   <string name="facebook_app_id" translatable="false">462405334160274</string>
diff --git a/iphone/Chart/Chart.xcodeproj/project.pbxproj b/iphone/Chart/Chart.xcodeproj/project.pbxproj
index aac61ec93d..6f5c573831 100644
--- a/iphone/Chart/Chart.xcodeproj/project.pbxproj
+++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj
@@ -179,7 +179,7 @@
 			attributes = {
 				DefaultBuildSystemTypeForWorkspace = Latest;
 				LastUpgradeCheck = 1130;
-				ORGANIZATIONNAME = maps.me;
+				ORGANIZATIONNAME = omaps.app;
 				TargetAttributes = {
 					47375D952420D4DB00FFCC49 = {
 						CreatedOnToolsVersion = 11.3;
@@ -445,7 +445,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart;
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.Chart;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -471,7 +471,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart;
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.Chart;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -555,7 +555,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart;
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.Chart;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
index 598a58038d..f67c0b1c5c 100644
--- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
+++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
@@ -866,7 +866,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				ORGANIZATIONNAME = maps.me;
+				ORGANIZATIONNAME = omaps.app;
 				TargetAttributes = {
 					470015EE2342509C00EBF03D = {
 						CreatedOnToolsVersion = 10.2;
@@ -1117,7 +1117,7 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = CoreApi.modulemap;
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi;
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.CoreApi;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1154,7 +1154,7 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = CoreApi.modulemap;
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi;
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.CoreApi;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1247,7 +1247,7 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = CoreApi.modulemap;
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi;
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.CoreApi;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj
index f91e14ea5a..3d441b16be 100644
--- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj
+++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj
@@ -143,7 +143,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1130;
-				ORGANIZATIONNAME = maps.me;
+				ORGANIZATIONNAME = omaps.app;
 				TargetAttributes = {
 					47A13C6424B4A86000027D4F = {
 						CreatedOnToolsVersion = 11.3;
diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib
index ca65c74bd8..2a501abb9f 100644
--- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib
+++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DownloadedBookmarksViewController" customModule="maps_me" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DownloadedBookmarksViewController" customModule="omaps_app" customModuleProvider="target">
             <connections>
                 <outlet property="bottomView" destination="A19-bw-qEr" id="kih-zB-eh4"/>
                 <outlet property="bottomViewDownloadButton" destination="Yjf-3F-Ewf" id="ELj-ol-N9n"/>
@@ -53,7 +53,7 @@
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lZi-fE-uf3">
                     <rect key="frame" x="16" y="41" width="343" height="50.5"/>
-                    <string key="text">Press the button to download thousands of intresting places and routes created by MAPS.ME users. You will need the internet connection.</string>
+                    <string key="text">Press the button to download thousands of intresting places and routes created by OMaps users. You will need the internet connection.</string>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <color key="textColor" white="0.0" alpha="0.54010595034246578" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
@@ -63,6 +63,7 @@
                     </userDefinedRuntimeAttributes>
                 </label>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="nPB-bx-EIH"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="TnJ-F3-v3h" secondAttribute="trailing" constant="16" id="60Y-LP-DTq"/>
@@ -77,7 +78,6 @@
                 <constraint firstItem="lZi-fE-uf3" firstAttribute="top" secondItem="TnJ-F3-v3h" secondAttribute="bottom" constant="12" id="vO0-Ba-ex8"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="nPB-bx-EIH"/>
             <point key="canvasLocation" x="458.5" y="471.5"/>
         </view>
         <view contentMode="scaleToFill" id="Q8q-x4-Mvv">
@@ -86,7 +86,7 @@
             <subviews>
                 <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="i5M-Pr-FkT">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                    <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                    <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/>
                     </userDefinedRuntimeAttributes>
@@ -116,7 +116,7 @@
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gY-vv-QfN">
                             <rect key="frame" x="16" y="285.5" width="343" height="50.5"/>
-                            <string key="text">Press the button to download thousands of intresting places and routes created by MAPS.ME users. You will need the internet connection.</string>
+                            <string key="text">Press the button to download thousands of intresting places and routes created by OMaps users. You will need the internet connection.</string>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" white="0.0" alpha="0.53735017123287676" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
@@ -164,6 +164,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="Ceu-pi-1ck"/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="Ceu-pi-1ck" firstAttribute="bottom" secondItem="EF0-Bq-c6F" secondAttribute="bottom" id="5y4-yL-yj0"/>
@@ -175,11 +176,13 @@
                 <constraint firstItem="i5M-Pr-FkT" firstAttribute="leading" secondItem="Ceu-pi-1ck" secondAttribute="leading" id="gVE-Vs-wgj"/>
                 <constraint firstItem="Ceu-pi-1ck" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="pYZ-O3-uHP"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="Ceu-pi-1ck"/>
             <point key="canvasLocation" x="-442" y="26"/>
         </view>
     </objects>
     <resources>
         <image name="img_empty_bookmarks" width="200" height="200"/>
+        <systemColor name="groupTableViewBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
index 8ff57ab76d..75b5769bbb 100644
--- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
@@ -14,7 +14,7 @@ extern NSString * const kUDAlreadyRatedKey;
 
 static NSString * const kRateAlertEventName = @"rateAlertEvent";
 static NSString * const kRateAlertNibName = @"MWMRateAlert";
-static NSString * const kRateEmail = @"rating@maps.me";
+static NSString * const kRateEmail = @"rating@omaps.app";
 
 static NSString * const kStatisticsEvent = @"Rate Alert";
 
@@ -151,7 +151,7 @@ static NSString * const kStatisticsEvent = @"Rate Alert";
         displayNameForKey:NSLocaleCountryCode
                     value:locale];
     NSString * bundleVersion = AppInfo.sharedInfo.bundleVersion;
-    NSString * text = [NSString stringWithFormat:@"\n\n\n\n- %@ (%@)\n- MAPS.ME %@\n- %@/%@",
+    NSString * text = [NSString stringWithFormat:@"\n\n\n\n- %@ (%@)\n- OMaps %@\n- %@/%@",
                                                  deviceModel, UIDevice.currentDevice.systemVersion,
                                                  bundleVersion, language, country];
     MWMMailViewController * mailController = [[MWMMailViewController alloc] init];
diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib
index 5e37f6d97e..daa2e13245 100644
--- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.xib
@@ -50,7 +50,7 @@
                                 <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="rate_alert_title"/>
                             </userDefinedRuntimeAttributes>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Спасибо что пользуетесь картами MAPS.ME. Пожалуйста, оцените приложение. Ваши оценки и отзывы помогают нам становиться лучше." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aP7-fq-KaH" userLabel="Message">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Спасибо что пользуетесь картами OMaps. Пожалуйста, оцените приложение. Ваши оценки и отзывы помогают нам становиться лучше." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aP7-fq-KaH" userLabel="Message">
                             <rect key="frame" x="20" y="45" width="240" height="82"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="240" id="HJM-e9-0wo"/>
diff --git a/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm b/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm
index ade0ff3689..8a4c784346 100644
--- a/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm
+++ b/iphone/Maps/Classes/Share/MWMEditorViralActivityItem.mm
@@ -18,12 +18,12 @@
       [activityType isEqualToString:@"com.facebook.Facebook.ShareExtension"] ||
       [activityType.lowercaseString rangeOfString:@"facebook"].length)
   {
-    NSString * url = [NSString stringWithFormat:@"http://maps.me/fb-editor-v1?lang=%@",
+    NSString * url = [NSString stringWithFormat:@"http://omaps.app/fb-editor-v1?lang=%@",
                       @(languages::GetCurrentNorm().c_str())];
     return [NSURL URLWithString:url];
   }
 
-  NSString * mapsmeURL = @"http://maps.me/im_get";
+  NSString * mapsmeURL = @"http://omaps.app/im_get";
   if ([activityType isEqualToString:UIActivityTypePostToTwitter] || [activityType isEqualToString:UIActivityTypeMail])
     return [NSString stringWithFormat:@"%@ %@", L(@"whatsnew_editor_message_1"), mapsmeURL];
 
diff --git a/iphone/Maps/Common/Statistics/StatisticsStrings.h b/iphone/Maps/Common/Statistics/StatisticsStrings.h
index 4ab1f4ec90..3500ff8568 100644
--- a/iphone/Maps/Common/Statistics/StatisticsStrings.h
+++ b/iphone/Maps/Common/Statistics/StatisticsStrings.h
@@ -283,7 +283,7 @@ static NSString *const kStatLon = @"lon";
 static NSString *const kStatLead = @"lead";
 static NSString *const kStatListSettings = @"list_settings";
 static NSString *const kStatLocals = @"Locals";
-static NSString *const kStatLocalsProvider = @"Locals.Maps.Me";
+static NSString *const kStatLocalsProvider = @"Locals.Omaps.App";
 static NSString *const kStatLocation = @"Location";
 static NSString *const kStatLogout = @"Logout";
 static NSString *const kStatMakeInvisibleOnMap = @"make_invisible_on_map";
@@ -297,7 +297,7 @@ static NSString *const kStatMapSearch = @"Map search";
 static NSString *const kStatMapToastShow = @"Map_Toast_show";
 static NSString *const kStatMapViewStyle = @"Map view style";
 static NSString *const kStatMapViewStyleSettings = @"Map view style settings";
-static NSString *const kStatMapsme = @"maps.me";
+static NSString *const kStatMapsme = @"omaps";
 static NSString *const kStatMapsmeGuides = @"MapsMeGuides";
 static NSString *const kStatMapsmeInAppSuggestionClicked = @"MapsMe_InAppSuggestion_clicked";
 static NSString *const kStatMapsmeInAppSuggestionClosed = @"MapsMe_InAppSuggestion_closed";
diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm
index 57ba32575a..29fa71700d 100644
--- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm
+++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm
@@ -33,7 +33,7 @@
     osm::Editor::Instance().UploadChanges(
         keySecret.first, keySecret.second,
         {{"created_by",
-          std::string("MAPS.ME " OMIM_OS_NAME " ") + AppInfo.sharedInfo.bundleVersion.UTF8String},
+          std::string("OMaps " OMIM_OS_NAME " ") + AppInfo.sharedInfo.bundleVersion.UTF8String},
          {"bundle_id", NSBundle.mainBundle.bundleIdentifier.UTF8String}},
         lambda);
   }
diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm
index 17537fc811..5718ae3b77 100644
--- a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm
+++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm
@@ -149,7 +149,7 @@
   } else {
     if (errorPtr) {
       if (pointsCount == 0) {
-        *errorPtr = [NSError errorWithDomain:@"maps.me.routing"
+        *errorPtr = [NSError errorWithDomain:@"omaps.app.routing"
                                         code:MWMRouterResultCodeStartPointNotFound
                                     userInfo:nil];
       } else {
@@ -160,7 +160,7 @@
         } else {
           code = MWMRouterResultCodeStartPointNotFound;
         }
-        *errorPtr = [NSError errorWithDomain:@"maps.me.routing"
+        *errorPtr = [NSError errorWithDomain:@"omaps.app.routing"
                                         code:code
                                     userInfo:nil];
       }
diff --git a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm
index 1ea91f445b..39eed0b35e 100644
--- a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm
+++ b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm
@@ -48,7 +48,7 @@
 
     CSSearchableItem * item =
         [[CSSearchableItem alloc] initWithUniqueIdentifier:categoryKeyString
-                                          domainIdentifier:@"maps.me.categories"
+                                          domainIdentifier:@"omaps.app.categories"
                                               attributeSet:attrSet];
     [items addObject:item];
   }
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json
index 26118ef23e..9221b9bb1a 100644
--- a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,116 +1,98 @@
 {
   "images" : [
     {
-      "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "Icons20@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-60.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-40@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-60@2x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "Icon-60@2x-1.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "Icon-60@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "Icons20.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "Icons20@2x-1.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-Small.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-Small@2x-1.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icons20@2x-2.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-Small-40@2x-1.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "Icon-83.5@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "iTunesArtwork@2x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@2x-1.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@2x-1.png
deleted file mode 100644
index cffb425d1b..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@2x-1.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
deleted file mode 100644
index cffb425d1b..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
deleted file mode 100644
index 64280118fb..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-76.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-76.png
deleted file mode 100644
index 408ee35669..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-76.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
deleted file mode 100644
index 754e05f38b..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
deleted file mode 100644
index 1bd3794dc2..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png
deleted file mode 100644
index 5f67210327..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x-1.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
deleted file mode 100644
index 5f67210327..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-60.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-60.png
deleted file mode 100644
index c30b7952d5..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small-60.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small.png
deleted file mode 100644
index f851dc6d7a..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png
deleted file mode 100644
index ba4c7c6301..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png
deleted file mode 100644
index ba4c7c6301..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png
deleted file mode 100644
index 8777cc41f8..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20.png
deleted file mode 100644
index 6b66bb38dd..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x-1.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x-1.png
deleted file mode 100644
index 35c5e9c2f9..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x-1.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x-2.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x-2.png
deleted file mode 100644
index 35c5e9c2f9..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x-2.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x.png
deleted file mode 100644
index 35c5e9c2f9..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/Icons20@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/iphone/Maps/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
deleted file mode 100644
index 37003f3af2..0000000000
Binary files a/iphone/Maps/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png and /dev/null differ
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 06a3e03231..949bbe6962 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "احصل عليه الآن";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "شكرا لاستخدامك MAPS.ME! هل يعجبك التطبيق؟ أخبر أصدقاءك عن التطبيق! سيكون ذلك هو غاية الامتنان بالنسبة لنا.";
+"share_on_facebook_text" = "شكرا لاستخدامك OMaps! هل يعجبك التطبيق؟ أخبر أصدقاءك عن التطبيق! سيكون ذلك هو غاية الامتنان بالنسبة لنا.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "ك.ب.";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "محاولة مرة أخرى";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "حول MAPS.ME";
+"about_menu_title" = "حول OMaps";
 
 "downloading_touch_to_cancel" = "جاري تنزيل %d%% ، انقر للإلغاء";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "خاصية التخزين بواسطة البطاقة الرقمية الآمنة\الناقل التسلسلي الشامل غير متاحة مع الخرائط التي تم تنزيلها.";
 
-"disconnect_usb_cable" = "الرجاء فصل كابل الناقل التسلسلي الشامل أو إدخال بطاقة الذاكرة من أجل استخدام MAPS.ME.";
+"disconnect_usb_cable" = "الرجاء فصل كابل الناقل التسلسلي الشامل أو إدخال بطاقة الذاكرة من أجل استخدام OMaps.";
 
 "not_enough_free_space_on_sdcard" = "الرجاء إخلاء بعض المساحة في تخزين البطاقة الرقمية الآمنة\الناقل التسلسلي الشامل أولا من أجل استخدام هذا التطبيق.";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "هناك تحديثات متوافرة للخرائط التالية:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "أنت لست بحاجة الى  MAPS.ME Lite بعد الآن، لذلك يمكنك إلغاء تثبيته.";
+"suggest_uninstall_lite" = "أنت لست بحاجة الى  OMaps Lite بعد الآن، لذلك يمكنك إلغاء تثبيته.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "تم تنزيل %@ بنجاح.";
@@ -249,10 +249,10 @@
 "set" = "المجموعة";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "ليس لديك أي إشارات مرجعية بعد.\nانقر على أي مكان على الخريطة لإضافة إشارة مرجعية.\nيمكنك أيضا استيراد الإشارات المرجعية من المصادر الأخرى وعرضها في MAPS.ME. افتح ملف KML/KMZ الذي يحتوي على الدبابيس المحفوظة من البريد الالكتروني، دروب بوكس أو ويب لينك.";
+"bookmarks_usage_hint" = "ليس لديك أي إشارات مرجعية بعد.\nانقر على أي مكان على الخريطة لإضافة إشارة مرجعية.\nيمكنك أيضا استيراد الإشارات المرجعية من المصادر الأخرى وعرضها في OMaps. افتح ملف KML/KMZ الذي يحتوي على الدبابيس المحفوظة من البريد الالكتروني، دروب بوكس أو ويب لينك.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "يمكن استيراد الإشارات المرجعية من المصادر الأخرى و عرضها على MAPS.ME. افتح ملف KML/KMZ الذي يحتوي على الإشارات المرجعية المحفوظة من البريد الالكتروني، دروب بوكس أو ويب لينك.";
+"bookmarks_usage_hint_import_only" = "يمكن استيراد الإشارات المرجعية من المصادر الأخرى و عرضها على OMaps. افتح ملف KML/KMZ الذي يحتوي على الإشارات المرجعية المحفوظة من البريد الالكتروني، دروب بوكس أو ويب لينك.";
 
 /* Settings button in system menu */
 "settings" = "الإعدادات";
@@ -354,9 +354,9 @@
 "share_by_email" = "مشاركة بواسطة البريد الالكتروني";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "تم مشاركة اشارات MAPS.ME المرجعية معك";
+"share_bookmarks_email_subject" = "تم مشاركة اشارات OMaps المرجعية معك";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "تحميل الإشارات المرجعية";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "جاري الآن تنزيل الدولة";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "نأمل أن تكون قد استمتعت باستخدام MAPS.ME! إذا كان الأمر كذلك، الرجاء تقييم التطبيق في App Store. يستغرق ذلك أقل من دقيقة لكنه يفيدنا بالفعل. شكرا لك على دعمك!";
+"appStore_message" = "نأمل أن تكون قد استمتعت باستخدام OMaps! إذا كان الأمر كذلك، الرجاء تقييم التطبيق في App Store. يستغرق ذلك أقل من دقيقة لكنه يفيدنا بالفعل. شكرا لك على دعمك!";
 
 /* No, thanks */
 "no_thanks" = "لا، شكرا";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "هاي، تفقد الدبوس الخاص بي على MAPS.ME! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: http://maps.me/get";
+"bookmark_share_sms" = "هاي، تفقد الدبوس الخاص بي على OMaps! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "هاي، تفقد الموقع الخاص بي على MAPS.ME! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: http://maps.me/get";
+"my_position_share_sms" = "هاي، تفقد الموقع الخاص بي على OMaps! %1$@ أو %2$@. ليس لديك أي خرائط تعمل بدون الاتصال مع الانترنت مثبتة على جهازك؟ قم بتحميلها من هنا: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "هاي، تفقد الدبوس الخاص بي على خريطة MAPS.ME!";
+"bookmark_share_email_subject" = "هاي، تفقد الدبوس الخاص بي على خريطة OMaps!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "يا هلا، تحقق من موقعي الحالي على خريطة MAPS.ME!";
+"my_position_share_email_subject" = "يا هلا، تحقق من موقعي الحالي على خريطة OMaps!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "مرحبا،\n\nأنا هنا الآن: %1$@. انقر على هذا الرابط %2$@ أو ذلك الرابط %3$@ لمشاهدة المكان على الخريطة.\n\nشكرا لك.";
@@ -549,7 +549,7 @@
 "search_show_on_map" = "مشاهدة على الخريطة";
 
 /* Used to warn user when fixing KitKat issue */
-"kitkat_migrate_ok" = "تم تحسين وسيلة تخزين بيانات الخريطة. الرجاء اعادة تشغيل التطبيق .\n\nلا حاجة بعد الآن لمجلد MAPS.ME في البطاقة الرقمية الآمنة، يمكنك حذفه.";
+"kitkat_migrate_ok" = "تم تحسين وسيلة تخزين بيانات الخريطة. الرجاء اعادة تشغيل التطبيق .\n\nلا حاجة بعد الآن لمجلد OMaps في البطاقة الرقمية الآمنة، يمكنك حذفه.";
 
 /* Used to warn user when fixing KitKat issue */
 "kitkat_migrate_failed" = "بسبب التغييرات في نظام أندرويد4.4 ، نحن بحاجة لتحسين وسيلة تخزين بيانات الخريطة، لكن لا يوجد حيز كافٍ لنسخ بيانات الخريطة.\n\nالرجاء إخلاء الذاكرة، وإلا ستتوافر الخرائط في وضع القراءة فقط.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "تنزيل خريطة المكان الذي توجد فيه";
 
 /* text of notification */
-"pro_version_is_free_today" = "تطبيق MAPS.ME مجاني اليوم! قم بتنزيله الآن وأخبر أصدقائك.";
+"pro_version_is_free_today" = "تطبيق OMaps مجاني اليوم! قم بتنزيله الآن وأخبر أصدقائك.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "نحن ننقل خرائط التنزيلات الخاصة بك من MAPS.ME Lite إلى MAPS.ME. يمكن أن يستغرق بضع دقائق";
+"move_lite_maps_to_pro" = "نحن ننقل خرائط التنزيلات الخاصة بك من OMaps Lite إلى OMaps. يمكن أن يستغرق بضع دقائق";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "تم بنجاح نقل خرائطك التي تم تنزيلها إلى MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "تم بنجاح نقل خرائطك التي تم تنزيلها إلى OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "فشل نقل خرائطك يُرجى حذف MAPS.ME Lite وتنزيل الخرائط مرة أخرى.";
+"move_lite_maps_to_pro_failed" = "فشل نقل خرائطك يُرجى حذف OMaps Lite وتنزيل الخرائط مرة أخرى.";
 
 /* Text in menu */
 "settings_and_more" = "الإعدادات والمزيد";
@@ -600,7 +600,7 @@
 "website" = "الموقع الإلكتروني";
 
 /* Text in menu */
-"maps_me_community" = "مجتمع MAPS.ME";
+"maps_me_community" = "مجتمع OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "أعجبني على الفيسبوك";
@@ -630,13 +630,13 @@
 "report_a_bug" = "الإبلاغ عن خطأ";
 
 /* Email subject */
-"subscribe_me_subject" = "يرجى اشتراكي في النشرة البريدية لدى MAPS.ME";
+"subscribe_me_subject" = "يرجى اشتراكي في النشرة البريدية لدى OMaps";
 
 /* Email body */
 "subscribe_me_body" = "أريد أن أكون أول من يعرف آخر الأخبار والتحديثات والترقيات. يمكنني إلغاء اشتراكي في أي وقت.";
 
 /* About text */
-"about_text" = "توفر لكم MAPS.ME أحدث الخرائط دون الاتصال بالإنترنت لكافة دول وكافة مدن العالم. سافر وتمتع بالثقة التامة: إينما كنت، تساعدك MAPS.ME على تحديد مكانك على الخريطة، والعثور على أقرب مطعم أو فندق أو بنك أو محطة غاز الخ لا يتطلب الاتصال بالإنترنت.\n\nنحن نعمل دوماً على إدخال مزايا جديدة على التطبيق ونود أن نسمع منك رأيك عن الكيفية التي يمكن بها تحسين تطبيق MAPS.ME في رأيك. إذا واجهتك أي مشاكل مع التطبيق، لا تتردد في الاتصال بنا على support@maps.me. نحن نرد على كافة الطلبات.\n\nهل أعجبك تطبيق MAPS.ME وترغب في دعمنا؟ هناك بعض الطرق السهلة والمجانية بالكامل لعمل ذلك.\n\n- انشر رأيك على متجر التطبيقات الخاص بك\n- اعجب بصفحتنا على موقع Facebook http://www.facebook.com/mapswithme\n- أو أخبر والدتك وأصدقائك وزملائك عن تطبيق MAPS.ME :)\n\nشكراً لك على وجودك معنا. نحن نقدر جداً دعمك لنا!\n\nيُرجى ملاحظة نحن نستقي بيانات الخرائط من OpenStreetMap، مشروع خرائط يشبه موسوعة Wikipedia ويتيح هذا المشروع للمستخدمين إنشاء وتحرير الخرائط. إذا كنت ترى أن هناك خطأ ما أو شيء غير موجود على الخريطة، يمكنك تصحيح الخرائط مباشرة على https://www.openstreetmap.org، وسوف تظهر تغييراتك على تطبيق MAPS.ME في الإصدار القادم للتطبيق.";
+"about_text" = "توفر لكم OMaps أحدث الخرائط دون الاتصال بالإنترنت لكافة دول وكافة مدن العالم. سافر وتمتع بالثقة التامة: إينما كنت، تساعدك OMaps على تحديد مكانك على الخريطة، والعثور على أقرب مطعم أو فندق أو بنك أو محطة غاز الخ لا يتطلب الاتصال بالإنترنت.\n\nنحن نعمل دوماً على إدخال مزايا جديدة على التطبيق ونود أن نسمع منك رأيك عن الكيفية التي يمكن بها تحسين تطبيق OMaps في رأيك. إذا واجهتك أي مشاكل مع التطبيق، لا تتردد في الاتصال بنا على support@omaps.app. نحن نرد على كافة الطلبات.\n\nهل أعجبك تطبيق OMaps وترغب في دعمنا؟ هناك بعض الطرق السهلة والمجانية بالكامل لعمل ذلك.\n\n- انشر رأيك على متجر التطبيقات الخاص بك\n- اعجب بصفحتنا على موقع Facebook http://www.facebook.com/mapswithme\n- أو أخبر والدتك وأصدقائك وزملائك عن تطبيق OMaps :)\n\nشكراً لك على وجودك معنا. نحن نقدر جداً دعمك لنا!\n\nيُرجى ملاحظة نحن نستقي بيانات الخرائط من OpenStreetMap، مشروع خرائط يشبه موسوعة Wikipedia ويتيح هذا المشروع للمستخدمين إنشاء وتحرير الخرائط. إذا كنت ترى أن هناك خطأ ما أو شيء غير موجود على الخريطة، يمكنك تصحيح الخرائط مباشرة على https://www.openstreetmap.org، وسوف تظهر تغييراتك على تطبيق OMaps في الإصدار القادم للتطبيق.";
 
 /* Alert text */
 "email_error_body" = "لم يتم تعيين البريد الإلكتروني للعميل. يرجى تكوينه أو استخدام أي وسيلة أخرى للاتصال بنا على %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "يرجى تحديث الخريطة لإنشاء مسار.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "إصدار MAPS.ME الجديد يسمح بإنشاء مسارات انطلاقاً من موقعك الحالي نحو المكان الذي تتجه إليه. يرجى تحديث الخرائط لاستخدام هذه الميزة.";
+"routing_update_maps" = "إصدار OMaps الجديد يسمح بإنشاء مسارات انطلاقاً من موقعك الحالي نحو المكان الذي تتجه إليه. يرجى تحديث الخرائط لاستخدام هذه الميزة.";
 
 /* Update all button text */
 "downloader_update_all_button" = "تحديث الكل";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "تم العثور على";
 
 /* Disclaimer message */
-"routing_disclaimer" = "عند إنشاء مسارات الطرق في تطبيق MAPS.ME، يرجى أخذ التالي في الحسبان:\n\n  - المسارات المقترحة تعتبر مجرد اقتراحات فقط.\n - حالة الطريق وقوانينه والإشارات الموجودة فيه لها الأولولية أثناء تقديم نصائح الملاحة.\n - قد تكون الخريطة خاطئة أو قديمة، لذا فإنه يمكن ألا تُرسم المسارات بالشكل الأمثل.\n\n  كن آمنا على الطريق وانتبه لتفسك!";
+"routing_disclaimer" = "عند إنشاء مسارات الطرق في تطبيق OMaps، يرجى أخذ التالي في الحسبان:\n\n  - المسارات المقترحة تعتبر مجرد اقتراحات فقط.\n - حالة الطريق وقوانينه والإشارات الموجودة فيه لها الأولولية أثناء تقديم نصائح الملاحة.\n - قد تكون الخريطة خاطئة أو قديمة، لذا فإنه يمكن ألا تُرسم المسارات بالشكل الأمثل.\n\n  كن آمنا على الطريق وانتبه لتفسك!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "انتهت صلاحيته";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "لم يتم العثور على مسار بين المنشأ والوُجْهَة المحددة. الرجاء تحديد نقطة بداية أو نهاية مختلفة.";
 
 /* InternalError */
-"routing_failed_internal_error" = "حدث خطأ داخلي. يرجى محاولة حذف الخريطة وإعادة تنزيلها مرة أخرى. إذا استمرت المشكلة يرجى الاتصال بنا على support@maps.me.";
+"routing_failed_internal_error" = "حدث خطأ داخلي. يرجى محاولة حذف الخريطة وإعادة تنزيلها مرة أخرى. إذا استمرت المشكلة يرجى الاتصال بنا على support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "تنزيل الخريطة + تحديد المسار";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "لقد قمت بتقييم تطبيقك للتو";
 
 /* Text for rating dialog */
-"rating_user_since" = "أنا مستخدم لتطبيق MAPS.ME منذ %@";
+"rating_user_since" = "أنا مستخدم لتطبيق OMaps منذ %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "هل تطبيق MAPS.ME يعجبك؟";
+"rating_do_like_maps" = "هل تطبيق OMaps يعجبك؟";
 
 /* Text for rating dialog */
 "rating_tap_star" = "انقر على النجمة لتقييم التطبيق.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Scarica la mappa";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Scarica la mappa aggiornata e i dati del percorso per ottenere tutte le funzionalità MAPS.ME.";
+"routing_download_map_and_routing" = "Scarica la mappa aggiornata e i dati del percorso per ottenere tutte le funzionalità OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Ottieni i dati del percorso";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "يعجبك التطبيق؟";
 
-"rate_alert_default_message" = "شكرا لاستخدامك MAPS.ME. من فضلك، أَعْطِ تقييمك للتطبيق. ملاحظاتك تساعدنا على أن نصبح أفضل.";
+"rate_alert_default_message" = "شكرا لاستخدامك OMaps. من فضلك، أَعْطِ تقييمك للتطبيق. ملاحظاتك تساعدنا على أن نصبح أفضل.";
 
 "rate_alert_five_star_message" = "مرحا! نحن أيضا نحبك!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "مكان متكرر";
 
-"first_launch_congrats_title" = "MAPS.ME جاهز للاستخدام";
+"first_launch_congrats_title" = "OMaps جاهز للاستخدام";
 
 "first_launch_congrats_text" = "ابحث وتصفح كل مكان في العالم بدون اتصال, مجانا.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "قم بإضافة أماكن جديدة للخريطة، وعدل أماكن حالية مباشرة من التطبيق.";
 
-"whatsnew_editor_message_2" = "*تستخدم MAPS.ME البيانات الخاصة بخريطة OpenStreetMap.";
+"whatsnew_editor_message_2" = "*تستخدم OMaps البيانات الخاصة بخريطة OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "لن تضل الطريق أبدا بعد الآن";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "خطط أفضل طرق السيارات والمشاة.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — وصول إلى الخرائط على مستوى العالم دون إنترنت";
+"onboarding_offline_maps_title" = "OMaps — وصول إلى الخرائط على مستوى العالم دون إنترنت";
 
 "onboarding_offline_maps_message" = "قم بتنزيل خرائط للمنطقة المطلوب مرة واحدة، واستخدم وظائف الملاحة والبحث دون الحاجة للاتصال بالإنترنت.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "لاستخدام الملاحة والميزات الأخرى، فنحن بحاجة إلى تحديد موقعك الجغرافي.";
 
-"onboarding_permissions_title" = "السماح لـ MAPS.ME بالوصول إلى ذاكرة التخزين والموقع";
+"onboarding_permissions_title" = "السماح لـ OMaps بالوصول إلى ذاكرة التخزين والموقع";
 
 "onboarding_permissions_message" = "من ثم يمكنك تنزيل الخرائط وعرض الأماكن وحركة المرور القريبة منك استخدام الملاحة.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "للتنزيل، فأنت تحتاج إلى توفير مساحة أكبر. من فضلك، احذف البيانات غير الضرورية.";
 
-"editor_sharing_title" = "لقد قمت بتحديث خرائط تطبيق MAPS.ME";
+"editor_sharing_title" = "لقد قمت بتحديث خرائط تطبيق OMaps";
 
 "editor_comment_will_be_sent" = "سوف نرسل تعليقك إلى فريق رسم الخرائط.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "تعليق مفصل";
 
-"editor_detailed_description" = "سيتم إرسال التغييرات التي اقترحتها إلى مجتمع OpenStreetMap. اذكر التفاصيل التي لا يمكن تحريرها في MAPS.ME";
+"editor_detailed_description" = "سيتم إرسال التغييرات التي اقترحتها إلى مجتمع OpenStreetMap. اذكر التفاصيل التي لا يمكن تحريرها في OMaps";
 
 "editor_more_about_osm" = "المزيد عن OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "لقد قمنا بتحديث محرر الخريطة";
 
-"whatsnew_update_editor_message" = "قام مستخدمو MAPS.ME بإجراء 200000 تغيير على الخرائط. معًا سنحصل على الخرائط الأكثر تفصيلاً في العالم. انضم إلينا!";
+"whatsnew_update_editor_message" = "قام مستخدمو OMaps بإجراء 200000 تغيير على الخرائط. معًا سنحصل على الخرائط الأكثر تفصيلاً في العالم. انضم إلينا!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "لاستخدام مُحَرّر الخريطة، يرجى تحديث جميع الخرائط.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "استمرار";
 
-"recent_track_background_dialog_message" = "يستخدم MAPS.ME موقعك الجغرافي في الخلفية لتسجيل مسار سفرك الأخير.";
+"recent_track_background_dialog_message" = "يستخدم OMaps موقعك الجغرافي في الخلفية لتسجيل مسار سفرك الأخير.";
 
 "whatsnew_car_navigation_header" = "ملاحة المركبات سهلة الاستخدام";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "التوجيه الملاحي مع الدراجات (إصدار تجريبي)";
 
-"whatsnew_cycle_navigation_message" = "نختبر الآن التوجيه الملاحي مع الدراجات للموسم الجديد. جرب طريق الدراجات المفضل لديك باستخدام MAPS.ME، واطلعنا على رأيك.";
+"whatsnew_cycle_navigation_message" = "نختبر الآن التوجيه الملاحي مع الدراجات للموسم الجديد. جرب طريق الدراجات المفضل لديك باستخدام OMaps، واطلعنا على رأيك.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "تصنيف على Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "أخبر صديق";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "مرحبًا! تثبيت MAPS.ME!";
+"tell_friends_text" = "مرحبًا! تثبيت OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME هو تطبيق أساسي للسفر بدون اتصال بالإنترنت. يعتمد برنامج MAPS.ME على بيانات OpenStreetMap ويتيح تحريرها.";
+"about_description" = "OMaps هو تطبيق أساسي للسفر بدون اتصال بالإنترنت. يعتمد برنامج OMaps على بيانات OpenStreetMap ويتيح تحريرها.";
 
 /* Text in menu */
 "blog" = "المدونة";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "فتح";
 
-"whatsnew_uber_header" = "MAPS.ME وUber";
+"whatsnew_uber_header" = "OMaps وUber";
 
 "whatsnew_uber_message" = "اطلب تاكسي Uber مباشرة من التطبيق!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "زيادة حجم الخط على الخريطة";
 
-"traffic_update_app" = "الرجاء تحديث MAPS.ME";
+"traffic_update_app" = "الرجاء تحديث OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "لعرض البيانات المرورية، يجب تحديث التطبيق.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "منح حق الوصول";
 
-"onboarding_storage_permissions_message" = "قم بتغيير إعدادات الأذونات في جهازك. يلزم الوصول إلى ذاكرة التخزين لاستخدام MAPS.ME.";
+"onboarding_storage_permissions_message" = "قم بتغيير إعدادات الأذونات في جهازك. يلزم الوصول إلى ذاكرة التخزين لاستخدام OMaps.";
 
 "button_exit" = "خروج";
 
-"onboarding_detail_permissions_title" = "MAPS.ME يحتاج إلى الوصول إلى";
+"onboarding_detail_permissions_title" = "OMaps يحتاج إلى الوصول إلى";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "ذاكرة التخزين";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "مشكلة الوصول للتخزين";
 
-"dialog_error_storage_message" = "التخزين الخارجي غير متوفر، ربما تمت إزالة بطاقة SD، أو أنها تالفة أو ملف النظام للقراءة فقط. افحصه واتصل بنا على support@maps.me";
+"dialog_error_storage_message" = "التخزين الخارجي غير متوفر، ربما تمت إزالة بطاقة SD، أو أنها تالفة أو ملف النظام للقراءة فقط. افحصه واتصل بنا على support@omaps.app";
 
 "setting_emulate_bad_storage" = "محاكاة التخزين السيء";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "أوافق على <a href=\"%s\">شروط الاستخدام</a>";
 
-"sign_agree_news_gdpr" = "أوافق على تلقي آخر الأخبار حول منتجات MAPS.ME";
+"sign_agree_news_gdpr" = "أوافق على تلقي آخر الأخبار حول منتجات OMaps";
 
 "whats_new_localbiz_title" = "تستحق الأعمال الصغيرة العناية";
 
-"whats_new_localbiz_message" = "ومن المقاهي المحلية والفنادق المريحة والمحلات التجارية التي من خلالها لم ننسى رحلاتنا. سنقوم بتحسين صفحتك في MAPS.ME لنجعلها ذات تميز.";
+"whats_new_localbiz_message" = "ومن المقاهي المحلية والفنادق المريحة والمحلات التجارية التي من خلالها لم ننسى رحلاتنا. سنقوم بتحسين صفحتك في OMaps لنجعلها ذات تميز.";
 
 "whats_new_order_button" = "اترك طلب";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "تحميل أماكن جديدة";
 
-"cached_bookmarks_placeholder_subtitle" = "اضغط على الزر لتحميل الآلاف من الأماكن المثيرة للاهتمام والطرق التي تم إنشاؤها من قبل لمستخدمين MAPS.ME. سوف تحتاج إلى اتصال بالإنترنت.";
+"cached_bookmarks_placeholder_subtitle" = "اضغط على الزر لتحميل الآلاف من الأماكن المثيرة للاهتمام والطرق التي تم إنشاؤها من قبل لمستخدمين OMaps. سوف تحتاج إلى اتصال بالإنترنت.";
 
 "downloader_download_routers" = "تحميل الإشارات";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "تقرير الحادث";
 
-"opt_out_fabric_description" = "قد نستخدم بياناتك لتحسين تجربة MAPS.ME. سوف تكون التغييرات نافذة المفعول بعد إعادة تشغيل التطبيق.";
+"opt_out_fabric_description" = "قد نستخدم بياناتك لتحسين تجربة OMaps. سوف تكون التغييرات نافذة المفعول بعد إعادة تشغيل التطبيق.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "لم يتم تنزيل الإشارات";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME لديها الآن كتاب الطريق";
+"whats_new_bookmarks_catalog_title" = "OMaps لديها الآن كتاب الطريق";
 
 "whats_new_bookmarks_catalog_message" = "تحدد المئات من الطرق التفصيلية في جميع أنحاء العالم: إلى أين نذهب و ماذا نرى و مكان لتناول الطعام.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "ازالة الاعلانات";
 
-"remove_ads_title" = "إزالة جميع الإعلانات ودعم MAPS.ME";
+"remove_ads_title" = "إزالة جميع الإعلانات ودعم OMaps";
 
 "paybtn_title" = "دفع%s/ سنة";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "مزيد من الخيارات";
 
-"why_support" = "لماذا تدعم MAPS.ME؟";
+"why_support" = "لماذا تدعم OMaps؟";
 
 "options_dropdown_item1" = "%s/الشهر (حفظ%s/سنة)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "سنقوم بإزالة جميع الإعلانات لك";
 
-"why_support_item2" = "أنت تساعدنا على تحسين MAPS.ME";
+"why_support_item2" = "أنت تساعدنا على تحسين OMaps";
 
 "why_support_item3" = "يمكنك مساعدتنا في تحسين خرائط مفتوحة OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "الخدمة غير متوفرة";
 
-"server_unavailable_message" = "سيتم الانتهاء من الشراء في وقت لاحق. إذا استمر الخطأ ، يرجى الاتصال بـ support@maps.me.";
+"server_unavailable_message" = "سيتم الانتهاء من الشراء في وقت لاحق. إذا استمر الخطأ ، يرجى الاتصال بـ support@omaps.app.";
 
 "offline_fiters_check_in" = "اتصل بالإنترنت لتصفية الفنادق حسب التواريخ.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "سيتم تحميل هذا الدليل إلى كتالوج MAPS.ME العام وسيكون متاحًا للمستخدمين الآخرين";
+"upload_and_publish_desc" = "سيتم تحميل هذا الدليل إلى كتالوج OMaps العام وسيكون متاحًا للمستخدمين الآخرين";
 
 "upload_and_publish" = "تحميل ونشر";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "مساعدة المسافرين من خلال ترك رأي!";
 
-"share_bookmarks_email_body_link" = "مرحبًا!\n\nللوصول إلى التطبيق: http://maps.me/get?kmzهذا هو الرابط الذي يمكنك من خلاله تنزيل إشاراتك المرجعية: %s. افتح القائمة عبر MAPS.ME واستمتع برحلتك!\n\n";
+"share_bookmarks_email_body_link" = "مرحبًا!\n\nللوصول إلى التطبيق: http://omaps.app/get?kmzهذا هو الرابط الذي يمكنك من خلاله تنزيل إشاراتك المرجعية: %s. افتح القائمة عبر OMaps واستمتع برحلتك!\n\n";
 
 "warning_speedcams_title" = "سوف يحذرك المستكشف من الكاميرات عندما تتجاوز الحد الأقصى للسرعة %d كم / س";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "من السهل مشاركة انطباعاتك";
 
-"whats_new_ugc_routes_subtitle" = "يمكنك حفظ الأماكن التي لا تنسى وإنشاء مسارات باستخدام الإشارات المرجعية ومشاركتها مع الجميع في كتالوج MAPS.ME";
+"whats_new_ugc_routes_subtitle" = "يمكنك حفظ الأماكن التي لا تنسى وإنشاء مسارات باستخدام الإشارات المرجعية ومشاركتها مع الجميع في كتالوج OMaps";
 
 "whats_new_webeditor_title" = "حوّل مساراتك إلى قصص";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "يجب أن يكون هناك 3 معلمات على الأقل لرفع دليلك إلى الدليل العام";
 
-"bookmark_public_upload_alert_title" = "أنت على بعد خطوات قليلة لمشاركة معلماتك مع جميع مسافري MAPS.ME!";
+"bookmark_public_upload_alert_title" = "أنت على بعد خطوات قليلة لمشاركة معلماتك مع جميع مسافري OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "يرجي التأكد من وجود اسم ووصف محدد لقائمتك، و جميع المعلمات تحتوي على بعض المعلومات عن الأماكن. بهذه الطريقة يمكن العثور على قائمتك و استخدامها بواسطة الآخرين.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "توفير الطاقة القصوى";
 
-"enable_logging_warning_message" = "يتحول الخيار إلى التسجيل لإغراض التشخيص. يمكن أن يكون مفيدًا لفريق الدعم الخاص بنا الذين يعملون على استكشاف أخطاء التطبيق وإصلاحها. قم بتفعيل هذا الخيار فقط في حالة طلب الدعم من MAPS.ME.";
+"enable_logging_warning_message" = "يتحول الخيار إلى التسجيل لإغراض التشخيص. يمكن أن يكون مفيدًا لفريق الدعم الخاص بنا الذين يعملون على استكشاف أخطاء التطبيق وإصلاحها. قم بتفعيل هذا الخيار فقط في حالة طلب الدعم من OMaps.";
 
 "html_error_upload_message_try_again" = "يرجى التحقق من إعدادات الشبكة الخاصة بك و حاول مرة أخرى";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "اسم المستخدم: %s.";
 
-"gdpr_request_window_message" = "يرجى نسخه وإرسال الطلب إلى support@maps.me";
+"gdpr_request_window_message" = "يرجى نسخه وإرسال الطلب إلى support@omaps.app";
 
 "gdpr_request_window_copy" = "انسخ اسم المستخدم";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "تجنب تقاطع العبارات";
 
-"cached_guides_placeholder_subtitle" = "توفر MAPS.ME دلائل جاهزة لإماكن مختارة مع الصور والوصف الذي يتم عرضه على الخريطة وهو متاح بدون اتصال بالانترنت.";
+"cached_guides_placeholder_subtitle" = "توفر OMaps دلائل جاهزة لإماكن مختارة مع الصور والوصف الذي يتم عرضه على الخريطة وهو متاح بدون اتصال بالانترنت.";
 
 "guides_catalogue_title" = "قائمة الدلائل";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "مطعم أوزبكي";
 
-"onboarding_welcome_title" = "خطط وسافر مع MAPS.ME";
+"onboarding_welcome_title" = "خطط وسافر مع OMaps";
 
 "onboarding_welcome_first_subtitle" = "ضع علامة مرجعية على الأماكن المثيرة للاهتمام، احجز الفنادق، احسب الطرق بدون اتصال بالانترنت";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "تحميل";
 
-"onboarding_bydeeplink_guide_title" = "دلائل جاهزة للاستخدام في MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "دلائل جاهزة للاستخدام في OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "أفضل الأماكن لزيارتها معروضة على الخريطة مع الصور والوصف. يعمل بدون اتصال بالانترنت.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "هل حجزت فندقًا؟";
 
-"popup_booking_download_guides_message" = "خطط لوجهتك باستخدام دلائل جاهزة من MAPS.ME";
+"popup_booking_download_guides_message" = "خطط لوجهتك باستخدام دلائل جاهزة من OMaps";
 
 "popup_mwm_download_guides_title" = "أدلة المدينة غير متصلة";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "الق نظرة";
 
-"gallery_pp_download_guides_offline_title" = "خطط لعطلتك مع MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "خطط لعطلتك مع OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "لا تفوت أي شىء مع دلائل تم اعدادها بواسطة خبراء السفر";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "سيتم خصم المبلغ من حساب iTunes الخاص بك عند تأكيد عملية الشراء. سيتم تجديد الاشتراك تلقائياً ما لم يتم إيقاف التجديد التلقائي قبل 24 ساعة على الأقل من نهاية الفترة الحالية. سيتم الخصم من حسابك وفقاً لخطة التجديد الخاصة بك وذلك خلال 24 ساعة قبل انتهاء الفترة الحالية. يمكنك إدارة أو إيقاف التجديد التلقائي عبر إعدادات حساب Apple ID الخاص بك في أي وقت عند الشراء.";
 
-"whatsnew_carplay_title" = "نظام ملاحة السيارات MAPS.ME في CarPlay!";
+"whatsnew_carplay_title" = "نظام ملاحة السيارات OMaps في CarPlay!";
 
 "whatsnew_carplay_message" = "خصائص تحديد علامات الأماكن، والبحث، وكاميرات السرعة والمسارات متاحة بدون اتصال بالانترنت";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "تحذير سريع";
 
-"download_map_carplay" = "يُرجى تحميل الخرائط في تطبيق MAPS.ME على جهازك";
+"download_map_carplay" = "يُرجى تحميل الخرائط في تطبيق OMaps على جهازك";
 
 "carplay_roundabout_exit" = "المخرج رقم %s";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "يا للروعة، لقد قمت بالاشتراك!";
 
-"popup_subscription_success_map_message" = "اكتشف الآن أفضل المعالم السياحية في كتالوج MAPS.ME";
+"popup_subscription_success_map_message" = "اكتشف الآن أفضل المعالم السياحية في كتالوج OMaps";
 
 "popup_subscription_success_map_start_button" = "ابدأ البحث";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "ابدأ الآن";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "كل ما تريده في صديق سفر واحد";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "افتح القائمة";
 
-"new_onboarding_step5.2_message" = "اشتراكك في قائمة دلائل MAPS.ME له قيمة كبيرة. يمكنك الوصول الكامل إلى أدلة المدينة والأنشطة الخارجية في جميع أنحاء العالم!";
+"new_onboarding_step5.2_message" = "اشتراكك في قائمة دلائل OMaps له قيمة كبيرة. يمكنك الوصول الكامل إلى أدلة المدينة والأنشطة الخارجية في جميع أنحاء العالم!";
 
 "new_onboarding_step5.2_button" = "تحقق من الشروط";
 
-"new_onboarding_step5.3_message" = "تحقق من عينات مجانية لمسارات جاهزة للمدن والمناطق الخارجية مع مجموعة مختارة مجانية من MAPS.ME!";
+"new_onboarding_step5.3_message" = "تحقق من عينات مجانية لمسارات جاهزة للمدن والمناطق الخارجية مع مجموعة مختارة مجانية من OMaps!";
 
 "new_onboarding_step5.3_button" = "تحميل مجاني";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "تتواجد الطرق من Outdooractive لرحلات الشتاء والصيف في القائمة!";
 
-"whatsnew_guides_galleries_title" = "خطط لرحلتك القادمة مع MAPS.ME";
+"whatsnew_guides_galleries_title" = "خطط لرحلتك القادمة مع OMaps";
 
 "whatsnew_guides_galleries_message" = "يمكنك الآن العثور على دلائل موصى بها في صفحات الأماكن للمدن والمعالم السياحية الشهيرة";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "تضاريس";
 
-"tips_map_layers_title_countour" = "الجديد في MAPS.ME: طبقة طبوغرافية بدون انترنت!";
+"tips_map_layers_title_countour" = "الجديد في OMaps: طبقة طبوغرافية بدون انترنت!";
 
 "tips_map_layers_message_countour" = "خطط و استمتع برحلاتك في الطبيعة و أنت متأكد من أنك تعرف كل شيء عن المنطقة";
 
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
index 9b2901995c..4f9807e067 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.stringsdict
@@ -135,4 +135,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 0cb98e1c9a..d354c4431b 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Získat nyní";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Děkujeme, že používáte MAPS.ME! Líbí se Vám tato aplikace? Řekněte o ní svým přátelům! To bude pro nás nejlepší vyjádření vděčnosti.";
+"share_on_facebook_text" = "Děkujeme, že používáte OMaps! Líbí se Vám tato aplikace? Řekněte o ní svým přátelům! To bude pro nás nejlepší vyjádření vděčnosti.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Zkusit znovu";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "O aplikaci MAPS.ME";
+"about_menu_title" = "O aplikaci OMaps";
 
 "downloading_touch_to_cancel" = "Stahování %d%%, klepněte pro zrušení";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD karta/USB uložiště s uloženými mapami není k dispozici";
 
-"disconnect_usb_cable" = "Prosím, odpojte USB kabel nebo vložte paměťovou kartu pro použití s MAPS.ME";
+"disconnect_usb_cable" = "Prosím, odpojte USB kabel nebo vložte paměťovou kartu pro použití s OMaps";
 
 "not_enough_free_space_on_sdcard" = "Prosím, uvolněte nejprve místo na SD kartě/USB uložišti";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Je k dispozici aktualizace pro tyto mapy:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Aplikaci MAPS.ME Lite už nyní nepotřebujete, takže si ji můžete klidně odinstalovat.";
+"suggest_uninstall_lite" = "Aplikaci OMaps Lite už nyní nepotřebujete, takže si ji můžete klidně odinstalovat.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "Úspěšně staženo: %@";
@@ -249,10 +249,10 @@
 "set" = "Skupina";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Zatím nemáte žádné záložky.\nZáložku můžete přidat přidržením libovolného místa na mapě.\nV MAPS.ME také umí importovat záložky z jiných zdrojů. Soubor ve formátu KML/KMZ s uloženými záložkami otevřete např. z emailu, Dropboxu nebo webového odkazu v MAPS.ME.";
+"bookmarks_usage_hint" = "Zatím nemáte žádné záložky.\nZáložku můžete přidat přidržením libovolného místa na mapě.\nV OMaps také umí importovat záložky z jiných zdrojů. Soubor ve formátu KML/KMZ s uloženými záložkami otevřete např. z emailu, Dropboxu nebo webového odkazu v OMaps.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "V MAPS.ME mohou být zobrazeny importované záložky z jiných zdrojů. Soubor ve formátu KML/KMZ s uloženými záložkami lze otevřít např. z emailu, Dropboxu nebo webového odkazu.";
+"bookmarks_usage_hint_import_only" = "V OMaps mohou být zobrazeny importované záložky z jiných zdrojů. Soubor ve formátu KML/KMZ s uloženými záložkami lze otevřít např. z emailu, Dropboxu nebo webového odkazu.";
 
 /* Settings button in system menu */
 "settings" = "Nastavení";
@@ -354,9 +354,9 @@
 "share_by_email" = "Sdílet emailem";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Sdílené záložky MAPS.ME";
+"share_bookmarks_email_subject" = "Sdílené záložky OMaps";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Nahrávání záložek";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "Právě probíhá stahování země.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Doufáme, že se vám používání MAPS.ME líbí! Je-li tomu tak, ohodnoťte, prosím, naši aplikaci nebo na ni napište recenzi v obchodu s aplikacemi. Nezabere to ani minutu, ale opravdu nám tím pomůžete. Děkujeme za vaši podporu!";
+"appStore_message" = "Doufáme, že se vám používání OMaps líbí! Je-li tomu tak, ohodnoťte, prosím, naši aplikaci nebo na ni napište recenzi v obchodu s aplikacemi. Nezabere to ani minutu, ale opravdu nám tím pomůžete. Děkujeme za vaši podporu!";
 
 /* No, thanks */
 "no_thanks" = "Ne, díky";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "Koukni kde jsem. Otevři odkaz: %1$@ nebo %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Koukni na moji značku na mapě v MAPS.ME";
+"bookmark_share_email_subject" = "Koukni na moji značku na mapě v OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Podívej se na mou aktuální polohu na mapě na MAPS.ME";
+"my_position_share_email_subject" = "Podívej se na mou aktuální polohu na mapě na OMaps";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Ahoj,\n\nPrávě jsem tady: %1$@. Klepni na jeden z těchto odkazů %2$@, %3$@ a uvidíš toto místo na mapě.\n\nDíky.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Stáhněte si mapu místa, kde právě jste";
 
 /* text of notification */
-"pro_version_is_free_today" = "Plná verze MAPS.ME je dnes zdarma! Stáhněte si ji nyní a dejte vědět přátelům.";
+"pro_version_is_free_today" = "Plná verze OMaps je dnes zdarma! Stáhněte si ji nyní a dejte vědět přátelům.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Právě přenášíme vaše stažené mapy z MAPS.ME Lite do MAPS.ME. Může to několik minut trvat.";
+"move_lite_maps_to_pro" = "Právě přenášíme vaše stažené mapy z OMaps Lite do OMaps. Může to několik minut trvat.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Vaše stažené mapy byly úspěšně přeneseny do MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Vaše stažené mapy byly úspěšně přeneseny do OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Vaše mapy se nepodařilo přenést. Prosím, odstraňte MAPS.ME Lite a stáhněte si mapy znovu.";
+"move_lite_maps_to_pro_failed" = "Vaše mapy se nepodařilo přenést. Prosím, odstraňte OMaps Lite a stáhněte si mapy znovu.";
 
 /* Text in menu */
 "settings_and_more" = "Nastavení a další";
@@ -600,7 +600,7 @@
 "website" = "Webové stránky";
 
 /* Text in menu */
-"maps_me_community" = "Komunita MAPS.ME";
+"maps_me_community" = "Komunita OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Lajknout na Facebooku";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Nahlásit chybu";
 
 /* Email subject */
-"subscribe_me_subject" = "Přihlaste mě, prosím, k odběru zpravodaje MAPS.ME";
+"subscribe_me_subject" = "Přihlaste mě, prosím, k odběru zpravodaje OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Chci se vždy jako první dozvídat o nejnovějších zprávách, aktualizacích a akčních nabídkách. Své přihlášení k odběru mohu kdykoli zrušit.";
 
 /* About text */
-"about_text" = "MAPS.ME nabízí nejrychlejší offline mapy všech měst a zemí po celém světě. Cestujte s naprostou důvěrou: kdekoliv jste, MAPS.ME vám pomůže se najít na mapě, vyhledat nejbližší restauraci, hotel, banku, benzínovou pumpu atd. Nevyžaduje připojení k Internetu.\n\nNeustále pracujeme na nových funkcích a rádi bychom slyšeli také váš názor, jak můžeme MAPS.ME vylepšit. Pokud máte s touto aplikací jakékoliv problémy, pak nás neváhejte kontaktovat na support@maps.me. Odpovídáme na každý požadavek!\n\nLíbí se vám MAPS.ME a chcete nás podpořit? Existuje několik snadných způsobů zcela zdarma:\n\n• napište recenzi ve svém obchodu s aplikacemi\n• označte naši facebookovou stránku http://www.facebook.com/mapswithme pomocí To se mi líbí\n• nebo jen řekněte o MAPS.ME své mámě, kamarádům a kolegům :)\n\nDěkujeme, že jste s námi. Velmi si ceníme vaší podpory!\n\nP.S. Mapové podklady získáváme z OpenStreetMap, což je mapový projekt podobný Wikipedii, který umožňuje uživatelům vytvářet a upravovat mapy. Pokud zjistíte, že na mapě něco chybí nebo je špatně, pak můžete mapy opravit přímo na https://www.openstreetmap.org, a vaše změny se objeví v příští verzi MAPS.ME. Díky!";
+"about_text" = "OMaps nabízí nejrychlejší offline mapy všech měst a zemí po celém světě. Cestujte s naprostou důvěrou: kdekoliv jste, OMaps vám pomůže se najít na mapě, vyhledat nejbližší restauraci, hotel, banku, benzínovou pumpu atd. Nevyžaduje připojení k Internetu.\n\nNeustále pracujeme na nových funkcích a rádi bychom slyšeli také váš názor, jak můžeme OMaps vylepšit. Pokud máte s touto aplikací jakékoliv problémy, pak nás neváhejte kontaktovat na support@omaps.app. Odpovídáme na každý požadavek!\n\nLíbí se vám OMaps a chcete nás podpořit? Existuje několik snadných způsobů zcela zdarma:\n\n• napište recenzi ve svém obchodu s aplikacemi\n• označte naši facebookovou stránku http://www.facebook.com/mapswithme pomocí To se mi líbí\n• nebo jen řekněte o OMaps své mámě, kamarádům a kolegům :)\n\nDěkujeme, že jste s námi. Velmi si ceníme vaší podpory!\n\nP.S. Mapové podklady získáváme z OpenStreetMap, což je mapový projekt podobný Wikipedii, který umožňuje uživatelům vytvářet a upravovat mapy. Pokud zjistíte, že na mapě něco chybí nebo je špatně, pak můžete mapy opravit přímo na https://www.openstreetmap.org, a vaše změny se objeví v příští verzi OMaps. Díky!";
 
 /* Alert text */
 "email_error_body" = "Emailový klient nebyl ještě nakonfigurován. Nastavte ho, prosím, nebo použijte jiný způsob k našemu kontaktování na %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Pro funkci vytváření tras je nutné aktualizovat mapu.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Nová verze MAPS.ME umožňuje vytvářet trasy z vaší aktuální polohy do cílového bodu. Chcete-li tuto funkci používat, aktualizujte mapy.";
+"routing_update_maps" = "Nová verze OMaps umožňuje vytvářet trasy z vaší aktuální polohy do cílového bodu. Chcete-li tuto funkci používat, aktualizujte mapy.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Aktualizovat vše";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Nalezeno";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Při vytváření tras v aplikaci MAPS.ME mějte, prosím, na paměti následující:\n\n • Navrhované trasy lze brát jen jako doporučení.\n • Pravidla silničního provozu, aktuální podmínky na silnici a dopravní značení mají přednost před údaji z navigace.\n • Mapa může být nepřesná nebo zastaralá a navržené cesty nemusí být ideální.\n\nCestujte bezpečně a ohleduplně. Šťastnou cestu!";
+"routing_disclaimer" = "Při vytváření tras v aplikaci OMaps mějte, prosím, na paměti následující:\n\n • Navrhované trasy lze brát jen jako doporučení.\n • Pravidla silničního provozu, aktuální podmínky na silnici a dopravní značení mají přednost před údaji z navigace.\n • Mapa může být nepřesná nebo zastaralá a navržené cesty nemusí být ideální.\n\nCestujte bezpečně a ohleduplně. Šťastnou cestu!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Zastaralé";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Mezi zvoleným počátkem a cílem nebyla nalezena žádná trasa. Vyberte jiný počáteční nebo koncový bod.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Došlo k vnitřní chybě. Zkuste, prosím, mapu smazat a znovu stáhnout. Jestliže problém přetrvává, kontaktujte nás na support@maps.me.";
+"routing_failed_internal_error" = "Došlo k vnitřní chybě. Zkuste, prosím, mapu smazat a znovu stáhnout. Jestliže problém přetrvává, kontaktujte nás na support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Stáhnout mapu + trasy";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Právě jsem ohodnotil(a) vaši aplikaci";
 
 /* Text for rating dialog */
-"rating_user_since" = "Uživatelem MAPS.ME jsem od roku %@";
+"rating_user_since" = "Uživatelem OMaps jsem od roku %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Líbí se vám aplikace MAPS.ME?";
+"rating_do_like_maps" = "Líbí se vám aplikace OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Klepnutím na hvězdičku naši aplikaci ohodnotíte.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Získejte mapu";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Stáhněte si aktualizovanou mapu a data tras, ať můžete využít všechny funkce MAPS.ME.";
+"routing_download_map_and_routing" = "Stáhněte si aktualizovanou mapu a data tras, ať můžete využít všechny funkce OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Získejte data tras";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Líbí se vám aplikace?";
 
-"rate_alert_default_message" = "Děkujeme, že používáte MAPS.ME. Ohodnoťte, prosím, tuto aplikaci. Váš komentář nám pomůže ji ještě zlepšit.";
+"rate_alert_default_message" = "Děkujeme, že používáte OMaps. Ohodnoťte, prosím, tuto aplikaci. Váš komentář nám pomůže ji ještě zlepšit.";
 
 "rate_alert_five_star_message" = "Hurá! Také vás zbožňujeme!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplicitní místo";
 
-"first_launch_congrats_title" = "MAPS.ME jsou připraveny k použití";
+"first_launch_congrats_title" = "OMaps jsou připraveny k použití";
 
 "first_launch_congrats_text" = "Prohledávejte a navigujte offline zdarma kdekoliv na světě.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Přidejte na mapu nová místa a upravte existující místa přímo z aplikace.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME používá komunitní data OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps používá komunitní data OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Již nikdy nezabloudíte";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Naplánujte si optimální trasy pro auto nebo pěší chůzi.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — přistupte k celosvětovým mapám bez internetu";
+"onboarding_offline_maps_title" = "OMaps — přistupte k celosvětovým mapám bez internetu";
 
 "onboarding_offline_maps_message" = "Stáhněte si jednou mapy požadované oblasti a poté používejte navigaci a vyhledávací funkce bez připojení k internetu.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Chcete-li používat navigaci a další funkce, pak potřebujeme přístup k vaší zeměpisné poloze.";
 
-"onboarding_permissions_title" = "Povolte MAPS.ME přístup k úložišti a určení polohy";
+"onboarding_permissions_title" = "Povolte OMaps přístup k úložišti a určení polohy";
 
 "onboarding_permissions_message" = "Tím umožníte stahování map, zobrazovat místa a dopravu ve vaší blízkosti a používat navigaci.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Ke stažení potřebujete více volného místa. Odstraňte prosím nepotřebná data.";
 
-"editor_sharing_title" = "Vylepšil jsem mapy MAPS.ME";
+"editor_sharing_title" = "Vylepšil jsem mapy OMaps";
 
 "editor_comment_will_be_sent" = "Váš komentář pošleme kartografům.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Podrobný komentář";
 
-"editor_detailed_description" = "Vámi navržené změny odešleme do komunity OpenStreetMap. Popište podrobnosti, které nelze upravit v MAPS.ME.";
+"editor_detailed_description" = "Vámi navržené změny odešleme do komunity OpenStreetMap. Popište podrobnosti, které nelze upravit v OMaps.";
 
 "editor_more_about_osm" = "Více o projektu OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Aktualizovali jsme editor map";
 
-"whatsnew_update_editor_message" = "Uživatelé aplikace MAPS.ME už provedli na 200 000 změn map. Přidejte se k nám a pomozte nám vytvořit nejpodrobnější mapy světa!";
+"whatsnew_update_editor_message" = "Uživatelé aplikace OMaps už provedli na 200 000 změn map. Přidejte se k nám a pomozte nám vytvořit nejpodrobnější mapy světa!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Chcete-li používat editor map, pak prosím aktualizujte všechny mapy.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Pokračovat";
 
-"recent_track_background_dialog_message" = "MAPS.ME používají geopozici na pozadí, aby se zaznamenala vaše nedávno ujetá trasa.";
+"recent_track_background_dialog_message" = "OMaps používají geopozici na pozadí, aby se zaznamenala vaše nedávno ujetá trasa.";
 
 "whatsnew_car_navigation_header" = "Uživatelsky přívětivá navigace pro vozidla";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navigace pro kola (beta verze)";
 
-"whatsnew_cycle_navigation_message" = "Tuto sezónu testujeme novou navigaci pro kola. Projeďte si svou oblíbenou trasu s MAPS.ME a podělte se s námi o svůj názor.";
+"whatsnew_cycle_navigation_message" = "Tuto sezónu testujeme novou navigaci pro kola. Projeďte si svou oblíbenou trasu s OMaps a podělte se s námi o svůj názor.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Ohodnotit na Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Sdílet s přáteli";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Ahoj! Naisntalujte si MAPS.ME!";
+"tell_friends_text" = "Ahoj! Naisntalujte si OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME je základní aplikace pro každého cestovatele. MAPS.ME je založena na datech z OpenStreetMap a umožňuje je upravovat.";
+"about_description" = "OMaps je základní aplikace pro každého cestovatele. OMaps je založena na datech z OpenStreetMap a umožňuje je upravovat.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Otevřít";
 
-"whatsnew_uber_header" = "MAPS.ME a Uber";
+"whatsnew_uber_header" = "OMaps a Uber";
 
 "whatsnew_uber_message" = "Objednejte si taxi Uber přímo z aplikace!";
 
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Povolit přístup";
 
-"onboarding_storage_permissions_message" = "Změňte nastavení oprávnění ve vašem zařízení. MAPS.ME vyžaduje přístup k úložišti.";
+"onboarding_storage_permissions_message" = "Změňte nastavení oprávnění ve vašem zařízení. OMaps vyžaduje přístup k úložišti.";
 
 "button_exit" = "Ukončit";
 
-"onboarding_detail_permissions_title" = "MAPS.ME vyžaduje přístup k";
+"onboarding_detail_permissions_title" = "OMaps vyžaduje přístup k";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Úložišti";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problém s přístupem k úložišti";
 
-"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@maps.me";
+"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@omaps.app";
 
 "setting_emulate_bad_storage" = "Emulovat špatné úložiště";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Souhlasím s <a href=\"%s\">Smluvními podmínkami</a>";
 
-"sign_agree_news_gdpr" = "Souhlasím s tím, že obdržím nejnovější zprávy o produktech MAPS.ME";
+"sign_agree_news_gdpr" = "Souhlasím s tím, že obdržím nejnovější zprávy o produktech OMaps";
 
 "whats_new_localbiz_title" = "Drobné podnikání si zaslouží pozornost";
 
-"whats_new_localbiz_message" = "Zejména místní kavárny, hostely a obchůdky dělají cestování nezapomenutelným. V MAPS.ME zdarma optimalizujeme stránky vašeho podnikání tak, aby neuniklo pozornosti.";
+"whats_new_localbiz_message" = "Zejména místní kavárny, hostely a obchůdky dělají cestování nezapomenutelným. V OMaps zdarma optimalizujeme stránky vašeho podnikání tak, aby neuniklo pozornosti.";
 
 "whats_new_order_button" = "Zanechat objednávku";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Nahrajte nová místa";
 
-"cached_bookmarks_placeholder_subtitle" = "Klikněte pro nahrání tisíce zajímavých míst a tras vytvořených uživateli MAPS.ME. Nutné připojení k internetu.";
+"cached_bookmarks_placeholder_subtitle" = "Klikněte pro nahrání tisíce zajímavých míst a tras vytvořených uživateli OMaps. Nutné připojení k internetu.";
 
 "downloader_download_routers" = "Nahrát značky";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Zprávy o chybách";
 
-"opt_out_fabric_description" = "Můžeme používat vaše údaje pro vývoj a zlepšení MAPS.ME. Změny se projeví po restartování aplikace.";
+"opt_out_fabric_description" = "Můžeme používat vaše údaje pro vývoj a zlepšení OMaps. Změny se projeví po restartování aplikace.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Značky se nenahrály";
 
-"whats_new_bookmarks_catalog_title" = "V MAPS.ME se objevil katalog tras";
+"whats_new_bookmarks_catalog_title" = "V OMaps se objevil katalog tras";
 
 "whats_new_bookmarks_catalog_message" = "Desítky podrobných tras po celém světě: kam zajít, na co se podívat, kde se najíst.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Vypnout reklamu";
 
-"remove_ads_title" = "Vypněte veškeré reklamy a podpořte MAPS.ME";
+"remove_ads_title" = "Vypněte veškeré reklamy a podpořte OMaps";
 
 "paybtn_title" = "Zaplatit %s/ročně";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Jiné varianty";
 
-"why_support" = "Proč podporovat MAPS.ME?";
+"why_support" = "Proč podporovat OMaps?";
 
 "options_dropdown_item1" = "%s/měsíčně (ušetříte %s/ročně)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Vypneme vám veškerou reklamu";
 
-"why_support_item2" = "Pomáháte nám zlepšovat MAPS.ME";
+"why_support_item2" = "Pomáháte nám zlepšovat OMaps";
 
 "why_support_item3" = "Pomáháte nám zlepšovat mapy OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Sever je nedostupný";
 
-"server_unavailable_message" = "Nákup bude dokončen později. Pokud se bude chyba opakovat, kontaktujte nás na support@maps.me.";
+"server_unavailable_message" = "Nákup bude dokončen později. Pokud se bude chyba opakovat, kontaktujte nás na support@omaps.app.";
 
 "offline_fiters_check_in" = "Připojte se k internetu, abyste si vybrali datum příjezdu a odjezdu.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Tento průvodce bude přidán do veřejného katalogu MAPS.ME a bude přístupný ostatním uživatelům";
+"upload_and_publish_desc" = "Tento průvodce bude přidán do veřejného katalogu OMaps a bude přístupný ostatním uživatelům";
 
 "upload_and_publish" = "Načíst a zveřejnit";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Okomentujte místo a pomozte cestovatelům!";
 
-"share_bookmarks_email_body_link" = "Dobrý den!\n\nVaše značky můžete stáhnout zde: %s. Otevírejte seznam s pomocí MAPS.ME a užívejte si cesty!\n\nStáhnout aplikaci: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Dobrý den!\n\nVaše značky můžete stáhnout zde: %s. Otevírejte seznam s pomocí OMaps a užívejte si cesty!\n\nStáhnout aplikaci: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigátor vás při překročení rychlosti o %d km/h upozorní na všechny radary";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Sdílet své dojmy je jednoduché";
 
-"whats_new_ugc_routes_subtitle" = "Uložte si nezapomenutelná místa, vytvořte trasy pomocí záložek a sdílejte je se všemi v katalogu MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Uložte si nezapomenutelná místa, vytvořte trasy pomocí záložek a sdílejte je se všemi v katalogu OMaps.";
 
 "whats_new_webeditor_title" = "Proměňte své trasy v příběhy";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Vaše trasa musí mít nejméně než 3 značky, abyste mohli uložit ho do veřejného katalogu";
 
-"bookmark_public_upload_alert_title" = "Vám je nutné udělat jen pár kroků, abyste mohli uložit vaši trasu do katalogu MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Vám je nutné udělat jen pár kroků, abyste mohli uložit vaši trasu do katalogu OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Přesvědčte se, že trasa má nazvu a popis, a všichni značky obsahují informaci o místech. Díky tomu, uživatelé najdou trasu a budou mít možnost ji použít na zájezdu.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximální šetření energií";
 
-"enable_logging_warning_message" = "Daná možnost se zapojuje pro protokolování činností za účelem diagnostiky. To pomáhá týmu odhalit problémy s přílohou. Zapojujte možnost jenom na požádání podržení MAPS.ME.";
+"enable_logging_warning_message" = "Daná možnost se zapojuje pro protokolování činností za účelem diagnostiky. To pomáhá týmu odhalit problémy s přílohou. Zapojujte možnost jenom na požádání podržení OMaps.";
 
 "html_error_upload_message_try_again" = "Zkontrolujte přístup k síti a zopakujte pokus";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Váš ID: %s.";
 
-"gdpr_request_window_message" = "Prosím, zkopírujte ho a odešlete požadavek do support@maps.me";
+"gdpr_request_window_message" = "Prosím, zkopírujte ho a odešlete požadavek do support@omaps.app";
 
 "gdpr_request_window_copy" = "Zkopírovat ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Vyhnout se přejezdům trajektů";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME nabízí hotové průvodce pro vybraná místa s fotografiemi a popisy, které jsou zobrazeny na mapě a jsou k dispozici offline.";
+"cached_guides_placeholder_subtitle" = "OMaps nabízí hotové průvodce pro vybraná místa s fotografiemi a popisy, které jsou zobrazeny na mapě a jsou k dispozici offline.";
 
 "guides_catalogue_title" = "Katalog průvodců";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Uzbecká kuchyně";
 
-"onboarding_welcome_title" = "Plánujte a cestujte s MAPS.ME";
+"onboarding_welcome_title" = "Plánujte a cestujte s OMaps";
 
 "onboarding_welcome_first_subtitle" = "Přidejte si do záložek zajímavá místa, rezervujte hotely, vypočítejte si trasy offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Stáhnout";
 
-"onboarding_bydeeplink_guide_title" = "Předem připravení průvodci v MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Předem připravení průvodci v OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Nejlepší místa k navštívení zobrazená na mapě s fotografiemi a popisy. Pracujte offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Zamluvili jste si hotel?";
 
-"popup_booking_download_guides_message" = "Naplánujte si trasu pomocí ready-made průvodců z MAPS.ME";
+"popup_booking_download_guides_message" = "Naplánujte si trasu pomocí ready-made průvodců z OMaps";
 
 "popup_mwm_download_guides_title" = "Offline průvodci";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Podívejte se";
 
-"gallery_pp_download_guides_offline_title" = "Plánujte svou dovolenou s MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Plánujte svou dovolenou s OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Nenechte si ujít nic s průvodci od zkušených cestovatelů";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Platba bude automaticky zaúčtována na váš účet iTunes v době potvrzení nákupu. Předplatné se automaticky obnoví, pokud automatické obnovení nevypnete nejméně 24 hodin před koncem aktuálního období. Váš účet bude zpoplatněn podle plánu období během 24 hodin před koncem aktuálního období. Automatické obnovení můžete vypnout nebo spravovat kdykoliv v nastavení účtu Apple ID.";
 
-"whatsnew_carplay_title" = "Auto navigace MAPS.ME v CarPlay!";
+"whatsnew_carplay_title" = "Auto navigace OMaps v CarPlay!";
 
 "whatsnew_carplay_message" = "Záložky, vyhledávání, rychlostní kamery a možnosti řízení jsou dostupné v režimu offline";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Rych. varování";
 
-"download_map_carplay" = "Stáhněte si prosím mapy do aplikace MAPS.ME ve vašem zařízení";
+"download_map_carplay" = "Stáhněte si prosím mapy do aplikace OMaps ve vašem zařízení";
 
 "carplay_roundabout_exit" = "%s výjezd";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Woohoo, máte přeplaceno!";
 
-"popup_subscription_success_map_message" = "Objevte nyní ty nejlepší turistické atrakce v katalogu MAPS.ME";
+"popup_subscription_success_map_message" = "Objevte nyní ty nejlepší turistické atrakce v katalogu OMaps";
 
 "popup_subscription_success_map_start_button" = "Začít s prohlížením";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Začínáme";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Všestranný parťák na cesty";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Otevřete katalog";
 
-"new_onboarding_step5.2_message" = "Vaše předplatné do katalogu průvodců MAPS.ME má mimořádnou hodnotu. Získejte plný přístup k městským a outdoorovým průvodcům po celém světě!";
+"new_onboarding_step5.2_message" = "Vaše předplatné do katalogu průvodců OMaps má mimořádnou hodnotu. Získejte plný přístup k městským a outdoorovým průvodcům po celém světě!";
 
 "new_onboarding_step5.2_button" = "Zkontrolujte termíny";
 
-"new_onboarding_step5.3_message" = "Vyzkoušejte zdarma vzorky hotových městských a venkovních tras s bezplatným výběrem MAPS.ME!";
+"new_onboarding_step5.3_message" = "Vyzkoušejte zdarma vzorky hotových městských a venkovních tras s bezplatným výběrem OMaps!";
 
 "new_onboarding_step5.3_button" = "Stáhněte si zdarma";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "V katalogu čekají trasy od Outdooractive pro zimní a letní cesty!";
 
-"whatsnew_guides_galleries_title" = "Plánujte váš nadcházející výlet s MAPS.ME";
+"whatsnew_guides_galleries_title" = "Plánujte váš nadcházející výlet s OMaps";
 
 "whatsnew_guides_galleries_message" = "Nyní najdete doporučené průvodce na místě na stránkách oblíbených turistických měst a památek";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terén";
 
-"tips_map_layers_title_countour" = "Novinka v MAPS.ME: offline topografická vrstva!";
+"tips_map_layers_title_countour" = "Novinka v OMaps: offline topografická vrstva!";
 
 "tips_map_layers_message_countour" = "Naplánujte si a užijte si své výlety do přírody s jistotou, že víte vše o této oblasti";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict
index 5016fa27fb..1c6f0abd78 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.stringsdict
@@ -139,4 +139,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 20b8cd72dc..8216ea7640 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Få det nu";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Tak for at du bruger MAPS.ME! Kan du lide appen? Fortæl dine venner om den! Det vil vi være så glade for.";
+"share_on_facebook_text" = "Tak for at du bruger OMaps! Kan du lide appen? Fortæl dine venner om den! Det vil vi være så glade for.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Prøv igen";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Om MAPS.ME";
+"about_menu_title" = "Om OMaps";
 
 "downloading_touch_to_cancel" = "Downloader %d%%, tryk for at afbryde";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD-kort/USB lagring med de downloadede kort er ikke tilgængeligt";
 
-"disconnect_usb_cable" = "Frakobl venligst USB-kabel eller indsæt et memory kort for at bruge MAPS.ME";
+"disconnect_usb_cable" = "Frakobl venligst USB-kabel eller indsæt et memory kort for at bruge OMaps";
 
 "not_enough_free_space_on_sdcard" = "Frigør venligst plads på dit SD-kort/USB lager først for at bruge denne app";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Der er opdateringer klar til følgende kort:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Du har ikke brug for MAPS.ME Lite længere, så du kan godt afinstallere den.";
+"suggest_uninstall_lite" = "Du har ikke brug for OMaps Lite længere, så du kan godt afinstallere den.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ download succesfuldt";
@@ -249,10 +249,10 @@
 "set" = "Sæt";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Du har ingen bogmærker endnu.\nTryk på et sted på kortet for at kunne tilføje det til bogmærker. Bogmærker fra andre kilder kan også blive importeret og vist i MAPS.ME.\nÅbn en KML/KMZ fil med gemte bogmærker/knappenåle på i Mail, Dropbox eller på et link.";
+"bookmarks_usage_hint" = "Du har ingen bogmærker endnu.\nTryk på et sted på kortet for at kunne tilføje det til bogmærker. Bogmærker fra andre kilder kan også blive importeret og vist i OMaps.\nÅbn en KML/KMZ fil med gemte bogmærker/knappenåle på i Mail, Dropbox eller på et link.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Du har ingen bogmærker endnu. Tryk på et sted på kortet for at kunne tilføje det til bogmærker. Bogmærker fra andre kilder kan også blive importeret og vist i MAPS.ME. Åbn en KML/KMZ fil med gemte bogmærker/knappenåle på i Mail, Dropbox eller på et link.";
+"bookmarks_usage_hint_import_only" = "Du har ingen bogmærker endnu. Tryk på et sted på kortet for at kunne tilføje det til bogmærker. Bogmærker fra andre kilder kan også blive importeret og vist i OMaps. Åbn en KML/KMZ fil med gemte bogmærker/knappenåle på i Mail, Dropbox eller på et link.";
 
 /* Settings button in system menu */
 "settings" = "Indstillinger";
@@ -354,9 +354,9 @@
 "share_by_email" = "Del via email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.ME bogmærker er blevet delt med dig";
+"share_bookmarks_email_subject" = "OMaps bogmærker er blevet delt med dig";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Indlæser Bogmærker";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Download af kort over land er i gang nu.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Vi håber du er glad for at bruge MAPS.ME! Hvis du er, vil du så overveje at bedømme og måske skrive en anmeldelse på App Store? Det tager under et minut, men det kan virkelig hjælpe os. Tak for din hjælp!";
+"appStore_message" = "Vi håber du er glad for at bruge OMaps! Hvis du er, vil du så overveje at bedømme og måske skrive en anmeldelse på App Store? Det tager under et minut, men det kan virkelig hjælpe os. Tak for din hjælp!";
 
 /* No, thanks */
 "no_thanks" = "Nej, tak";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hey, tjek min knappenål på MAPS.ME ud! %1$@ or %2$@ Har du ikke offline kort? Download her: http://maps.me/get";
+"bookmark_share_sms" = "Hey, tjek min knappenål på OMaps ud! %1$@ or %2$@ Har du ikke offline kort? Download her: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hey, tjek min nuværende lokation ud på MAPS.ME! %1$@ or %2$@. Har du ikke offline kort? Download her: http://maps.me/get";
+"my_position_share_sms" = "Hey, tjek min nuværende lokation ud på OMaps! %1$@ or %2$@. Har du ikke offline kort? Download her: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hey, tjek min knappenål på MAPS.ME kortet ud!";
+"bookmark_share_email_subject" = "Hey, tjek min knappenål på OMaps kortet ud!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hey, tjek min nuværende lokation ud på MAPS.ME kortet!";
+"my_position_share_email_subject" = "Hey, tjek min nuværende lokation ud på OMaps kortet!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hey, her er jeg nu: %1$@. Tryk på dette link %2$@ eller dette %3$@ for at se stedet på kortet. Tak.";
@@ -549,7 +549,7 @@
 "search_show_on_map" = "Vis på kortet";
 
 /* Used to warn user when fixing KitKat issue */
-"kitkat_migrate_ok" = "Kort data lagring er blevet optimeret. Genstart venligst applikationen.\n\nMAPS.ME mappen i SD-kortet er ikke nødvendig mere. Du kan derfor slette den.";
+"kitkat_migrate_ok" = "Kort data lagring er blevet optimeret. Genstart venligst applikationen.\n\nOMaps mappen i SD-kortet er ikke nødvendig mere. Du kan derfor slette den.";
 
 /* Used to warn user when fixing KitKat issue */
 "kitkat_migrate_failed" = "På grund af ændringer i Android 4.4 er vi nødsaget til at optimere kort data lagringen, men der er ikke nok plads til at kopiere kort dataen.\n\nFrigør venligst noget plads på din enhed, ellers vil kortene være skrivebeskyttede.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Download kortet over det sted, hvor du befinder dig";
 
 /* text of notification */
-"pro_version_is_free_today" = "Fuld version af MAPS.ME er gratis i dag! Download nu og fortæl dine venner om det.";
+"pro_version_is_free_today" = "Fuld version af OMaps er gratis i dag! Download nu og fortæl dine venner om det.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Vi overfører dine downloadede kort fra MAPS.ME Lite til MAPS.ME. Det kan tage et par minutter.";
+"move_lite_maps_to_pro" = "Vi overfører dine downloadede kort fra OMaps Lite til OMaps. Det kan tage et par minutter.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Dine downloadede kort er blevet succesfuldt overført til MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Dine downloadede kort er blevet succesfuldt overført til OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Det lykkedes ikke at overføre dine kort. Slet venligst MAPS.ME Lite og download kortene igen.";
+"move_lite_maps_to_pro_failed" = "Det lykkedes ikke at overføre dine kort. Slet venligst OMaps Lite og download kortene igen.";
 
 /* Text in menu */
 "settings_and_more" = "Indstillinger & Mere";
@@ -600,7 +600,7 @@
 "website" = "Hjemmeside";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME Samfund";
+"maps_me_community" = "OMaps Samfund";
 
 /* Text in menu */
 "like_on_facebook" = "Synes godt om på Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Rapportér fejl";
 
 /* Email subject */
-"subscribe_me_subject" = "Tilmeld mig MAPS.ME-nyhedsbrev";
+"subscribe_me_subject" = "Tilmeld mig OMaps-nyhedsbrev";
 
 /* Email body */
 "subscribe_me_body" = "Jeg vil være den første til at høre om de seneste nyheder opdateringer og tilbud. Jeg kan opsige abonnementet når som helst.";
 
 /* About text */
-"about_text" = "MAPS.ME tilbyder de hurtigste offline-kort over alle byer og alle lande i verden. Rejs med tillid: Hvor end du befinder dig, hjælper MAPS.ME med at lokalisere din placering på kortet, finde den nærmeste restaurant, hotel, bank, benzintank og så videre. Det er ikke nødvendigt at have forbindelse til internettet.\n\nVi arbejder altid på nye funktioner, og vi vil meget gerne høre fra dig, hvis du har forslag til, hvordan vi kan forbedre MAPS.ME. Hvis du oplever problemer med appen, er du meget velkommen til at kontakte os på support@maps.me. Vi besvarer alle henvendelser!\n\nSynes du om MAPS.ME, og har du lyst til at støtte os? Her er nogle simple og helt gratis metoder:\n\n-post en anmeldelse i din App Store\n-like vores facebook-side http://www.facebook.com/mapswithme\n-neller fortæl din mor, venner og kollegaer om MAPS.ME :)\n\nTak fordi du støtter os. Vi sætter stor pris på din støtte!\n\nPS: Vi får vores kortdata fra OpenStreetMap, som er et kortprojekt, der minder om Wikipedia, og som gør brugere i stand til at oprette og rette kort. Hvis du oplever, at noget mangler eller er forkert på kortet, kan du rette kortene direkte på https://www.openstreetmap.org, og dine ændringer vil figurere på MAPS.ME-appen i forbindelse med frigivelsen af den næste version.";
+"about_text" = "OMaps tilbyder de hurtigste offline-kort over alle byer og alle lande i verden. Rejs med tillid: Hvor end du befinder dig, hjælper OOMapsd at lokalisere din placering på kortet, finde den nærmeste restaurant, hotel, bank, benzintank og så videre. Det er ikke nødvendigt at have forbindelse til internettet.\n\nVi arbejder altid på nye funktioner, og vi vil meget gerne høre fra dig, hvis du har forslag til, hvordan vi kan forbedre OMaps. Hvis du oplever problemer med appen, er du meget velkommen til at kontakte os på support@omaps.app. Vi besvarer alle henvendelser!\n\nSynes du om OMaps, og har du lyst til at støtte os? Her er nogle simple og helt gratis metoder:\n\n-post en anmeldelse i din App Store\n-like vores facebook-side http://www.facebook.com/mapswithme\n-neller fortæl din mor, venner og kollegaer om OMaps :)\n\nTak fordi du støtter os. Vi sætter stor pris på din støtte!\n\nPS: Vi får vores kortdata fra OpenStreetMap, som er et kortprojekt, der minder om Wikipedia, og som gør brugere i stand til at oprette og rette kort. Hvis du oplever, at noget mangler eller er forkert på kortet, kan du rette kortene direkte på https://www.openstreetmap.org, og dine ændringer vil figurere på OMaps-appen i forbindelse med frigivelsen af den næste version.";
 
 /* Alert text */
 "email_error_body" = "Emailklienten er ikke blevet sat op. Venligst konfigurér den eller brug en anden måde til at kontakte os på %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Venligst opdatér kortet for at oprette en rute.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Den nye version af MAPS.ME gør det muligt at oprette ruter fra din nuværende position til et destinationspunkt. Venligst opdatér kortene for at bruge denne funktion.";
+"routing_update_maps" = "Den nye version af OMaps gør det muligt at oprette ruter fra din nuværende position til et destinationspunkt. Venligst opdatér kortene for at bruge denne funktion.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Opdatér alle";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Fundet";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Ved oprettelse af ruter i MAPS.ME appen, venligst tænk over følgende:\n\n- Anbefalede ruter kan kun betragtes som anbefalinger.\n- Vejtilstande, trafikregler og skilte har højere prioritet end navigationsråd.\n Kortet kan være ukorrekt eller forældet, og ruter kan muligvis ikke være oprettet på den bedste måde.\n\nVær sikker på vejene og pas på dig selv!";
+"routing_disclaimer" = "Ved oprettelse af ruter i OMaps appen, venligst tænk over følgende:\n\n- Anbefalede ruter kan kun betragtes som anbefalinger.\n- Vejtilstande, trafikregler og skilte har højere prioritet end navigationsråd.\n Kortet kan være ukorrekt eller forældet, og ruter kan muligvis ikke være oprettet på den bedste måde.\n\nVær sikker på vejene og pas på dig selv!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Uddateret";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Der blev ikke fundet en rute mellem det valgte begyndelsespunkt og destinationen. Venligst vælg et andet start- eller slutpunkt.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Intern fejl opstod. Venligt prøv at slette og downloade kortet igen. Hvis problemet vare ved, venligst kontakt os på support@maps.me.";
+"routing_failed_internal_error" = "Intern fejl opstod. Venligt prøv at slette og downloade kortet igen. Hvis problemet vare ved, venligst kontakt os på support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Hent kort + ruteangivelse";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Jeg har netop bedømt jeres app";
 
 /* Text for rating dialog */
-"rating_user_since" = "Jeg er MAPS.ME bruger siden %@";
+"rating_user_since" = "Jeg er OMaps bruger siden %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Kan du lide MAPS.ME?";
+"rating_do_like_maps" = "Kan du lide OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Tryk på en stjerne for at bedømme vores app.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Få kort";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Download opdaterede kort og routing data for at få alle MAPS.ME funktioner.";
+"routing_download_map_and_routing" = "Download opdaterede kort og routing data for at få alle OMaps funktioner.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Få routing data";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Kan du lide appen?";
 
-"rate_alert_default_message" = "Tak for at du bruger MAPS.ME. Venligst bedøm appen. Din feedback hjælper os med at blive bedre.";
+"rate_alert_default_message" = "Tak for at du bruger OMaps. Venligst bedøm appen. Din feedback hjælper os med at blive bedre.";
 
 "rate_alert_five_star_message" = "Hurra! Vi elsker også dig!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplikeret sted";
 
-"first_launch_congrats_title" = "MAPS.ME er klart til brug";
+"first_launch_congrats_title" = "OMaps er klart til brug";
 
 "first_launch_congrats_text" = "Søg og navigér i kort over alle verdens lande gratis.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Tilføj nye steder til kortet og redigér eksisterende direkte fra app'en.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME bruger fællesskabsdata fra OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps bruger fællesskabsdata fra OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Du vil aldrig fare vild igen";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planlæg de optimale ruter i bil og til fods.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — adgang til verdensomspændende kort uden internet";
+"onboarding_offline_maps_title" = "OMaps — adgang til verdensomspændende kort uden internet";
 
 "onboarding_offline_maps_message" = "Download kortene til det ønskede område en gang, og brug navigerings- og søgefunktionerne uden internetforbindelse.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "For at bruge navigering og andre funktioner skal vi have adgang til din geolokation.";
 
-"onboarding_permissions_title" = "Giv MAPS.ME adgang til lager og position";
+"onboarding_permissions_title" = "Giv OMaps adgang til lager og position";
 
 "onboarding_permissions_message" = "Så du kan hente kort, se steder og trafik i nærheden af dig og benytte navigation.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "For at opdatere app'en skal du bruge mere plads. Slet unødvendig data.";
 
-"editor_sharing_title" = "Jeg forbedrede MAPS.ME kortene";
+"editor_sharing_title" = "Jeg forbedrede OMaps kortene";
 
 "editor_comment_will_be_sent" = "Vi vil sende dine kommentarer til kartograferne.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Detaljerede bemærkninger";
 
-"editor_detailed_description" = "Dine foreslåede ændringer vil blive sendt til OpenStreetMap fællesskabet. Beskrive detaljer, som ikke kan redigeres i MAPS.ME.";
+"editor_detailed_description" = "Dine foreslåede ændringer vil blive sendt til OpenStreetMap fællesskabet. Beskrive detaljer, som ikke kan redigeres i OMaps.";
 
 "editor_more_about_osm" = "Mere om OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Har vi opdateret korteditoren";
 
-"whatsnew_update_editor_message" = "MAPS.ME brugere har foretaget 200.000 kortændringer. Sammen laver vi det mest detaljerede kort i verden. Tilmeld dig!";
+"whatsnew_update_editor_message" = "OMaps brugere har foretaget 200.000 kortændringer. Sammen laver vi det mest detaljerede kort i verden. Tilmeld dig!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "For at bruge kortredigering, bedes du opdatere alle kort.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Fortsæt";
 
-"recent_track_background_dialog_message" = "MAPS.ME anvender din geoposition i baggrunden til at gemme din seneste rejserute.";
+"recent_track_background_dialog_message" = "OMaps anvender din geoposition i baggrunden til at gemme din seneste rejserute.";
 
 "whatsnew_car_navigation_header" = "Brugervenlig navigation i køretøjer";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Cykelnavigation (beta-version)";
 
-"whatsnew_cycle_navigation_message" = "Vi tester cykelnavigation til den nye sæson. Prøv din favoritcykelrute med MAPS.ME, og del dine kommentarer med os.";
+"whatsnew_cycle_navigation_message" = "Vi tester cykelnavigation til den nye sæson. Prøv din favoritcykelrute med OMaps, og del dine kommentarer med os.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Bedøm på Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Sig det videre til en ven";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hej! Installer MAPS.ME!";
+"tell_friends_text" = "Hej! Installer OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME er en essentiel offline-app for rejsende. MAPS.ME er baseret på data fra OpenStreetMap, og gør det muligt at redigere disse data.";
+"about_description" = "OMaps er en essentiel offline-app for rejsende. OMaps er baseret på data fra OpenStreetMap, og gør det muligt at redigere disse data.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Åbn";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Bestil Uber taxi direkte fra app'en!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Forøg skriftstørrelsen på kortet";
 
-"traffic_update_app" = "Opdater MAPS.ME";
+"traffic_update_app" = "Opdater OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Appen skal opdateres for at kunne vise trafikdata.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Giv adgang";
 
-"onboarding_storage_permissions_message" = "Rediger tilladelsesindstillingerne i din enhed. Brug af MAPS.ME kræver adgang til lager.";
+"onboarding_storage_permissions_message" = "Rediger tilladelsesindstillingerne i din enhed. Brug af OMaps kræver adgang til lager.";
 
 "button_exit" = "Afslut";
 
-"onboarding_detail_permissions_title" = "MAPS.ME skal have adgang til";
+"onboarding_detail_permissions_title" = "OMaps skal have adgang til";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Lager";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problem med lageradgang";
 
-"dialog_error_storage_message" = "Eksternt lager er ikke tilgængeligt, formentlig er SD-kortet blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller det og kontakt os på support@maps.me";
+"dialog_error_storage_message" = "Eksternt lager er ikke tilgængeligt, formentlig er SD-kortet blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller det og kontakt os på support@omaps.app";
 
 "setting_emulate_bad_storage" = "Emulere beskadiget lager";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Jeg accepterer <a href=\"%s\">Vilkår for brug</a>";
 
-"sign_agree_news_gdpr" = "Jeg accepterer at modtage de seneste nyheder om MAPS.ME produkter";
+"sign_agree_news_gdpr" = "Jeg accepterer at modtage de seneste nyheder om OMaps produkter";
 
 "whats_new_localbiz_title" = "Mindre virksomheder fortjener opmærksomhed";
 
-"whats_new_localbiz_message" = "Det være sig de lokale caféer, hyggelige hoteller og de butikker, som gør vores rejser uforglemmelige. Vi kan optimere din side på MAPS.ME, så den skiller sig ud fra mængden.";
+"whats_new_localbiz_message" = "Det være sig de lokale caféer, hyggelige hoteller og de butikker, som gør vores rejser uforglemmelige. Vi kan optimere din side på OMaps, så den skiller sig ud fra mængden.";
 
 "whats_new_order_button" = "Send en forespørgsel";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Download nye steder";
 
-"cached_bookmarks_placeholder_subtitle" = "Tryk på knappen for at downloade tusindvis af interessanter steder og ruter oprettet af brugerne på MAPS.ME. Du skal bruge en internetforbindelse.";
+"cached_bookmarks_placeholder_subtitle" = "Tryk på knappen for at downloade tusindvis af interessanter steder og ruter oprettet af brugerne på OMaps. Du skal bruge en internetforbindelse.";
 
 "downloader_download_routers" = "Download bogmærker";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Nedbrudsrapport";
 
-"opt_out_fabric_description" = "Vi kan anvende dine data til at forbedre brugeroplevelsen på MAPS.ME. Ændringerne træder i kraft, når du har genstartet appen.";
+"opt_out_fabric_description" = "Vi kan anvende dine data til at forbedre brugeroplevelsen på OMaps. Ændringerne træder i kraft, når du har genstartet appen.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Bogmærker er ikke blevet downloadet";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME har nu et rutekatalog";
+"whats_new_bookmarks_catalog_title" = "OMaps har nu et rutekatalog";
 
 "whats_new_bookmarks_catalog_message" = "Hundreder af detaljerede ruter over hele verden: hvor man kan tage hen, hvad man kan se, hvad man kan spise.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Fjern reklamer";
 
-"remove_ads_title" = "Fjern alle reklamer, og støt MAPS.ME";
+"remove_ads_title" = "Fjern alle reklamer, og støt OMaps";
 
 "paybtn_title" = "Betal %s/år";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Flere valgmuligheder";
 
-"why_support" = "Hvorfor støtte MAPS.ME?";
+"why_support" = "Hvorfor støtte OMaps?";
 
 "options_dropdown_item1" = "%s/måned (spar %s/år)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Vi fjerner alle reklamer for dig";
 
-"why_support_item2" = "Du hjælper os med at forbedre MAPS.ME";
+"why_support_item2" = "Du hjælper os med at forbedre OMaps";
 
 "why_support_item3" = "Du hjælper os med at forbedre de åbne kort på OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server er utilgængelig";
 
-"server_unavailable_message" = "Købet vil blive gennemført senere. Hvis fejlen bliver ved med at opstå, så kontakt venligst support@maps.me.";
+"server_unavailable_message" = "Købet vil blive gennemført senere. Hvis fejlen bliver ved med at opstå, så kontakt venligst support@omaps.app.";
 
 "offline_fiters_check_in" = "Tilslutter til internettet for at filtrere hoteller efter datoer.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Denne guide vil blive uploadet til det offentlige MAPS.ME katalog, hvor den vil være tilgængelig for andre brugere";
+"upload_and_publish_desc" = "Denne guide vil blive uploadet til det offentlige OMaps katalog, hvor den vil være tilgængelig for andre brugere";
 
 "upload_and_publish" = "Upload og offentliggør";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Hjælp rejsende ved at skrive en anmeldelse!";
 
-"share_bookmarks_email_body_link" = "Hej!\n\nHer er et link, hvor du kan hente dine bogmærker: %s. Åben listen via MAPS.ME og nyd turen!\n\nHent applikation: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hej!\n\nHer er et link, hvor du kan hente dine bogmærker: %s. Åben listen via OMaps og nyd turen!\n\nHent applikation: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigator advarer dig om kameraer, når du overskrider hastighedsgrænsen på %d km/t";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Det er nemt at dele dine indtryk";
 
-"whats_new_ugc_routes_subtitle" = "Gem mindeværdige steder, lav ruter ved hjælp af bogmærker og del dem med alle i MAPS.ME kataloget.";
+"whats_new_ugc_routes_subtitle" = "Gem mindeværdige steder, lav ruter ved hjælp af bogmærker og del dem med alle i OMaps kataloget.";
 
 "whats_new_webeditor_title" = "Lav dine ruter om til historier";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Du skal have mindst 3 bogmærker, for at kunne uploade din guide til det offentlige katalog";
 
-"bookmark_public_upload_alert_title" = "Du er et par skridt væk fra at dele dine bogmærker med alle MAPS.ME rejsende!";
+"bookmark_public_upload_alert_title" = "Du er et par skridt væk fra at dele dine bogmærker med alle OMaps rejsende!";
 
 "bookmark_public_upload_alert_subtitle" = "Sørg for, at du har et bestemt navn og en beskrivelse til din liste, og at alle bogmærker har oplysninger om stederne. På denne måde kan din liste findes og bruges af andre.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maksimum strømbesparelse";
 
-"enable_logging_warning_message" = "Indstillingen aktiverer logning til diagnostiske formål. Det kan være nyttigt for vores supportere, der fejlfinder problemer med appen. Aktiver kun denne mulighed på anmodning fra MAPS.ME support.";
+"enable_logging_warning_message" = "Indstillingen aktiverer logning til diagnostiske formål. Det kan være nyttigt for vores supportere, der fejlfinder problemer med appen. Aktiver kun denne mulighed på anmodning fra OMaps support.";
 
 "html_error_upload_message_try_again" = "Kontroller dine netværksindstillinger, og prøv igen";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Dit ID: %s.";
 
-"gdpr_request_window_message" = "Kopiere det og send anmodningen til support@maps.me";
+"gdpr_request_window_message" = "Kopiere det og send anmodningen til support@omaps.app";
 
 "gdpr_request_window_copy" = "Kopier ID'et";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Undgå færgeoverfarter";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME tilbyder færdiglavede guides med fotos og beskrivelser til de udvalgte steder, der vises på kortet, som er tilgængelige offline.";
+"cached_guides_placeholder_subtitle" = "OMaps tilbyder færdiglavede guides med fotos og beskrivelser til de udvalgte steder, der vises på kortet, som er tilgængelige offline.";
 
 "guides_catalogue_title" = "Katalog over Guides";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Usbekisk køkken";
 
-"onboarding_welcome_title" = "Planlæg og rejs med MAPS.ME";
+"onboarding_welcome_title" = "Planlæg og rejs med OMaps";
 
 "onboarding_welcome_first_subtitle" = "Bookmark interessante steder, book hoteller og beregn ruter offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Download";
 
-"onboarding_bydeeplink_guide_title" = "Klar-til-brug guider i MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Klar-til-brug guider i OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "De bedste steder at besøge er vist på kort med fotos og beskrivelser. Fungerer offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Book et hotel?";
 
-"popup_booking_download_guides_message" = "Planlæg din rute med færdiglavede guider fra MAPS.ME";
+"popup_booking_download_guides_message" = "Planlæg din rute med færdiglavede guider fra OMaps";
 
 "popup_mwm_download_guides_title" = "Offline byguides";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Tag et kig";
 
-"gallery_pp_download_guides_offline_title" = "Planlæg din ferie med MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Planlæg din ferie med OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Gå ikke glip af noget med guider lavet af erfarne rejsende";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Betalingen opkræves via din iTunes-konto ved bekræftelse af købet. Abonnementet fornys automatisk, medmindre den automatiske fornyelse er slået fra senest 24 timer før udgangen af den aktuelle periode. Din konto debiteres i overensstemmelse med din plan for fornyelse indenfor 24 timer før udgangen af den aktuelle periode. Du kan administrere eller slukke for automatisk fornyelse i dine Apple ID-kontoindstillinger på ethvert tidspunkt af dit køb.";
 
-"whatsnew_carplay_title" = "MAPS.ME bil navigation i CarPlay!";
+"whatsnew_carplay_title" = "OMaps bil navigation i CarPlay!";
 
 "whatsnew_carplay_message" = "Bogmærker, søgning, fartkameraer og køre muligheder er tilgængelige offline";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Radar advarsel";
 
-"download_map_carplay" = "Download kort i MAPS.ME appen, på din enhed";
+"download_map_carplay" = "Download kort i OMaps appen, på din enhed";
 
 "carplay_roundabout_exit" = "%s exit";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Juuhuu, du har abonnement!";
 
-"popup_subscription_success_map_message" = "Opdag nu de bedste turisthøjdepunkter i MAPS.ME kataloget";
+"popup_subscription_success_map_message" = "Opdag nu de bedste turisthøjdepunkter i OMaps kataloget";
 
 "popup_subscription_success_map_start_button" = "Begynd at udforske";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Kom i gang";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Alt i en rejsekammerat";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Åbent katalog";
 
-"new_onboarding_step5.2_message" = "Dit abonnement til MAPS.ME guidekatalog er af stor værdi. Få fuld adgang til byen og udendørsguider i hele verden!";
+"new_onboarding_step5.2_message" = "Dit abonnement til OMaps guidekatalog er af stor værdi. Få fuld adgang til byen og udendørsguider i hele verden!";
 
 "new_onboarding_step5.2_button" = "Check betingelserne ud";
 
-"new_onboarding_step5.3_message" = "Check de gratis prøver på færdige by- og udendørsruter med et gratis udvalg af MAPS.ME!";
+"new_onboarding_step5.3_message" = "Check de gratis prøver på færdige by- og udendørsruter med et gratis udvalg af OMaps!";
 
 "new_onboarding_step5.3_button" = "Gratis download";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Ruter fra Outdooractive til vinter- og summerture venter i kataloget!";
 
-"whatsnew_guides_galleries_title" = "Planlæg din kommende tur med MAPS.ME";
+"whatsnew_guides_galleries_title" = "Planlæg din kommende tur med OMaps";
 
 "whatsnew_guides_galleries_message" = "Nu kan du finde anbefalede guides på stedsiderne om populære turistbyer og syn";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terræn";
 
-"tips_map_layers_title_countour" = "Nyt på MAPS.ME: offline topografiske lag!";
+"tips_map_layers_title_countour" = "Nyt på OMaps: offline topografiske lag!";
 
 "tips_map_layers_message_countour" = "Planlæg og nyd din naturtur ved at være sikker på, at du ved alt om området";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict
index 93b1671d1e..530b449b1b 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 28ed371106..dbcd2b029d 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Installieren";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Danke, dass Sie MAPS.ME nutzen! Gefällt Ihnen die App? Erzählen Sie Ihren Freunden davon! Das ist der beste Dank für uns.";
+"share_on_facebook_text" = "Danke, dass Sie OMaps nutzen! Gefällt Ihnen die App? Erzählen Sie Ihren Freunden davon! Das ist der beste Dank für uns.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Erneut versuchen";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Über MAPS.ME";
+"about_menu_title" = "Über OMaps";
 
 "downloading_touch_to_cancel" = "Herunterladen %d%%. Antippen, um abzubrechen";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD-Karte/USB-Speicher mit heruntergeladenen Karten nicht verfügbar";
 
-"disconnect_usb_cable" = "Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um MAPS.ME zu verwenden";
+"disconnect_usb_cable" = "Bitte USB-Kabel entfernen oder Speicherkarte einsetzen, um OMaps zu verwenden";
 
 "not_enough_free_space_on_sdcard" = "Bitte zuerst Speicherplatz auf SD-Karte/USB-Speicher freigeben, um die Anwendung zu nutzen";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Aktualisierung für diese Karten erhältlich:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Sie benötigen MAPS.ME Lite nicht mehr und können es deinstallieren.";
+"suggest_uninstall_lite" = "Sie benötigen OMaps Lite nicht mehr und können es deinstallieren.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ erfolgreich heruntergeladen";
@@ -249,10 +249,10 @@
 "set" = "Gruppe";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Sie haben bislang noch keine Lesezeichen gesetzt.\nTippen Sie auf der Karte auf irgendeinen Punkt, um ein Lesezeichen hinzuzufügen.\nLesezeichen von anderen Quellen können ebenfalls importiert und in der MAPS.ME-App angezeigt werden. KML-/KMZ-Datei mit gespeicherten Stecknadeln aus einer Email, Dropbox oder einem Weblink öffnen.";
+"bookmarks_usage_hint" = "Sie haben bislang noch keine Lesezeichen gesetzt.\nTippen Sie auf der Karte auf irgendeinen Punkt, um ein Lesezeichen hinzuzufügen.\nLesezeichen von anderen Quellen können ebenfalls importiert und in der OMaps-App angezeigt werden. KML-/KMZ-Datei mit gespeicherten Stecknadeln aus einer Email, Dropbox oder einem Weblink öffnen.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Lesezeichen von anderen Quellen können importiert und in der MAPS.ME-App angezeigt werden. KML-/KMZ-Datei mit gespeicherten Stecknadeln aus einer Email, Dropbox oder einem Weblink öffnen.";
+"bookmarks_usage_hint_import_only" = "Lesezeichen von anderen Quellen können importiert und in der OMaps-App angezeigt werden. KML-/KMZ-Datei mit gespeicherten Stecknadeln aus einer Email, Dropbox oder einem Weblink öffnen.";
 
 /* Settings button in system menu */
 "settings" = "Einstellungen";
@@ -354,9 +354,9 @@
 "share_by_email" = "Per Email teilen";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.ME-Lesezeichen mit Ihnen geteilt";
+"share_bookmarks_email_subject" = "OMaps-Lesezeichen mit Ihnen geteilt";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Lesezeichen werden geladen";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Das Land wird gerade heruntergeladen.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Wir hoffen, dass Ihnen die Verwendung von MAPS.ME Freude bereitet! Wenn ja, geben Sie bitte eine Bewertung oder einen Bericht für die App im App Store ab. Es dauert weniger als eine Minute, kann uns aber wirklich helfen. Danke für Ihre Unterstützung!";
+"appStore_message" = "Wir hoffen, dass Ihnen die Verwendung von OMaps Freude bereitet! Wenn ja, geben Sie bitte eine Bewertung oder einen Bericht für die App im App Store ab. Es dauert weniger als eine Minute, kann uns aber wirklich helfen. Danke für Ihre Unterstützung!";
 
 /* No, thanks */
 "no_thanks" = "Nein danke";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Siehe meine Markierung auf MAPS.ME an. %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: http://maps.me/get";
+"bookmark_share_sms" = "Siehe meine Markierung auf OMaps an. %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Schau wo ich gerade bin. Klicke auf den Link %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: http://maps.me/get";
+"my_position_share_sms" = "Schau wo ich gerade bin. Klicke auf den Link %1$@ oder %2$@ - Keine Offline-Karten installiert? Hier herunterladen: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Schau dir meine Stecknadel auf der MAPS.ME-Karte an";
+"bookmark_share_email_subject" = "Schau dir meine Stecknadel auf der OMaps-Karte an";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Sieh dir meinen aktuellen Standort auf der MAPS.ME-Karte an";
+"my_position_share_email_subject" = "Sieh dir meinen aktuellen Standort auf der OMaps-Karte an";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hi,\n\nich bin gerade hier: %1$@. Klicke den Link %2$@ oder %3$@, um den Ort auf der Karte anzuzeigen.\n\nVielen Dank.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Laden Sie die Karte Ihres Standortes herunter";
 
 /* text of notification */
-"pro_version_is_free_today" = "MAPS.ME heute gratis! Jetzt runterladen & Ihre Freunde informieren";
+"pro_version_is_free_today" = "OMaps heute gratis! Jetzt runterladen & Ihre Freunde informieren";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Wir übertragen Ihre heruntergeladenen Karten von MAPS.ME Lite zu MAPS.ME. Dieser Vorgang kann einige Minuten in Anspruch nehmen.";
+"move_lite_maps_to_pro" = "Wir übertragen Ihre heruntergeladenen Karten von OMaps Lite zu OMaps. Dieser Vorgang kann einige Minuten in Anspruch nehmen.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Ihre heruntergeladenen Karten wurden erfolgreich zu MAPS.ME übertragen.";
+"move_lite_maps_to_pro_ok" = "Ihre heruntergeladenen Karten wurden erfolgreich zu OMaps übertragen.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Ihre Karten konnten nicht übertragen werden. Bitte löschen Sie MAPS.ME Lite und laden Sie die Karten erneut herunter.";
+"move_lite_maps_to_pro_failed" = "Ihre Karten konnten nicht übertragen werden. Bitte löschen Sie OMaps Lite und laden Sie die Karten erneut herunter.";
 
 /* Text in menu */
 "settings_and_more" = "Einstellungen & mehr";
@@ -600,7 +600,7 @@
 "website" = "Webseite";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME-Gemeinschaft";
+"maps_me_community" = "OMaps-Gemeinschaft";
 
 /* Text in menu */
 "like_on_facebook" = "„Gefällt mir“ auf Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Fehler melden";
 
 /* Email subject */
-"subscribe_me_subject" = "Ich möchte gerne den MAPS.ME-Newsletter abonnieren";
+"subscribe_me_subject" = "Ich möchte gerne den OMaps-Newsletter abonnieren";
 
 /* Email body */
 "subscribe_me_body" = "Gerne möchte ich zu den Ersten gehören, die aktuelle Neuigkeiten erfahren und über neueste Aktualisierungen und Werbeangebote informiert werden. Mein Abo kann ich jederzeit kündigen.";
 
 /* About text */
-"about_text" = "MAPS.ME bietet die schnellsten Offline-Karten aller Städte weltweit. Reisen Sie mit Vertrauen: wo immer Sie sind hilft Ihnen MAPS.ME, sich auf der Karte zurecht zu finden. Finden Sie das nächstgelegene Restaurant, Hotel, Bank, Tankstelle usw. Es ist keine Internet-Verbindung erforderlich.\n\nWir arbeiten ständig an neuen Funktionen und freuen uns, von Ihnen zu hören, wie wir MAPS.ME verbessern können. Wenn Sie Probleme mit der App haben, zögern Sie nicht, mit uns über support@maps.me in Verbindung zu treten. Wir reagieren auf jede Anfrage!\n\nMögen Sie MAPS.ME und wollen Sie uns unterstützen? Es gibt einige einfache und absolut kostenlose Möglichkeiten:\n\n- Veröffentlichen Sie eine Bewertung auf Ihrem App-Store\n- Liken Sie unsere Facebook-Seite http://www.facebook.com/mapswithme\n- Oder erzählen einfach nur Ihrer Mutter, Freunden und Kollegen von MAPS.ME:)\n\nDanke, dass Sie bei uns sind. Wir freuen uns sehr über Ihre Unterstützung!\n\nPS: Wir nutzen die Kartendaten von OpenStreetMap, einem Kartierungs-Projekt ähnlich Wikipedia, bei welchem Mitglieder Kartendaten erfassen. Wenn Sie sehen, dass auf der Karte etwas fehlt oder falsch ist, können Sie die Karten direkt auf https://www.openstreetmap.org korrigieren und die Änderungen erscheinen in der nächsten Version der MAPS.ME-App.";
+"about_text" = "OMaps bietet die schnellsten Offline-Karten aller Städte weltweit. Reisen Sie mit Vertrauen: wo immer Sie sind hilft Ihnen OMaps, sich auf der Karte zurecht zu finden. Finden Sie das nächstgelegene Restaurant, Hotel, Bank, Tankstelle usw. Es ist keine Internet-Verbindung erforderlich.\n\nWir arbeiten ständig an neuen Funktionen und freuen uns, von Ihnen zu hören, wie wir OMaps verbessern können. Wenn Sie Probleme mit der App haben, zögern Sie nicht, mit uns über support@omaps.app in Verbindung zu treten. Wir reagieren auf jede Anfrage!\n\nMögen Sie OMaps und wollen Sie uns unterstützen? Es gibt einige einfache und absolut kostenlose Möglichkeiten:\n\n- Veröffentlichen Sie eine Bewertung auf Ihrem App-Store\n- Liken Sie unsere Facebook-Seite http://www.facebook.com/mapswithme\n- Oder erzählen einfach nur Ihrer Mutter, Freunden und Kollegen von OMaps:)\n\nDanke, dass Sie bei uns sind. Wir freuen uns sehr über Ihre Unterstützung!\n\nPS: Wir nutzen die Kartendaten von OpenStreetMap, einem Kartierungs-Projekt ähnlich Wikipedia, bei welchem Mitglieder Kartendaten erfassen. Wenn Sie sehen, dass auf der Karte etwas fehlt oder falsch ist, können Sie die Karten direkt auf https://www.openstreetmap.org korrigieren und die Änderungen erscheinen in der nächsten Version der OMaps-App.";
 
 /* Alert text */
 "email_error_body" = "Der Email-Client ist noch nicht eingerichtet worden. Konfigurieren Sie ihn bitte oder nutzen Sie eine andere Möglichkeit, uns unter %@ zu erreichen.";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Bitte aktualisieren Sie die Karte, um eine Route zu erstellen.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Die neue Version von MAPS.ME ermöglicht das Erzeugen von Routen von Ihrem aktuellen Standort bis zum gewünschten Ziel. Bitte aktualisieren Sie Karten, um diese Funktion nutzen zu können.";
+"routing_update_maps" = "Die neue Version von OMaps ermöglicht das Erzeugen von Routen von Ihrem aktuellen Standort bis zum gewünschten Ziel. Bitte aktualisieren Sie Karten, um diese Funktion nutzen zu können.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Alle aktualisieren";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Gefunden";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Beim Erstellen von Routen mit der MAPS.ME-App sollten Sie Folgendes beachten:\n\n  - Vorgeschlagenen Routen können nur als Empfehlungen angesehen werden.\n - Straßenbedingungen, Verkehrsregeln und Schilder haben höhere Priorität als Navigationsratschläge.\n - Die Karte kann falsch oder veraltet sein und Routen könnten somit nicht auf die bestmögliche Weise erstellt worden sein.\n\n  Bleiben Sie auf der Straße sicher und achten Sie auf sich selbst!";
+"routing_disclaimer" = "Beim Erstellen von Routen mit der OMaps-App sollten Sie Folgendes beachten:\n\n  - Vorgeschlagenen Routen können nur als Empfehlungen angesehen werden.\n - Straßenbedingungen, Verkehrsregeln und Schilder haben höhere Priorität als Navigationsratschläge.\n - Die Karte kann falsch oder veraltet sein und Routen könnten somit nicht auf die bestmögliche Weise erstellt worden sein.\n\n  Bleiben Sie auf der Straße sicher und achten Sie auf sich selbst!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Veraltet";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Ich habe gerade Ihre App bewertet";
 
 /* Text for rating dialog */
-"rating_user_since" = "Ich bin MAPS.ME-Nutzer seit %@";
+"rating_user_since" = "Ich bin OMaps-Nutzer seit %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Mögen Sie MAPS.ME?";
+"rating_do_like_maps" = "Mögen Sie OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Tippen Sie auf einen Stern, um unsere App zu bewerten.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Karte abrufen";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Laden Sie die aktualisierte Karte und Daten der Routenplanung herunter, um alle MAPS.ME-Funktionen zu nutzen.";
+"routing_download_map_and_routing" = "Laden Sie die aktualisierte Karte und Daten der Routenplanung herunter, um alle OMaps-Funktionen zu nutzen.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Daten für Routenplanung abrufen";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Gefällt Ihnen die App?";
 
-"rate_alert_default_message" = "Danke, dass Sie MAPS.ME nutzen. Bitte bewerten Sie die App. Ihre Rückmeldung hilft uns, besser zu werden.";
+"rate_alert_default_message" = "Danke, dass Sie OMaps nutzen. Bitte bewerten Sie die App. Ihre Rückmeldung hilft uns, besser zu werden.";
 
 "rate_alert_five_star_message" = "Hurra! Wir lieben Sie auch!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Doppelter Ort";
 
-"first_launch_congrats_title" = "MAPS.ME kann verwendet werden";
+"first_launch_congrats_title" = "OMaps kann verwendet werden";
 
 "first_launch_congrats_text" = "Suche und Navigation weltweit offline verfügbar, völlig kostenfrei.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Fügen Sie auf der Karte einen neuen Ort hinzu und bearbeiten Sie existierende Ort direkt in der App.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME verwendet Community-Daten von OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps verwendet Community-Daten von OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Sie werden sich nie wieder verfahren oder verlaufen";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planen Sie optimale Auto- und Fußgängerstrecken.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — weltweit ohne Internetzugriff auf die Karte zugreifen";
+"onboarding_offline_maps_title" = "OMaps — weltweit ohne Internetzugriff auf die Karte zugreifen";
 
 "onboarding_offline_maps_message" = "Laden Sie die Karten für das gewünschte Gebiet auf einmal herunter und verwenden Sie die Navigation- und Such-Funktion ohne eine Internetverbindung.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Um Navigation und andere Funktionen zu verwenden, brauchen wir Zugriff auf Ihren Geo-Standort.";
 
-"onboarding_permissions_title" = "Erlauben Sie MAPS.ME, auf Speicher und Standort zuzugreifen";
+"onboarding_permissions_title" = "Erlauben Sie OMaps, auf Speicher und Standort zuzugreifen";
 
 "onboarding_permissions_message" = "So können Sie Karten herunterladen, Orte und Verkehrslage in Ihrer Nähe sehen und die Navigation nutzen.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Zum Herunterladen benötigen Sie mehr Platz. Bitte löschen Sie unnötige Daten.";
 
-"editor_sharing_title" = "Ich habe die MAPS.ME-Karten verbessert";
+"editor_sharing_title" = "Ich habe die OMaps-Karten verbessert";
 
 "editor_comment_will_be_sent" = "Wir werden Ihren Kommentar an die Kartografierer weiterleiten.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Ausführlicher Kommentar";
 
-"editor_detailed_description" = "Ihre Änderungsvorschläge für die Karte werden an OpenStreetMap gesendet: Beschreiben Sie die Details der Objekte, die Sie in MAPS.ME nicht bearbeiten können.";
+"editor_detailed_description" = "Ihre Änderungsvorschläge für die Karte werden an OpenStreetMap gesendet: Beschreiben Sie die Details der Objekte, die Sie in OMaps nicht bearbeiten können.";
 
 "editor_more_about_osm" = "Mehr Informationen über OpenStreetMap";
 
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Fortsetzen";
 
-"recent_track_background_dialog_message" = "MAPS.ME verwendet Ihre Geoposition im Hintergrund, um Ihre kürzlich gefahrene Route aufzunehmen.";
+"recent_track_background_dialog_message" = "OMaps verwendet Ihre Geoposition im Hintergrund, um Ihre kürzlich gefahrene Route aufzunehmen.";
 
 "whatsnew_car_navigation_header" = "Benutzerfreundliche Fahrzeug-Navigation";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Fahrradnavigation (Betaversion)";
 
-"whatsnew_cycle_navigation_message" = "Wir testen die Fahrradnavigation für die neue Saison. Testen Sie Ihre Lieblings-Fahrradroute mit MAPS.ME und teilen Sie Ihre Meinung mit uns.";
+"whatsnew_cycle_navigation_message" = "Wir testen die Fahrradnavigation für die neue Saison. Testen Sie Ihre Lieblings-Fahrradroute mit OMaps und teilen Sie Ihre Meinung mit uns.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Bei Google Play bewerten";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Einem Freund empfehlen";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hallo! Installiere dir MAPS.ME!";
+"tell_friends_text" = "Hallo! Installiere dir OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME ist eine wichtige Offline-App zum Reisen. MAPS.ME basiert auf OpenStreetMap-Daten und ermöglicht das Bearbeiten dieser.";
+"about_description" = "OMaps ist eine wichtige Offline-App zum Reisen. OMaps basiert auf OpenStreetMap-Daten und ermöglicht das Bearbeiten dieser.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Öffnen";
 
-"whatsnew_uber_header" = "MAPS.ME und Uber";
+"whatsnew_uber_header" = "OMaps und Uber";
 
 "whatsnew_uber_message" = "Uber-Taxi direkt über die App bestellen!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Schriftgröße auf der Karte erhöhen";
 
-"traffic_update_app" = "Bitte aktualisieren Sie MAPS.ME";
+"traffic_update_app" = "Bitte aktualisieren Sie OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Um Verkehrsdaten anzuzeigen, muss die Anwendung aktualisiert werden.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Zugriff gewähren";
 
-"onboarding_storage_permissions_message" = "Ändern Sie die Berechtigungseinstellungen auf Ihrem Gerät. Der Zugriff auf den Speicher muss gestattet werden, damit Sie MAPS.ME nutzen können.";
+"onboarding_storage_permissions_message" = "Ändern Sie die Berechtigungseinstellungen auf Ihrem Gerät. Der Zugriff auf den Speicher muss gestattet werden, damit Sie OMaps nutzen können.";
 
 "button_exit" = "Beenden";
 
-"onboarding_detail_permissions_title" = "MAPS.ME benötigt Zugriff auf";
+"onboarding_detail_permissions_title" = "OMaps benötigt Zugriff auf";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Speicher";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problem mit dem Zugreifen auf den Speicher";
 
-"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 und kontaktieren Sie uns unter support@maps.me";
+"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 und kontaktieren Sie uns unter support@omaps.app";
 
 "setting_emulate_bad_storage" = "Fehlerhaften Speicher emulieren";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Ich stimme den <a href=\"%s\">Nutzungsbedingungen</a> zu";
 
-"sign_agree_news_gdpr" = "Ich bin damit einverstanden, die neuesten Nachrichten über MAPS.ME-Produkte zu erhalten";
+"sign_agree_news_gdpr" = "Ich bin damit einverstanden, die neuesten Nachrichten über OMaps-Produkte zu erhalten";
 
 "whats_new_localbiz_title" = "Kleine Betriebe verdienen Aufmerksamkeit";
 
-"whats_new_localbiz_message" = "Genau die lokalen Cafés, Hostels und Geschäfte machen die Reisen unvergesslich. Wir werden die Seite Ihres Geschäfts bei MAPS.ME kostenlos optimieren, damit es bemerkt wird.";
+"whats_new_localbiz_message" = "Genau die lokalen Cafés, Hostels und Geschäfte machen die Reisen unvergesslich. Wir werden die Seite Ihres Geschäfts bei OMaps kostenlos optimieren, damit es bemerkt wird.";
 
 "whats_new_order_button" = "Einen Antrag hinterlassen";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Laden Sie neue Plätze hoch";
 
-"cached_bookmarks_placeholder_subtitle" = "Klicken Sie auf die Schaltfläche, um Tausende von interessanten Orten und Routen, die von den Anwendern von MAPS.ME erstellt wurden, zu laden. Sie werden eine Internetverbindung benötigen.";
+"cached_bookmarks_placeholder_subtitle" = "Klicken Sie auf die Schaltfläche, um Tausende von interessanten Orten und Routen, die von den Anwendern von OMaps erstellt wurden, zu laden. Sie werden eine Internetverbindung benötigen.";
 
 "downloader_download_routers" = "Markierungen laden";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Berichte über die Fehler";
 
-"opt_out_fabric_description" = "Wir können Ihre Daten benutzen, um MAPS.ME zu entwickeln und zu verbessern. Die Änderungen werden nach dem Neustart der App in Kraft treten.";
+"opt_out_fabric_description" = "Wir können Ihre Daten benutzen, um OMaps zu entwickeln und zu verbessern. Die Änderungen werden nach dem Neustart der App in Kraft treten.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Die Markierungen wurden nicht geladen";
 
-"whats_new_bookmarks_catalog_title" = "Bei MAPS.ME ist ein Routenkatalog aufgetreten";
+"whats_new_bookmarks_catalog_title" = "Bei OMaps ist ein Routenkatalog aufgetreten";
 
 "whats_new_bookmarks_catalog_message" = "Dutzende ausführliche Routen weltweit: wo man hingehen kann, was man sich anschauen kann, wohin man essen gehen kann.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Werbung abschalten";
 
-"remove_ads_title" = "Schalten Sie die ganze Werbung ab und unterstützen Sie MAPS.ME";
+"remove_ads_title" = "Schalten Sie die ganze Werbung ab und unterstützen Sie OMaps";
 
 "paybtn_title" = "Bezahlen %s/Jahr";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Weitere Varianten";
 
-"why_support" = "Warum MAPS.ME unterstützen?";
+"why_support" = "Warum OMaps unterstützen?";
 
 "options_dropdown_item1" = "%s/Monat (Einsparung %s/Jahr)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Wir schalten für Sie die ganze Werbung ab";
 
-"why_support_item2" = "Sie helfen uns MAPS.ME zu verbesern";
+"why_support_item2" = "Sie helfen uns OMaps zu verbesern";
 
 "why_support_item3" = "Sie helfen uns die Karten OpenStreetMap.org zu verbessern";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server unzugänglich";
 
-"server_unavailable_message" = "Der Kauf wird später abgeschlossen. Wenn der Fehler anhält, kontaktieren Sie support@maps.me.";
+"server_unavailable_message" = "Der Kauf wird später abgeschlossen. Wenn der Fehler anhält, kontaktieren Sie support@omaps.app.";
 
 "offline_fiters_check_in" = "Verbinden Sie sich mit dem Internet, um das Datum der Ankunft und der Abreise auszuwählen.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Dieser Reiseführer wird in das öffentliche Katalog MAPS.ME geladen und wird für andere Benutzer verfügbar sein";
+"upload_and_publish_desc" = "Dieser Reiseführer wird in das öffentliche Katalog OMaps geladen und wird für andere Benutzer verfügbar sein";
 
 "upload_and_publish" = "Laden und veröffentlichen";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Hinterlassen Sie Ihr Feedback und helfen Sie den Reisenden!";
 
-"share_bookmarks_email_body_link" = "Guten Tag!\n\nIhre Markierungen stehen unter folgendem Link zum Download bereit: %s. Öffnen Sie die Liste mit MAPS.ME und genießen Sie die Reise!\n\nApp downloaden: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Guten Tag!\n\nIhre Markierungen stehen unter folgendem Link zum Download bereit: %s. Öffnen Sie die Liste mit OMaps und genießen Sie die Reise!\n\nApp downloaden: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Der Navigator wird Sie über Geschwindigkeitskameras bei Geschwindigkeitsüberschreitung von %d km/h informieren";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Es ist einfach, Ihre Eindrücke zu teilen";
 
-"whats_new_ugc_routes_subtitle" = "Speichern Sie unvergessliche Orte, erstellen Sie Routen mithilfe von Lesezeichen und teilen Sie sie mit allen im MAPS.ME-Katalog.";
+"whats_new_ugc_routes_subtitle" = "Speichern Sie unvergessliche Orte, erstellen Sie Routen mithilfe von Lesezeichen und teilen Sie sie mit allen im OMaps-Katalog.";
 
 "whats_new_webeditor_title" = "Verwandeln Sie Ihre Routen in Geschichten";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "In Ihrer Route sollen mindestens 3 Markierungen vorhanden sein, um sie in den öffentlichen Katalog zu laden";
 
-"bookmark_public_upload_alert_title" = "Noch ein paar Schritte und Ihre Route wird in den Katalog MAPS.ME geladen!";
+"bookmark_public_upload_alert_title" = "Noch ein paar Schritte und Ihre Route wird in den Katalog OMaps geladen!";
 
 "bookmark_public_upload_alert_subtitle" = "Überprüfen Sie, ob die Route einen Titel und Beschreibung hat und alle Markierungen Informationen über die Orte enthalten. So finden Benutzer die Route und werden Sie während der Reise benutzen können.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximale Stromsparung";
 
-"enable_logging_warning_message" = "Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik zu loggen. Das hilft unserem Team Probleme mit der App zu erkennen. Aktivieren Sie diese Option nur auf Ersuchen des MAPS.ME-Supports.";
+"enable_logging_warning_message" = "Diese Option wird aktiviert, um Aktivitäten zwecks Diagnostik zu loggen. Das hilft unserem Team Probleme mit der App zu erkennen. Aktivieren Sie diese Option nur auf Ersuchen des OMaps-Supports.";
 
 "html_error_upload_message_try_again" = "Überprüfen Sie die Internetverbindung und versuchen Sie es noch einmal";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Ihr ID: %s.";
 
-"gdpr_request_window_message" = "Bitte kopieren und schicken Sie die ID an support@maps.me";
+"gdpr_request_window_message" = "Bitte kopieren und schicken Sie die ID an support@omaps.app";
 
 "gdpr_request_window_copy" = "ID kopieren";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Fährstellen vermeiden";
 
-"cached_guides_placeholder_subtitle" = "Fertige Reiseführer in MAPS.ME – das sind ausgewählte Orte mit Fotos und Beschreibungen, die auf der Karte angezeigt werden und off-line verfügbar sind.";
+"cached_guides_placeholder_subtitle" = "Fertige Reiseführer in OMaps – das sind ausgewählte Orte mit Fotos und Beschreibungen, die auf der Karte angezeigt werden und off-line verfügbar sind.";
 
 "guides_catalogue_title" = "Reiseführer-Katalog";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Usbekische Küche";
 
-"onboarding_welcome_title" = "Planen und reisen Sie mit MAPS.ME";
+"onboarding_welcome_title" = "Planen und reisen Sie mit OMaps";
 
 "onboarding_welcome_first_subtitle" = "Bewahren Sie interessante Stellen, reservieren Sie Hotels, planen Sie Reiserouten offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Herunterladen";
 
-"onboarding_bydeeplink_guide_title" = "Fertige Reiseführer in MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Fertige Reiseführer in OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Ausgewählte Orte mit Fotos und Beschreibungen werden auf der Karte wiederspiegelt und sind offline zugänglich.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Hotel gebucht?";
 
-"popup_booking_download_guides_message" = "Planen Sie die Route mit fertigen Reiseführern von MAPS.ME";
+"popup_booking_download_guides_message" = "Planen Sie die Route mit fertigen Reiseführern von OMaps";
 
 "popup_mwm_download_guides_title" = "Offline-Reiseführer";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Anschauen";
 
-"gallery_pp_download_guides_offline_title" = "Planen Sie Ihren Urlaub mit MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Planen Sie Ihren Urlaub mit OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Verpassen Sie das wichtigste mit den Routen von erfahrenen Reisenden nicht";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Die Zahlung erfolgt nach Kaufbestätigung über Ihr iTunes-Konto. Das Abonnement wird automatisch verlängert, sofern Sie die automatische Verlängerung nicht 24 Stunden vor Ende des aktuellen Zeitraums abgestellt haben. Ihr Konto wird gemäß Ihres Plans für die Verlängerung innerhalb von 24 Stunden vor dem Ende des aktuellen Zeitraums belastet. Sie können bei Kauf die automatisch Verlängerung über Ihre Apple-ID-Kontoeinstellungen jederzeit verwalten oder abstellen.";
 
-"whatsnew_carplay_title" = "Autonavigation MAPS.ME in CarPlay!";
+"whatsnew_carplay_title" = "Autonavigation OMaps in CarPlay!";
 
 "whatsnew_carplay_message" = "Lesezeichengruppen, Suche, Geschwindigkeitskameras und Einstellung des Umweges – all das funktioniert ohne Internet";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Blitzerwarnung";
 
-"download_map_carplay" = "Laden Sie Karten in der App MAPS.ME auf Ihrem Gerät herunter";
+"download_map_carplay" = "Laden Sie Karten in der App OMaps auf Ihrem Gerät herunter";
 
 "carplay_roundabout_exit" = "%s Ausfahrt";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hurra! Sie haben erfolgreich abonniert!";
 
-"popup_subscription_success_map_message" = "Entdecken Sie die besten touristischen Sehenswürdigkeiten im MAPS.ME-Katalog";
+"popup_subscription_success_map_message" = "Entdecken Sie die besten touristischen Sehenswürdigkeiten im OMaps-Katalog";
 
 "popup_subscription_success_map_start_button" = "Ansehen";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Start";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Mehrzweckhilfe für Reisen";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Katalog öffnen";
 
-"new_onboarding_step5.2_message" = "Es ist günstig den Reiseführerkatalog in MAPS.ME zu abonnieren. Sie bekommen einen uneingeschränkten Zugriff auf die Routen für Stadtspaziergänge und Aktivurlaub!";
+"new_onboarding_step5.2_message" = "Es ist günstig den Reiseführerkatalog in OMaps zu abonnieren. Sie bekommen einen uneingeschränkten Zugriff auf die Routen für Stadtspaziergänge und Aktivurlaub!";
 
 "new_onboarding_step5.2_button" = "Bedingungen ansehen";
 
-"new_onboarding_step5.3_message" = "Lade herunter und bewerte Routen für Spaziergänge durch die Stadt und aktive Erholung mit der gratis Sammlung von MAPS.ME!";
+"new_onboarding_step5.3_message" = "Lade herunter und bewerte Routen für Spaziergänge durch die Stadt und aktive Erholung mit der gratis Sammlung von OMaps!";
 
 "new_onboarding_step5.3_button" = "Download Gratis";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Routen von Outdooractive für Winter- und Sommerurlaub warten auf Sie im Katalog!";
 
-"whatsnew_guides_galleries_title" = "Planen Sie die nächste Reise mit MAPS.Me";
+"whatsnew_guides_galleries_title" = "Planen Sie die nächste Reise mit OMaps";
 
 "whatsnew_guides_galleries_message" = "Jetzt sind die empfohlenen Reiseführer in den Karten berühmter Städte und Sehenswürdigkeiten zu finden";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terrain";
 
-"tips_map_layers_title_countour" = "Neu in MAPS.ME: Topographie-Layer offline!";
+"tips_map_layers_title_countour" = "Neu in OMaps: Topographie-Layer offline!";
 
 "tips_map_layers_message_countour" = "Der Topographie-Layer hilft Ihnen Ihre Reise in die Natur zu planen und sich in der Gegen zurechtzufinden";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict
index bcdd86da89..4b5b398b3e 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 4b6ec491ef..416a221e84 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Get it now";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Σας ευχαριστούμε που χρησιμοποιείτε το MAPS.ME! Σας αρέσει η εφαρμογή; Πείτε το στους φίλους σας! Είναι ότι καλύτερο μπορείτε να κάνετε για εμάς.";
+"share_on_facebook_text" = "Σας ευχαριστούμε που χρησιμοποιείτε το OMaps! Σας αρέσει η εφαρμογή; Πείτε το στους φίλους σας! Είναι ότι καλύτερο μπορείτε να κάνετε για εμάς.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Δοκιμάστε ξανά";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Σχετικά με το MAPS.ME";
+"about_menu_title" = "Σχετικά με το OMaps";
 
 "downloading_touch_to_cancel" = "Downloading %d%%, touch to cancel";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
 
-"disconnect_usb_cable" = "Αποσυνδέστε το καλώδιο USB ή τοποθετήστε την κάρτα μνήμης για να χρησιμοποιήσετε το MAPS.ME";
+"disconnect_usb_cable" = "Αποσυνδέστε το καλώδιο USB ή τοποθετήστε την κάρτα μνήμης για να χρησιμοποιήσετε το OMaps";
 
 "not_enough_free_space_on_sdcard" = "Ελευθερώσετε  χώρο αποθήκευσης στην SD κάρτα/USB πρώτα προκειμένου να χρησιμοποιήσετε την εφαρμογή";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Υπάρχει διαθέσιμη ενημέρωση για τους παρακάτω χάρτες:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Δε χρειάζεστε το MAPS.ME Lite πλέον, μπορείτε να το απεγκαταστήσετε.";
+"suggest_uninstall_lite" = "Δε χρειάζεστε το OMaps Lite πλέον, μπορείτε να το απεγκαταστήσετε.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ downloaded successfully";
@@ -249,10 +249,10 @@
 "set" = "Σύνολο";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Δεν έχετε αγαπημένα ακόμα.\nΠατήστε σε οποιοδήποτε σημείο στο χάρτη για να προσθέσετε αγαπημένο.\nΜπορείτε επίσης να εισάγετε αγαπημένα από άλλες πηγές και να τα εμφανίσετε στο MAPS.ME. Ανοίξτε το αρχείο KML/KMZ με τα αποθηκευμένα αγαπημένα από το email, το Dropbox ή τους υπερσυνδέσμους.";
+"bookmarks_usage_hint" = "Δεν έχετε αγαπημένα ακόμα.\nΠατήστε σε οποιοδήποτε σημείο στο χάρτη για να προσθέσετε αγαπημένο.\nΜπορείτε επίσης να εισάγετε αγαπημένα από άλλες πηγές και να τα εμφανίσετε στο OMaps. Ανοίξτε το αρχείο KML/KMZ με τα αποθηκευμένα αγαπημένα από το email, το Dropbox ή τους υπερσυνδέσμους.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Μπορείτε επίσης να εισάγετε αγαπημένα από άλλες πηγές και να τα εμφανίσετε στο MAPS.ME. Ανοίξτε το αρχείο KML/KMZ με τα αποθηκευμένα αγαπημένα από το email, το Dropbox ή τους υπερσυνδέσμους.";
+"bookmarks_usage_hint_import_only" = "Μπορείτε επίσης να εισάγετε αγαπημένα από άλλες πηγές και να τα εμφανίσετε στο OMaps. Ανοίξτε το αρχείο KML/KMZ με τα αποθηκευμένα αγαπημένα από το email, το Dropbox ή τους υπερσυνδέσμους.";
 
 /* Settings button in system menu */
 "settings" = "Ρυθμίσεις";
@@ -354,9 +354,9 @@
 "share_by_email" = "Κοινοποίηση μέσω ηλεκτρονικού ταχυδρομείου";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Κοινοποιήθηκαν αγαπημένα MAPS.ME με σας";
+"share_bookmarks_email_subject" = "Κοινοποιήθηκαν αγαπημένα OMaps με σας";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Φόρτωση αγαπημένων";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Λήψη χάρτη σε εξέλιξη.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Hope you enjoy using MAPS.ME! If so, please rate or review the app at the App Store. It takes less than a minute but can really help us. Thanks for your support!";
+"appStore_message" = "Hope you enjoy using OMaps! If so, please rate or review the app at the App Store. It takes less than a minute but can really help us. Thanks for your support!";
 
 /* No, thanks */
 "no_thanks" = "No, thanks";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο MAPS.ME! %1$@ ή %2$@ εάν δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: http://maps.me/get";
+"bookmark_share_sms" = "Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο OMaps! %1$@ ή %2$@ εάν δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Έλεγξε την τρέχουσα τοποθεσία μου στο MAPS.ME! %1$@ ή %2$@ στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: http://maps.me/get";
+"my_position_share_sms" = "Έλεγξε την τρέχουσα τοποθεσία μου στο OMaps! %1$@ ή %2$@ στην περίπτωση που δεν έχεις εγκαταστήσει χάρτες εκτός σύνδεσης, μπορείς να τους κατεβάσεις εδώ: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο MAPS.ME!";
+"bookmark_share_email_subject" = "Έλεγξε τις τοποθεσίες που έχω καρφιτσώσει στο OMaps!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Έλεγξε την τρέχουσα τοποθεσία μου στο χάρτη MAPS.ME!";
+"my_position_share_email_subject" = "Έλεγξε την τρέχουσα τοποθεσία μου στο χάρτη OMaps!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Γεια,\n\nείμαι εδώ τώρα: %1$@. Κάνε κλικ σε αυτό το σύνδεσμο %2$@ ή σε αυτόν %3$@ για να δεις την τοποθεσία στο χάρτη.\n\nΕυχαριστώ.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Κατεβάστε τον χάρτη της τοποθεσίας που βρίσκεστε";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "We are transferring your downloaded maps from MAPS.ME Lite to MAPS.ME. It may take a few minutes.";
+"move_lite_maps_to_pro" = "We are transferring your downloaded maps from OMaps Lite to OMaps. It may take a few minutes.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Your downloaded maps are successfully transferred to MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Your downloaded maps are successfully transferred to OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete MAPS.ME Lite and download the maps again.";
+"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete OMaps Lite and download the maps again.";
 
 /* Text in menu */
 "settings_and_more" = "Settings & More";
@@ -600,7 +600,7 @@
 "website" = "Ιστότοπος";
 
 /* Text in menu */
-"maps_me_community" = "Κοινότητα MAPS.ME ";
+"maps_me_community" = "Κοινότητα OMaps ";
 
 /* Text in menu */
 "like_on_facebook" = "Κάντε Like στο Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Αναφορά σφάλματος";
 
 /* Email subject */
-"subscribe_me_subject" = "Εγγράψτε με στο ενημερωτικό δελτίο MAPS.ME";
+"subscribe_me_subject" = "Εγγράψτε με στο ενημερωτικό δελτίο OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Θέλω να μαθαίνω πρώτος(η) τις τελευταίες ειδήσεις, ενημερώσεις εφαρμογών και προωθητικές ενέργειεςς. Καταλαβαίνω ότι μπορώ να ακυρώσω τη συνδρομή μου ανά πάσα στιγμή.";
 
 /* About text */
-"about_text" = "MAPS.ME offers the fastest offline maps of all the cities, all countries of the world. Travel with full confidence: wherever you are, MAPS.ME helps to locate yourself on the map, find the nearest restaurant, hotel, bank, gas station etc. It doesn’t require internet connection.\n\nWe are always working on new features and would love to hear from you on how you think we could improve MAPS.ME. If you have any problems with the app, don't hesitate to contact us at support@maps.me. We respond to every request!\n\nDo you like MAPS.ME and want to support us? There are some simple and absolutely free ways:\n\n- post a review at your App Market\n- like our Facebook page http://www.facebook.com/mapswithme\n- or just tell about MAPS.ME to your mom, friends and colleagues :)\n\nThank you for being with us. We appreciate your support very much!\n\nP.S. We take map data from OpenStreetMap, a mapping project similar to Wikipedia, which allows users to create and edit maps. If you see something is missing or wrong on the map, you can correct the maps directly at https://www.openstreetmap.org, and your changes will appear in MAPS.ME app with the next version release.";
+"about_text" = "OMaps offers the fastest offline maps of all the cities, all countries of the world. Travel with full confidence: wherever you are, OMaps helps to locate yourself on the map, find the nearest restaurant, hotel, bank, gas station etc. It doesn’t require internet connection.\n\nWe are always working on new features and would love to hear from you on how you think we could improve OMaps. If you have any problems with the app, don't hesitate to contact us at support@omaps.app. We respond to every request!\n\nDo you like OMaps and want to support us? There are some simple and absolutely free ways:\n\n- post a review at your App Market\n- like our Facebook page http://www.facebook.com/mapswithme\n- or just tell about OMaps to your mom, friends and colleagues :)\n\nThank you for being with us. We appreciate your support very much!\n\nP.S. We take map data from OpenStreetMap, a mapping project similar to Wikipedia, which allows users to create and edit maps. If you see something is missing or wrong on the map, you can correct the maps directly at https://www.openstreetmap.org, and your changes will appear in OMaps app with the next version release.";
 
 /* Alert text */
 "email_error_body" = "Το πρόγραμμα-client ηλεκτρονικού ταχυδρομείου έχει δεν έχει ρυθμιστεί. Ρυθμίστε το ή χρησιμοποιήστε άλλο τρόπο να επικοινωνήσετε μαζί μας στη διεύθυνση %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Please update the map to create a route";
 
 /* Update maps suggestion */
-"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
+"routing_update_maps" = "The new version of OMaps allows creating routes from your current position to a destination point. Please update maps to use this feature.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Ενημέρωση όλων";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Βρέθηκαν";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Creating routes in MAPS.ME app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
+"routing_disclaimer" = "Creating routes in OMaps app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Outdated";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Δεν βρέθηκε καμία διαδρομή μεταξύ της επιλεγμένης προέλευσης και προορισμού. Επιλέξτε ένα διαφορετικό σημείο έναρξης ή λήξης.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Παρουσιάστηκε εσωτερικό σφάλμα. Δοκιμάστε να διαγράψετε και να κατεβάσετε το χάρτη ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε μαζί μας στη διεύθυνση support@maps.me.";
+"routing_failed_internal_error" = "Παρουσιάστηκε εσωτερικό σφάλμα. Δοκιμάστε να διαγράψετε και να κατεβάσετε το χάρτη ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε μαζί μας στη διεύθυνση support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Download Map + Routing";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Μόλις βαθμολόγησα την εφαρμογή σας";
 
 /* Text for rating dialog */
-"rating_user_since" = "Χρησιμοποιώ το MAPS.ME από τις %@";
+"rating_user_since" = "Χρησιμοποιώ το OMaps από τις %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Σας αρέσει το MAPS.ME;";
+"rating_do_like_maps" = "Σας αρέσει το OMaps;";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Πατήστε ένα αστέρι να βαθμολογήσετε την εφαρμογή μας.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Λήψη χάρτη";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Κάντε λήψη ενημερωμένου χάρτη και δεδομένων πλοήγησης για να έχετε όλα τα χαρακτηριστικά του MAPS.ME.";
+"routing_download_map_and_routing" = "Κάντε λήψη ενημερωμένου χάρτη και δεδομένων πλοήγησης για να έχετε όλα τα χαρακτηριστικά του OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Λήψη δεδομένων πλοήγησης";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Σας αρέσει η εφαρμογή;";
 
-"rate_alert_default_message" = "Σας ευχαριστούμε που χρησιμοποιείτε το MAPS.ME. Βαθμολογήστε την εφαρμογή. Τα σχόλιά σας μας βοηθάνε να βελτιώσουμε το προϊόν μας.";
+"rate_alert_default_message" = "Σας ευχαριστούμε που χρησιμοποιείτε το OMaps. Βαθμολογήστε την εφαρμογή. Τα σχόλιά σας μας βοηθάνε να βελτιώσουμε το προϊόν μας.";
 
 "rate_alert_five_star_message" = "Ζήτω! Σας ευχαριστούμε πάρα πολύ!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Διπλότυπη τοποθεσία";
 
-"first_launch_congrats_title" = "Το MAPS.ME είναι έτοιμο για χρήση";
+"first_launch_congrats_title" = "Το OMaps είναι έτοιμο για χρήση";
 
 "first_launch_congrats_text" = "Κάντε αναζήτηση και πλοηγηθείτε παντού στον κόσμο χωρίς σύνδεση και χωρίς χρέωση.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Προσθέστε νέες τοποθεσίες στο χάρτη, και επεξεργαστείτε τις υπάρχουσες απευθείας από την εφαρμογή.";
 
-"whatsnew_editor_message_2" = "* Το MAPS.ME χρησιμοποιεί δεδομένα της κοινότητας OpenStreetMap.";
+"whatsnew_editor_message_2" = "* Το OMaps χρησιμοποιεί δεδομένα της κοινότητας OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Δεν θα χαθείτε ποτέ ξανά";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Plan optimal car and pedestrian routes.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — χρησιμοποιήστε χάρτες από όλο τον κόσμο χωρίς σύνδεση στο Internet";
+"onboarding_offline_maps_title" = "OMaps — χρησιμοποιήστε χάρτες από όλο τον κόσμο χωρίς σύνδεση στο Internet";
 
 "onboarding_offline_maps_message" = "Κατεβάστε τους χάρτες της περιοχής που επιθυμείτε μια φορά και χρησιμοποιήστε τις λειτουργίες πλοήγησης και αναζήτησης χωρίς σύνδεση στο Internet.";
 
@@ -1340,9 +1340,9 @@
 
 "onboarding_location_title" = "Βοηθήστε μας να σας βρούμε";
 
-"onboarding_location_message" = "Προκειμένου να χρησιμοποιήσετε την πλοήγηση και τις άλλες λειτουργίες του MAPS.ME χρειάζεται πρόσβαση στη γεωγραφική σας θέση.";
+"onboarding_location_message" = "Προκειμένου να χρησιμοποιήσετε την πλοήγηση και τις άλλες λειτουργίες του OMaps χρειάζεται πρόσβαση στη γεωγραφική σας θέση.";
 
-"onboarding_permissions_title" = "Να επιτραπεί στο MAPS.ME πρόσβαση στον αποθηκευτικό χώρο και την τοποθεσία";
+"onboarding_permissions_title" = "Να επιτραπεί στο OMaps πρόσβαση στον αποθηκευτικό χώρο και την τοποθεσία";
 
 "onboarding_permissions_message" = "Μπορείτε να κατεβάσετε χάρτες, να δείτε μέρη και πληροφορίες για την κίνηση κοντά σε εσάς και να χρησιμοποιήσεττ την πλοήγηση.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Για να το κατεβάσετε, χρειάζεστε περισσότερο χώρο. Διαγράψτε τυχόν μη απαραίτητα δεδομένα.";
 
-"editor_sharing_title" = "Βελτίωσα τους χάρτες MAPS.ME";
+"editor_sharing_title" = "Βελτίωσα τους χάρτες OMaps";
 
 "editor_comment_will_be_sent" = "We will make sure to send your comments to the map editors.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Αναλυτικό σχόλιο";
 
-"editor_detailed_description" = "Οι προτεινόμενες αλλαγές χάρτη θα σταλούν στην Κοινότητα του OpenStreetMap. Περιγράψτε τυχόν πρόσθετα στοιχεία που δεν μπορείτε να επεξεργαστείτε στο MAPS.ME.";
+"editor_detailed_description" = "Οι προτεινόμενες αλλαγές χάρτη θα σταλούν στην Κοινότητα του OpenStreetMap. Περιγράψτε τυχόν πρόσθετα στοιχεία που δεν μπορείτε να επεξεργαστείτε στο OMaps.";
 
 "editor_more_about_osm" = "Περισσότερα σχετικά με το OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Έχουμε ενημερωθεί το πρόγραμμα επεξεργασίας του χάρτη";
 
-"whatsnew_update_editor_message" = "Οι χρήστες MAPS.ME έχουν ήδη κάνει 200.000 αλλαγές χάρτη. Μαζί δημιουργούμε τους πιο λεπτομερείς χάρτες του κόσμου. Ελάτε μαζί μας!";
+"whatsnew_update_editor_message" = "Οι χρήστες OMaps έχουν ήδη κάνει 200.000 αλλαγές χάρτη. Μαζί δημιουργούμε τους πιο λεπτομερείς χάρτες του κόσμου. Ελάτε μαζί μας!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Ενημερώστε όλους τους χάρτες για να χρησιμοποιήσετε το πρόγραμμα επεξεργασίας του χάρτη.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continue";
 
-"recent_track_background_dialog_message" = "Το MAPS.ME χρησιμοποιεί τη γεωγραφική σας τοποθεσία στο παρασκήνιο για την καταγραφή των πρόσφατων διαδρομών σας.";
+"recent_track_background_dialog_message" = "Το OMaps χρησιμοποιεί τη γεωγραφική σας τοποθεσία στο παρασκήνιο για την καταγραφή των πρόσφατων διαδρομών σας.";
 
 "whatsnew_car_navigation_header" = "Πλοήγηση οχήματος φιλική προς το χρήστη";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Πλοήγηση με ποδήλατο (έκδοση beta)";
 
-"whatsnew_cycle_navigation_message" = "Δοκιμάζουμε την πλοήγησης με ποδήλατο για τη νέα σεζόν. Δοκιμάστε την αγαπημένη σας διαδρομή με ποδήλατο με το MAPS.ME και μοιραστείτε τη γνώμη σας μαζί μας.";
+"whatsnew_cycle_navigation_message" = "Δοκιμάζουμε την πλοήγησης με ποδήλατο για τη νέα σεζόν. Δοκιμάστε την αγαπημένη σας διαδρομή με ποδήλατο με το OMaps και μοιραστείτε τη γνώμη σας μαζί μας.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Βαθμολογήστε το στο Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Πείτε το σε ένα φίλο";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Γεια σας! Εγκαταστήστε το MAPS.ME!";
+"tell_friends_text" = "Γεια σας! Εγκαταστήστε το OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "Το MAPS.ME είναι η απαραίτητη εφαρμογή γα ταξίδια που λειτουργεί εκτός σύνδεσης. Το MAPS.ME βασίζεται σε δεδομένα OpenStreetMap και σας επιτρέπει να τα επεξεργαστείτε.";
+"about_description" = "Το OMaps είναι η απαραίτητη εφαρμογή γα ταξίδια που λειτουργεί εκτός σύνδεσης. Το OMaps βασίζεται σε δεδομένα OpenStreetMap και σας επιτρέπει να τα επεξεργαστείτε.";
 
 /* Text in menu */
 "blog" = "Ιστολόγιο";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Άνοιγμα";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Καλέστε ταξί Uber απευθείας μέσα από την εφαρμογή!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Αύξηση μεγέθους γραμματοσειράς στο χάρτη";
 
-"traffic_update_app" = "Κάντε ενημέρωση του MAPS.ME";
+"traffic_update_app" = "Κάντε ενημέρωση του OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να γίνει ενημέρωση της εφαρμογής.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Εκχώρηση άδειας";
 
-"onboarding_storage_permissions_message" = "Αλλάξτε τις ρυθμίσεις άδειας στη συσκευή σας. Χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για τη χρήση του MAPS.ME";
+"onboarding_storage_permissions_message" = "Αλλάξτε τις ρυθμίσεις άδειας στη συσκευή σας. Χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για τη χρήση του OMaps";
 
 "button_exit" = "Έξοδος";
 
-"onboarding_detail_permissions_title" = "Το MAPS.ME χρειάζεται πρόσβαση στο";
+"onboarding_detail_permissions_title" = "Το OMaps χρειάζεται πρόσβαση στο";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Αποθηκευτικός χώρος";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Πρόβλημα πρόσβασης στον αποθηκευτικό χώρο";
 
-"dialog_error_storage_message" = "Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@maps.me";
+"dialog_error_storage_message" = "Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@omaps.app";
 
 "setting_emulate_bad_storage" = "Εξομείωση κακού αποθηκευτικού χώρου";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Συμφωνώ με τους <a href=\"%s\">Όρους Χρήσης</a>";
 
-"sign_agree_news_gdpr" = "Συμφωνώ να λαμβάνω τα τελευταία νέα σχετικά με τα προϊόντα MAPS.ME";
+"sign_agree_news_gdpr" = "Συμφωνώ να λαμβάνω τα τελευταία νέα σχετικά με τα προϊόντα OMaps";
 
 "whats_new_localbiz_title" = "Οι μικρές επιχειρήσεις αξίζουν προσοχή";
 
-"whats_new_localbiz_message" = "Οι τοπικές καφετέριες, τα άνετα πανδοχεία και τα καταστήματα είναι που κάνουν τα ταξίδι μας αξέχαστα. Θα βελτιστοποιήσουμε τη σελίδα σας στο MAPS.ME για να την κάνουμε να ξεχωρίσει.";
+"whats_new_localbiz_message" = "Οι τοπικές καφετέριες, τα άνετα πανδοχεία και τα καταστήματα είναι που κάνουν τα ταξίδι μας αξέχαστα. Θα βελτιστοποιήσουμε τη σελίδα σας στο OMaps για να την κάνουμε να ξεχωρίσει.";
 
 "whats_new_order_button" = "Αφήστε μια αίτηση";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Κατεβάστε νέα μέρη";
 
-"cached_bookmarks_placeholder_subtitle" = "Πιέστε το κουμπί για να κατεβάστε χιλιάδες ενδιαφέροντα μέρη και διαδρομές που δημιουργήθηκαν από τους χρήστες του MAPS.ME. Θα χρειαστείτε σύνδεση στο διαδίκτυο.";
+"cached_bookmarks_placeholder_subtitle" = "Πιέστε το κουμπί για να κατεβάστε χιλιάδες ενδιαφέροντα μέρη και διαδρομές που δημιουργήθηκαν από τους χρήστες του OMaps. Θα χρειαστείτε σύνδεση στο διαδίκτυο.";
 
 "downloader_download_routers" = "Κατεβάστε σελιδοδείκτες";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Αναφορά σφάλματος";
 
-"opt_out_fabric_description" = "Μπορεί να χρησιμοποιήσουμε τα δεδομένα σας για να βελτιώσουμε την εμπειρία του MAPS.ME. Οι αλλαγές θα ενεργοποιηθούν μετά την επανεκκίνηση της εφαρμογής.";
+"opt_out_fabric_description" = "Μπορεί να χρησιμοποιήσουμε τα δεδομένα σας για να βελτιώσουμε την εμπειρία του OMaps. Οι αλλαγές θα ενεργοποιηθούν μετά την επανεκκίνηση της εφαρμογής.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Οι σελιδοδείκτες δεν κατέβηκαν";
 
-"whats_new_bookmarks_catalog_title" = "Το MAPS.ME έχει τώρα κατάλογο διαδρομών";
+"whats_new_bookmarks_catalog_title" = "Το OMaps έχει τώρα κατάλογο διαδρομών";
 
 "whats_new_bookmarks_catalog_message" = "Εκατοντάδες λεπτομερείς διαδρομές από όλο τον κόσμο: πού να πας, τι να δεις, πού να φας.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Αφαιρέστε τις διαφημίσεις";
 
-"remove_ads_title" = "Αφαιρέστε όλες τις διαφημίσεις και υποστηρίξτε το MAPS.ME";
+"remove_ads_title" = "Αφαιρέστε όλες τις διαφημίσεις και υποστηρίξτε το OMaps";
 
 "paybtn_title" = "Πληρώστε %s/χρόνο";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Περισσότερες επιλογές";
 
-"why_support" = "Γιατί να υποστηρίξετε το MAPS.ME?";
+"why_support" = "Γιατί να υποστηρίξετε το OMaps?";
 
 "options_dropdown_item1" = "%s/το μήνα (εξοικονομήστε %s/χρόνο)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Θα αφαιρέσουμε όλες τις διαφημίσεις για σας";
 
-"why_support_item2" = "Μας βοηθάτε να βελτιώσουμε το MAPS.ME";
+"why_support_item2" = "Μας βοηθάτε να βελτιώσουμε το OMaps";
 
 "why_support_item3" = "Μας βοηθάτε να βελτιώσουμε ανοιχτούς χάρτες στο OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Ο εξυπηρετητής δεν είναι διαθέσιμος";
 
-"server_unavailable_message" = "Η αγορά θα ολοκληρωθεί αργότερα. Αν το σφάλμα επιμένει, παρακαλώ επικοινωνήστε στο support@maps.me.";
+"server_unavailable_message" = "Η αγορά θα ολοκληρωθεί αργότερα. Αν το σφάλμα επιμένει, παρακαλώ επικοινωνήστε στο support@omaps.app.";
 
 "offline_fiters_check_in" = "Συνδεθείτε στο διαδίκτυο για να φιλτράρετε ξενοδοχεία με βάση τις ημερομηνίες.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Αυτός ο οδηγός θα ανέβει στο δημόσιο κατάλογο MAPS.ME και θα είναι διαθέσιμος για άλλους χρήστες";
+"upload_and_publish_desc" = "Αυτός ο οδηγός θα ανέβει στο δημόσιο κατάλογο OMaps και θα είναι διαθέσιμος για άλλους χρήστες";
 
 "upload_and_publish" = "Ανέβασμα και δημοσίευση";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Βοηθήστε ταξιδιώτες αφήνοντας μια κριτική!";
 
-"share_bookmarks_email_body_link" = "Γεια!\n\nΕδώ είναι ο σύνδεσμος που μπορείς να κατεβάσεις τους σελιδοδείκτες σου: %s. Ανοίξτε τη λίστα μέσω MAPS.ME και απολαύστε το ταξίδι σας!\n\nΚατεβάστε την εφαρμογή: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Γεια!\n\nΕδώ είναι ο σύνδεσμος που μπορείς να κατεβάσεις τους σελιδοδείκτες σου: %s. Ανοίξτε τη λίστα μέσω OMaps και απολαύστε το ταξίδι σας!\n\nΚατεβάστε την εφαρμογή: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Ο πλοηγός θα σας ειδοποιεί για κάμερες όταν υπερβαίνετε το όριο ταχύτητας των %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Easy to share your impressions";
 
-"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using MAPS.ME catalogue.";
+"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using OMaps catalogue.";
 
 "whats_new_webeditor_title" = "Turn your routes into stories";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Η διαδρομή σας πρέπει να έχει τουλάχιστον 3 σημάδια για να μεταφορτωθεί στον δημόσιο κατάλογο";
 
-"bookmark_public_upload_alert_title" = "Είστε μόνο μερικά βήματα μακριά από τη φόρτωση της διαδρομής σας στον κατάλογο MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Είστε μόνο μερικά βήματα μακριά από τη φόρτωση της διαδρομής σας στον κατάλογο OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Βεβαιωθείτε ότι η διαδρομή έχει τίτλο και περιγραφή και ότι όλα τα σημάδια περιέχουν πληροφορίες σχετικά με τις τοποθεσίες. Χάρη σε αυτό, οι χρήστες θα βρουν τη διαδρομή και θα μπορέσουν να τη χρησιμοποιήσουν στο ταξίδι τους.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Μέγιστη εξοικονόμηση ενέργειας";
 
-"enable_logging_warning_message" = "Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του MAPS.ME.";
+"enable_logging_warning_message" = "Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του OMaps.";
 
 "html_error_upload_message_try_again" = "Ελέγξτε την πρόσβαση στο δίκτυο και δοκιμάστε ξανά";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Ο αναγνωριστικός αριθμός σας είναι: %s.";
 
-"gdpr_request_window_message" = "Αντιγράψτε το και στείλτε το αίτημα στη διεύθυνση support@maps.me";
+"gdpr_request_window_message" = "Αντιγράψτε το και στείλτε το αίτημα στη διεύθυνση support@omaps.app";
 
 "gdpr_request_window_copy" = "Αντιγραφή του αναγνωριστικού αριθμού";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Αποφυγή των πορθμείων";
 
-"cached_guides_placeholder_subtitle" = "Οι έτοιμοι οδηγοί του MAPS.ME προσφέρουν κάποια επιλεγμένα μέρη με φωτογραφίες και περιγραφές που εμφανίζονται στον χάρτη και είναι διαθέσιμα εκτός σύνδεσης.";
+"cached_guides_placeholder_subtitle" = "Οι έτοιμοι οδηγοί του OMaps προσφέρουν κάποια επιλεγμένα μέρη με φωτογραφίες και περιγραφές που εμφανίζονται στον χάρτη και είναι διαθέσιμα εκτός σύνδεσης.";
 
 "guides_catalogue_title" = "Κατάλογος οδηγών";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Ουζμπεκική κουζίνα";
 
-"onboarding_welcome_title" = "Σχεδιάστε και ταξιδέψτε με το MAPS.ME";
+"onboarding_welcome_title" = "Σχεδιάστε και ταξιδέψτε με το OMaps";
 
 "onboarding_welcome_first_subtitle" = "Αποθηκεύετε τα ενδιαφέροντα μέρη, κάντε κράτηση ξενοδοχείων, χτίστε τις διαδρομές εκτός σύνδεσης";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Λήψη";
 
-"onboarding_bydeeplink_guide_title" = "Έτοιμοι οδηγοί στο MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Έτοιμοι οδηγοί στο OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Επιλεγμένα μέρη με φωτογραφίες και περιγραφές εμφανίζονται στον χάρτη και είναι διαθέσιμα εκτός σύνδεσης.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Έχετε κράτηση ξενοδοχείου;";
 
-"popup_booking_download_guides_message" = "Προγραμματίστε τη διαδρομή σας με τους έτοιμους οδηγούς MAPS.ME";
+"popup_booking_download_guides_message" = "Προγραμματίστε τη διαδρομή σας με τους έτοιμους οδηγούς OMaps";
 
 "popup_mwm_download_guides_title" = "Οδηγοί εκτός σύνδεσης";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Προβολή";
 
-"gallery_pp_download_guides_offline_title" = "Προγραμματίστε τις διακοπές σας με το MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Προγραμματίστε τις διακοπές σας με το OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Μην χάσετε τα πιο σημαντικά πράγματα με τη χρήση των διαδρομών από έμπειρους ταξιδιώτες";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Η πληρωμή θα χρεωθεί στον iTunes λογαριασμό σας κατά την επιβεβαίωση της αγοράς. Η συνδρομή θα ανανεωθεί αυτόματα εκτός εάν η αυτόματη ανανέωση είναι απενεργοποιημένη τουλάχιστον 24 ώρες πριν από το τέλος της τρέχουσας περιόδου. Ο λογαριασμός σας θα χρεωθεί σύμφωνα με το σχέδιο ανανέωσής σας εντός 24 ωρών πριν από το τέλος της τρέχουσας περιόδου. Μπορείτε να διαχειριστείτε ή να απενεργοποιήσετε την αυτόματη ανανέωση στις ρυθμίσεις του Apple ID λογαριασμού σας ανά πάσα στιγμή κατά την αγορά σας.";
 
-"whatsnew_carplay_title" = "Αυτοπλοήγηση MAPS.ME στο CarPlay!";
+"whatsnew_carplay_title" = "Αυτοπλοήγηση OMaps στο CarPlay!";
 
 "whatsnew_carplay_message" = "Ετικέτες, αναζήτηση, κάμερες ταχύτητας και ρυθμίσεις παράκαμψης — όλα λειτουργούν χωρίς την πρόσβαση στο διαδίκτυο";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Πληροφ. γιαόρια";
 
-"download_map_carplay" = "Κάντε λήψη χαρτών στην εφαρμογή MAPS.ME στη συσκευή σας";
+"download_map_carplay" = "Κάντε λήψη χαρτών στην εφαρμογή OMaps στη συσκευή σας";
 
 "carplay_roundabout_exit" = "%s έξοδος";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Ζήτω! Είστε συνδρομητής!";
 
-"popup_subscription_success_map_message" = "Τώρα μελετήστε τα καλύτερα τουριστικά αξιοθέατα στον κατάλογο MAPS.ME";
+"popup_subscription_success_map_message" = "Τώρα μελετήστε τα καλύτερα τουριστικά αξιοθέατα στον κατάλογο OMaps";
 
 "popup_subscription_success_map_start_button" = "Προβολή";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Εκκίνηση";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Ολοκληρωμένος βοηθός στα ταξίδια";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Άνοιγμα καταλόγου";
 
-"new_onboarding_step5.2_message" = "Η εγγραφή στον κατάλογο οδηγών στο MAPS.ME συμφέρει. Αποκτήστε πλήρη πρόσβαση σε διαδρομές για περιπάτους στην πόλη και υπαίθριες δραστηριότητες!";
+"new_onboarding_step5.2_message" = "Η εγγραφή στον κατάλογο οδηγών στο OMaps συμφέρει. Αποκτήστε πλήρη πρόσβαση σε διαδρομές για περιπάτους στην πόλη και υπαίθριες δραστηριότητες!";
 
 "new_onboarding_step5.2_button" = "Προβολή όρων";
 
-"new_onboarding_step5.3_message" = "Κάντε λήψη και αξιολογήστε διαδρομές για περιπάτους στην πόλη και υπαίθριες δραστηριότητες με δωρεάν συλλογή του MAPS.ME!";
+"new_onboarding_step5.3_message" = "Κάντε λήψη και αξιολογήστε διαδρομές για περιπάτους στην πόλη και υπαίθριες δραστηριότητες με δωρεάν συλλογή του OMaps!";
 
 "new_onboarding_step5.3_button" = "Δωρεάν λήψη";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Οι διαδρομές από την Outdooractive για χειμερινές και καλοκαιρινές διακοπές σας περιμένουν στον κατάλογο!";
 
-"whatsnew_guides_galleries_title" = "Προγραμματίστε το επόμενο ταξίδι με το MAPS.ME";
+"whatsnew_guides_galleries_title" = "Προγραμματίστε το επόμενο ταξίδι με το OMaps";
 
 "whatsnew_guides_galleries_message" = "Τώρα μπορείτε να βρείτε τους συνιστώμενους οδηγούς στις κάρτες των δημοφιλών πόλεων και αξιοθέατων";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Υψόμετρα";
 
-"tips_map_layers_title_countour" = "Τοπογραφικά στρώματα εκτός σύνδεσης στο MAPS.ME!";
+"tips_map_layers_title_countour" = "Τοπογραφικά στρώματα εκτός σύνδεσης στο OMaps!";
 
 "tips_map_layers_message_countour" = "Τα τοπογραφικά στρώματα θα σας βοηθήσουν να σχεδιάσετε το ταξίδι σας στη φύση και να μην χαθείτε στην περιοχή";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
index 0d775eeb9c..cceb7a71ec 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 18a752a0a7..d3c41d3c39 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Get it now";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Thank you for using MAPS.ME! Do you like the app? Tell your friends about it! This is the best thanks you could give us.";
+"share_on_facebook_text" = "Thank you for using OMaps! Do you like the app? Tell your friends about it! This is the best thanks you could give us.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Try Again";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "About MAPS.ME";
+"about_menu_title" = "About OMaps";
 
 "downloading_touch_to_cancel" = "Downloading %d%%, touch to cancel";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MAPS.ME";
+"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use OMaps";
 
 "not_enough_free_space_on_sdcard" = "Please free up some space on the SD card/USB storage first in order to use the app";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Update available for the following maps:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need MAPS.ME Lite any more, so you can uninstall it.";
+"suggest_uninstall_lite" = "You don't need OMaps Lite any more, so you can uninstall it.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ downloaded successfully";
@@ -249,10 +249,10 @@
 "set" = "Set";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "You have no bookmarks yet.\nTap on any place on the map to add a bookmark.\nBookmarks from other sources can also be imported and displayed in MAPS.ME. Open KML/KMZ file with saved bookmarks from email, Dropbox or weblink.";
+"bookmarks_usage_hint" = "You have no bookmarks yet.\nTap on any place on the map to add a bookmark.\nBookmarks from other sources can also be imported and displayed in OMaps. Open KML/KMZ file with saved bookmarks from email, Dropbox or weblink.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Bookmarks from other sources can be imported and displayed in MAPS.ME. Open a KML/KMZ file with saved bookmarks from email, Dropbox or a weblink.";
+"bookmarks_usage_hint_import_only" = "Bookmarks from other sources can be imported and displayed in OMaps. Open a KML/KMZ file with saved bookmarks from email, Dropbox or a weblink.";
 
 /* Settings button in system menu */
 "settings" = "Settings";
@@ -354,9 +354,9 @@
 "share_by_email" = "Share by email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.ME bookmarks were shared with you";
+"share_bookmarks_email_subject" = "OMaps bookmarks were shared with you";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Loading Bookmarks";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Map download is in progress now.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Hope you enjoy using MAPS.ME! If so, please rate or review the app at the App Store. It takes less than a minute but can really help us. Thanks for your support!";
+"appStore_message" = "Hope you enjoy using OMaps! If so, please rate or review the app at the App Store. It takes less than a minute but can really help us. Thanks for your support!";
 
 /* No, thanks */
 "no_thanks" = "No, thanks";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hey, check out my pin at MAPS.ME! %1$@ or %2$@ Don't have offline maps installed? Download here: http://maps.me/get";
+"bookmark_share_sms" = "Hey, check out my pin at OMaps! %1$@ or %2$@ Don't have offline maps installed? Download here: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hey, check out my current location in MAPS.ME! %1$@ or %2$@ Don't have offline maps? Download here: http://maps.me/get";
+"my_position_share_sms" = "Hey, check out my current location in OMaps! %1$@ or %2$@ Don't have offline maps? Download here: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hey, check out my pin in MAPS.ME!";
+"bookmark_share_email_subject" = "Hey, check out my pin in OMaps!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hey, check out my current location on the MAPS.ME map!";
+"my_position_share_email_subject" = "Hey, check out my current location on the OMaps map!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hi,\n\nI'm here now: %1$@. Click this link %2$@ or this one %3$@ to see the place on the map.\n\nThanks.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Download the map of the place where you are";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "We are transferring your downloaded maps from MAPS.ME Lite to MAPS.ME. It may take a few minutes.";
+"move_lite_maps_to_pro" = "We are transferring your downloaded maps from OMaps Lite to OMaps. It may take a few minutes.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Your downloaded maps are successfully transferred to MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Your downloaded maps are successfully transferred to OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete MAPS.ME Lite and download the maps again.";
+"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete OMaps Lite and download the maps again.";
 
 /* Text in menu */
 "settings_and_more" = "Settings & More";
@@ -600,7 +600,7 @@
 "website" = "Website";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME Community";
+"maps_me_community" = "OMaps Community";
 
 /* Text in menu */
 "like_on_facebook" = "Like on Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Report a bug";
 
 /* Email subject */
-"subscribe_me_subject" = "Please subscribe me to the MAPS.ME newsletter";
+"subscribe_me_subject" = "Please subscribe me to the OMaps newsletter";
 
 /* Email body */
 "subscribe_me_body" = "I want to be the first to learn about the latest news, app updates, and promotions. I understand that I can cancel my subscription at any time.";
 
 /* About text */
-"about_text" = "MAPS.ME offers the fastest offline maps of all the cities, all countries of the world. Travel with full confidence: wherever you are, MAPS.ME helps to locate yourself on the map, find the nearest restaurant, hotel, bank, petrol station etc. It doesn’t require internet connection.\n\nWe are always working on new features and would love to hear from you on how you think we could improve MAPS.ME. If you have any problems with the app, don't hesitate to contact us at support@maps.me. We respond to every request!\n\nDo you like MAPS.ME and want to support us? There are some simple and absolutely free ways:\n\n- post a review at your App Market\n- like our Facebook page http://www.facebook.com/mapswithme\n- or just tell about MAPS.ME to your mom, friends and colleagues :)\n\nThank you for being with us. We appreciate your support very much!\n\nP.S. We take map data from OpenStreetMap, a mapping project similar to Wikipedia, which allows users to create and edit maps. If you see something is missing or wrong on the map, you can correct the maps directly at https://www.openstreetmap.org, and your changes will appear in MAPS.ME app with the next version release.";
+"about_text" = "OMaps offers the fastest offline maps of all the cities, all countries of the world. Travel with full confidence: wherever you are, OMaps helps to locate yourself on the map, find the nearest restaurant, hotel, bank, petrol station etc. It doesn’t require internet connection.\n\nWe are always working on new features and would love to hear from you on how you think we could improve OMaps. If you have any problems with the app, don't hesitate to contact us at support@omaps.app. We respond to every request!\n\nDo you like OMaps and want to support us? There are some simple and absolutely free ways:\n\n- post a review at your App Market\n- like our Facebook page http://www.facebook.com/mapswithme\n- or just tell about OMaps to your mom, friends and colleagues :)\n\nThank you for being with us. We appreciate your support very much!\n\nP.S. We take map data from OpenStreetMap, a mapping project similar to Wikipedia, which allows users to create and edit maps. If you see something is missing or wrong on the map, you can correct the maps directly at https://www.openstreetmap.org, and your changes will appear in OMaps app with the next version release.";
 
 /* Alert text */
 "email_error_body" = "The email client has not been set up. Please configure it or use any other way to contact us at %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Please update the map to create a route";
 
 /* Update maps suggestion */
-"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
+"routing_update_maps" = "The new version of OMaps allows creating routes from your current position to a destination point. Please update maps to use this feature.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Update All";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Found";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Creating routes in MAPS.ME app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
+"routing_disclaimer" = "Creating routes in OMaps app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Outdated";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "There is no route found between the selected origin and destination. Please select a different start or end point.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Internal error occurred. Please try to delete and download the map again. If the problem persists, please contact us at support@maps.me.";
+"routing_failed_internal_error" = "Internal error occurred. Please try to delete and download the map again. If the problem persists, please contact us at support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Download Map + Routing";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "I’ve just rated your app";
 
 /* Text for rating dialog */
-"rating_user_since" = "I’ve been a MAPS.ME user since %@";
+"rating_user_since" = "I’ve been a OMaps user since %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Do you like MAPS.ME?";
+"rating_do_like_maps" = "Do you like OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Tap a star to rate our app.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Get map";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Download updated map and routing data to get all MAPS.ME features.";
+"routing_download_map_and_routing" = "Download updated map and routing data to get all OMaps features.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Get routing data";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Like the app?";
 
-"rate_alert_default_message" = "Thank you for using MAPS.ME. Please rate the app. Your feedback helps us improve our product.";
+"rate_alert_default_message" = "Thank you for using OMaps. Please rate the app. Your feedback helps us improve our product.";
 
 "rate_alert_five_star_message" = "Hooray! We love you, too!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplicated place";
 
-"first_launch_congrats_title" = "MAPS.ME is ready to use";
+"first_launch_congrats_title" = "OMaps is ready to use";
 
 "first_launch_congrats_text" = "Search and navigate everywhere in the world offline, free of charge.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME uses OpenStreetMap community data.";
+"whatsnew_editor_message_2" = "* OMaps uses OpenStreetMap community data.";
 
 "onboarding_offline_navigation_title" = "You will never get lost again";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Plan optimal car and pedestrian routes.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — use the maps of the entire world without an Internet connection";
+"onboarding_offline_maps_title" = "OMaps — use the maps of the entire world without an Internet connection";
 
 "onboarding_offline_maps_message" = "Download the maps for the desired area once, and use the navigation and search functions without an Internet connection.";
 
@@ -1340,9 +1340,9 @@
 
 "onboarding_location_title" = "Help us find you";
 
-"onboarding_location_message" = "In order for you to use navigation and the other app functions, MAPS.ME needs access to your geoposition.";
+"onboarding_location_message" = "In order for you to use navigation and the other app functions, OMaps needs access to your geoposition.";
 
-"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
+"onboarding_permissions_title" = "Allow OMaps access to storage and location";
 
 "onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data.";
 
-"editor_sharing_title" = "I improved the MAPS.ME maps";
+"editor_sharing_title" = "I improved the OMaps maps";
 
 "editor_comment_will_be_sent" = "We will make sure to send your comments to the map editors.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Detailed comment";
 
-"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in MAPS.ME.";
+"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in OMaps.";
 
 "editor_more_about_osm" = "More about OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "We've updated the map editor";
 
-"whatsnew_update_editor_message" = "MAPS.ME users have already made 200,000 map changes. Together we are making the most detailed maps in the world. Join us!";
+"whatsnew_update_editor_message" = "OMaps users have already made 200,000 map changes. Together we are making the most detailed maps in the world. Join us!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Update all maps to use Map Editor.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continue";
 
-"recent_track_background_dialog_message" = "MAPS.ME uses your geoposition in the background for recording your recently traveled route.";
+"recent_track_background_dialog_message" = "OMaps uses your geoposition in the background for recording your recently traveled route.";
 
 "whatsnew_car_navigation_header" = "User-friendly vehicle navigation";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Bike navigation (beta version)";
 
-"whatsnew_cycle_navigation_message" = "We are testing bike navigation for the new season. Try your favorite bike route with MAPS.ME, and share your opinion with us.";
+"whatsnew_cycle_navigation_message" = "We are testing bike navigation for the new season. Try your favorite bike route with OMaps, and share your opinion with us.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Rate on Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Tell a Friend";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hi! Install MAPS.ME!";
+"tell_friends_text" = "Hi! Install OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME is an essential offline application for travelling. MAPS.ME is based on OpenStreetMap data and allows editing it.";
+"about_description" = "OMaps is an essential offline application for travelling. OMaps is based on OpenStreetMap data and allows editing it.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Open";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Book a taxi directly from the app!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Increase font size on the map";
 
-"traffic_update_app" = "Please update MAPS.ME";
+"traffic_update_app" = "Please update OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "To display traffic data, the application must be updated.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Grant Access";
 
-"onboarding_storage_permissions_message" = "Please grant MAPS.ME the permission to use storage in your device settings, otherwise you will not be able to use MAPS.ME.";
+"onboarding_storage_permissions_message" = "Please grant OMaps the permission to use storage in your device settings, otherwise you will not be able to use OMaps.";
 
 "button_exit" = "Exit";
 
-"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
+"onboarding_detail_permissions_title" = "OMaps needs access to";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Storage";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Storage access problem";
 
-"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@maps.me";
+"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@omaps.app";
 
 "setting_emulate_bad_storage" = "Emulate bad storage";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "I agree to the <a href=\"%s\">Terms of Use</a>";
 
-"sign_agree_news_gdpr" = "I agree to receive the latest news about MAPS.ME products";
+"sign_agree_news_gdpr" = "I agree to receive the latest news about OMaps products";
 
 "whats_new_localbiz_title" = "Small business deserves attention";
 
-"whats_new_localbiz_message" = "It is local cafes, cozy hostels and shops that make our journeys unforgettable. We will optimize your page in MAPS.ME to make it stand out.";
+"whats_new_localbiz_message" = "It is local cafes, cozy hostels and shops that make our journeys unforgettable. We will optimize your page in OMaps to make it stand out.";
 
 "whats_new_order_button" = "Leave a request";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Download new places";
 
-"cached_bookmarks_placeholder_subtitle" = "Press the button to download thousands of interesting places and routes created by MAPS.ME users. You will need the internet connection.";
+"cached_bookmarks_placeholder_subtitle" = "Press the button to download thousands of interesting places and routes created by OMaps users. You will need the internet connection.";
 
 "downloader_download_routers" = "Download bookmarks";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Crash report";
 
-"opt_out_fabric_description" = "We may use your data to improve MAPS.ME experience. Changes will take effect after you restart the app.";
+"opt_out_fabric_description" = "We may use your data to improve OMaps experience. Changes will take effect after you restart the app.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Bookmarks were not downloaded";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME now has a route library";
+"whats_new_bookmarks_catalog_title" = "OMaps now has a route library";
 
 "whats_new_bookmarks_catalog_message" = "Hundreds of detailed routes all around the world: where to go, what to see, where to eat.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Remove ads";
 
-"remove_ads_title" = "Remove all ads and support MAPS.ME";
+"remove_ads_title" = "Remove all ads and support OMaps";
 
 "paybtn_title" = "Pay %s/year";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "More options";
 
-"why_support" = "Why support MAPS.ME?";
+"why_support" = "Why support OMaps?";
 
 "options_dropdown_item1" = "%s/month (save %s/year)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "We will remove all ads for you";
 
-"why_support_item2" = "You help us to improve MAPS.ME";
+"why_support_item2" = "You help us to improve OMaps";
 
 "why_support_item3" = "You help us improve open maps OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server is unavailable";
 
-"server_unavailable_message" = "The purchase will be completed later. If the error persists, please contact support@maps.me.";
+"server_unavailable_message" = "The purchase will be completed later. If the error persists, please contact support@omaps.app.";
 
 "offline_fiters_check_in" = "Connect to the internet to filter hotels by dates.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "This guide will be uploaded to the public MAPS.ME catalog and will be available to other users";
+"upload_and_publish_desc" = "This guide will be uploaded to the public OMaps catalog and will be available to other users";
 
 "upload_and_publish" = "Upload and publish";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Help travellers by leaving a review!";
 
-"share_bookmarks_email_body_link" = "Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in MAPS.ME and enjoy your trip!\n\nGet application: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in OMaps and enjoy your trip!\n\nGet application: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigator will warn you about cameras when you exceed the speed limit of %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Easy to share your impressions";
 
-"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using MAPS.ME catalogue.";
+"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using OMaps catalogue.";
 
 "whats_new_webeditor_title" = "Turn your routes into stories";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "You should have at least 3 bookmarks to be able to upload your guide to the public catalogue";
 
-"bookmark_public_upload_alert_title" = "You are a few steps away from sharing your bookmarks with all MAPS.ME travellers!";
+"bookmark_public_upload_alert_title" = "You are a few steps away from sharing your bookmarks with all OMaps travellers!";
 
 "bookmark_public_upload_alert_subtitle" = "Please make sure you have a specific name and description for your list, and all bookmarks have some info about places. This way your list can be found and used by others.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximum power saving";
 
-"enable_logging_warning_message" = "The option turns on logging for diagnostic purposes. It can be helpful for our support staff who are troubleshooting issues with the app. Enable this option only at the request of MAPS.ME support.";
+"enable_logging_warning_message" = "The option turns on logging for diagnostic purposes. It can be helpful for our support staff who are troubleshooting issues with the app. Enable this option only at the request of OMaps support.";
 
 "html_error_upload_message_try_again" = "Please check your network settings and try again";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Your ID is %s.";
 
-"gdpr_request_window_message" = "Please copy it and send the request to support@maps.me";
+"gdpr_request_window_message" = "Please copy it and send the request to support@omaps.app";
 
 "gdpr_request_window_copy" = "Copy the ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Avoid ferry crossings";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME ready-made guides are select places with photos and descriptions that are displayed on the map and available offline.";
+"cached_guides_placeholder_subtitle" = "OMaps ready-made guides are select places with photos and descriptions that are displayed on the map and available offline.";
 
 "guides_catalogue_title" = "Guides catalog";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Uzbek cuisine";
 
-"onboarding_welcome_title" = "Plan and travel with MAPS.ME";
+"onboarding_welcome_title" = "Plan and travel with OMaps";
 
 "onboarding_welcome_first_subtitle" = "Bookmark interesting places, book hotels, calculate routes offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Download";
 
-"onboarding_bydeeplink_guide_title" = "Ready-to-use guides in MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Ready-to-use guides in OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Best places to visit are displayed on the map with photos and descriptions. Works offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Booked a hotel?";
 
-"popup_booking_download_guides_message" = "Plan your route with ready-made guides from MAPS.ME";
+"popup_booking_download_guides_message" = "Plan your route with ready-made guides from OMaps";
 
 "popup_mwm_download_guides_title" = "Offline city guides";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Take a look";
 
-"gallery_pp_download_guides_offline_title" = "Plan your vacation with MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Plan your vacation with OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Don't miss anything with guides made by experienced travellers";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.";
 
-"whatsnew_carplay_title" = "MAPS.ME car navigation in CarPlay!";
+"whatsnew_carplay_title" = "OMaps car navigation in CarPlay!";
 
 "whatsnew_carplay_message" = "Bookmarks, search, speed cameras and routing options are available offline";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Speed warnings";
 
-"download_map_carplay" = "Please download maps in MAPS.ME app on your device";
+"download_map_carplay" = "Please download maps in OMaps app on your device";
 
 "carplay_roundabout_exit" = "%s exit";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Woohoo, you're subscribed!";
 
-"popup_subscription_success_map_message" = "Now discover the best touristic highlights in MAPS.ME catalog";
+"popup_subscription_success_map_message" = "Now discover the best touristic highlights in OMaps catalog";
 
 "popup_subscription_success_map_start_button" = "Start browsing";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Get started";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "All-in-one travel buddy";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Open catalog";
 
-"new_onboarding_step5.2_message" = "Your subscription to the MAPS.ME guides catalog is a bargain. Get full access to city and outdoor guides around the world!";
+"new_onboarding_step5.2_message" = "Your subscription to the OMaps guides catalog is a bargain. Get full access to city and outdoor guides around the world!";
 
 "new_onboarding_step5.2_button" = "Check out the terms";
 
-"new_onboarding_step5.3_message" = "Check out free samples of ready-made city and outdoor routes with a free selection of MAPS.ME!";
+"new_onboarding_step5.3_message" = "Check out free samples of ready-made city and outdoor routes with a free selection of OMaps!";
 
 "new_onboarding_step5.3_button" = "Free download";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Routes from Outdooractive for winter and summer journeys are waiting in the catalog!";
 
-"whatsnew_guides_galleries_title" = "Plan your upcoming trip with MAPS.ME";
+"whatsnew_guides_galleries_title" = "Plan your upcoming trip with OMaps";
 
 "whatsnew_guides_galleries_message" = "Now you can find recommended guides in place pages of popular touristic cities and sights";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terrain";
 
-"tips_map_layers_title_countour" = "New in MAPS.ME: offline topographic layer!";
+"tips_map_layers_title_countour" = "New in OMaps: offline topographic layer!";
 
 "tips_map_layers_message_countour" = "Plan and enjoy your nature trips being sure you know everything about the area";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict
index d8735104b0..26dde2f943 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.stringsdict
@@ -129,4 +129,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 24a6d8c12c..4a53e946df 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Get it now";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Thank you for using MAPS.ME! Do you like the app? Tell your friends about it! This is the best thanks you could give us.";
+"share_on_facebook_text" = "Thank you for using OMaps! Do you like the app? Tell your friends about it! This is the best thanks you could give us.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Try Again";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "About MAPS.ME";
+"about_menu_title" = "About OMaps";
 
 "downloading_touch_to_cancel" = "Downloading %d%%, touch to cancel";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD card/USB storage with downloaded maps is not available";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MAPS.ME";
+"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use OMaps";
 
 "not_enough_free_space_on_sdcard" = "Please free up some space on the SD card/USB storage first in order to use the app";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Update available for the following maps:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "You don't need MAPS.ME Lite any more, so you can uninstall it.";
+"suggest_uninstall_lite" = "You don't need OMaps Lite any more, so you can uninstall it.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ downloaded successfully";
@@ -249,10 +249,10 @@
 "set" = "Set";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "You have no bookmarks yet.\nTap on any place on the map to add a bookmark.\nBookmarks from other sources can also be imported and displayed in MAPS.ME. Open KML/KMZ file with saved bookmarks from email, Dropbox or weblink.";
+"bookmarks_usage_hint" = "You have no bookmarks yet.\nTap on any place on the map to add a bookmark.\nBookmarks from other sources can also be imported and displayed in OMaps. Open KML/KMZ file with saved bookmarks from email, Dropbox or weblink.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Bookmarks from other sources can be imported and displayed in MAPS.ME. Open a KML/KMZ file with saved bookmarks from email, Dropbox or a weblink.";
+"bookmarks_usage_hint_import_only" = "Bookmarks from other sources can be imported and displayed in OMaps. Open a KML/KMZ file with saved bookmarks from email, Dropbox or a weblink.";
 
 /* Settings button in system menu */
 "settings" = "Settings";
@@ -354,9 +354,9 @@
 "share_by_email" = "Share by email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.ME bookmarks were shared with you";
+"share_bookmarks_email_subject" = "OMaps bookmarks were shared with you";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Loading Bookmarks";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Map download is in progress now.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Hope you enjoy using MAPS.ME! If so, please rate or review the app at the App Store. It takes less than a minute but can really help us. Thanks for your support!";
+"appStore_message" = "Hope you enjoy using OMaps! If so, please rate or review the app at the App Store. It takes less than a minute but can really help us. Thanks for your support!";
 
 /* No, thanks */
 "no_thanks" = "No, thanks";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hey, check out my pin at MAPS.ME! %1$@ or %2$@ Don't have offline maps installed? Download here: http://maps.me/get";
+"bookmark_share_sms" = "Hey, check out my pin at OMaps! %1$@ or %2$@ Don't have offline maps installed? Download here: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hey, check out my current location in MAPS.ME! %1$@ or %2$@ Don't have offline maps? Download here: http://maps.me/get";
+"my_position_share_sms" = "Hey, check out my current location in OMaps! %1$@ or %2$@ Don't have offline maps? Download here: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hey, check out my pin in MAPS.ME!";
+"bookmark_share_email_subject" = "Hey, check out my pin in OMaps!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hey, check out my current location on the MAPS.ME map!";
+"my_position_share_email_subject" = "Hey, check out my current location on the OMaps map!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hi,\n\nI'm here now: %1$@. Click this link %2$@ or this one %3$@ to see the place on the map.\n\nThanks.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Download the map of the place where you are";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "We are transferring your downloaded maps from MAPS.ME Lite to MAPS.ME. It may take a few minutes.";
+"move_lite_maps_to_pro" = "We are transferring your downloaded maps from OMaps Lite to OMaps. It may take a few minutes.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Your downloaded maps are successfully transferred to MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Your downloaded maps are successfully transferred to OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete MAPS.ME Lite and download the maps again.";
+"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete OMaps Lite and download the maps again.";
 
 /* Text in menu */
 "settings_and_more" = "Settings & More";
@@ -600,7 +600,7 @@
 "website" = "Website";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME Community";
+"maps_me_community" = "OMaps Community";
 
 /* Text in menu */
 "like_on_facebook" = "Like on Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Report a bug";
 
 /* Email subject */
-"subscribe_me_subject" = "Please subscribe me to the MAPS.ME newsletter";
+"subscribe_me_subject" = "Please subscribe me to the OMaps newsletter";
 
 /* Email body */
 "subscribe_me_body" = "I want to be the first to learn about the latest news, app updates, and promotions. I understand that I can cancel my subscription at any time.";
 
 /* About text */
-"about_text" = "MAPS.ME offers the fastest offline maps of all the cities, all countries of the world. Travel with full confidence: wherever you are, MAPS.ME helps to locate yourself on the map, find the nearest restaurant, hotel, bank, gas station etc. It doesn’t require internet connection.\n\nWe are always working on new features and would love to hear from you on how you think we could improve MAPS.ME. If you have any problems with the app, don't hesitate to contact us at support@maps.me. We respond to every request!\n\nDo you like MAPS.ME and want to support us? There are some simple and absolutely free ways:\n\n- post a review at your App Market\n- like our Facebook page http://www.facebook.com/mapswithme\n- or just tell about MAPS.ME to your mom, friends and colleagues :)\n\nThank you for being with us. We appreciate your support very much!\n\nP.S. We take map data from OpenStreetMap, a mapping project similar to Wikipedia, which allows users to create and edit maps. If you see something is missing or wrong on the map, you can correct the maps directly at https://www.openstreetmap.org, and your changes will appear in MAPS.ME app with the next version release.";
+"about_text" = "OMaps offers the fastest offline maps of all the cities, all countries of the world. Travel with full confidence: wherever you are, OMaps helps to locate yourself on the map, find the nearest restaurant, hotel, bank, gas station etc. It doesn’t require internet connection.\n\nWe are always working on new features and would love to hear from you on how you think we could improve OMaps. If you have any problems with the app, don't hesitate to contact us at support@omaps.app. We respond to every request!\n\nDo you like OMaps and want to support us? There are some simple and absolutely free ways:\n\n- post a review at your App Market\n- like our Facebook page http://www.facebook.com/mapswithme\n- or just tell about OMaps to your mom, friends and colleagues :)\n\nThank you for being with us. We appreciate your support very much!\n\nP.S. We take map data from OpenStreetMap, a mapping project similar to Wikipedia, which allows users to create and edit maps. If you see something is missing or wrong on the map, you can correct the maps directly at https://www.openstreetmap.org, and your changes will appear in OMaps app with the next version release.";
 
 /* Alert text */
 "email_error_body" = "The email client has not been set up. Please configure it or use any other way to contact us at %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Please update the map to create a route";
 
 /* Update maps suggestion */
-"routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
+"routing_update_maps" = "The new version of OMaps allows creating routes from your current position to a destination point. Please update maps to use this feature.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Update All";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Found";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Creating routes in MAPS.ME app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
+"routing_disclaimer" = "Creating routes in OMaps app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Outdated";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "There is no route found between the selected origin and destination. Please select a different start or end point.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Internal error occurred. Please try to delete and download the map again. If the problem persists, please contact us at support@maps.me.";
+"routing_failed_internal_error" = "Internal error occurred. Please try to delete and download the map again. If the problem persists, please contact us at support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Download Map + Routing";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "I’ve just rated your app";
 
 /* Text for rating dialog */
-"rating_user_since" = "I’ve been a MAPS.ME user since %@";
+"rating_user_since" = "I’ve been a OMaps user since %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Do you like MAPS.ME?";
+"rating_do_like_maps" = "Do you like OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Tap a star to rate our app.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Get map";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Download updated map and routing data to get all MAPS.ME features.";
+"routing_download_map_and_routing" = "Download updated map and routing data to get all OMaps features.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Get routing data";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Like the app?";
 
-"rate_alert_default_message" = "Thank you for using MAPS.ME. Please rate the app. Your feedback helps us improve our product.";
+"rate_alert_default_message" = "Thank you for using OMaps. Please rate the app. Your feedback helps us improve our product.";
 
 "rate_alert_five_star_message" = "Hooray! We love you, too!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplicated place";
 
-"first_launch_congrats_title" = "MAPS.ME is ready to use";
+"first_launch_congrats_title" = "OMaps is ready to use";
 
 "first_launch_congrats_text" = "Search and navigate everywhere in the world offline, free of charge.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME uses OpenStreetMap community data.";
+"whatsnew_editor_message_2" = "* OMaps uses OpenStreetMap community data.";
 
 "onboarding_offline_navigation_title" = "You will never get lost again";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Plan optimal car and pedestrian routes.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — use the maps of the entire world without an Internet connection";
+"onboarding_offline_maps_title" = "OMaps — use the maps of the entire world without an Internet connection";
 
 "onboarding_offline_maps_message" = "Download the maps for the desired area once, and use the navigation and search functions without an Internet connection.";
 
@@ -1340,9 +1340,9 @@
 
 "onboarding_location_title" = "Help us find you";
 
-"onboarding_location_message" = "In order for you to use navigation and the other app functions, MAPS.ME needs access to your geoposition.";
+"onboarding_location_message" = "In order for you to use navigation and the other app functions, OMaps needs access to your geoposition.";
 
-"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
+"onboarding_permissions_title" = "Allow OMaps access to storage and location";
 
 "onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data.";
 
-"editor_sharing_title" = "I improved the MAPS.ME maps";
+"editor_sharing_title" = "I improved the OMaps maps";
 
 "editor_comment_will_be_sent" = "We will make sure to send your comments to the map editors.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Detailed comment";
 
-"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in MAPS.ME.";
+"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Describe any additional details that cannot be edited in OMaps.";
 
 "editor_more_about_osm" = "More about OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "We've updated the map editor";
 
-"whatsnew_update_editor_message" = "MAPS.ME users have already made 200,000 map changes. Together we are making the most detailed maps in the world. Join us!";
+"whatsnew_update_editor_message" = "OMaps users have already made 200,000 map changes. Together we are making the most detailed maps in the world. Join us!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Update all maps to use Map Editor.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continue";
 
-"recent_track_background_dialog_message" = "MAPS.ME uses your geoposition in the background for recording your recently traveled route.";
+"recent_track_background_dialog_message" = "OMaps uses your geoposition in the background for recording your recently traveled route.";
 
 "whatsnew_car_navigation_header" = "User-friendly vehicle navigation";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Bike navigation (beta version)";
 
-"whatsnew_cycle_navigation_message" = "We are testing bike navigation for the new season. Try your favorite bike route with MAPS.ME, and share your opinion with us.";
+"whatsnew_cycle_navigation_message" = "We are testing bike navigation for the new season. Try your favorite bike route with OMaps, and share your opinion with us.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Rate on Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Tell a Friend";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hi! Install MAPS.ME!";
+"tell_friends_text" = "Hi! Install OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME is an essential offline application for travelling. MAPS.ME is based on OpenStreetMap data and allows editing it.";
+"about_description" = "OMaps is an essential offline application for travelling. OMaps is based on OpenStreetMap data and allows editing it.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Open";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Order a taxi directly from the app!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Increase font size on the map";
 
-"traffic_update_app" = "Please update MAPS.ME";
+"traffic_update_app" = "Please update OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "To display traffic data, the application must be updated.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Grant Access";
 
-"onboarding_storage_permissions_message" = "Please grant MAPS.ME the permission to use storage in your device settings, otherwise you will not be able to use MAPS.ME.";
+"onboarding_storage_permissions_message" = "Please grant OMaps the permission to use storage in your device settings, otherwise you will not be able to use OMaps.";
 
 "button_exit" = "Exit";
 
-"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
+"onboarding_detail_permissions_title" = "OMaps needs access to";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Storage";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Storage access problem";
 
-"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@maps.me";
+"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@omaps.app";
 
 "setting_emulate_bad_storage" = "Emulate bad storage";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "I agree to the <a href=\"%s\">Terms of Use</a>";
 
-"sign_agree_news_gdpr" = "I agree to receive the latest news about MAPS.ME products";
+"sign_agree_news_gdpr" = "I agree to receive the latest news about OMaps products";
 
 "whats_new_localbiz_title" = "Small business deserves attention";
 
-"whats_new_localbiz_message" = "It is local cafes, cozy hostels and shops that make our journeys unforgettable. We will optimize your page in MAPS.ME to make it stand out.";
+"whats_new_localbiz_message" = "It is local cafes, cozy hostels and shops that make our journeys unforgettable. We will optimize your page in OMaps to make it stand out.";
 
 "whats_new_order_button" = "Leave a request";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Download new places";
 
-"cached_bookmarks_placeholder_subtitle" = "Press the button to download thousands of interesting places and routes created by MAPS.ME users. You will need the internet connection.";
+"cached_bookmarks_placeholder_subtitle" = "Press the button to download thousands of interesting places and routes created by OMaps users. You will need the internet connection.";
 
 "downloader_download_routers" = "Download bookmarks";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Crash report";
 
-"opt_out_fabric_description" = "We may use your data to improve MAPS.ME experience. Changes will take effect after you restart the app.";
+"opt_out_fabric_description" = "We may use your data to improve OMaps experience. Changes will take effect after you restart the app.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Bookmarks were not downloaded";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME now has a route library";
+"whats_new_bookmarks_catalog_title" = "OMaps now has a route library";
 
 "whats_new_bookmarks_catalog_message" = "Hundreds of detailed routes all around the world: where to go, what to see, where to eat.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Remove ads";
 
-"remove_ads_title" = "Remove all ads and support MAPS.ME";
+"remove_ads_title" = "Remove all ads and support OMaps";
 
 "paybtn_title" = "Pay %s/year";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "More options";
 
-"why_support" = "Why support MAPS.ME?";
+"why_support" = "Why support OMaps?";
 
 "options_dropdown_item1" = "%s/month (save %s/year)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "We will remove all ads for you";
 
-"why_support_item2" = "You help us to improve MAPS.ME";
+"why_support_item2" = "You help us to improve OMaps";
 
 "why_support_item3" = "You help us improve open maps OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server is unavailable";
 
-"server_unavailable_message" = "The purchase will be completed later. If the error persists, please contact support@maps.me.";
+"server_unavailable_message" = "The purchase will be completed later. If the error persists, please contact support@omaps.app.";
 
 "offline_fiters_check_in" = "Connect to the internet to filter hotels by dates.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "This guide will be uploaded to the public MAPS.ME catalog and will be available to other users";
+"upload_and_publish_desc" = "This guide will be uploaded to the public OMaps catalog and will be available to other users";
 
 "upload_and_publish" = "Upload and publish";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Help travellers by leaving a review!";
 
-"share_bookmarks_email_body_link" = "Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in MAPS.ME and enjoy your trip!\n\nGet application: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hello!\n\nHere is the link where you can download bookmarks: %s. Open the list in OMaps and enjoy your trip!\n\nGet application: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigator will warn you about cameras when you exceed the speed limit of %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Easy to share your impressions";
 
-"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using MAPS.ME catalogue.";
+"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using OMaps catalogue.";
 
 "whats_new_webeditor_title" = "Turn your routes into stories";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "You should have at least 3 bookmarks to be able to upload your guide to the public catalogue";
 
-"bookmark_public_upload_alert_title" = "You are a few steps away from sharing your bookmarks with all MAPS.ME travellers!";
+"bookmark_public_upload_alert_title" = "You are a few steps away from sharing your bookmarks with all OMaps travellers!";
 
 "bookmark_public_upload_alert_subtitle" = "Please make sure you have a specific name and description for your list, and all bookmarks have some info about places. This way your list can be found and used by others.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximum power saving";
 
-"enable_logging_warning_message" = "The option turns on logging for diagnostic purposes. It can be helpful for our support staff who are troubleshooting issues with the app. Enable this option only at the request of MAPS.ME support.";
+"enable_logging_warning_message" = "The option turns on logging for diagnostic purposes. It can be helpful for our support staff who are troubleshooting issues with the app. Enable this option only at the request of OMaps support.";
 
 "html_error_upload_message_try_again" = "Please check your network settings and try again";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Your ID is %s.";
 
-"gdpr_request_window_message" = "Please copy it and send the request to support@maps.me";
+"gdpr_request_window_message" = "Please copy it and send the request to support@omaps.app";
 
 "gdpr_request_window_copy" = "Copy the ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Avoid ferry crossings";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME ready-made guides are select places with photos and descriptions that are displayed on the map and available offline.";
+"cached_guides_placeholder_subtitle" = "OMaps ready-made guides are select places with photos and descriptions that are displayed on the map and available offline.";
 
 "guides_catalogue_title" = "Guides catalog";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Uzbek cuisine";
 
-"onboarding_welcome_title" = "Plan and travel with MAPS.ME";
+"onboarding_welcome_title" = "Plan and travel with OMaps";
 
 "onboarding_welcome_first_subtitle" = "Bookmark interesting places, book hotels, calculate routes offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Download";
 
-"onboarding_bydeeplink_guide_title" = "Ready-to-use guides in MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Ready-to-use guides in OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Best places to visit are displayed on the map with photos and descriptions. Works offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Booked a hotel?";
 
-"popup_booking_download_guides_message" = "Plan your route with ready-made guides from MAPS.ME";
+"popup_booking_download_guides_message" = "Plan your route with ready-made guides from OMaps";
 
 "popup_mwm_download_guides_title" = "Offline city guides";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Take a look";
 
-"gallery_pp_download_guides_offline_title" = "Plan your vacation with MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Plan your vacation with OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Don't miss anything with guides made by experienced travellers";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.";
 
-"whatsnew_carplay_title" = "MAPS.ME car navigation in CarPlay!";
+"whatsnew_carplay_title" = "OMaps car navigation in CarPlay!";
 
 "whatsnew_carplay_message" = "Bookmarks, search, speed cameras and routing options are available offline";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Speed warnings";
 
-"download_map_carplay" = "Please download maps in MAPS.ME app on your device";
+"download_map_carplay" = "Please download maps in OMaps app on your device";
 
 "carplay_roundabout_exit" = "%s exit";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Woohoo, you're subscribed!";
 
-"popup_subscription_success_map_message" = "Now discover the best touristic highlights in MAPS.ME catalog";
+"popup_subscription_success_map_message" = "Now discover the best touristic highlights in OMaps catalog";
 
 "popup_subscription_success_map_start_button" = "Start browsing";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Get started";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "All-in-one travel buddy";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Open catalog";
 
-"new_onboarding_step5.2_message" = "Your subscription to the MAPS.ME guides catalog is a bargain. Get full access to city and outdoor guides around the world!";
+"new_onboarding_step5.2_message" = "Your subscription to the OMaps guides catalog is a bargain. Get full access to city and outdoor guides around the world!";
 
 "new_onboarding_step5.2_button" = "Check out the terms";
 
-"new_onboarding_step5.3_message" = "Check out free samples of ready-made city and outdoor routes with a free selection of MAPS.ME!";
+"new_onboarding_step5.3_message" = "Check out free samples of ready-made city and outdoor routes with a free selection of OMaps!";
 
 "new_onboarding_step5.3_button" = "Free download";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Routes from Outdooractive for winter and summer journeys are waiting in the catalog!";
 
-"whatsnew_guides_galleries_title" = "Plan your upcoming trip with MAPS.ME";
+"whatsnew_guides_galleries_title" = "Plan your upcoming trip with OMaps";
 
 "whatsnew_guides_galleries_message" = "Now you can find recommended guides in place pages of popular touristic cities and sights";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terrain";
 
-"tips_map_layers_title_countour" = "New in MAPS.ME: offline topographic layer!";
+"tips_map_layers_title_countour" = "New in OMaps: offline topographic layer!";
 
 "tips_map_layers_message_countour" = "Plan and enjoy your nature trips being sure you know everything about the area";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict
index 8000b6477b..31a0c102c6 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.stringsdict
@@ -147,4 +147,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 69a98483d6..a24c77b6a4 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Instalar";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "¡Gracias por utilizar MAPS.ME! ¿Te gusta la aplicación? ¡Habla de la aplicación a tus amigos! Sería la mejor muestra de gratitud para nosotros.";
+"share_on_facebook_text" = "¡Gracias por utilizar OMaps! ¿Te gusta la aplicación? ¡Habla de la aplicación a tus amigos! Sería la mejor muestra de gratitud para nosotros.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Intentarla otra vez";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Sobre MAPS.ME";
+"about_menu_title" = "Sobre OMaps";
 
 "downloading_touch_to_cancel" = "Descargando %d%%, presionar para cancelar";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "La memoria SD/almacenamiento USB con los mapas descargados no está disponible";
 
-"disconnect_usb_cable" = "Por favor desconectar el cable USB o insertar la memoria SD para usar MAPS.ME";
+"disconnect_usb_cable" = "Por favor desconectar el cable USB o insertar la memoria SD para usar OMaps";
 
 "not_enough_free_space_on_sdcard" = "Por favor liberar espacio en la memoria SD/almacenamiento USB para usar la aplicación";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Hay actualizaciones disponibles para estos mapas:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Ahora no necesita MAPS.ME Lite, la puede desinstalar.";
+"suggest_uninstall_lite" = "Ahora no necesita OMaps Lite, la puede desinstalar.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ se descargó exitosamente";
@@ -249,10 +249,10 @@
 "set" = "Grupo";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Todavía no tienes favoritos.\nToca en cualquier lugar del mapa y añade favoritos.\nTambién se pueden importar y mostrar marcadores de otras fuentes en la aplicación MAPS.ME. Abre el archivo KML/KMZ con los alfileres guardados desde el correo, Dropbox o Weblink.";
+"bookmarks_usage_hint" = "Todavía no tienes favoritos.\nToca en cualquier lugar del mapa y añade favoritos.\nTambién se pueden importar y mostrar marcadores de otras fuentes en la aplicación OMaps. Abre el archivo KML/KMZ con los alfileres guardados desde el correo, Dropbox o Weblink.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Se pueden importar y mostrar marcadores de otras fuentes en la aplicación MAPS.ME. Abre el archivo KML/KMZ con los alfileres guardados desde el corre, Dropbox o Weblink.";
+"bookmarks_usage_hint_import_only" = "Se pueden importar y mostrar marcadores de otras fuentes en la aplicación OMaps. Abre el archivo KML/KMZ con los alfileres guardados desde el corre, Dropbox o Weblink.";
 
 /* Settings button in system menu */
 "settings" = "Configuración";
@@ -354,9 +354,9 @@
 "share_by_email" = "Enviar por email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Marcapáginas de MAPS.ME compartidos contigo";
+"share_bookmarks_email_subject" = "Marcapáginas de OMaps compartidos contigo";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Cargando favoritos";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "Se está descargando un país.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "¡Ojalá disfrute mucho con MAPS.ME! Si le gusta, le agradeceremos que puntúe nuestra aplicación en el App Store. Es menos de un minuto y nos sería de gran ayuda. ¡Gracias por su apoyo!";
+"appStore_message" = "¡Ojalá disfrute mucho con OMaps! Si le gusta, le agradeceremos que puntúe nuestra aplicación en el App Store. Es menos de un minuto y nos sería de gran ayuda. ¡Gracias por su apoyo!";
 
 /* No, thanks */
 "no_thanks" = "No, gracias";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "Mira dónde estoy. Abre %1$@ o %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Mira mi alfiler en el mapa de MAPS.ME";
+"bookmark_share_email_subject" = "Mira mi alfiler en el mapa de OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Mira mi ubicación actual en el mapa en MAPS.ME";
+"my_position_share_email_subject" = "Mira mi ubicación actual en el mapa en OMaps";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hola:\n\nAhora estoy aquí: %1$@. Haz clic en este enlace %2$@ o esta %3$@ para verlo en el mapa.\n\nGracias.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Descarga el mapa del lugar en que te encuentras";
 
 /* text of notification */
-"pro_version_is_free_today" = "¡Versión completa de MAPS.ME gratis hoy! Descárgalo ahora y dilo a tus amigos.";
+"pro_version_is_free_today" = "¡Versión completa de OMaps gratis hoy! Descárgalo ahora y dilo a tus amigos.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Estamos transfiriendo tus mapas descargados de MAPS.ME Lite a MAPS.ME, lo cual puede llevar unos minutos.";
+"move_lite_maps_to_pro" = "Estamos transfiriendo tus mapas descargados de OMaps Lite a OMaps, lo cual puede llevar unos minutos.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Tus mapas descargados se han transferido correctamente a MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Tus mapas descargados se han transferido correctamente a OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "No se han podido transferir tus mapas. Por favor, elimina MAPS.ME Lite y descarga los mapas de nuevo.";
+"move_lite_maps_to_pro_failed" = "No se han podido transferir tus mapas. Por favor, elimina OMaps Lite y descarga los mapas de nuevo.";
 
 /* Text in menu */
 "settings_and_more" = "Ajustes y más";
@@ -600,7 +600,7 @@
 "website" = "Sitio web";
 
 /* Text in menu */
-"maps_me_community" = "Comunidad de MAPS.ME";
+"maps_me_community" = "Comunidad de OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Pulsa \"Me gusta\" en Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Hay un error";
 
 /* Email subject */
-"subscribe_me_subject" = "Por favor quiero suscribirme al boletín de MAPS.ME";
+"subscribe_me_subject" = "Por favor quiero suscribirme al boletín de OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Quiero ser el primero en conocer las últimas noticias actualizaciones y promociones. Puedo cancelar mi suscripción en cualquier momento.";
 
 /* About text */
-"about_text" = "MAPS.ME ofrece los mapas sin conexión más rápidos de todas las ciudades y todos los países del mundo. Viaja con plena confianza: estés donde estés, MAPS.ME te ayuda a ubicarte en el mapa, encontrar el restaurante, hotel, banco o gasolinera más próximo, etc. No requiere conexión a Internet.\n\nTrabajamos continuamente en el desarrollo de nuevas funcionalidades y nos encantaría conocer tu opinión sobre cómo podríamos mejorar MAPS.ME. Si tienes cualquier problema con la aplicación, no dudes en contactar con nosotros en support@maps.me. ¡Respondemos a todas las solicitudes!\n\n¿Te gusta MAPS.ME y quieres apoyarnos? Estas son algunas formas simples y totalmente gratis:\n\n- Publica una opinión en tu App Market\n- Dale a me gusta a nuestra página de Facebook http://www.facebook.com/mapswithme\n- O simplemente habla sobre MAPS.ME a tu madre, amigos y colegas :)\n\nGracias por estar a nuestro lado. ¡Agradecemos mucho tu apoyo!\n\nPD: obtenemos datos de los mapas de OpenStreetMap, un proyecto de mapeo similar a Wikipedia, que permite a los usuarios crear y editar mapas. Si crees que falta algo o hay cualquier error en el mapa, puedes corregir los mapas directamente en https://www.openstreetmap.org y los cambios aparecerán en la aplicación MAPS.ME en el próximo lanzamiento de la versión.";
+"about_text" = "OMaps ofrece los mapas sin conexión más rápidos de todas las ciudades y todos los países del mundo. Viaja con plena confianza: estés donde estés, OMaps te ayuda a ubicarte en el mapa, encontrar el restaurante, hotel, banco o gasolinera más próximo, etc. No requiere conexión a Internet.\n\nTrabajamos continuamente en el desarrollo de nuevas funcionalidades y nos encantaría conocer tu opinión sobre cómo podríamos mejorar OMaps. Si tienes cualquier problema con la aplicación, no dudes en contactar con nosotros en support@omaps.app. ¡Respondemos a todas las solicitudes!\n\n¿Te gusta OMaps y quieres apoyarnos? Estas son algunas formas simples y totalmente gratis:\n\n- Publica una opinión en tu App Market\n- Dale a me gusta a nuestra página de Facebook http://www.facebook.com/mapswithme\n- O simplemente habla sobre OMaps a tu madre, amigos y colegas :)\n\nGracias por estar a nuestro lado. ¡Agradecemos mucho tu apoyo!\n\nPD: obtenemos datos de los mapas de OpenStreetMap, un proyecto de mapeo similar a Wikipedia, que permite a los usuarios crear y editar mapas. Si crees que falta algo o hay cualquier error en el mapa, puedes corregir los mapas directamente en https://www.openstreetmap.org y los cambios aparecerán en la aplicación OMaps en el próximo lanzamiento de la versión.";
 
 /* Alert text */
 "email_error_body" = "No se ha configurado el cliente de correo electrónico. Por favor, configúralo o utiliza alguna otra forma de ponerte en contacto con nosotros en %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Por favor, actualiza el mapa para crear una ruta.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "La nueva versión de MAPS.ME permite crear rutas desde tu ubicación actual hasta un punto de destino. Por favor, actualiza los mapas para utilizar esta característica.";
+"routing_update_maps" = "La nueva versión de OMaps permite crear rutas desde tu ubicación actual hasta un punto de destino. Por favor, actualiza los mapas para utilizar esta característica.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Actualizar todos";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Encontrado";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Creando rutas en la aplicación MAPS.ME, por favor, tenga en cuenta lo siguiente:\n\n  - Las rutas sugeridas se pueden considerar únicamente como recomendaciones.\n - Las condiciones de la carretera, las normas y las señales de tráfico tienen mayor prioridad que el consejo de navegación.\n - El mapa podría ser incorrecto o estar obsoleto y las rutas pueden no crear el mejor camino posible.\n\n  ¡Esté seguro en las carreteras y cuídese!";
+"routing_disclaimer" = "Creando rutas en la aplicación OMaps, por favor, tenga en cuenta lo siguiente:\n\n  - Las rutas sugeridas se pueden considerar únicamente como recomendaciones.\n - Las condiciones de la carretera, las normas y las señales de tráfico tienen mayor prioridad que el consejo de navegación.\n - El mapa podría ser incorrecto o estar obsoleto y las rutas pueden no crear el mejor camino posible.\n\n  ¡Esté seguro en las carreteras y cuídese!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Anticuado";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "No se ha encontrado ninguna ruta entre el origen seleccionado y el destino. Por favor, seleccione un punto de partida o destino diferente.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Se ha producido un error interno. Por favor, intente eliminar y descargar el mapa otra vez. Si el problema persiste, por favor contáctenos en support@maps.me.";
+"routing_failed_internal_error" = "Se ha producido un error interno. Por favor, intente eliminar y descargar el mapa otra vez. Si el problema persiste, por favor contáctenos en support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Descargar mapa + itinerario";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Acabo de puntuar tu aplicación";
 
 /* Text for rating dialog */
-"rating_user_since" = "Soy usuario de MAPS.ME desde %@";
+"rating_user_since" = "Soy usuario de OMaps desde %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "¿Te gusta MAPS.ME?";
+"rating_do_like_maps" = "¿Te gusta OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Pulsa una estrella para puntuar tu aplicación.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Obtén el mapa";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Descarga el mapa actualizado y los datos de enrutamiento para conseguir todas las funciones de MAPS.ME.";
+"routing_download_map_and_routing" = "Descarga el mapa actualizado y los datos de enrutamiento para conseguir todas las funciones de OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Obtén datos de enrutamiento";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "¿Te gusta la aplicación?";
 
-"rate_alert_default_message" = "Gracias por usar MAPS.ME. Por favor, puntúa la aplicación. Tus comentarios nos ayudan a mejorar.";
+"rate_alert_default_message" = "Gracias por usar OMaps. Por favor, puntúa la aplicación. Tus comentarios nos ayudan a mejorar.";
 
 "rate_alert_five_star_message" = "¡Genial! ¡Nosotros también te queremos!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Lugar duplicado";
 
-"first_launch_congrats_title" = "MAPS.ME está listo para usar";
+"first_launch_congrats_title" = "OMaps está listo para usar";
 
 "first_launch_congrats_text" = "Busca y navega sin conexión por cualquier parte del mundo, sin cargos.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Añadir lugares nuevos al mapa y editar los lugares actuales directamente desde la aplicación.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME utiliza datos de la comunidad de OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps utiliza datos de la comunidad de OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Nunca volverás a perderte";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planifica rutas óptimas en coche y a pie.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — accede al mapa del mundo sin Internet";
+"onboarding_offline_maps_title" = "OMaps — accede al mapa del mundo sin Internet";
 
 "onboarding_offline_maps_message" = "Descarga una vez los mapas para el área deseada, y utiliza las funciones de navegación y búsqueda sin conexión a Internet.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Para utilizar la navegación y otras funciones, necesitamos acceso a tu geolocalización.";
 
-"onboarding_permissions_title" = "Permita el acceso de MAPS.ME a los servicios de almacenamiento y ubicación";
+"onboarding_permissions_title" = "Permita el acceso de OMaps a los servicios de almacenamiento y ubicación";
 
 "onboarding_permissions_message" = "Así podrá descargar mapas, ver lugares y el estado de tráfico en su zona y utilizar navegación.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Necesitas más espacio para descargar. Por favor, elimina los datos innecesarios.";
 
-"editor_sharing_title" = "He mejorado los mapas de MAPS.ME";
+"editor_sharing_title" = "He mejorado los mapas de OMaps";
 
 "editor_comment_will_be_sent" = "Enviaremos tus comentarios a los cartógrafos.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Comentario detallado";
 
-"editor_detailed_description" = "Los cambios que ha sugerido se enviarán a la comunidad de OpenStreetMap. Describa los detalles que no pueden editarse en MAPS.ME.";
+"editor_detailed_description" = "Los cambios que ha sugerido se enviarán a la comunidad de OpenStreetMap. Describa los detalles que no pueden editarse en OMaps.";
 
 "editor_more_about_osm" = "Más acerca de OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Hemos actualizado el editor de mapas";
 
-"whatsnew_update_editor_message" = "Los usuarios de MAPS.ME han realizado 200 000 cambios de mapas. Juntos estamos creando los mapas más detallados del mundo. ¡Únase a nosotros!";
+"whatsnew_update_editor_message" = "Los usuarios de OMaps han realizado 200 000 cambios de mapas. Juntos estamos creando los mapas más detallados del mundo. ¡Únase a nosotros!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Para usar el editor de mapas, actualiza todos los mapas.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continuar";
 
-"recent_track_background_dialog_message" = "MAPS.ME usa tu geolocalización en segundo plano para registrar tu ruta recorrida recientemente.";
+"recent_track_background_dialog_message" = "OMaps usa tu geolocalización en segundo plano para registrar tu ruta recorrida recientemente.";
 
 "whatsnew_car_navigation_header" = "Navegación en vehículo intuitiva";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navegación en bici (versión beta)";
 
-"whatsnew_cycle_navigation_message" = "Estamos probando la navegación en bici para la nueva temporada. Prueba tu ruta favorita en bicicleta con MAPS.ME y comparte tu opinión con nosotros.";
+"whatsnew_cycle_navigation_message" = "Estamos probando la navegación en bici para la nueva temporada. Prueba tu ruta favorita en bicicleta con OMaps y comparte tu opinión con nosotros.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Valorar en Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Enviar a un amigo";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "¡Hola! ¡Instala MAPS.ME!";
+"tell_friends_text" = "¡Hola! ¡Instala OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME es una aplicación esencial offline para viajar. MAPS.ME se basa en datos de OpenStreetMap y permite editarla.";
+"about_description" = "OMaps es una aplicación esencial offline para viajar. OMaps se basa en datos de OpenStreetMap y permite editarla.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Abrir";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "¡Pide un taxi Uber directamente desde la aplicación!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Aumentar el tamaño de fuente en el mapa";
 
-"traffic_update_app" = "Por favor, actualice MAPS.ME";
+"traffic_update_app" = "Por favor, actualice OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Para mostrar los datos de tráfico, debe actualizar la aplicación.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Otorgar acceso";
 
-"onboarding_storage_permissions_message" = "Cambie la configuración de permisos en su dispositivo. MAPS.ME necesita tener acceso al almacenamiento.";
+"onboarding_storage_permissions_message" = "Cambie la configuración de permisos en su dispositivo. OMaps necesita tener acceso al almacenamiento.";
 
 "button_exit" = "Salir";
 
-"onboarding_detail_permissions_title" = "MAPS.ME necesita tener acceso a";
+"onboarding_detail_permissions_title" = "OMaps necesita tener acceso a";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Almacenamiento";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problema de acceso al almacenamiento";
 
-"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 y escríbanos a support@maps.me";
+"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 y escríbanos a support@omaps.app";
 
 "setting_emulate_bad_storage" = "Emular almacenamiento dañado";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Acepto los <a href=\"%s\">Términos de Uso</a>";
 
-"sign_agree_news_gdpr" = "Acepto recibir las últimas noticias sobre productos de MAPS.ME";
+"sign_agree_news_gdpr" = "Acepto recibir las últimas noticias sobre productos de OMaps";
 
 "whats_new_localbiz_title" = "Los pequeños negocios merecen atención";
 
-"whats_new_localbiz_message" = "Lo que hace que nuestros viajes sean inolvidables son las cafeterías locales, los acogedores hostales y las tiendas. Optimizaremos vuestra página en MAPS.ME para hacerla resaltar.";
+"whats_new_localbiz_message" = "Lo que hace que nuestros viajes sean inolvidables son las cafeterías locales, los acogedores hostales y las tiendas. Optimizaremos vuestra página en OMaps para hacerla resaltar.";
 
 "whats_new_order_button" = "Deja vuestra solicitud";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Descargar nuevos lugares";
 
-"cached_bookmarks_placeholder_subtitle" = "Presione el botón para descargar miles de lugares y rutas interesantes creadas por usuarios de MAPS.ME. Necesitará una conexión a Internet.";
+"cached_bookmarks_placeholder_subtitle" = "Presione el botón para descargar miles de lugares y rutas interesantes creadas por usuarios de OMaps. Necesitará una conexión a Internet.";
 
 "downloader_download_routers" = "Descargar marcadores";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Informe de incidentes";
 
-"opt_out_fabric_description" = "Puede que utilicemos vuestros datos para mejorar la experiencia de MAPS.ME. Los cambios tendrán efecto después que reinicie la aplicación.";
+"opt_out_fabric_description" = "Puede que utilicemos vuestros datos para mejorar la experiencia de OMaps. Los cambios tendrán efecto después que reinicie la aplicación.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Los marcadores no se descargaron";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME ahora tiene un catálogo de rutas";
+"whats_new_bookmarks_catalog_title" = "OMaps ahora tiene un catálogo de rutas";
 
 "whats_new_bookmarks_catalog_message" = "Cientos de rutas detalladas por todo el mundo: a dónde ir, qué ver, dónde comer.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Desactivar anuncios";
 
-"remove_ads_title" = "Desactive todos los anuncios y apoye a MAPS.ME";
+"remove_ads_title" = "Desactive todos los anuncios y apoye a OMaps";
 
 "paybtn_title" = "Pagar %s/por año";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Otras opciones";
 
-"why_support" = "¿Por qué apoyar a MAPS.ME?";
+"why_support" = "¿Por qué apoyar a OMaps?";
 
 "options_dropdown_item1" = "%s/al mes (ahorro %s/por año)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Desactivaremos todos los anuncios para usted";
 
-"why_support_item2" = "Usted nos ayuda a mejorar a MAPS.ME";
+"why_support_item2" = "Usted nos ayuda a mejorar a OMaps";
 
 "why_support_item3" = "Nos está ayudando a mejorar los mapas de OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Servidor no disponible";
 
-"server_unavailable_message" = "La compra se completará más tarde. Si el error persiste, póngase en contacto con support@maps.me.";
+"server_unavailable_message" = "La compra se completará más tarde. Si el error persiste, póngase en contacto con support@omaps.app.";
 
 "offline_fiters_check_in" = "Conéctese a Internet para seleccionar la fecha de llegada y salida.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Esta guía se cargará en el directorio público de MAPS.ME y estará disponible para otros usuarios";
+"upload_and_publish_desc" = "Esta guía se cargará en el directorio público de OMaps y estará disponible para otros usuarios";
 
 "upload_and_publish" = "Cargar y publicar";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "¡Deje un comentario y ayude a otros viajeros!";
 
-"share_bookmarks_email_body_link" = "Hola!\n\nSus etiquetas se pueden descargar desde el enlace: %s. Abra la lista con la ayuda de MAPS.ME y disfrute del viaje!\n\nDescargar la aplicación: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hola!\n\nSus etiquetas se pueden descargar desde el enlace: %s. Abra la lista con la ayuda de OMaps y disfrute del viaje!\n\nDescargar la aplicación: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "El navegador le notificará de las cámaras cuando se exceda el límite de velocidad en %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Compartir tus impresiones es fácil";
 
-"whats_new_ugc_routes_subtitle" = "Guarda lugares memorables, crea rutas mediante marcadores y compártelas con todo el mundo en el catálogo de MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Guarda lugares memorables, crea rutas mediante marcadores y compártelas con todo el mundo en el catálogo de OMaps.";
 
 "whats_new_webeditor_title" = "Convierte tus rutas en historias";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Debe haber al menos 3 etiquetas en tu ruta para poder cargarla en el directorio público";
 
-"bookmark_public_upload_alert_title" = "¡Estás a sólo un par de pasos de la carga de tu ruta en el directorio de MAPS.ME!";
+"bookmark_public_upload_alert_title" = "¡Estás a sólo un par de pasos de la carga de tu ruta en el directorio de OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Asegúrate de que la ruta tenga un nombre y una descripción, y que todas las marcas contengan información sobre los lugares. Gracias a esto, los usuarios encontrarán la ruta y podrán usarla en el viaje.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Ahorro de energía máximo";
 
-"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 MAPS.ME.";
+"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 OMaps.";
 
 "html_error_upload_message_try_again" = "Comprueba el acceso a la red y vuelve a intentarlo";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Tu ID es: %s.";
 
-"gdpr_request_window_message" = "Por favor cópialo y envía una solicitud a support@maps.me";
+"gdpr_request_window_message" = "Por favor cópialo y envía una solicitud a support@omaps.app";
 
 "gdpr_request_window_copy" = "Copiar el ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Evitar ferries";
 
-"cached_guides_placeholder_subtitle" = "Las guías listas de MAPS.ME, son lugares seleccionados con fotos y descripciones que se muestran en el mapa y están disponibles sin conexión a internet.";
+"cached_guides_placeholder_subtitle" = "Las guías listas de OMaps, son lugares seleccionados con fotos y descripciones que se muestran en el mapa y están disponibles sin conexión a internet.";
 
 "guides_catalogue_title" = "Catálogo de guías";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Cocina uzbeka";
 
-"onboarding_welcome_title" = "Planifica y viaja con MAPS.ME";
+"onboarding_welcome_title" = "Planifica y viaja con OMaps";
 
 "onboarding_welcome_first_subtitle" = "Guarda lugares interesantes, reserva hoteles, construye rutas sin conexión a internet";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Descargar";
 
-"onboarding_bydeeplink_guide_title" = "Guías ya listas en MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Guías ya listas en OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Los lugares seleccionados con fotos y descripciones se muestran en el mapa y están disponibles sin conexión.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "¿Hotel reservado?";
 
-"popup_booking_download_guides_message" = "Planea tu ruta con las guías listas de MAPS.ME";
+"popup_booking_download_guides_message" = "Planea tu ruta con las guías listas de OMaps";
 
 "popup_mwm_download_guides_title" = "Guías sin conexión";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Más información";
 
-"gallery_pp_download_guides_offline_title" = "¡Planea tus vacaciones con MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "¡Planea tus vacaciones con OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "No te pierdas lo más importante con las rutas de viajeros experimentados";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "El pago se cobrará en tu cuenta de iTunes a la confirmación de la compra. La suscripción se renovará automáticamente a menos que se desactive la renovación automática al menos 24 horas antes del final del periodo actual. Se cobrará en tu cuenta según tu plan de renovación dentro de las 24 horas antes del final del periodo actual. Puedes gestionar o desactivar la renovación automática en los ajustes de cuenta de tu Apple ID en cualquier momento de tu compra.";
 
-"whatsnew_carplay_title" = "¡Navegación en coche de MAPS.ME en CarPlay!";
+"whatsnew_carplay_title" = "¡Navegación en coche de OMaps en CarPlay!";
 
 "whatsnew_carplay_message" = "Marcadores, búsqueda, cámaras de la velocidad y configuración de desvíos: todo funciona sin Internet";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Alerta velocid.";
 
-"download_map_carplay" = "Descarga mapas en la aplicación MAPS.ME en tu dispositivo";
+"download_map_carplay" = "Descarga mapas en la aplicación OMaps en tu dispositivo";
 
 "carplay_roundabout_exit" = "%s desviación";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "¡Genial, te has suscrito!";
 
-"popup_subscription_success_map_message" = "Ahora descubre las mejores atracciones turísticas en el catálogo MAPS.ME";
+"popup_subscription_success_map_message" = "Ahora descubre las mejores atracciones turísticas en el catálogo OMaps";
 
 "popup_subscription_success_map_start_button" = "Ver más";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Iniciar";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Asistente de viaje universal";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Abrir catálogo";
 
-"new_onboarding_step5.2_message" = "Suscribirse al directorio de guías en MAPS.ME es rentable. ¡Obtén acceso completo a las rutas para paseos urbanos y actividades al aire libre!";
+"new_onboarding_step5.2_message" = "Suscribirse al directorio de guías en OMaps es rentable. ¡Obtén acceso completo a las rutas para paseos urbanos y actividades al aire libre!";
 
 "new_onboarding_step5.2_button" = "Mira los términos";
 
-"new_onboarding_step5.3_message" = "¡Descarga y califica las rutas para paseos por la ciudad y actividades al aire libre con una selección gratuita de MAPS.ME!";
+"new_onboarding_step5.3_message" = "¡Descarga y califica las rutas para paseos por la ciudad y actividades al aire libre con una selección gratuita de OMaps!";
 
 "new_onboarding_step5.3_button" = "Descarga gratis";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "¡Las rutas de Outdooractive para viajes de verano e invierno están a la espera en el catálogo!";
 
-"whatsnew_guides_galleries_title" = "Planifica tu próximo viaje con MAPS.ME";
+"whatsnew_guides_galleries_title" = "Planifica tu próximo viaje con OMaps";
 
 "whatsnew_guides_galleries_message" = "Ahora puedes encontrar guías recomendadas en las tarjetas de ciudades y sitios de atracción populares";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Alturas";
 
-"tips_map_layers_title_countour" = "¡Altitud de relieve sin conexión en MAPS.ME!";
+"tips_map_layers_title_countour" = "¡Altitud de relieve sin conexión en OMaps!";
 
 "tips_map_layers_message_countour" = "La altitud de relieve te ayudará a planificar un viaje a la naturaleza y no perderte en la zona";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict
index 2d16e40211..74ffc9f893 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 488e959c4c..be07b86c80 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "هم اکنون دریافت کنید";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "ایا از کارکرد این اپلیکیشن رضایت دارید؟ درمورد این اپلیکیشن به دوستانتان بگویید! این بهترین تشکر از ماست.!MAPS.MEباتشکر از شما برای استفاده از";
+"share_on_facebook_text" = "ایا از کارکرد این اپلیکیشن رضایت دارید؟ درمورد این اپلیکیشن به دوستانتان بگویید! این بهترین تشکر از ماست.!OMapsباتشکر از شما برای استفاده از";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "کیلوبایت";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "تلاش مجدد";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "MAPS.ME درباره‌ی";
+"about_menu_title" = "OMaps درباره‌ی";
 
 "downloading_touch_to_cancel" = "درحال دانلود %d%%, برای لغو لمس کنید";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "حافظه خارجی که نقشه ها در ان دانلود شده موجود نیست";
 
-"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use MAPS.ME";
+"disconnect_usb_cable" = "Please disconnect USB cable or insert memory card to use OMaps";
 
 "not_enough_free_space_on_sdcard" = "لطفا مقداری از فضای ذخیره سازی را آزاد نمایید";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "اپدیتی برای نقشه مورد نظر موجود است:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "شما دیگر نیازی به نسخه رایگان MAPS.ME ندارید, پس ان را از روی دیوایستان حذف نمایید.";
+"suggest_uninstall_lite" = "شما دیگر نیازی به نسخه رایگان OMaps ندارید, پس ان را از روی دیوایستان حذف نمایید.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ دانلود با موفقیت انجام شد";
@@ -249,10 +249,10 @@
 "set" = "مجموعه";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "شما تا کنون نشانه ای نداشته اید.\nبر روی مکانی از نقشه لمس کنید تا نشانه ای افزوده شود.\nنشانه ها را می توانید از جایی دیگر وارد کرده و در MAPS.ME نمایش دهید.Open KML/KMZ file with saved bookmarks from email, Dropbox or weblink.";
+"bookmarks_usage_hint" = "شما تا کنون نشانه ای نداشته اید.\nبر روی مکانی از نقشه لمس کنید تا نشانه ای افزوده شود.\nنشانه ها را می توانید از جایی دیگر وارد کرده و در OMaps نمایش دهید.Open KML/KMZ file with saved bookmarks from email, Dropbox or weblink.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Bookmarks from other sources can be imported and displayed in MAPS.ME. Open a KML/KMZ file with saved bookmarks from email, Dropbox or a weblink.";
+"bookmarks_usage_hint_import_only" = "Bookmarks from other sources can be imported and displayed in OMaps. Open a KML/KMZ file with saved bookmarks from email, Dropbox or a weblink.";
 
 /* Settings button in system menu */
 "settings" = "تنظیمات";
@@ -354,9 +354,9 @@
 "share_by_email" = "اشتراک گذاری به وسیله ایمیل";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.ME bookmarks were shared with you";
+"share_bookmarks_email_subject" = "OMaps bookmarks were shared with you";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "در حال بارگیری نشانه ها";
@@ -392,16 +392,16 @@
 "no_thanks" = "نه ,متشکرم";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hey, check out my pin at MAPS.ME! %1$@ or %2$@ Don't have offline maps installed? Download here: http://maps.me/get";
+"bookmark_share_sms" = "Hey, check out my pin at OMaps! %1$@ or %2$@ Don't have offline maps installed? Download here: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hey, check out my current location in MAPS.ME! %1$@ or %2$@ Don't have offline maps? Download here: http://maps.me/get";
+"my_position_share_sms" = "Hey, check out my current location in OMaps! %1$@ or %2$@ Don't have offline maps? Download here: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hey, check out my pin in MAPS.ME!";
+"bookmark_share_email_subject" = "Hey, check out my pin in OMaps!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hey, check out my current location on the MAPS.ME map!";
+"my_position_share_email_subject" = "Hey, check out my current location on the OMaps map!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hi,\n\nI'm here now: %1$@. Click this link %2$@ or this one %3$@ to see the place on the map.\n\nThanks.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "دانلود نقشه جایی که هستید";
 
 /* text of notification */
-"pro_version_is_free_today" = "نسخه کامل MAPS.ME امروز رایگان است!دانلود کنید و به دوستان خود نیز بگویید";
+"pro_version_is_free_today" = "نسخه کامل OMaps امروز رایگان است!دانلود کنید و به دوستان خود نیز بگویید";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "ما در حال انتقال نقشه های دانلود شده شما از MAPS.ME Lite به MAPS.ME هستیم. ممکن است چند دقیقه طول بکشد.";
+"move_lite_maps_to_pro" = "ما در حال انتقال نقشه های دانلود شده شما از OMaps Lite به OMaps هستیم. ممکن است چند دقیقه طول بکشد.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "نقشه های دانلود شده شما با موفقیت به MAPS.ME منتقل شد.";
+"move_lite_maps_to_pro_ok" = "نقشه های دانلود شده شما با موفقیت به OMaps منتقل شد.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "انتقال نقشه با شکست مواجه شد.لطفا MAPS.ME Lite حذف کرده و نقشه ها را دوباره دانلود نماید";
+"move_lite_maps_to_pro_failed" = "انتقال نقشه با شکست مواجه شد.لطفا OMaps Lite حذف کرده و نقشه ها را دوباره دانلود نماید";
 
 /* Text in menu */
 "settings_and_more" = "تنظیمات و بیشتر";
@@ -600,7 +600,7 @@
 "website" = "وب سایت";
 
 /* Text in menu */
-"maps_me_community" = "انجمن MAPS.ME";
+"maps_me_community" = "انجمن OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "ما را در فیسبوک لایک کنید";
@@ -630,13 +630,13 @@
 "report_a_bug" = "گزارش خطا";
 
 /* Email subject */
-"subscribe_me_subject" = "لطفا من را در خبرنامه MAPS.ME مشترک کنید";
+"subscribe_me_subject" = "لطفا من را در خبرنامه OMaps مشترک کنید";
 
 /* Email body */
 "subscribe_me_body" = "من می خواهم اولین نفری باشم که در جریان اخرین اخبار واپدیت های نرم افزار قرار می گیرم.می دانم در هر زمان میتوان این اشتراک را لغو کرد.";
 
 /* About text */
-"about_text" = "MAPS.ME  به شما سریع ترین نقشه های تمامی شهر ها و کشور های جهان را پیشنهاد می دهد. در هرجایی که هستید با اطمینان کامل سفر کنید. MAPS.ME کمک می مند تا موقعیت خود و نزدیک ترین هتل ها,بانک ها,جایگاه های سوخت و چیز های دیگر را بر روی نقشه بیابید.وای کارهیچ نیازی به اتصال اینترنتی ندارد. \n\nما همیشه بر روی قابلیت های جدید کار می کنیم و دوست داریم که از طرف شما بشنویم که چطور می توانیم این نرم افزار مسیر یابی را بهتر از قبل نماییم. اگر هر مشکلی با برنامه داشتید تردید نکنید و در support@maps.me با ما تماس بگیرید.ما به تمامی درخواست ها پاسخ می دهیم! \n\n از MAPS.ME راضی هستید و می خواهید از ما حمایت کنید؟ چند راه کاملا رایگان وجود دارد\n- برای ما یک نظر در فروشگاه نرم افزاری بنویسید \n- صفحه فیسبوک ما را http://www.facebook.com/mapswithme لایک کنید \n- یا از MAPS.ME به مادرتان دوستانتان وهم دانشگاهیانتان بگویید:))\n\n متشکروسپاس گذاریم که با ما همکاری می کنید\n\nP.S. مانقشه های خود را از OpenStreetMap دریافت می کنیم این سایت همانند ویکیپدیا برای نقشه برداری است و به تمام کاربران خود اجازه می دهد تا در تکمیل نقشه ها کمک کنند اگر در نقشه مشاهده نمودید چیزی اشتباه بود یا وجود نداشت شما می توانید ان را مستقیما در سایت https://www.openstreetmap.org تصحیح یا اضافه کنید  و تغییرات ای را که ایجاد کرده اید را در اپدیت بعدی MAPS.ME ببینید";
+"about_text" = "OMaps  به شما سریع ترین نقشه های تمامی شهر ها و کشور های جهان را پیشنهاد می دهد. در هرجایی که هستید با اطمینان کامل سفر کنید. OMaps کمک می مند تا موقعیت خود و نزدیک ترین هتل ها,بانک ها,جایگاه های سوخت و چیز های دیگر را بر روی نقشه بیابید.وای کارهیچ نیازی به اتصال اینترنتی ندارد. \n\nما همیشه بر روی قابلیت های جدید کار می کنیم و دوست داریم که از طرف شما بشنویم که چطور می توانیم این نرم افزار مسیر یابی را بهتر از قبل نماییم. اگر هر مشکلی با برنامه داشتید تردید نکنید و در support@omaps.app با ما تماس بگیرید.ما به تمامی درخواست ها پاسخ می دهیم! \n\n از OMaps راضی هستید و می خواهید از ما حمایت کنید؟ چند راه کاملا رایگان وجود دارد\n- برای ما یک نظر در فروشگاه نرم افزاری بنویسید \n- صفحه فیسبوک ما را http://www.facebook.com/mapswithme لایک کنید \n- یا از OMaps به مادرتان دوستانتان وهم دانشگاهیانتان بگویید:))\n\n متشکروسپاس گذاریم که با ما همکاری می کنید\n\nP.S. مانقشه های خود را از OpenStreetMap دریافت می کنیم این سایت همانند ویکیپدیا برای نقشه برداری است و به تمام کاربران خود اجازه می دهد تا در تکمیل نقشه ها کمک کنند اگر در نقشه مشاهده نمودید چیزی اشتباه بود یا وجود نداشت شما می توانید ان را مستقیما در سایت https://www.openstreetmap.org تصحیح یا اضافه کنید  و تغییرات ای را که ایجاد کرده اید را در اپدیت بعدی OMaps ببینید";
 
 /* Alert text */
 "email_error_body" = "کلاینت ایمیل شما پیکربندی نشده است.لطفا ان را پیکربندی کنید یا از طریق دیگر با ما تماس بگیرید %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "لطفا نقشه خود را برای ایجاد مسیر اپدیت نمایید";
 
 /* Update maps suggestion */
-"routing_update_maps" = "نسخه جدید MAPS.ME به شما اجازه ایجاد یک مسیر از موقعیت فعلیتان به مقصدتان را می دهد.لطفابرای استفاده از این ویژگی نقشه خود را اپدیت نمایید.";
+"routing_update_maps" = "نسخه جدید OMaps به شما اجازه ایجاد یک مسیر از موقعیت فعلیتان به مقصدتان را می دهد.لطفابرای استفاده از این ویژگی نقشه خود را اپدیت نمایید.";
 
 /* Update all button text */
 "downloader_update_all_button" = "اپدیت همه";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "یافت شد";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Creating routes in MAPS.ME app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
+"routing_disclaimer" = "Creating routes in OMaps app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "منسوخ شده";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "مسیری بین مبدا و مقصد انتخابی یافت نشد.لطفا مبدا یا مقصد دیگری را انتخاب کنید";
 
 /* InternalError */
-"routing_failed_internal_error" = "خطای داخلی اتفاق افتاد.لطفا تلاش کنید نقشه را حذف و مجددا دانلود کنید.اگر همچنان مشکل پابرجاست لطفا با ما تماس بگیرید support@maps.me.";
+"routing_failed_internal_error" = "خطای داخلی اتفاق افتاد.لطفا تلاش کنید نقشه را حذف و مجددا دانلود کنید.اگر همچنان مشکل پابرجاست لطفا با ما تماس بگیرید support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "دانلود نقشه + مسیریابی";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "I’ve just rated your app";
 
 /* Text for rating dialog */
-"rating_user_since" = "I’ve been a MAPS.ME user since %@";
+"rating_user_since" = "I’ve been a OMaps user since %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "MAPS.ME را می پسندید؟";
+"rating_do_like_maps" = "OMaps را می پسندید؟";
 
 /* Text for rating dialog */
 "rating_tap_star" = "بر روی ستاره ها لمس کنید تا به این اپ رای بدهید";
@@ -792,7 +792,7 @@
 "routing_download_map" = "دریافت نقشه";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "برای داشتن تمامی ویژگی های MAPS.ME نقشه ها و داده های مسیریابی را اپدیت نمایید.";
+"routing_download_map_and_routing" = "برای داشتن تمامی ویژگی های OMaps نقشه ها و داده های مسیریابی را اپدیت نمایید.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "دریافت داده های مسیریابی";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "این اپ را دوست دارید؟";
 
-"rate_alert_default_message" = "باتشکر از شما بابت استفاده ازMAPS.ME.لطفا به این اپلیکیشن رای بدهید. بازخورد شما باعث پیشرفت اپلیکیشن ما می شود.";
+"rate_alert_default_message" = "باتشکر از شما بابت استفاده ازOMaps.لطفا به این اپلیکیشن رای بدهید. بازخورد شما باعث پیشرفت اپلیکیشن ما می شود.";
 
 "rate_alert_five_star_message" = "هورا ! ما هم شما را دوست داریم!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "مکان تکراری";
 
-"first_launch_congrats_title" = "MAPS.ME اماده استفاده است";
+"first_launch_congrats_title" = "OMaps اماده استفاده است";
 
 "first_launch_congrats_text" = "در سرتاسر دنیا جست وجو و مسیریابی کنید بدون نیاز به اینترنت و کاملا رایگان.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "اضافه کردن مکان به نقشه و ویرایش ان مستقیما از طریق این اپلیکیشن.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME از دیتای انجمن  OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps از دیتای انجمن  OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "شما دیگر هیچ چیز را از دست نمی دهید";
 
@@ -1340,9 +1340,9 @@
 
 "onboarding_location_title" = "کمک کنید تا شما را بیابیم";
 
-"onboarding_location_message" = "به منظور استفاده شما از ناوبری و دیگر ویژگی های این اپلیکیشن MAPS.ME نیازمند دسترسی به موقعیت مکانی تان است.";
+"onboarding_location_message" = "به منظور استفاده شما از ناوبری و دیگر ویژگی های این اپلیکیشن OMaps نیازمند دسترسی به موقعیت مکانی تان است.";
 
-"onboarding_permissions_title" = "به MAPS.ME اجازه دسترسی به محل ذخیره سازی و موقعیت مکانی خود را بدهید.";
+"onboarding_permissions_title" = "به OMaps اجازه دسترسی به محل ذخیره سازی و موقعیت مکانی خود را بدهید.";
 
 "onboarding_permissions_message" = "خب شما می تونید نقشه رو دانلود کنید و مکان های دور اطراف را به همراه حجم ترافیک دوروبرتان ببینید و از مسیر یابی استفاده کنید.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "برای دانلود,شما نیازمند فضای ذخیره سازی بیشتری هستید.لطفا داده های غیر ضروری خود را حذف کنید.";
 
-"editor_sharing_title" = "من نقشه های MAPS.ME را بهبود بخشیدم";
+"editor_sharing_title" = "من نقشه های OMaps را بهبود بخشیدم";
 
 "editor_comment_will_be_sent" = "ما مطمئن خواهیم شد که پیام خود را به ویرایشگران نقشه ارسال خواهید کرد.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "اظهارنظر بیشتر";
 
-"editor_detailed_description" = "شما یک سری تغییرات در نقشه را برای انجمن OpenStreetMap ارسال کردید.جزئیات اضافی را که نتوانستید در MAPS.ME ویرایش کنید را برایشان بنویسید.";
+"editor_detailed_description" = "شما یک سری تغییرات در نقشه را برای انجمن OpenStreetMap ارسال کردید.جزئیات اضافی را که نتوانستید در OMaps ویرایش کنید را برایشان بنویسید.";
 
 "editor_more_about_osm" = "در مورد OpenStreetMap بیشتر بدانید";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "ما ویرایشگر نقشه را بروزرسانی کرده ایم";
 
-"whatsnew_update_editor_message" = "کاربران MAPS.ME تا کنون 200,000 تغییر در نقشه انجام داده اند.با یکدیگر می توانیم جزئیات بیشتری را به نقشه جهان اضافه کنیم.به ما بپیوندید!";
+"whatsnew_update_editor_message" = "کاربران OMaps تا کنون 200,000 تغییر در نقشه انجام داده اند.با یکدیگر می توانیم جزئیات بیشتری را به نقشه جهان اضافه کنیم.به ما بپیوندید!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "برای استفاده از ویرایشگر نقشه ابتدا تمامی نقشه های خود را بروزرسانی کنید.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "ادامه";
 
-"recent_track_background_dialog_message" = "MAPS.ME  از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر هایی که اخیرا سفر کرده اید استفاده می کند.";
+"recent_track_background_dialog_message" = "OMaps  از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر هایی که اخیرا سفر کرده اید استفاده می کند.";
 
 "whatsnew_car_navigation_header" = "User-friendly vehicle navigation";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Bike navigation (beta version)";
 
-"whatsnew_cycle_navigation_message" = "We are testing bike navigation for the new season. Try your favorite bike route with MAPS.ME, and share your opinion with us.";
+"whatsnew_cycle_navigation_message" = "We are testing bike navigation for the new season. Try your favorite bike route with OMaps, and share your opinion with us.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "امتیاز دادن در گوگل پلی";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "به یک دوست بگویید";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "سلام!  MAPS.ME را نصب کنید.";
+"tell_friends_text" = "سلام!  OMaps را نصب کنید.";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME یک نرم افزار افلاین مخصوص سفر است. MAPS.ME بر پایه دیتای OpenStreetMap است و به شما اجازه ویرایش در ان را می دهد.";
+"about_description" = "OMaps یک نرم افزار افلاین مخصوص سفر است. OMaps بر پایه دیتای OpenStreetMap است و به شما اجازه ویرایش در ان را می دهد.";
 
 /* Text in menu */
 "blog" = "وبلاگ";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "باز";
 
-"whatsnew_uber_header" = "MAPS.ME & اوبر";
+"whatsnew_uber_header" = "OMaps & اوبر";
 
 "whatsnew_uber_message" = "سفارش تاکسی, مستقیم از طریق اپلیکیشن!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "افزایش اندازه متن بر روی نقشه";
 
-"traffic_update_app" = "لطفا MAPS.ME را بروزرسانی کنید";
+"traffic_update_app" = "لطفا OMaps را بروزرسانی کنید";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "برای نمایش ترافیک باید اپلیکیشن را بروزرسانی کنید.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "مجوز دسترسی";
 
-"onboarding_storage_permissions_message" = "لطفا MAPS.ME را مجاز به استفاده از ذخیره سازی در تنظیمات دستگاه خود کنید، در غیر این صورت نمی توانید از MAPS.ME استفاده کنید.";
+"onboarding_storage_permissions_message" = "لطفا OMaps را مجاز به استفاده از ذخیره سازی در تنظیمات دستگاه خود کنید، در غیر این صورت نمی توانید از OMaps استفاده کنید.";
 
 "button_exit" = "خروج";
 
-"onboarding_detail_permissions_title" = "MAPS.ME نیاز به دسترسی دارد";
+"onboarding_detail_permissions_title" = "OMaps نیاز به دسترسی دارد";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "ذخیره سازی";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "مشکل دسترسی به ذخیره سازی";
 
-"dialog_error_storage_message" = "ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support@maps.me تماس بگیرید";
+"dialog_error_storage_message" = "ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support@omaps.app تماس بگیرید";
 
 "setting_emulate_bad_storage" = "شبیه سازی ذخیره سازی بد";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "من <a href=\"%s\">شرایط استفاده</a> را می‌پذیرم";
 
-"sign_agree_news_gdpr" = "می‌پذیرم که جدیدترین خبرها از محصولات MAPS.ME برایم ارسال شود";
+"sign_agree_news_gdpr" = "می‌پذیرم که جدیدترین خبرها از محصولات OMaps برایم ارسال شود";
 
 "whats_new_localbiz_title" = "کسب‌وکار کوچک شایستهٔ حمایت است";
 
-"whats_new_localbiz_message" = "حرف از کافه‌های محلی، مسافرخانه‌های گرم‌ودنج و مغازه‌هایی است که سفرمان را به‌یادماندنی می‌کنند. ما صفحه‌های شما را در MAPS.ME بهینه می‌کنیم تا برجسته باشد.";
+"whats_new_localbiz_message" = "حرف از کافه‌های محلی، مسافرخانه‌های گرم‌ودنج و مغازه‌هایی است که سفرمان را به‌یادماندنی می‌کنند. ما صفحه‌های شما را در OMaps بهینه می‌کنیم تا برجسته باشد.";
 
 "whats_new_order_button" = "درخواستی ثبت کنید";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "دانلود مکان‌های جدید";
 
-"cached_bookmarks_placeholder_subtitle" = "دکمه را بزنید تا هزاران مکان و مسیر جالبی که دیگران کاربران MAPS.ME ساخته‌اند را ببینید. به اتصال اینترنتی نیاز خواهید داشت.";
+"cached_bookmarks_placeholder_subtitle" = "دکمه را بزنید تا هزاران مکان و مسیر جالبی که دیگران کاربران OMaps ساخته‌اند را ببینید. به اتصال اینترنتی نیاز خواهید داشت.";
 
 "downloader_download_routers" = "دانلود نشانه‌ها";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "گزارش خرابی";
 
-"opt_out_fabric_description" = "ما از داده‌های شما برای بهبود MAPS.ME استفاده می‌کنیم. تغییرات پس از راه‌اندازی مجدد برنامه به‌کار می‌افتد.";
+"opt_out_fabric_description" = "ما از داده‌های شما برای بهبود OMaps استفاده می‌کنیم. تغییرات پس از راه‌اندازی مجدد برنامه به‌کار می‌افتد.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "نشانه ها دانلود نشدند";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME در حال حاضر یک کتابخانه مسیر دارد";
+"whats_new_bookmarks_catalog_title" = "OMaps در حال حاضر یک کتابخانه مسیر دارد";
 
 "whats_new_bookmarks_catalog_message" = "صدها مسیر دقیق در سراسر جهان: به کجا بروید، چه چیزی را ببینید، کجا غذا بخورید.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "حذف تبلیغات";
 
-"remove_ads_title" = "تمام تبلیغات را حذف کنید و MAPS.ME را پشتیبانی کنید";
+"remove_ads_title" = "تمام تبلیغات را حذف کنید و OMaps را پشتیبانی کنید";
 
 "paybtn_title" = "هزینه %s/سال";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "گزینه های بیشتر";
 
-"why_support" = "چرا پشتیبانی از MAPS.ME؟";
+"why_support" = "چرا پشتیبانی از OMaps؟";
 
 "options_dropdown_item1" = "ماه (صرفه جویی %s/ سال)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "ما همه تبلیغات را برای شما حذف خواهیم کرد";
 
-"why_support_item2" = "شما برای بهبود MAPS.ME به ما کمک میکنید";
+"why_support_item2" = "شما برای بهبود OMaps به ما کمک میکنید";
 
 "why_support_item3" = "شما به ما در بهبود نقشه OpenStreetMap.org کمک میکنید.";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "سرویس موجود نیست";
 
-"server_unavailable_message" = "خرید بعدا تکمیل خواهد شد. اگر خطا همچنان ادامه دارد، لطفا با support@maps.me تماس بگیرید.";
+"server_unavailable_message" = "خرید بعدا تکمیل خواهد شد. اگر خطا همچنان ادامه دارد، لطفا با support@omaps.app تماس بگیرید.";
 
 "offline_fiters_check_in" = "برای فیلتر کردن هتل ها با تاریخ، به اینترنت متصل شوید.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "این راهنما به کاتالوگ عمومی MAPS.ME ارسال خواهد شد و برای کاربران دیگر در دسترس خواهد بود";
+"upload_and_publish_desc" = "این راهنما به کاتالوگ عمومی OMaps ارسال خواهد شد و برای کاربران دیگر در دسترس خواهد بود";
 
 "upload_and_publish" = "بارگذاری و انتشار";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "با بیان نظر خود به مسافران کمک نمایید!";
 
-"share_bookmarks_email_body_link" = "سلام!\n\nاین لینکی است که شما می توانید نشان شده های خود را از آن دانلود نمایید: %s. لیست را از طریق MAPS.ME باز کرده و از سفر خود لذت ببرید!\n\nدریافت برنامه: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "سلام!\n\nاین لینکی است که شما می توانید نشان شده های خود را از آن دانلود نمایید: %s. لیست را از طریق OMaps باز کرده و از سفر خود لذت ببرید!\n\nدریافت برنامه: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "هدایتگر هنگامی که از محدوده سرعت %d کیلومتر بر ساعت تجاوز نمایید، در مورد دوربین هشدار می دهد";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Easy to share your impressions";
 
-"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using MAPS.ME catalogue.";
+"whats_new_ugc_routes_subtitle" = "Save memorable places, create routes from bookmarks and share them with everyone using OMaps catalogue.";
 
 "whats_new_webeditor_title" = "Turn your routes into stories";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "شما باید حداقل 3 نشان‌ شده داشته باشید تا راهنمای خود را به کاتالوگ عمومی ارسال کنید";
 
-"bookmark_public_upload_alert_title" = "چند گام تا اشتراک گذاری نشان شده‌های خود با تمام مسافران MAPS.ME فاصله دارید!";
+"bookmark_public_upload_alert_title" = "چند گام تا اشتراک گذاری نشان شده‌های خود با تمام مسافران OMaps فاصله دارید!";
 
 "bookmark_public_upload_alert_subtitle" = "لطفا اطمینان حاصل کنید نام و توضیح مشخصی برای فهرست خود داشته باشید و تمام نشان شده‌ها دارای اطلاعاتی راجع به مکان‌ها هستند. به این ترتیب لیست شما می‌تواند توسط دیگران یافت استفاده شود.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "حداکثر ذخیره انرژی";
 
-"enable_logging_warning_message" = "این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی MAPS.ME فعال کنید.";
+"enable_logging_warning_message" = "این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی OMaps فعال کنید.";
 
 "html_error_upload_message_try_again" = "لطفاً تنظیمات شبکه را بررسی و مجدد تلاش کنید";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "شناسه شما: %s.";
 
-"gdpr_request_window_message" = "لطفاً آن را کپی کرده و درخواست را به support@maps.me ارسال کنید";
+"gdpr_request_window_message" = "لطفاً آن را کپی کرده و درخواست را به support@omaps.app ارسال کنید";
 
 "gdpr_request_window_copy" = "شناسه را کپی کنید";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "اجتناب از گذرگاه های کشتی";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME راهنمایی های آماده برای مکان های انتخاب شده همراه عکس و توضیحات ارائه می دهد که بر روی نقشه نمایش داده می شوند و در حالت آفلاین در دسترس هستند.";
+"cached_guides_placeholder_subtitle" = "OMaps راهنمایی های آماده برای مکان های انتخاب شده همراه عکس و توضیحات ارائه می دهد که بر روی نقشه نمایش داده می شوند و در حالت آفلاین در دسترس هستند.";
 
 "guides_catalogue_title" = "کاتالوگراهنماها";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "غذای ازبکستانی";
 
-"onboarding_welcome_title" = "برنامه ریزی و سفر با MAPS.ME";
+"onboarding_welcome_title" = "برنامه ریزی و سفر با OMaps";
 
 "onboarding_welcome_first_subtitle" = "مکان های جالب را نشان دار کنید ، هتل رزرو کنید، مسیرها را به صورت آفلاین محاسبه کنید";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "دریافت";
 
-"onboarding_bydeeplink_guide_title" = "راهنماهای آماده استفاده در MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "راهنماهای آماده استفاده در OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "بهترین مکان ها برای بازدید روی نقشه با عکس و توضیحات نمایش داده شده است. آفلاین اجرا می شود.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "هتل رزرو کرده‌اید؟";
 
-"popup_booking_download_guides_message" = "مسیر خود را با راهنماهای آماده MAPS.ME برنامه ریزی کنید";
+"popup_booking_download_guides_message" = "مسیر خود را با راهنماهای آماده OMaps برنامه ریزی کنید";
 
 "popup_mwm_download_guides_title" = "راهنماهای آفلاین شهر";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "نگاهی کنید";
 
-"gallery_pp_download_guides_offline_title" = "تعطیلات خود را با MAPS.ME برنامه ریزی کنید!";
+"gallery_pp_download_guides_offline_title" = "تعطیلات خود را با OMaps برنامه ریزی کنید!";
 
 "gallery_pp_download_guides_offline_subtitle" = "با استفاده از راهنماهای تهیه شده توسط مسافران با تجربه، هیچ چیز را از دست ندهید";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.";
 
-"whatsnew_carplay_title" = "مسیر یابی خودرو MAPS.ME در CarPlay!";
+"whatsnew_carplay_title" = "مسیر یابی خودرو OMaps در CarPlay!";
 
 "whatsnew_carplay_message" = "نشانه ها، جستجو، دوربین های سرعت و گزینه های رانندگی در حالت آفلاین در دسترس هستند";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "هشدارهای سرعت";
 
-"download_map_carplay" = "لطفا نقشه ها را در نرم افزار MAPS.ME روی دستگاه خود دانلود کنید";
+"download_map_carplay" = "لطفا نقشه ها را در نرم افزار OMaps روی دستگاه خود دانلود کنید";
 
 "carplay_roundabout_exit" = "خروجی %s";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "هورا، شما مشترک شدید!";
 
-"popup_subscription_success_map_message" = "اکنون بهترین مکان های برجسته گردشگری را در کاتالوگ MAPS.ME کشف کنید";
+"popup_subscription_success_map_message" = "اکنون بهترین مکان های برجسته گردشگری را در کاتالوگ OMaps کشف کنید";
 
 "popup_subscription_success_map_start_button" = "شروع جستجو";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "شروع کنید";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "همه چیز دریک سفر دوست من";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "کاتالوگ را باز کنید";
 
-"new_onboarding_step5.2_message" = "عضویت شما در کاتالوگ راهنمای MAPS.ME بسیار ارزشمند است. به راهنماهای درون و برون شهری در سراسر جهان دسترسی کامل بیابید!";
+"new_onboarding_step5.2_message" = "عضویت شما در کاتالوگ راهنمای OMaps بسیار ارزشمند است. به راهنماهای درون و برون شهری در سراسر جهان دسترسی کامل بیابید!";
 
 "new_onboarding_step5.2_button" = "شرایط را چک کنید";
 
-"new_onboarding_step5.3_message" = "با گزینش رایگان MAPS.ME نمونههای رایگان مسیرهای آماده شهرها و فضاهای باز را چک کنید!";
+"new_onboarding_step5.3_message" = "با گزینش رایگان OMaps نمونههای رایگان مسیرهای آماده شهرها و فضاهای باز را چک کنید!";
 
 "new_onboarding_step5.3_button" = "دانلود رایگان";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "مسیرهای Outdooractive برای سفرهای زمستانی و تابستانی در کاتالوگ در حال انتظار هستند!";
 
-"whatsnew_guides_galleries_title" = "سفر آتی خود را با MAPS.ME برنامهریزی کنید";
+"whatsnew_guides_galleries_title" = "سفر آتی خود را با OMaps برنامهریزی کنید";
 
 "whatsnew_guides_galleries_message" = "حال میتوانید توصیههای پیشنهادی را در صفحه مربوط به مکان شهرها و مکان‎های توریستی مشهور مشاهده کنید";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "ایزومپ";
 
-"tips_map_layers_title_countour" = "تازه ها در MAPS.ME: لایه توپوگرافی آفلاین!";
+"tips_map_layers_title_countour" = "تازه ها در OMaps: لایه توپوگرافی آفلاین!";
 
 "tips_map_layers_message_countour" = "با اطمینان از این که همه چیز را در مورد منطقه می دانید طبیعت گردی خود را برنامه ریزی کنید و لذت ببرید";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict
index 78b36bb9ed..685fe70a74 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.stringsdict
@@ -147,4 +147,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 2c21cb8364..653839c84b 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Hanki nyt";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Kiitos kun käytät MAPS.ME:tä! Pidätkö sovelluksesta? Kerro kavereillesi siitä! Se on meille paras mahdollinen kiitos.";
+"share_on_facebook_text" = "Kiitos kun käytät OMaps:tä! Pidätkö sovelluksesta? Kerro kavereillesi siitä! Se on meille paras mahdollinen kiitos.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "Kt";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Yritä uudelleen";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Tietoa MAPS.ME:stä";
+"about_menu_title" = "Tietoa OMaps:stä";
 
 "downloading_touch_to_cancel" = "Ladataan %d%%, peruuta koskettamalla";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD-kortti/USB-massamuisti, jolle kartat on ladattu, ei ole käytettävissä";
 
-"disconnect_usb_cable" = "Irrota USB-kaapeli tai syötä muistikortti käyttääksesi MAPS.ME -sovellusta";
+"disconnect_usb_cable" = "Irrota USB-kaapeli tai syötä muistikortti käyttääksesi OMaps -sovellusta";
 
 "not_enough_free_space_on_sdcard" = "Vapauta ensin tilaa SD-kortilta/USB-massamuistilta käyttääksesi sovellusta";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Päivitys saatavissa seuraaville kartoille:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Et tarvitse enää MAPS.ME Lite:ä, joten voit poistaa sen.";
+"suggest_uninstall_lite" = "Et tarvitse enää OMaps Lite:ä, joten voit poistaa sen.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ ladattu onnistuneesti";
@@ -249,10 +249,10 @@
 "set" = "Aseta";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Sinulla ei vielä ole kirjanmerkkejä.\nLisää kirjanmerkki napsauttamalla mitä tahansa paikkaa kartalla.\nVoit myös tuoda kirjanmerkkejä muista lähteistä MAPS.ME:ssä käytettäviksi avaamalla KML/KMZ-kirjanmerkkitiedoston sähköpostistasi, Dropbox-tililtäsi tai verkko-osoitteesta.";
+"bookmarks_usage_hint" = "Sinulla ei vielä ole kirjanmerkkejä.\nLisää kirjanmerkki napsauttamalla mitä tahansa paikkaa kartalla.\nVoit myös tuoda kirjanmerkkejä muista lähteistä OMaps:ssä käytettäviksi avaamalla KML/KMZ-kirjanmerkkitiedoston sähköpostistasi, Dropbox-tililtäsi tai verkko-osoitteesta.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Voit tuoda kirjanmerkkejä MAPS.ME:ssä käytettäväksi muista lähteistä avaamalla KML/KMZ-kirjanmerkkitiedoston sähköpostistasi, Dropbox-tililtäsi tai verkko-osoitteesta.";
+"bookmarks_usage_hint_import_only" = "Voit tuoda kirjanmerkkejä OMaps:ssä käytettäväksi muista lähteistä avaamalla KML/KMZ-kirjanmerkkitiedoston sähköpostistasi, Dropbox-tililtäsi tai verkko-osoitteesta.";
 
 /* Settings button in system menu */
 "settings" = "Asetukset";
@@ -354,9 +354,9 @@
 "share_by_email" = "Jaa sähköpostilla";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Jaetut MAPS.ME-kirjanmerkit";
+"share_bookmarks_email_subject" = "Jaetut OMaps-kirjanmerkit";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Ladataan kirjanmerkkejä";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Maata ladataan parhaillaan.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Toivottavasti nautit MAPS.ME -sovelluksen käyttämisestä! Olisimme tyytyväisiä, jos voisit arvioida sovelluksen App Storessa. Se kesää alle minuutin, ja auttaa meitä todella paljon. Kiitos tuestasi!";
+"appStore_message" = "Toivottavasti nautit OMaps -sovelluksen käyttämisestä! Olisimme tyytyväisiä, jos voisit arvioida sovelluksen App Storessa. Se kesää alle minuutin, ja auttaa meitä todella paljon. Kiitos tuestasi!";
 
 /* No, thanks */
 "no_thanks" = "Ei kiitos";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hei, katso merkintäni MAPS.ME-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole offline-karttoja? Lataa ne täältä: http://maps.me/get";
+"bookmark_share_sms" = "Hei, katso merkintäni OMaps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole offline-karttoja? Lataa ne täältä: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hei, katso sijaintini MAPS.ME-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: http://maps.me/get";
+"my_position_share_sms" = "Hei, katso sijaintini OMaps-sovelluksessa! %1$@ tai %2$@ Eikö sinulla ole vielä offline-karttoja? Lataa ne täältä: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hei, katso merkintäni MAPS.ME-kartalla";
+"bookmark_share_email_subject" = "Hei, katso merkintäni OMaps-kartalla";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hei, kurkkaa tämänhetkinen sijaintini MAPS.ME:n kartalla!";
+"my_position_share_email_subject" = "Hei, kurkkaa tämänhetkinen sijaintini OMaps:n kartalla!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hei,n\nOlen nyt täällä: %1$@. Klikkaa linkkiä %2$@ tai %3$@ nähdäksesi paikan kartalla. Kiitos.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Lataa sijaintisi kartta";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Me siirrämme lataamasi kartat MAPS.ME Lite:stä MAPS.ME:hen. Siirtäminen voi viedä muutaman minuutin.";
+"move_lite_maps_to_pro" = "Me siirrämme lataamasi kartat OMaps Lite:stä OMaps:hen. Siirtäminen voi viedä muutaman minuutin.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Lataamasi kartat on siirretty onnistuneesti MAPS.ME:hen.";
+"move_lite_maps_to_pro_ok" = "Lataamasi kartat on siirretty onnistuneesti OMaps:hen.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Karttoja ei voitu siirtää. Ole hyvä ja poista MAPS.ME Lite ja lataa kartat uudelleen.";
+"move_lite_maps_to_pro_failed" = "Karttoja ei voitu siirtää. Ole hyvä ja poista OMaps Lite ja lataa kartat uudelleen.";
 
 /* Text in menu */
 "settings_and_more" = "Asetukset &amp; Lisää";
@@ -600,7 +600,7 @@
 "website" = "Kotisivut";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME -yhteisö";
+"maps_me_community" = "OMaps -yhteisö";
 
 /* Text in menu */
 "like_on_facebook" = "Tykkää meistä Facebookissa";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Ilmoita virheestä";
 
 /* Email subject */
-"subscribe_me_subject" = "Lisätkää minut MAPS.ME:n uutiskirjeen tilaajaksi";
+"subscribe_me_subject" = "Lisätkää minut OMaps:n uutiskirjeen tilaajaksi";
 
 /* Email body */
-"subscribe_me_body" = "Liittäkää minut MAPS.ME -uutiskirjeen tilaajaksi saadakseni ensimmäisenä tietoa uusista päivityksistä ja TARJOUKSISTA. Voin peruuttaa tilaukseni koska tahansa.";
+"subscribe_me_body" = "Liittäkää minut OMaps -uutiskirjeen tilaajaksi saadakseni ensimmäisenä tietoa uusista päivityksistä ja TARJOUKSISTA. Voin peruuttaa tilaukseni koska tahansa.";
 
 /* About text */
-"about_text" = "MAPS.ME tarjoaa nopeimmat offline-kartat kaikista kaupungeista, kaikissa maissa ympäri maailman. Matkusta luottavaisin mielin - missä ikinä oletkin, MAPS.ME auttaa sinua löytämään itsesi kartalta, ohjaamaan sinut lähimpään ravintolaan, hotelliin, pankkiin, huoltoasemalle jne. Internet-yhteyttä ei tarvita.\n\nTyöskentelemme jatkuvasti uusien ominaisuuksien parissa, ja haluammekin kuulla sinulta kuinka voimme parantaa MAPS.me -sovellusta entisestään. Mikäli sinulla on ongelmia sovelluksen kanssa, älä epäröi ottaa yhteyttä asiakaspalveluumme osoitteessa support@maps.me. Vastaamme jokaiseen yhteydenottoon!\n\nTykkäätkö MAPS.ME -sovelluksesta ja haluat tukea meitä? Siihen on muutamia helppoja ja täysin ilmaisia tapoja:\n\n- lisää sovellusarviosi käyttämääsi sovelluskauppaan\n - tykkää Facebook-sivustamme osoitteessa http://www.facebook.com/mapswithme\n- kerro MAPS.me:stä äidillesi, ystävillesi ja kollegoillesi :)\n\nKiitos sovelluksen käytöstä. Arvostamme tukeasi todella paljon!\n\nP.S. Kaikki tiedot noudetaan OpenStreetMap-palvelusta, joka on Wikipedian kaltainen karttaprojekti, jossa kuka tahansa voi lisätä ja muokata karttoja. Mikäli havaitset kartoissa virheitä ja puutteita, voit korjata ne osoitteessa https://www.openstreetmap.org, ja muutokset näkyvät sovelluksessa seuraavan MAPS.ME -päivityksen jälkeen.";
+"about_text" = "OMaps tarjoaa nopeimmat offline-kartat kaikista kaupungeista, kaikissa maissa ympäri maailman. Matkusta luottavaisin mielin - missä ikinä oletkin, OMaps auttaa sinua löytämään itsesi kartalta, ohjaamaan sinut lähimpään ravintolaan, hotelliin, pankkiin, huoltoasemalle jne. Internet-yhteyttä ei tarvita.\n\nTyöskentelemme jatkuvasti uusien ominaisuuksien parissa, ja haluammekin kuulla sinulta kuinka voimme parantaa OMaps -sovellusta entisestään. Mikäli sinulla on ongelmia sovelluksen kanssa, älä epäröi ottaa yhteyttä asiakaspalveluumme osoitteessa support@omaps.app. Vastaamme jokaiseen yhteydenottoon!\n\nTykkäätkö OMaps -sovelluksesta ja haluat tukea meitä? Siihen on muutamia helppoja ja täysin ilmaisia tapoja:\n\n- lisää sovellusarviosi käyttämääsi sovelluskauppaan\n - tykkää Facebook-sivustamme osoitteessa http://www.facebook.com/mapswithme\n- kerro OMaps:stä äidillesi, ystävillesi ja kollegoillesi :)\n\nKiitos sovelluksen käytöstä. Arvostamme tukeasi todella paljon!\n\nP.S. Kaikki tiedot noudetaan OpenStreetMap-palvelusta, joka on Wikipedian kaltainen karttaprojekti, jossa kuka tahansa voi lisätä ja muokata karttoja. Mikäli havaitset kartoissa virheitä ja puutteita, voit korjata ne osoitteessa https://www.openstreetmap.org, ja muutokset näkyvät sovelluksessa seuraavan OMaps -päivityksen jälkeen.";
 
 /* Alert text */
 "email_error_body" = "Sähköpostisovellusta ei ole asetettu. Ole hyvä ja määritä sähköpostiasetukset tai ota meihin yhteyttä toista kautta osoitteessa %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Päivitä kartta luodaksesi reitin";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Uusi MAPS.ME -versio mahdollistaa reittien luonnin nykyisestä sijainnista määränpäähäsi.Päivitä kartat käyttääksesi tätä ominaisuutta.";
+"routing_update_maps" = "Uusi OMaps -versio mahdollistaa reittien luonnin nykyisestä sijainnista määränpäähäsi.Päivitä kartat käyttääksesi tätä ominaisuutta.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Päivitä kaikki";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Löytyi";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Pidä mielessä seuraavat seikat luodessasi reittejä MAPS.ME -sovelluksella:\n\n- Ehdotettuja reittejä tulee pitää vain suosituksina.\n- Teiden kunto, liikennesäännöt ja -merkit on aina otettava huomioon navigointiehdotuksista huolimatta.\n - Kartassa saattaa olla virheitä, tai se saattaa olla vanhentunut, eikä reittejä sen takia voida luoda parhaalla mahdollisella tavalla.\n\nPysy valppaana liikenteessä ja pidä huolta itsestäsi!";
+"routing_disclaimer" = "Pidä mielessä seuraavat seikat luodessasi reittejä OMaps -sovelluksella:\n\n- Ehdotettuja reittejä tulee pitää vain suosituksina.\n- Teiden kunto, liikennesäännöt ja -merkit on aina otettava huomioon navigointiehdotuksista huolimatta.\n - Kartassa saattaa olla virheitä, tai se saattaa olla vanhentunut, eikä reittejä sen takia voida luoda parhaalla mahdollisella tavalla.\n\nPysy valppaana liikenteessä ja pidä huolta itsestäsi!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Vanhentunut";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Lähtöpisteen ja määränpään välillä ei löytynyt reittiä. Valitse toinen lähtöpiste tai määränpää.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Sisäinen virhe. Kokeile asentaa kartta uudelleen. Mikäli ongelma jatkuu, ota yhteyttä asiakaspalveluun osoitteessa support@maps.me.";
+"routing_failed_internal_error" = "Sisäinen virhe. Kokeile asentaa kartta uudelleen. Mikäli ongelma jatkuu, ota yhteyttä asiakaspalveluun osoitteessa support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Lataa kartta + reititys";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Olen juuri arvostellut sovelluksesi.";
 
 /* Text for rating dialog */
-"rating_user_since" = "Olen MAPS.ME käyttäjä vuodesta %@.";
+"rating_user_since" = "Olen OMaps käyttäjä vuodesta %@.";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Pidätkö MAPS.ME sovelluksesta?";
+"rating_do_like_maps" = "Pidätkö OMaps sovelluksesta?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Napauta tähteä arvostellaksesi sovelluksemme.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Hanki kartta";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Lataa päivitetty kartta ja reititysdata saadaksesi kaikki MAPS.ME -ominaisuudet.";
+"routing_download_map_and_routing" = "Lataa päivitetty kartta ja reititysdata saadaksesi kaikki OMaps -ominaisuudet.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Hanki reitityskartta";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Pidätkö sovelluksesta?";
 
-"rate_alert_default_message" = "Kiitos kun käytät MAPS.ME:tä. Voisitko myös arvostella sovelluksen? Palautteesi avulla tulemme vielä paremmiksi.";
+"rate_alert_default_message" = "Kiitos kun käytät OMaps:tä. Voisitko myös arvostella sovelluksen? Palautteesi avulla tulemme vielä paremmiksi.";
 
 "rate_alert_five_star_message" = "Hurraa! Mekin rakastamme sinua!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Paikan kaksoiskappale";
 
-"first_launch_congrats_title" = "MAPS.ME on valmiina käyttöön";
+"first_launch_congrats_title" = "OMaps on valmiina käyttöön";
 
 "first_launch_congrats_text" = "Etsi ja navigoi ympäri maailman ilman verkkoyhteyttä, ilmaiseksi.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Lisää karttaan uusia paikkoja ja muokkaa sovelluksessa olevia karttoja suoraan sovelluksessa.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME käyttää OpenStreetMap -yhteisön dataa.";
+"whatsnew_editor_message_2" = "* OMaps käyttää OpenStreetMap -yhteisön dataa.";
 
 "onboarding_offline_navigation_title" = "Et eksy enää koskaan";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Suunnittele ihanteelliset autoilu- ja kävelyreitit.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — koko maailman kartat ilman Internet-yhteyttä";
+"onboarding_offline_maps_title" = "OMaps — koko maailman kartat ilman Internet-yhteyttä";
 
 "onboarding_offline_maps_message" = "Lataa haluamasi alueen kartat yhden kerran ja voit käyttää navigointi- ja hakutoimintoja ilman Internet-yhteyttä.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Tarvitsemme sijaintisi käyttääksemme navigointia ja muita ominaisuuksia.";
 
-"onboarding_permissions_title" = "Anna MAPS:ME:lle tallennustilan ja sijainnin käyttöoikeus";
+"onboarding_permissions_title" = "Anna OMaps:lle tallennustilan ja sijainnin käyttöoikeus";
 
 "onboarding_permissions_message" = "Jotta voisit ladata karttoja, nähdä lähistöllä olevat paikan ja liikenteen sekä käyttää navigointia.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Tarvitset lisää tilaa ladataksesi. Poista tarpeeton data.";
 
-"editor_sharing_title" = "Paransin MAPS.ME-karttoja";
+"editor_sharing_title" = "Paransin OMaps-karttoja";
 
 "editor_comment_will_be_sent" = "Lähetämme kommenttisi kartanpiirtäjille.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Yksityiskohtainen kommentti";
 
-"editor_detailed_description" = "Ehdottamasi muutokset lähetetään OpenStreetMap-yhteisöön. Kuvaa tiedot, joita ei voi muokata MAPS.ME:ssä.";
+"editor_detailed_description" = "Ehdottamasi muutokset lähetetään OpenStreetMap-yhteisöön. Kuvaa tiedot, joita ei voi muokata OMaps:ssä.";
 
 "editor_more_about_osm" = "Lisätietoja OpenStreetMap:ista";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Olemme päivittäneet karttamuokkaimen";
 
-"whatsnew_update_editor_message" = "MAPS.ME -käyttäjät ovat tehneet 200 000 karttavaihtoehtoa. Yhdessä teemme maailman yksityiskohtaisimmat kartat. Liity meihin!";
+"whatsnew_update_editor_message" = "OMaps -käyttäjät ovat tehneet 200 000 karttavaihtoehtoa. Yhdessä teemme maailman yksityiskohtaisimmat kartat. Liity meihin!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Päivitä kaikki kartat käyttääksesi Karttamuokkainta.";
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Polkupyöränavigointi (betaversio)";
 
-"whatsnew_cycle_navigation_message" = "Testaamme polkupyöränavigointia uudelle kaudelle. Kokeile suosikkipyöräilyreittiäsi MAPS.ME-sovelluksella ja jaa mielipiteesi kanssamme.";
+"whatsnew_cycle_navigation_message" = "Testaamme polkupyöränavigointia uudelle kaudelle. Kokeile suosikkipyöräilyreittiäsi OMaps-sovelluksella ja jaa mielipiteesi kanssamme.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Arvioi Google Playssa";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Kerro kaverille";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hei, asenna MAPS.ME!";
+"tell_friends_text" = "Hei, asenna OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME on ehdoton offline-sovellus matkoja varten. MAPS.ME perustuu OpenStreetMap-dataan ja sallii sen muokkauksen.";
+"about_description" = "OMaps on ehdoton offline-sovellus matkoja varten. OMaps perustuu OpenStreetMap-dataan ja sallii sen muokkauksen.";
 
 /* Text in menu */
 "blog" = "Blogi";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Avaa";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Tilaa Uber -taksi suoraan sovelluksesta!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Suurenna fonttikokoa kartalla";
 
-"traffic_update_app" = "Päivitä MAPS.ME";
+"traffic_update_app" = "Päivitä OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Liikennetietojen näyttämiseksi sovellus on päivitettävä.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Myönnä käyttöoikeus";
 
-"onboarding_storage_permissions_message" = "Muuta laitteesi käyttöoikeusasetuksia. MAPS:ME:n käyttö edellyttää tallennustilan käyttöoikeutta.";
+"onboarding_storage_permissions_message" = "Muuta laitteesi käyttöoikeusasetuksia. OMaps:n käyttö edellyttää tallennustilan käyttöoikeutta.";
 
 "button_exit" = "Poistu";
 
-"onboarding_detail_permissions_title" = "MAPS.ME tarvitsee seuraavat käyttöoikeudet:";
+"onboarding_detail_permissions_title" = "OMaps tarvitsee seuraavat käyttöoikeudet:";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Tallennustila";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Ongelma tallennustilan käyttämisessä";
 
-"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 ja ota yhteyttä osoitteeseen support@maps.me";
+"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 ja ota yhteyttä osoitteeseen support@omaps.app";
 
 "setting_emulate_bad_storage" = "Jäljittele virheellistä tallennustilaa";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Hyväksyn <a href=\"%s\">käyttöehdot</a>";
 
-"sign_agree_news_gdpr" = "Hyväksyn viimeisimmät uutiset MAPS.ME-tuotteista";
+"sign_agree_news_gdpr" = "Hyväksyn viimeisimmät uutiset OMaps-tuotteista";
 
 "whats_new_localbiz_title" = "Pienet yritykset ansaitsevat huomiota";
 
-"whats_new_localbiz_message" = "Juuri paikalliset kahvilat, kotoisat hostellit ja kaupat tekevät matkastasi unohtumattoman. Me optimoimme sivusi MAPS.ME:ssä saadaksesi sen erottumaan joukosta.";
+"whats_new_localbiz_message" = "Juuri paikalliset kahvilat, kotoisat hostellit ja kaupat tekevät matkastasi unohtumattoman. Me optimoimme sivusi OMaps:ssä saadaksesi sen erottumaan joukosta.";
 
 "whats_new_order_button" = "Jätä pyyntö";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Lataa uudet paikat";
 
-"cached_bookmarks_placeholder_subtitle" = "Paina nappulaa ladataksesi tuhansia kiinnostavia paikkoja ja reittejä joita MAPS.ME käyttäjät ovat luoneet. Tarvitset internet yhteyden.";
+"cached_bookmarks_placeholder_subtitle" = "Paina nappulaa ladataksesi tuhansia kiinnostavia paikkoja ja reittejä joita OMaps käyttäjät ovat luoneet. Tarvitset internet yhteyden.";
 
 "downloader_download_routers" = "Lataa kirjanmerkit";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Kaatumisraportti";
 
-"opt_out_fabric_description" = "Me saatamme käyttää tietojasi parantaaksemme MAPS.ME kokemusta. Muutokset alkavat vaikuttamaan kun käynnistät sovelluksen uudestaan.";
+"opt_out_fabric_description" = "Me saatamme käyttää tietojasi parantaaksemme OMaps kokemusta. Muutokset alkavat vaikuttamaan kun käynnistät sovelluksen uudestaan.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Kirjanmerkkejä ei ole ladattu";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME:ssä on nyt reitti katalogi";
+"whats_new_bookmarks_catalog_title" = "OMaps:ssä on nyt reitti katalogi";
 
 "whats_new_bookmarks_catalog_message" = "Satoja yksityiskohtaisia reittejä kaikkialta maailmasta: minne mennä, mitä nähdä, missä syödä.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Poista mainokset";
 
-"remove_ads_title" = "Poista kaikki mainokset ja tue MAPS.ME:tä";
+"remove_ads_title" = "Poista kaikki mainokset ja tue OMaps:tä";
 
 "paybtn_title" = "Maksa %s/vuosi";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Lisää vaihtoehtoja";
 
-"why_support" = "Miksi tukea MAPS.ME?";
+"why_support" = "Miksi tukea OMaps?";
 
 "options_dropdown_item1" = "%s/kuukausi (Säästä %s/vuosi)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Poistamme kaikki mainokset sinulta";
 
-"why_support_item2" = "Sinä autat meitä parantamaan MAPS.ME:tä";
+"why_support_item2" = "Sinä autat meitä parantamaan OMaps:tä";
 
 "why_support_item3" = "Auta meitä parantamaan avoimia karttoja OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Serveri ei ole saatavilla";
 
-"server_unavailable_message" = "Ostos viimeistellään myöhemmin. Jos virhe jatkuu, ota yhteyttä support@maps.me.";
+"server_unavailable_message" = "Ostos viimeistellään myöhemmin. Jos virhe jatkuu, ota yhteyttä support@omaps.app.";
 
 "offline_fiters_check_in" = "Yhdistä internettiin suodattaaksesi hotelleja päivillä.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Tämä matkaopas lähetetään julkiseen hakemistoon MAPS.ME ja se on muiden käyttäjien käytettävissä";
+"upload_and_publish_desc" = "Tämä matkaopas lähetetään julkiseen hakemistoon OMaps ja se on muiden käyttäjien käytettävissä";
 
 "upload_and_publish" = "Ladata ja julkaista";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Kirjoita arvostelu ja auta matkustajia!";
 
-"share_bookmarks_email_body_link" = "Hei!\n\nMerkkinne voi ladata linkistä: %s. Avaa luettelo MAPS.ME: llä ja nauti matkasta!\n\nLataa sovellus: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hei!\n\nMerkkinne voi ladata linkistä: %s. Avaa luettelo OMaps: llä ja nauti matkasta!\n\nLataa sovellus: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigaattori ilmoittaa sinulle kameroista, kun nopeusraja ylittyy %d km/t";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Voit helposti jakaa kokemuksiasi";
 
-"whats_new_ugc_routes_subtitle" = "Tallenna ikimuistoiset paikat, luo reittejä kirjainmerkkien avulla ja jaa ne kaikkien kanssa MAPS.ME-luettelossa.";
+"whats_new_ugc_routes_subtitle" = "Tallenna ikimuistoiset paikat, luo reittejä kirjainmerkkien avulla ja jaa ne kaikkien kanssa OMaps-luettelossa.";
 
 "whats_new_webeditor_title" = "Muuta reittisi tarinoiksi";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Sinulla täytyy olla vähintään 3 kirjanmerkkiä, jotta voit lähettää oppaan julkiseen luetteloon";
 
-"bookmark_public_upload_alert_title" = "Muutama askel vielä, niin voit jakaa kirjanmerkkisi kaikkien MAPS.ME-matkailijoiden kanssa!";
+"bookmark_public_upload_alert_title" = "Muutama askel vielä, niin voit jakaa kirjanmerkkisi kaikkien OMaps-matkailijoiden kanssa!";
 
 "bookmark_public_upload_alert_subtitle" = "Varmista, että listallasi on kunnollinen nimi ja kuvaus, ja että kaikissa kirjanmerkeissäsi on paikoista jotain tietoa. Näin muut voivat löytää listasi ja käyttää sitä.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Täysi virransäästö";
 
-"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 MAPS.ME:n tuki pyytää.";
+"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 OMaps:n tuki pyytää.";
 
 "html_error_upload_message_try_again" = "Tarkista verkkoasetukset ja kokeile uudelleen";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Sinun ID: %s.";
 
-"gdpr_request_window_message" = "Kopioi se ja lähetä pyyntö osoitteeseen support@maps.me";
+"gdpr_request_window_message" = "Kopioi se ja lähetä pyyntö osoitteeseen support@omaps.app";
 
 "gdpr_request_window_copy" = "Kopioi ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Vältä lautan käyttöä";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME:n valmiit oppaat ovat valittuja paikkoja valokuvien ja kuvauksien kanssa, jotka näkyvät kartalla ja ovat käytettävissä offline-tilassa.";
+"cached_guides_placeholder_subtitle" = "OMaps:n valmiit oppaat ovat valittuja paikkoja valokuvien ja kuvauksien kanssa, jotka näkyvät kartalla ja ovat käytettävissä offline-tilassa.";
 
 "guides_catalogue_title" = "Oppaiden luettelo";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Uzbekistanilainen ruokaa";
 
-"onboarding_welcome_title" = "Suunnittele ja matkusta MAPS.ME:n kanssa";
+"onboarding_welcome_title" = "Suunnittele ja matkusta OMaps:n kanssa";
 
 "onboarding_welcome_first_subtitle" = "Tallenna mielenkiintoisia paikkoja, varaa hotelleja, luo reittejä offline-tilassa";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Ladata";
 
-"onboarding_bydeeplink_guide_title" = "Valmiit oppaat MAPS.ME:ssä";
+"onboarding_bydeeplink_guide_title" = "Valmiit oppaat OMaps:ssä";
 
 "onboarding_bydeeplink_guide_subtitle" = "Valittuja paikkoja valokuvien ja kuvauksien kanssa, jotka näkyvät kartalla ja ovat käytettävissä offline-tilassa.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Onko hotellin jo varattu?";
 
-"popup_booking_download_guides_message" = "Suunnittele reittisi valmiilla MAPS.ME -matkaoppailla";
+"popup_booking_download_guides_message" = "Suunnittele reittisi valmiilla OMaps -matkaoppailla";
 
 "popup_mwm_download_guides_title" = "Offline-matkaoppaat";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Katso";
 
-"gallery_pp_download_guides_offline_title" = "Suunnittele lomasi MAPS.ME:n kanssa!";
+"gallery_pp_download_guides_offline_title" = "Suunnittele lomasi OMaps:n kanssa!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Älä missaa tärkeimpiä reittejä kokeneilta matkustajilta";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Maksu veloitetaan iTunes-tililtäsi maksuvahvistuksen yhteydessä. Tilauksesi uusitaan automaattisesti ellei automaattista uusintaa ole otettu pois käytöstä vähintään 24 tuntia ennen nykyisen tilausjakson päättymistä. Tilauksen uusinta veloitetaan tililtäsi 24 tunnin kuluessa ennen nykyisen tilausjakson päättymistä. Voit hallita tai ottaa tilausten automaattisen uusinnan pois käytöstä Apple ID -tilisi asetuksissa oston jälkeen.";
 
-"whatsnew_carplay_title" = "MAPS.ME -autonavigointi CarPlayssa!";
+"whatsnew_carplay_title" = "OMaps -autonavigointi CarPlayssa!";
 
 "whatsnew_carplay_message" = "Kirjanmerkit, haku, nopeuskamerat ja kiertotien asetukset ovat käytettävissä offline-tilassa";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Nopeuskamerat";
 
-"download_map_carplay" = "Lataa kartat laitteesi MAPS.ME-sovelluksessa";
+"download_map_carplay" = "Lataa kartat laitteesi OMaps-sovelluksessa";
 
 "carplay_roundabout_exit" = "Poistumisramppi %s";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hurraa! Tilauksesi on voimassa!";
 
-"popup_subscription_success_map_message" = "Tutustu nyt parhaisiin nähtävyyksiin MAPS.ME-luettelossa";
+"popup_subscription_success_map_message" = "Tutustu nyt parhaisiin nähtävyyksiin OMaps-luettelossa";
 
 "popup_subscription_success_map_start_button" = "Näytä";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Aloita";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Yleisavustaja matkojen aikana";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Avaa luettelo";
 
-"new_onboarding_step5.2_message" = "MAPS.ME -matkaoppaiden tilaus on löytöostos. Käytä vapaasti matkaoppaiden kaikkia mahdollisuuksia!";
+"new_onboarding_step5.2_message" = "OMaps -matkaoppaiden tilaus on löytöostos. Käytä vapaasti matkaoppaiden kaikkia mahdollisuuksia!";
 
 "new_onboarding_step5.2_button" = "Näytä ehdot";
 
-"new_onboarding_step5.3_message" = "Lataa ja arvioi kaupunkikierroksia ja ulkoiluaktiviteetteja ilmaisella MAPS.ME-valinnalla!";
+"new_onboarding_step5.3_message" = "Lataa ja arvioi kaupunkikierroksia ja ulkoiluaktiviteetteja ilmaisella OMaps-valinnalla!";
 
 "new_onboarding_step5.3_button" = "Lataa ilmaiseksi";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Outdooractiven talvi- ja kesälomareitit odottavat luettelossa!";
 
-"whatsnew_guides_galleries_title" = "Suunnittele seuraava matka MAPS.ME:n kanssa";
+"whatsnew_guides_galleries_title" = "Suunnittele seuraava matka OMaps:n kanssa";
 
 "whatsnew_guides_galleries_message" = "Nyt te voitte löytää suositeltuja matkaoppaita suosittujen kaupunkien ja nähtävyyksien korteista";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Korkeudet";
 
-"tips_map_layers_title_countour" = "Korkeuslinjat offline-tilassa MAPS.ME:ssä!";
+"tips_map_layers_title_countour" = "Korkeuslinjat offline-tilassa OMaps:ssä!";
 
 "tips_map_layers_message_countour" = "Korkeuslinjat auttavat suunnittelemaan luontomatkan etkä enää eksy maastolla";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict
index fdab9506b4..dbc529a236 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 26a6ee45cd..83eecb5ffd 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Obtenez-la maintenant";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Merci d’avoir utilisé MAPS.ME ! Vous aimez cette application ? Parlez-en à vos amis ! Ce serait la meilleure preuve de gratitude à notre égard.";
+"share_on_facebook_text" = "Merci d’avoir utilisé OMaps ! Vous aimez cette application ? Parlez-en à vos amis ! Ce serait la meilleure preuve de gratitude à notre égard.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "ko";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Ressayer";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "À propos de MAPS.ME";
+"about_menu_title" = "À propos de OMaps";
 
 "downloading_touch_to_cancel" = "Téléchargement de %d%%, toucher pour annuler";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "La carte SD/le stockage USB contenant les cartes téléchargées n'est pas disponible";
 
-"disconnect_usb_cable" = "Veuillez débrancher le câble USB ou insérer la carte SD pour utiliser MAPS.ME";
+"disconnect_usb_cable" = "Veuillez débrancher le câble USB ou insérer la carte SD pour utiliser OMaps";
 
 "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";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Des mises à jour sont disponibles pour ces cartes :";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Vous n'avez plus besoin de MAPS.ME Lite, vous pouvez donc le désinstaller.";
+"suggest_uninstall_lite" = "Vous n'avez plus besoin de OMaps Lite, vous pouvez donc le désinstaller.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@, téléchargement réussi";
@@ -249,10 +249,10 @@
 "set" = "Groupe";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Vous n'avez encore aucun signet.\nTouchez n'importe où sur la carte pour en ajouter un.\nLes signets provenant d'autres sources peuvent aussi être importés et affichés dans MAPS.ME. Ouvrez des fichiers KML/KMZ contenant des signets enregistrés, à partir d'un courriel, de Dropbox ou d'un lien Web.";
+"bookmarks_usage_hint" = "Vous n'avez encore aucun signet.\nTouchez n'importe où sur la carte pour en ajouter un.\nLes signets provenant d'autres sources peuvent aussi être importés et affichés dans OMaps. Ouvrez des fichiers KML/KMZ contenant des signets enregistrés, à partir d'un courriel, de Dropbox ou d'un lien Web.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Les signets provenant d'autres sources peuvent être importés et affichés dans MAPS.ME. Ouvrez des fichiers KML/KMZ contenant des signets enregistrés, à partir d'un courriel, de Dropbox ou d'un lien Web.";
+"bookmarks_usage_hint_import_only" = "Les signets provenant d'autres sources peuvent être importés et affichés dans OMaps. Ouvrez des fichiers KML/KMZ contenant des signets enregistrés, à partir d'un courriel, de Dropbox ou d'un lien Web.";
 
 /* Settings button in system menu */
 "settings" = "Paramètres";
@@ -354,9 +354,9 @@
 "share_by_email" = "Partager par courriel";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Signets MAPS.ME partagés";
+"share_bookmarks_email_subject" = "Signets OMaps partagés";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Chargement des signets";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Le téléchargement du pays est en cours.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Nous espérons que vous appréciez l'utilisation de MAPS.ME ! Si oui, veuillez évaluer l'appli ou laisser une critique sur l'App Store. Cela prend moins d'une minute, mais peut vraiment nous aider. Merci pour votre soutien !";
+"appStore_message" = "Nous espérons que vous appréciez l'utilisation de OMaps ! Si oui, veuillez évaluer l'appli ou laisser une critique sur l'App Store. Cela prend moins d'une minute, mais peut vraiment nous aider. Merci pour votre soutien !";
 
 /* No, thanks */
 "no_thanks" = "Non, merci";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hé, regarde mon épingle sur MAPS.ME ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://maps.me/get";
+"bookmark_share_sms" = "Hé, regarde mon épingle sur OMaps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hé, regarde ma position actuelle sur MAPS.ME ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://maps.me/get";
+"my_position_share_sms" = "Hé, regarde ma position actuelle sur OMaps ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hé, regarde mon épingle sur la carte MAPS.ME !";
+"bookmark_share_email_subject" = "Hé, regarde mon épingle sur la carte OMaps !";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hé, regarde ma position actuelle sur la carte MAPS.ME !";
+"my_position_share_email_subject" = "Hé, regarde ma position actuelle sur la carte OMaps !";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Bonjour,\n\nJe suis actuellement ici : %1$@. Clique sur ce lien %2$@ ou sur celui-ci %3$@ pour voir l'endroit sur la carte.\n\nMerci.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Télécharger la carte de l'endroit où vous êtes";
 
 /* text of notification */
-"pro_version_is_free_today" = "Version complète de MAPS.ME gratuite aujourd'hui ! Téléchargez-le maintenant et dites-le à vos amis.";
+"pro_version_is_free_today" = "Version complète de OMaps gratuite aujourd'hui ! Téléchargez-le maintenant et dites-le à vos amis.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Nous transférons vos cartes téléchargées de MAPS.ME Lite vers MAPS.ME. Cela peut prendre quelques minutes.";
+"move_lite_maps_to_pro" = "Nous transférons vos cartes téléchargées de OMaps Lite vers OMaps. Cela peut prendre quelques minutes.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Vos cartes téléchargées ont été transférées avec succès vers MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Vos cartes téléchargées ont été transférées avec succès vers OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Le transfert de vos cartes a échoué. Veuillez supprimer MAPS.ME Lite et télécharger les cartes de nouveau.";
+"move_lite_maps_to_pro_failed" = "Le transfert de vos cartes a échoué. Veuillez supprimer OMaps Lite et télécharger les cartes de nouveau.";
 
 /* Text in menu */
 "settings_and_more" = "Paramètres & plus";
@@ -600,7 +600,7 @@
 "website" = "Site internet";
 
 /* Text in menu */
-"maps_me_community" = "Communauté MAPS.ME";
+"maps_me_community" = "Communauté OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Aimer sur Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Signaler un bug";
 
 /* Email subject */
-"subscribe_me_subject" = "Veuillez m'inscrire à la lettre d'information de MAPS.ME";
+"subscribe_me_subject" = "Veuillez m'inscrire à la lettre d'information de OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Informez-moi en priorité des dernières nouvelles, des mises à jour et des promotions. Je peux annuler mon abonnement à tout moment.";
 
 /* About text */
-"about_text" = "MAPS.ME offre les cartes hors ligne les plus rapides de toutes les villes, de tous les pays du monde. Voyagez en toute confiance : où que vous soyez, MAPS.ME permet de vous situer sur la carte, de trouver le restaurant, l'hôtel, la banque, la station d'essence, etc. les plus proches. Ceci sans aucune connexion Internet.\n\nNous travaillons toujours sur de nouvelles fonctionnalités et nous aimerions avoir votre avis sur la manière d'améliorer MAPS.ME. Si vous avez quelque problème avec l'appli, n'hésitez pas à nous contacter à support@maps.me. Nous répondons à toutes les demandes !\n\nVous aimez-vous MAPS.ME et souhaitez nous soutenir ? Il existe des moyens simples et tout à fait gratuits :\n\n- Publier une critique sur votre boutique d'applis\n- aimez notre page Facebook http://www.facebook.com/mapswithme\n- ou parlez simplement de MAPS.ME à votre maman, à vos amis et à vos collègues :)\n\nNous vous remercions de votre fidélité. Nous apprécions beaucoup votre soutien !\n\nP.S. : nous prenons les données cartographiques d'OpenStreetMap, un projet de cartographie similaire à Wikipédia, qui permet aux utilisateurs de créer et de modifier des cartes. Si vous voyez une omission ou une erreur sur la carte, vous pouvez corriger les cartes directement sur https://www.openstreetmap.org, et vos modifications apparaîtront dans l'appli MAPS.ME lors la prochaine version.";
+"about_text" = "OMaps offre les cartes hors ligne les plus rapides de toutes les villes, de tous les pays du monde. Voyagez en toute confiance : où que vous soyez, OMaps permet de vous situer sur la carte, de trouver le restaurant, l'hôtel, la banque, la station d'essence, etc. les plus proches. Ceci sans aucune connexion Internet.\n\nNous travaillons toujours sur de nouvelles fonctionnalités et nous aimerions avoir votre avis sur la manière d'améliorer OMaps. Si vous avez quelque problème avec l'appli, n'hésitez pas à nous contacter à support@omaps.app. Nous répondons à toutes les demandes !\n\nVous aimez-vous OMaps et souhaitez nous soutenir ? Il existe des moyens simples et tout à fait gratuits :\n\n- Publier une critique sur votre boutique d'applis\n- aimez notre page Facebook http://www.facebook.com/mapswithme\n- ou parlez simplement de OMaps à votre maman, à vos amis et à vos collègues :)\n\nNous vous remercions de votre fidélité. Nous apprécions beaucoup votre soutien !\n\nP.S. : nous prenons les données cartographiques d'OpenStreetMap, un projet de cartographie similaire à Wikipédia, qui permet aux utilisateurs de créer et de modifier des cartes. Si vous voyez une omission ou une erreur sur la carte, vous pouvez corriger les cartes directement sur https://www.openstreetmap.org, et vos modifications apparaîtront dans l'appli OMaps lors la prochaine version.";
 
 /* Alert text */
 "email_error_body" = "Le client de courriel n'a pas été configuré. Veuillez le faire ou employer tout autre moyen pour nous contacter à %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Veuillez mettre à jour la carte pour créer un itinéraire.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "La nouvelle version de MAPS.ME permet de créer des itinéraires à partir de votre position actuelle vers un point de destination. Veuillez mettre à jour les cartes pour utiliser cette fonctionnalité.";
+"routing_update_maps" = "La nouvelle version de OMaps permet de créer des itinéraires à partir de votre position actuelle vers un point de destination. Veuillez mettre à jour les cartes pour utiliser cette fonctionnalité.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Tout mettre à jour";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Trouvé";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Quand vous créez des itinéraires sur l'application MAPS.ME, veuillez garder à l'esprit les points suivants :\n\n  - Les itinéraires suggérés ne doivent être considérés que comme des recommandations.\n\n  - Les conditions des routes, les règlementations de circulations et les panneaux sont prioritaires sur les conseils de navigation.\n\n  - Il est possible qu'une carte soit incorrecte ou obsolète, et les itinéraires ne sont pas toujours créés de la meilleure façon possible.\n\n  Soyez prudents sur les routes et prenez soin de vous.";
+"routing_disclaimer" = "Quand vous créez des itinéraires sur l'application OMaps, veuillez garder à l'esprit les points suivants :\n\n  - Les itinéraires suggérés ne doivent être considérés que comme des recommandations.\n\n  - Les conditions des routes, les règlementations de circulations et les panneaux sont prioritaires sur les conseils de navigation.\n\n  - Il est possible qu'une carte soit incorrecte ou obsolète, et les itinéraires ne sont pas toujours créés de la meilleure façon possible.\n\n  Soyez prudents sur les routes et prenez soin de vous.";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Dépassé";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Il n'existe aucun itinéraire entre l'origine et la destination choisie. Veuillez sélectionner un point de départ ou d'arrivée différent.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Une erreur interne s'est produite. Veuillez essayer de supprimer la carte et téléchargez la à nouveau. Si le problème persiste, veuillez contacter support@maps.me.";
+"routing_failed_internal_error" = "Une erreur interne s'est produite. Veuillez essayer de supprimer la carte et téléchargez la à nouveau. Si le problème persiste, veuillez contacter support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Télécharger Carte + Itinéraire";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Je viens d'évaluer votre appli";
 
 /* Text for rating dialog */
-"rating_user_since" = "J'utilise MAPS.ME depuis %@";
+"rating_user_since" = "J'utilise OMaps depuis %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Aimez-vous MAPS.ME ?";
+"rating_do_like_maps" = "Aimez-vous OMaps ?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Tapotez sur une étoile pour évaluer notre appli";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Téléchargez des cartes";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Des cartes actualisées et des données de routage pour obtenir toutes les fonctionnalités de MAPS.ME.";
+"routing_download_map_and_routing" = "Des cartes actualisées et des données de routage pour obtenir toutes les fonctionnalités de OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Recevez des données de routage";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Vous aimez l’application ?";
 
-"rate_alert_default_message" = "Merci d’avoir utilisé MAPS.ME. Pourriez-vous, s’il vous plaît, noter cette application ? Vos commentaires nous aideront à nous améliorer.";
+"rate_alert_default_message" = "Merci d’avoir utilisé OMaps. Pourriez-vous, s’il vous plaît, noter cette application ? Vos commentaires nous aideront à nous améliorer.";
 
 "rate_alert_five_star_message" = "Super ! Nous vous aimons aussi !";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Lieu doublon";
 
-"first_launch_congrats_title" = "MAPS.ME est prêt à l'utilisation";
+"first_launch_congrats_title" = "OMaps est prêt à l'utilisation";
 
 "first_launch_congrats_text" = "Cherchez et trouvez la bonne direction partout dans le monde, en mode hors-connexion, gratuitement.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Ajoutez de nouveaux lieux sur la carte et modifiez les lieux existants directement depuis l'appli.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME utilise les données de la communauté OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps utilise les données de la communauté OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Vous ne vous perdrez plus jamais";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planifiez des itinéraires optimaux en voiture ou à pied.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — accédez à une carte mondiale hors connexion";
+"onboarding_offline_maps_title" = "OMaps — accédez à une carte mondiale hors connexion";
 
 "onboarding_offline_maps_message" = "Téléchargez une seule fois les cartes de la zone désirée, et utilisez les fonctions de navigation et de recherche sans connexion Internet.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Pour utiliser la navigation et d'autres fonctionnalités, nous devons pouvoir accéder à votre position géographique.";
 
-"onboarding_permissions_title" = "Autoriser MAPS.ME à accéder au stockage et à la localisation";
+"onboarding_permissions_title" = "Autoriser OMaps à accéder au stockage et à la localisation";
 
 "onboarding_permissions_message" = "Afin de pouvoir télécharger des cartes, voir les lieux et le trafic près de vous et utiliser la navigation.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Pour télécharger, vous avez besoin de plus d'espace. Veuillez supprimer les données non nécessaires.";
 
-"editor_sharing_title" = "J'ai amélioré les cartes de MAPS.ME";
+"editor_sharing_title" = "J'ai amélioré les cartes de OMaps";
 
 "editor_comment_will_be_sent" = "Nous transmettrons votre commentaire aux cartographes.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Commentaire détaillé";
 
-"editor_detailed_description" = "Vos modifications suggérées ont été envoyées à la communauté OpenStreetMap. Décrivez les détails qui ne peuvent pas être modifiés dans MAPS.ME.";
+"editor_detailed_description" = "Vos modifications suggérées ont été envoyées à la communauté OpenStreetMap. Décrivez les détails qui ne peuvent pas être modifiés dans OMaps.";
 
 "editor_more_about_osm" = "En savoir plus sur OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Nous avons mis à jour l'éditeur de cartes";
 
-"whatsnew_update_editor_message" = "Les utilisateurs de MAPS.ME ont procédé à 200 000 modifications de cartes. Nous créons ensemble les cartes les plus détaillées du monde. Rejoignez-nous !";
+"whatsnew_update_editor_message" = "Les utilisateurs de OMaps ont procédé à 200 000 modifications de cartes. Nous créons ensemble les cartes les plus détaillées du monde. Rejoignez-nous !";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Pour utiliser l'Éditeur de Cartes, veuillez mettre à jour toutes les cartes.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continuer";
 
-"recent_track_background_dialog_message" = "MAPS.ME utilise votre géolocalisation en arrière-plan pour enregistrer vos itinéraires récents.";
+"recent_track_background_dialog_message" = "OMaps utilise votre géolocalisation en arrière-plan pour enregistrer vos itinéraires récents.";
 
 "whatsnew_car_navigation_header" = "Navigation conviviale pour véhicule";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navigation à vélo (version bêta)";
 
-"whatsnew_cycle_navigation_message" = "Nous testons la navigation à vélo pour la nouvelle saison. Essayez votre parcours préféré à vélo avec MAPS.ME, et n'hésitez pas à nous partager vos impressions.";
+"whatsnew_cycle_navigation_message" = "Nous testons la navigation à vélo pour la nouvelle saison. Essayez votre parcours préféré à vélo avec OMaps, et n'hésitez pas à nous partager vos impressions.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Noter sur Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Recommander à un ami";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Salut! Installe MAPS.ME!";
+"tell_friends_text" = "Salut! Installe OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME est une application hors ligne essentielle pour les voyages. MAPS.ME se base sur les données OpenStreetMap et permet de les modifier.";
+"about_description" = "OMaps est une application hors ligne essentielle pour les voyages. OMaps se base sur les données OpenStreetMap et permet de les modifier.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Ouvrir";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Commandez un taxi directement depuis l'appli !";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Augmenter la taille de police sur la carte";
 
-"traffic_update_app" = "Veuillez mettre à jour MAPS.ME";
+"traffic_update_app" = "Veuillez mettre à jour OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Pour afficher les données de circulation, l'application doit être actualisée.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Autoriser l'accès";
 
-"onboarding_storage_permissions_message" = "Modifiez les paramètres d’autorisation dans votre appareil. Il est nécessaire d’accéder à un stockage pour utiliser MAPS.ME.";
+"onboarding_storage_permissions_message" = "Modifiez les paramètres d’autorisation dans votre appareil. Il est nécessaire d’accéder à un stockage pour utiliser OMaps.";
 
 "button_exit" = "Quitter";
 
-"onboarding_detail_permissions_title" = "MAPS.ME doit avoir accès à";
+"onboarding_detail_permissions_title" = "OMaps doit avoir accès à";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Stockage";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problème d'accès au stockage";
 
-"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 et nous contacter via support@maps.me";
+"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 et nous contacter via support@omaps.app";
 
 "setting_emulate_bad_storage" = "Émuler le mauvais stockage";
 
@@ -2281,7 +2281,7 @@
 
 "whats_new_localbiz_title" = "Les petites entreprises méritent l'attention";
 
-"whats_new_localbiz_message" = "Ce sont des cafés locaux, des auberges confortables et des boutiques qui rendent nos voyages inoubliables. Nous optimiserons votre page dans MAPS.ME pour la faire ressortir.";
+"whats_new_localbiz_message" = "Ce sont des cafés locaux, des auberges confortables et des boutiques qui rendent nos voyages inoubliables. Nous optimiserons votre page dans OMaps pour la faire ressortir.";
 
 "whats_new_order_button" = "Laissez une demande";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Télécharger de nouveaux lieux";
 
-"cached_bookmarks_placeholder_subtitle" = "Appuyez sur le bouton pour télécharger des milliers de lieux et d'itinéraires intéressants créés par les utilisateurs de MAPS.ME. Vous aurez besoin d'une connexion Internet.";
+"cached_bookmarks_placeholder_subtitle" = "Appuyez sur le bouton pour télécharger des milliers de lieux et d'itinéraires intéressants créés par les utilisateurs de OMaps. Vous aurez besoin d'une connexion Internet.";
 
 "downloader_download_routers" = "Télécharger les favoris";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Rapport d'accident";
 
-"opt_out_fabric_description" = "Nous pouvons utiliser vos données pour améliorer l'expérience de MAPS.ME. Les modifications prendront effet après le redémarrage de l'application.";
+"opt_out_fabric_description" = "Nous pouvons utiliser vos données pour améliorer l'expérience de OMaps. Les modifications prendront effet après le redémarrage de l'application.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Les signets n'ont pas été téléchargés";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME a maintenant un catalogue de routes";
+"whats_new_bookmarks_catalog_title" = "OMaps a maintenant un catalogue de routes";
 
 "whats_new_bookmarks_catalog_message" = "Des centaines d'itinéraires détaillés partout dans le monde : où aller, quoi voir, où manger.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Retirer les publicités";
 
-"remove_ads_title" = "Supprimer toutes les annonces et soutenir MAPS.ME";
+"remove_ads_title" = "Supprimer toutes les annonces et soutenir OMaps";
 
 "paybtn_title" = "Payez %s/an";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Plus d'options";
 
-"why_support" = "Pourquoi soutenir MAPS.ME ?";
+"why_support" = "Pourquoi soutenir OMaps ?";
 
 "options_dropdown_item1" = "%s/mois (économisez %s/an)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Nous allons supprimer toutes les annonces pour vous";
 
-"why_support_item2" = "Vous nous aidez à améliorer MAPS.ME";
+"why_support_item2" = "Vous nous aidez à améliorer OMaps";
 
 "why_support_item3" = "Vous nous aidez à améliorer les cartes ouvertes OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Le serveur n'est pas disponible";
 
-"server_unavailable_message" = "L'achat sera complété plus tard. Si l'erreur persiste, veuillez contacter support@maps.me.";
+"server_unavailable_message" = "L'achat sera complété plus tard. Si l'erreur persiste, veuillez contacter support@omaps.app.";
 
 "offline_fiters_check_in" = "Connectez-vous à Internet pour sélectionner les hôtels par dates.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Ce guide sera chargé dans le catalogue public MAPS.ME et sera disponible pour les autres utilisateurs";
+"upload_and_publish_desc" = "Ce guide sera chargé dans le catalogue public OMaps et sera disponible pour les autres utilisateurs";
 
 "upload_and_publish" = "Télécharger et publier";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Aidez les voyageurs en leur laissant un avis !";
 
-"share_bookmarks_email_body_link" = "Bonjour !\n\nVoici le lien où vous pouvez télécharger vos signets : %s. Ouvrez la liste via MAPS.ME et profitez de votre voyage !\n\nInstaller l'application : http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Bonjour !\n\nVoici le lien où vous pouvez télécharger vos signets : %s. Ouvrez la liste via OMaps et profitez de votre voyage !\n\nInstaller l'application : http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigator vous avertira des caméras lorsque vous dépassez la limite de vitesse de %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Il est facile de partager vos impressions";
 
-"whats_new_ugc_routes_subtitle" = "Sauvegardez des lieux mémorables, créez des itinéraires à l'aide des signets et partagez-les avec tout le monde dans le catalogue MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Sauvegardez des lieux mémorables, créez des itinéraires à l'aide des signets et partagez-les avec tout le monde dans le catalogue OMaps.";
 
 "whats_new_webeditor_title" = "Transformez vos itinéraires en histoires";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Votre itinéraire doit avoir au moins 3 tags afin d'effectuer le téléchargement dans le répertoire public";
 
-"bookmark_public_upload_alert_title" = "Il ne vous reste que deux étapes à suivre pour charger votre itinéraire dans le répertoire MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Il ne vous reste que deux étapes à suivre pour charger votre itinéraire dans le répertoire OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Assurez-vous que votre itinéraire a un nom et une description, ainsi que tous les tags contiennent des informations sur les lieux. Grâce à ça les utilisateurs peuvent trouver l'itinéraire et l'utiliser pour leurs voyages.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Économie d'énergie maximale";
 
-"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 MAPS.ME.";
+"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 OMaps.";
 
 "html_error_upload_message_try_again" = "Vérifiez l'accès au réseau et réessayez";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Votre ID : %s.";
 
-"gdpr_request_window_message" = "Veuillez le copier et envoyer une demande à support@maps.me";
+"gdpr_request_window_message" = "Veuillez le copier et envoyer une demande à support@omaps.app";
 
 "gdpr_request_window_copy" = "Copier l'ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Éviter les passages d'un cours d'eau";
 
-"cached_guides_placeholder_subtitle" = "Les guides prêts à l'emploi sur MAPS.ME sont des lieux sélectionnés avec des photos et des descriptions affichées sur la carte et disponibles hors connexion internet.";
+"cached_guides_placeholder_subtitle" = "Les guides prêts à l'emploi sur OMaps sont des lieux sélectionnés avec des photos et des descriptions affichées sur la carte et disponibles hors connexion internet.";
 
 "guides_catalogue_title" = "Catalogue de guides";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Cuisine ouzbek";
 
-"onboarding_welcome_title" = "Planifiez et voyagez avec MAPS.ME";
+"onboarding_welcome_title" = "Planifiez et voyagez avec OMaps";
 
 "onboarding_welcome_first_subtitle" = "Enregistrez des lieux intéressants, réservez des hôtels, créez des itinéraires hors ligne";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Télécharger";
 
-"onboarding_bydeeplink_guide_title" = "Guides prêts à l'emploi sur MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Guides prêts à l'emploi sur OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Les lieux sélectionnés avec des photos et des descriptions sont affichés sur la carte et disponibles hors connexion internet.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Avez-vous réservé un hôtel ?";
 
-"popup_booking_download_guides_message" = "Planifiez votre itinéraire avec des guides prêts à l'emploi fait par MAPS.ME";
+"popup_booking_download_guides_message" = "Planifiez votre itinéraire avec des guides prêts à l'emploi fait par OMaps";
 
 "popup_mwm_download_guides_title" = "Guides hors ligne";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Jetez un coup d'oeil";
 
-"gallery_pp_download_guides_offline_title" = "Planifiez vos vacances avec MAPS.ME !";
+"gallery_pp_download_guides_offline_title" = "Planifiez vos vacances avec OMaps !";
 
 "gallery_pp_download_guides_offline_subtitle" = "Ne manquez rien avec les guides faits par des voyageurs expérimentés";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Le paiement sera débité de votre compte iTunes lors de la confirmation d'achat. L'abonnement sera automatiquement renouvelé à moins que le renouvellement automatique ne soit désactivé au moins 24 heures avant la fin de la période en cours. Votre compte sera débité selon votre forfait pour un renouvellement dans les 24 heures précédant la fin de la période en cours. Vous pouvez gérer ou désactiver le renouvellement automatique depuis les paramètres de votre compte Apple ID à tout moment lors de votre achat.";
 
-"whatsnew_carplay_title" = "Navigation MAPS.ME pour automobile en mode CarPlay !";
+"whatsnew_carplay_title" = "Navigation OMaps pour automobile en mode CarPlay !";
 
 "whatsnew_carplay_message" = "Les signets, la recherche, les radars et les options de routage sont disponibles hors ligne";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Info Caméras";
 
-"download_map_carplay" = "Téléchargez des cartes dans l'application MAPS.ME sur votre appareil";
+"download_map_carplay" = "Téléchargez des cartes dans l'application OMaps sur votre appareil";
 
 "carplay_roundabout_exit" = "%s sortie";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hourra ! Vous êtes abonné !";
 
-"popup_subscription_success_map_message" = "Explorez maintenant les meilleures attractions touristiques du catalogue MAPS.ME";
+"popup_subscription_success_map_message" = "Explorez maintenant les meilleures attractions touristiques du catalogue OMaps";
 
 "popup_subscription_success_map_start_button" = "Regarder";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Commencer";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Assistant de voyage universel";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Ouvrir le catalogue";
 
-"new_onboarding_step5.2_message" = "L’abonnement au catalogue des guides MAPS.ME est avantageux. Un accès complet à tous les itinéraires pour des promenades en ville et des activités en plein air !";
+"new_onboarding_step5.2_message" = "L’abonnement au catalogue des guides OMaps est avantageux. Un accès complet à tous les itinéraires pour des promenades en ville et des activités en plein air !";
 
 "new_onboarding_step5.2_button" = "Voir les conditions";
 
-"new_onboarding_step5.3_message" = "Téléchargez et notez les itinéraires de promenades en ville et les activités de plein air grâce à une sélection gratuite de MAPS.ME !";
+"new_onboarding_step5.3_message" = "Téléchargez et notez les itinéraires de promenades en ville et les activités de plein air grâce à une sélection gratuite de OMaps !";
 
 "new_onboarding_step5.3_button" = "Télécharger gratuitement";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Les itinéraires de vacances d'été et d'hiver de Outdooractive vous attendent dans le catalogue !";
 
-"whatsnew_guides_galleries_title" = "Planifiez votre prochain voyage avec MAPS.ME";
+"whatsnew_guides_galleries_title" = "Planifiez votre prochain voyage avec OMaps";
 
 "whatsnew_guides_galleries_message" = "Désormais vous pouvez trouver les guides recommandés dans les fiches des villes et des attractions touristiques populaires";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terrain";
 
-"tips_map_layers_title_countour" = "Lignes d'altitude hors-ligne dans MAPS.ME !";
+"tips_map_layers_title_countour" = "Lignes d'altitude hors-ligne dans OMaps !";
 
 "tips_map_layers_message_countour" = "Les lignes d'altitude vous aideront à planifier votre voyage à la campagne sans vous perdre dans les champs";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
index a43ced25a9..65ba8b4841 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.stringsdict
@@ -139,4 +139,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 04496db30b..e6e76664a0 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Telepítés most";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Köszönjük, hogy a MAPS.ME-t használja! Kedveli az appot? Akkor számoljon be a barátainak róla. Ez lenne a legnagyobb hála, amit adhat nekünk.";
+"share_on_facebook_text" = "Köszönjük, hogy a OMaps-t használja! Kedveli az appot? Akkor számoljon be a barátainak róla. Ez lenne a legnagyobb hála, amit adhat nekünk.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Újrapróbálkozás";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "A MAPS.ME programról";
+"about_menu_title" = "A OMaps programról";
 
 "downloading_touch_to_cancel" = "%d%% letöltése, elvetéshez érintse meg";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "Nem található téképeket tartalmazó SD kártya / USB tároló";
 
-"disconnect_usb_cable" = "Kérjük bontsa az USB kapcsolatot vagy helyezzen be memóriakártyát a MAPS.ME használatához";
+"disconnect_usb_cable" = "Kérjük bontsa az USB kapcsolatot vagy helyezzen be memóriakártyát a OMaps használatához";
 
 "not_enough_free_space_on_sdcard" = "Kérjük szabadítson fel helyet az SD kártyán / USB tárolón az alkalmazás használatához!";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Az aktuális térképhez elérhető frissítések:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Már nincs szüksége a MAPS.ME lite alkalmazásra, nyugodtan letörölheti.";
+"suggest_uninstall_lite" = "Már nincs szüksége a OMaps lite alkalmazásra, nyugodtan letörölheti.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ letöltése sikeres";
@@ -249,10 +249,10 @@
 "set" = "Csoport";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Nincsenek megjelölt helyeid.\nHely megjelöléséhez koppints a térkép bármelyik pontjára.\nSzintén más forrásokból származó könyvjelzőket is beolvashat a MAPS.ME programba. Nyisson meg KML/KMZ fájlt egy levélből, Dropbox-ból vagy internetről.";
+"bookmarks_usage_hint" = "Nincsenek megjelölt helyeid.\nHely megjelöléséhez koppints a térkép bármelyik pontjára.\nSzintén más forrásokból származó könyvjelzőket is beolvashat a OMaps programba. Nyisson meg KML/KMZ fájlt egy levélből, Dropbox-ból vagy internetről.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Más forrásokból származó könyvjelzőket is beolvashat a MAPS.ME programba. Nyisson meg KML/KMZ fájlt egy levélből, Dropbox-ból vagy internetről.";
+"bookmarks_usage_hint_import_only" = "Más forrásokból származó könyvjelzőket is beolvashat a OMaps programba. Nyisson meg KML/KMZ fájlt egy levélből, Dropbox-ból vagy internetről.";
 
 /* Settings button in system menu */
 "settings" = "Beállítások";
@@ -354,9 +354,9 @@
 "share_by_email" = "Megosztás email-en";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Egy MAPS.ME könyvjelzőt osztottak meg Önnel";
+"share_bookmarks_email_subject" = "Egy OMaps könyvjelzőt osztottak meg Önnel";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Könyvjelzők letöltése";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Országletöltés folyamatban.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Reméljük élvezi a MAPS.ME használatát. Ha igen, kérjük írjon ajánlást az App Store-ban! Kevesebb mint egy perc, és valóban segít nekünk. Köszönjük!";
+"appStore_message" = "Reméljük élvezi a OMaps használatát. Ha igen, kérjük írjon ajánlást az App Store-ban! Kevesebb mint egy perc, és valóban segít nekünk. Köszönjük!";
 
 /* No, thanks */
 "no_thanks" = "Köszönöm, nem";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Nézd meg a MAPS.ME jelzőt! %1$@ vagy %2$@ A program letöltése: http://maps.me/get";
+"bookmark_share_sms" = "Nézd meg a OMaps jelzőt! %1$@ vagy %2$@ A program letöltése: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Nézd meg a MAPS.ME helyzetemet! %1$@ vagy %2$@ A program letöltése: http://maps.me/get";
+"my_position_share_sms" = "Nézd meg a OMaps helyzetemet! %1$@ vagy %2$@ A program letöltése: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Nézze meg a MAPS.ME jelzőmet";
+"bookmark_share_email_subject" = "Nézze meg a OMaps jelzőmet";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Nézze meg a helyzetemet a MAPS.ME térképen!";
+"my_position_share_email_subject" = "Nézze meg a helyzetemet a OMaps térképen!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Üdvözlöm!\n\nJelenleg itt vagyok: %1$@ Kattintson erre a hivatkozásra %2$@ vagy erre %3$@, hogy lássa a helyet a térképen.\n\nKöszönöm.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Töltsd le annak a helynek a térképét, ahol most vagy";
 
 /* text of notification */
-"pro_version_is_free_today" = "A teljes verzió MAPS.ME ma ingyenes! Töltsd le most és meséld el barátaidnak.";
+"pro_version_is_free_today" = "A teljes verzió OMaps ma ingyenes! Töltsd le most és meséld el barátaidnak.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Letöltött térképeidet áthelyezzük a MAPS.ME Lite-ból a MAPS.ME-be. Ez eltarthat pár percig.";
+"move_lite_maps_to_pro" = "Letöltött térképeidet áthelyezzük a OMaps Lite-ból a OMaps-be. Ez eltarthat pár percig.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Letöltött térképeidet sikeresen áthelyeztük a MAPS.ME-be.";
+"move_lite_maps_to_pro_ok" = "Letöltött térképeidet sikeresen áthelyeztük a OMaps-be.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Térképeid áthelyezése nem sikerült. Kérjük, töröld a MAPS.ME Lite-t és töltsd le a térképet megint.";
+"move_lite_maps_to_pro_failed" = "Térképeid áthelyezése nem sikerült. Kérjük, töröld a OMaps Lite-t és töltsd le a térképet megint.";
 
 /* Text in menu */
 "settings_and_more" = "Beállítások és egyéb";
@@ -600,7 +600,7 @@
 "website" = "Honlap";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME közösség";
+"maps_me_community" = "OMaps közösség";
 
 /* Text in menu */
 "like_on_facebook" = "Lájkolj minket Facebookon";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Hibabejelentés";
 
 /* Email subject */
-"subscribe_me_subject" = "Fel szeretnék iratkozni a MAPS.ME hírlevelére";
+"subscribe_me_subject" = "Fel szeretnék iratkozni a OMaps hírlevelére";
 
 /* Email body */
 "subscribe_me_body" = "Elsőként szeretnék értesülni a legújabb hírekről frissítésekről és promóciókról. A feliratkozásom bármikor törölhetem.";
 
 /* About text */
-"about_text" = "A MAPS.ME kínálja a leggyorsabb offline térképeket, a világ összes városáról és országáról. Utazz magabiztosan: bárhol is vagy, a MAPS.ME segít, hogy megtaláld magad a térképen, valamint segít a legközelebbi étterem, hotel, bank, benzinkút stb. felkutatásában is. Nem igényel internet kapcsolatot.\n\nMindig dolgozunk új fejlesztéseken és örömmel vennénk a te véleményedet is arról, hogyan tudnánk tovább fejleszteni a MAPS.ME-t. Bármely probléma esetén írj nekünk a support@maps.me email címre. Minden levélre válaszolunk!\n\nSzereted a MAPS.ME-t és szeretnél támogatni minket? Van erre pár egyszerű és teljesen ingyenes lehetőséged:\n\n- írj rólunk értékelést az App Market-en\n- kedveld a Facebook oldalunkat: http://www.facebook.com/mapswithme\n- vagy csak mesélj a MAPS.ME-ről anyukádnak, barátaidnak és munkatársaidnak :)\n\nKöszönjük, hogy velünk vagy. Nagyra értékeljük támogatásodat!\n\nU.i: Adatainkat az OpenStreetMap-ről vesszük, ami egy, a Wikipedia-hoz hasonló térképes projekt, ami megengedi felhasználóinak a térképek létrehozását és szerkesztését. Ha bármi hiányzik vagy rossz a térképpel, közvetlenül te is kijavíthatod a https://www.openstreetmap.org-on és változtatásaid a MAPS.ME következő verziójában már meg fognak jelenni.";
+"about_text" = "A OMaps kínálja a leggyorsabb offline térképeket, a világ összes városáról és országáról. Utazz magabiztosan: bárhol is vagy, a OMaps segít, hogy megtaláld magad a térképen, valamint segít a legközelebbi étterem, hotel, bank, benzinkút stb. felkutatásában is. Nem igényel internet kapcsolatot.\n\nMindig dolgozunk új fejlesztéseken és örömmel vennénk a te véleményedet is arról, hogyan tudnánk tovább fejleszteni a OMaps-t. Bármely probléma esetén írj nekünk a support@omaps.app email címre. Minden levélre válaszolunk!\n\nSzereted a OMaps-t és szeretnél támogatni minket? Van erre pár egyszerű és teljesen ingyenes lehetőséged:\n\n- írj rólunk értékelést az App Market-en\n- kedveld a Facebook oldalunkat: http://www.facebook.com/mapswithme\n- vagy csak mesélj a OMaps-ről anyukádnak, barátaidnak és munkatársaidnak :)\n\nKöszönjük, hogy velünk vagy. Nagyra értékeljük támogatásodat!\n\nU.i: Adatainkat az OpenStreetMap-ről vesszük, ami egy, a Wikipedia-hoz hasonló térképes projekt, ami megengedi felhasználóinak a térképek létrehozását és szerkesztését. Ha bármi hiányzik vagy rossz a térképpel, közvetlenül te is kijavíthatod a https://www.openstreetmap.org-on és változtatásaid a OMaps következő verziójában már meg fognak jelenni.";
 
 /* Alert text */
 "email_error_body" = "Az email kliens nincs beállítva. Kérjük, konfiguráld vagy próbálj meg valamilyen más módon kapcsolatba lépni velünk a %@ email címen keresztül.";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Kérjük, útvonal létrehozásához frissítsd a térképet.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "A MAPS.ME új verziójában már útvonalakt is létrehozhatsz tartózkodási helyedtől az úticélodig. Kérjük, ennek a funkciónak a használatához frissítsd a térképeket.";
+"routing_update_maps" = "A OMaps új verziójában már útvonalakt is létrehozhatsz tartózkodási helyedtől az úticélodig. Kérjük, ennek a funkciónak a használatához frissítsd a térképeket.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Mindegyik frissítése";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Megtalálva";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Amikor útvonalakat készít a MAPS.ME appban, kérjük, vegye figyelembe a következőket:\n\n  - Az ajánlott útvonalak csak javaslatoknak tekintendők.\n - Az utak kondíciója, a forgalmi szabályok és jelzőtáblák magasabb prioritásúak, mint a navigációs javaslatok.\n - A térkép lehet, hogy hibás vagy idejétmúlt, az útvonalak pedig lehet, hogy nem a lehető legjobb módon készülnek el.\n\n  Legyen óvatos az utakon és vigyázzon magára!";
+"routing_disclaimer" = "Amikor útvonalakat készít a OMaps appban, kérjük, vegye figyelembe a következőket:\n\n  - Az ajánlott útvonalak csak javaslatoknak tekintendők.\n - Az utak kondíciója, a forgalmi szabályok és jelzőtáblák magasabb prioritásúak, mint a navigációs javaslatok.\n - A térkép lehet, hogy hibás vagy idejétmúlt, az útvonalak pedig lehet, hogy nem a lehető legjobb módon készülnek el.\n\n  Legyen óvatos az utakon és vigyázzon magára!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Elavult";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Nem találtunk útvonalat a kiválasztott kiindulópont és az úti cél között. Kérjük, válasszon másik kiinduló- vagy végpontot.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Belső hiba történt. Kérjük, próbálja meg kitörölni és újra letölteni a térképet. Ha a probléma továbbra is fennáll, kérjük, vegye fel velünk a kapcsolatot a support@maps.me email címen.";
+"routing_failed_internal_error" = "Belső hiba történt. Kérjük, próbálja meg kitörölni és újra letölteni a térképet. Ha a probléma továbbra is fennáll, kérjük, vegye fel velünk a kapcsolatot a support@omaps.app email címen.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Térkép + útvonal letöltése";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Most értékeltem az alkalmazásodat";
 
 /* Text for rating dialog */
-"rating_user_since" = "MAPS.ME felhasználó vagyok %@ óta";
+"rating_user_since" = "OMaps felhasználó vagyok %@ óta";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Szereted a MAPS.ME-t?";
+"rating_do_like_maps" = "Szereted a OMaps-t?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Érints meg egy csillagot az alkalmazás értékeléséhez.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Térkép megszerzése";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Frissített térkép és útvonaltervezési adatok letöltése az összes MAPS.ME tulajdonság megszerzése érdekében.";
+"routing_download_map_and_routing" = "Frissített térkép és útvonaltervezési adatok letöltése az összes OMaps tulajdonság megszerzése érdekében.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Útvonaltervezési adatok megszerzése";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Tetszik az app?";
 
-"rate_alert_default_message" = "Köszönjük, hogy a MAPS.ME-t használta. Kérjük, értékelje az appot. A visszajelzéseik segítenek bennünket abban, hogy jobbá váljunk.";
+"rate_alert_default_message" = "Köszönjük, hogy a OMaps-t használta. Kérjük, értékelje az appot. A visszajelzéseik segítenek bennünket abban, hogy jobbá váljunk.";
 
 "rate_alert_five_star_message" = "Hurrá! Mi is szeretjük magát!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplikált hely";
 
-"first_launch_congrats_title" = "A MAPS.ME használatra készen áll";
+"first_launch_congrats_title" = "A OMaps használatra készen áll";
 
 "first_launch_congrats_text" = "Keress és navigálj offline a világon mindenhol, térítésmentesen.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Adj hozzá új helyeket a térképhez, és szerkeszd a meglévőket közvetlenül az alkalmazásból.";
 
-"whatsnew_editor_message_2" = "* A MAPS.ME az OpenStreetMap közösség adatait használja.";
+"whatsnew_editor_message_2" = "* A OMaps az OpenStreetMap közösség adatait használja.";
 
 "onboarding_offline_navigation_title" = "Többé nem fogsz eltévedni";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Tervezd meg az optimális autós és gyalogos útvonalakat.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — hozzáférés a világ térképéhez Internet nélkül";
+"onboarding_offline_maps_title" = "OMaps — hozzáférés a világ térképéhez Internet nélkül";
 
 "onboarding_offline_maps_message" = "Mindössze egyszer kell letöltened egy adott helyszín térképét, azt követően internetkapcsolat nélkül is használhatod a navigációs és keresési funkciókat.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "A navigáció és egyéb funkciók használatához hozzá kell férnünk a geolokációdhoz.";
 
-"onboarding_permissions_title" = "Engedélyezi a MAPS.ME számára, hogy hozzáférjen a tárolóhoz és a tartózkodási helyhez";
+"onboarding_permissions_title" = "Engedélyezi a OMaps számára, hogy hozzáférjen a tárolóhoz és a tartózkodási helyhez";
 
 "onboarding_permissions_message" = "Így tehát Ön letölthet térképeket, megtekintheti az Önhöz közeli helyeket és forgalmat, és használhatja a navigációt.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "A letöltéshez több szabad tárhelyre van szükség. Kérjük, töröld a szükségtelen adatokat.";
 
-"editor_sharing_title" = "Én fejlesztettem a MAPS.ME térképeket";
+"editor_sharing_title" = "Én fejlesztettem a OMaps térképeket";
 
 "editor_comment_will_be_sent" = "Megjegyzését elküldjük a térképészeknek.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Részletes megjegyzés";
 
-"editor_detailed_description" = "Javasolt változtatásait elküldjük az OpenStreetMap közösségnek. Írja le a további információkat, amelyek nem szerkeszthetők a MAPS.ME-ben.";
+"editor_detailed_description" = "Javasolt változtatásait elküldjük az OpenStreetMap közösségnek. Írja le a további információkat, amelyek nem szerkeszthetők a OMaps-ben.";
 
 "editor_more_about_osm" = "További részletek az OpenStreetMap-ról";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Frissítettük a szerkesztőt";
 
-"whatsnew_update_editor_message" = "A MAPS.ME felhasználói 200 ezer változtatást vittek fel a térképre. Együtt a világ legrészletesebb térképét készítjük. Csatlakozzon hozzánk!";
+"whatsnew_update_editor_message" = "A OMaps felhasználói 200 ezer változtatást vittek fel a térképre. Együtt a világ legrészletesebb térképét készítjük. Csatlakozzon hozzánk!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "A térképszerkesztő használatához, kérjük, frissítsd az összes térképet.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Folytatás";
 
-"recent_track_background_dialog_message" = "A MAPS.ME a geopozíciód használatával a háttérben rögzíti a legutóbb megtett utad.";
+"recent_track_background_dialog_message" = "A OMaps a geopozíciód használatával a háttérben rögzíti a legutóbb megtett utad.";
 
 "whatsnew_car_navigation_header" = "Felhasználóbarát járműnavigáció";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Kerékpáros navigáció (béta verzió)";
 
-"whatsnew_cycle_navigation_message" = "Most teszteljük a kerékpáros navigációt a következő évszakra. Próbáld ki kedvenc kerékpáros útvonalad a MAPS.ME-vel és oszd meg velünk véleményedet.";
+"whatsnew_cycle_navigation_message" = "Most teszteljük a kerékpáros navigációt a következő évszakra. Próbáld ki kedvenc kerékpáros útvonalad a OMaps-vel és oszd meg velünk véleményedet.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Arány a Google Play-n";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Mondja el egy ismerősének";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Szia! Telepítsd a MAPS.ME alkalmazást!";
+"tell_friends_text" = "Szia! Telepítsd a OMaps alkalmazást!";
 
 /* About short text (below logo) */
-"about_description" = "A MAPS.ME egy nélkülözhetetlen alkalmazás utazáshoz. A MAPS.ME az OpenStreetMap adataira épül, és lehetővé teszi ezek szerkesztését.";
+"about_description" = "A OMaps egy nélkülözhetetlen alkalmazás utazáshoz. A OMaps az OpenStreetMap adataira épül, és lehetővé teszi ezek szerkesztését.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Megnyitás";
 
-"whatsnew_uber_header" = "MAPS.ME és Uber";
+"whatsnew_uber_header" = "OMaps és Uber";
 
 "whatsnew_uber_message" = "Hívj Uber-taxit közvetlenül az alkalmazásból!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Betűméret növelése a térképen";
 
-"traffic_update_app" = "Kérjük, frissítse a MAPS.ME alkalmazást";
+"traffic_update_app" = "Kérjük, frissítse a OMaps alkalmazást";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "A forgalmi adatok megjelenítéséhez frissíteni kell az alkalmazást.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Hozzáférés biztosítása";
 
-"onboarding_storage_permissions_message" = "Engedélyek módosításának engedélyezése az Ön készüléken. Hozzáférésre van szükség a tárolóhoz, hogy használja a MAPS.ME alkalmazást.";
+"onboarding_storage_permissions_message" = "Engedélyek módosításának engedélyezése az Ön készüléken. Hozzáférésre van szükség a tárolóhoz, hogy használja a OMaps alkalmazást.";
 
 "button_exit" = "Kilépés";
 
-"onboarding_detail_permissions_title" = "A MAPS.ME.-nek hozzáférésre van szüksége a következőhöz: ";
+"onboarding_detail_permissions_title" = "A OMaps.-nek hozzáférésre van szüksége a következőhöz: ";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Tárolás";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Tároló hozzáférési hiba";
 
-"dialog_error_storage_message" = "Külső tároló 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@maps.me címen";
+"dialog_error_storage_message" = "Külső tároló 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@omaps.app címen";
 
 "setting_emulate_bad_storage" = "Sérült tároló emulálása";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Elfogadom a <a href=\"%s\">Általános Szerződési Feltételeket</a>";
 
-"sign_agree_news_gdpr" = "Elfogadom, hogy megkapja a MAPS.ME termékekkel kapcsolatos legfrissebb híreke";
+"sign_agree_news_gdpr" = "Elfogadom, hogy megkapja a OMaps termékekkel kapcsolatos legfrissebb híreke";
 
 "whats_new_localbiz_title" = "A kis cégek is figyelmet érdemelnek";
 
-"whats_new_localbiz_message" = "Legyenek helyi kávézók, kényelmes szállók és üzletek, amik feledhetetlenné teszik az utazást. A weboldaladat úgy optimalizáljuk a MAPS.ME-ben, hogy igazán kitűnjön.";
+"whats_new_localbiz_message" = "Legyenek helyi kávézók, kényelmes szállók és üzletek, amik feledhetetlenné teszik az utazást. A weboldaladat úgy optimalizáljuk a OMaps-ben, hogy igazán kitűnjön.";
 
 "whats_new_order_button" = "Kérés küldése";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Új helyek letöltése";
 
-"cached_bookmarks_placeholder_subtitle" = "Nyomja meg a gombot, hogy MAPS.ME felhasználók ezrei által gyűjtött érdekes helyet és útvonalat tölthessen le. Ehhez internetkapcsolatra van szükség.";
+"cached_bookmarks_placeholder_subtitle" = "Nyomja meg a gombot, hogy OMaps felhasználók ezrei által gyűjtött érdekes helyet és útvonalat tölthessen le. Ehhez internetkapcsolatra van szükség.";
 
 "downloader_download_routers" = "Könyvjelzők letöltése";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Hibajelentés";
 
-"opt_out_fabric_description" = "A MAPS.ME fejlesztéséhez felhasználhatjuk az adatait. A változtatások az alkalmazás újraindítása után lépnek életbe.";
+"opt_out_fabric_description" = "A OMaps fejlesztéséhez felhasználhatjuk az adatait. A változtatások az alkalmazás újraindítása után lépnek életbe.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Nem került letöltésre könyvjelző";
 
-"whats_new_bookmarks_catalog_title" = "A MAPS.ME már útvonal-katalógussal is rendelkezik";
+"whats_new_bookmarks_catalog_title" = "A OMaps már útvonal-katalógussal is rendelkezik";
 
 "whats_new_bookmarks_catalog_message" = "Több száz részletes útvonal a világszerte: hova érdemes menni, mit érdemes megnézni, hol együnk.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Reklámok eltávolítása";
 
-"remove_ads_title" = "Reklámok eltávolítása és MAPS.ME támogatása";
+"remove_ads_title" = "Reklámok eltávolítása és OMaps támogatása";
 
 "paybtn_title" = "Fizessen %s/év";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "További lehetőségek";
 
-"why_support" = "Miért éri meg támogatni a MAPS.ME-t?";
+"why_support" = "Miért éri meg támogatni a OMaps-t?";
 
 "options_dropdown_item1" = "%s/hó (%s/év megtakarítás)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Eltávolítjuk a reklámokat";
 
-"why_support_item2" = "Ön segít a MAPS.ME-t fejleszteni";
+"why_support_item2" = "Ön segít a OMaps-t fejleszteni";
 
 "why_support_item3" = "Segítsen a térkép fejlesztésében az OpenStreetMap.org-on";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "A szerver nem elérhető";
 
-"server_unavailable_message" = "A vásárlás később kerül befejezésre. Ha továbbra is fennáll a hiba írjon ide: support@maps.me.";
+"server_unavailable_message" = "A vásárlás később kerül befejezésre. Ha továbbra is fennáll a hiba írjon ide: support@omaps.app.";
 
 "offline_fiters_check_in" = "Csatlakozzon az internetre a hotelek dátum alapú szűréséhez.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Ez az útikalauz a MAPS.ME nyitott katalógusba lesz feltöltve, és mindenki számára elérhető lesz";
+"upload_and_publish_desc" = "Ez az útikalauz a OMaps nyitott katalógusba lesz feltöltve, és mindenki számára elérhető lesz";
 
 "upload_and_publish" = "Feltöltés és megjelenítés";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Írja meg a véleményét és segítsen a kirándulóknak!";
 
-"share_bookmarks_email_body_link" = "Üdvözlöm!\n\nA jeleit le lehet tölteni ezzel a linkkel: %s. Nyíssa meg a listát MAPS.ME segítségével és élvezze az utazását!\n\nAlkalmazás letöltése: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Üdvözlöm!\n\nA jeleit le lehet tölteni ezzel a linkkel: %s. Nyíssa meg a listát OMaps segítségével és élvezze az utazását!\n\nAlkalmazás letöltése: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigátor értesít a kamerákról sebességkorlátozás megsértésénél %d km/óra-ra";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Könnyű megosztani a benyomásaidat";
 
-"whats_new_ugc_routes_subtitle" = "Ments el emlékezetes helyeket, hozz létre útvonalakat könyvjelzők segítségével és oszd meg őket mindenkivel a MAPS.ME katalógusban.";
+"whats_new_ugc_routes_subtitle" = "Ments el emlékezetes helyeket, hozz létre útvonalakat könyvjelzők segítségével és oszd meg őket mindenkivel a OMaps katalógusban.";
 
 "whats_new_webeditor_title" = "Alakítsd át az útvonalaidat történetekké";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Legalább 3 könyvjelződnek kell lennie, hogy az útmutatódat feltölthesd a nyilvános katalógusba";
 
-"bookmark_public_upload_alert_title" = "Csak pár lépésnyire vagy attól, hogy megoszthasd a könyvjelzőidet minden MAPS.ME utazóval!";
+"bookmark_public_upload_alert_title" = "Csak pár lépésnyire vagy attól, hogy megoszthasd a könyvjelzőidet minden OMaps utazóval!";
 
 "bookmark_public_upload_alert_subtitle" = "Kéjük győződj meg róla, hogy egy jellemző neved és leírásod van a listádhoz, és hogy minden könyvjelzőnél van információ a helyekről. Ily módon a listádat mások is megtalálhatják és használhatják.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximális energiatakarékosság";
 
-"enable_logging_warning_message" = "Az opció bekapcsolja a diagnosztikai célú naplózást. Hasznos lehet a support csapatunknak, akik elhárítják az alkalmazás hibáit. Csak a MAPS.ME support kérésére kapcsold be ezt az opciót.";
+"enable_logging_warning_message" = "Az opció bekapcsolja a diagnosztikai célú naplózást. Hasznos lehet a support csapatunknak, akik elhárítják az alkalmazás hibáit. Csak a OMaps support kérésére kapcsold be ezt az opciót.";
 
 "html_error_upload_message_try_again" = "Kérjük ellenőrizd a hálózati beállításaidat és próbáld újra";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "A te ID-d: %s.";
 
-"gdpr_request_window_message" = "Kérjük másold le és küldd el a kérést a support@maps.me címre";
+"gdpr_request_window_message" = "Kérjük másold le és küldd el a kérést a support@omaps.app címre";
 
 "gdpr_request_window_copy" = "ID lemásolása";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Kompátkelők elkerülése";
 
-"cached_guides_placeholder_subtitle" = "A MAPS.ME használatra kész útmutatókat kínál azon kiválasztott helyekhez fényképekkel és leírásokkal, amelyek a térképen jelölve vannak és offline elérhetőek.";
+"cached_guides_placeholder_subtitle" = "A OMaps használatra kész útmutatókat kínál azon kiválasztott helyekhez fényképekkel és leírásokkal, amelyek a térképen jelölve vannak és offline elérhetőek.";
 
 "guides_catalogue_title" = "Útmutató katalógus";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Üzbég konyha";
 
-"onboarding_welcome_title" = "Tervezz és utazz a MAPS.ME-vel";
+"onboarding_welcome_title" = "Tervezz és utazz a OMaps-vel";
 
 "onboarding_welcome_first_subtitle" = "Könyvjelzőzz érdekes helyeket, foglalj szállásokat, számíts ki útvonalakat offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Letöltés";
 
-"onboarding_bydeeplink_guide_title" = "Használatra kész útmutatók a MAPS.ME-ben";
+"onboarding_bydeeplink_guide_title" = "Használatra kész útmutatók a OMaps-ben";
 
 "onboarding_bydeeplink_guide_subtitle" = "A legjobb meglátogatandó helyeket a térkép fényképekkel és leírásokkal jelöli. Offline munka.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Foglaltál egy hotelben?";
 
-"popup_booking_download_guides_message" = "Tervezd meg az útvonaladat a naprakész útikönyvekkel a MAPS.ME-től";
+"popup_booking_download_guides_message" = "Tervezd meg az útvonaladat a naprakész útikönyvekkel a OMaps-től";
 
 "popup_mwm_download_guides_title" = "Offline városi útikönyvek";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Vess rá egy pillantást";
 
-"gallery_pp_download_guides_offline_title" = "Tervezd meg a nyaralásodat MAPS.ME-vel!";
+"gallery_pp_download_guides_offline_title" = "Tervezd meg a nyaralásodat OMaps-vel!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Ne mulassz el semmit az útikönyvekkel, amiket tapasztalt utazók készítettek";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "A vásárlás megerősítésekor az összeg az iTunes számládra lesz terhelve. Az előfizetés automatikusan megújul, ha csak az automatikus megújítást 24 órával a jelenlegi időszak vége előtt ki nem kapcsolod. A számlád az előfizetésednek megfelelően a jelenlegi időszak lejárta előtti 24 órában lesz megterhelve. Az automatikus megújítást az Apple ID fiókod beállításaidban az előfizetés bármely szakaszában kikapcsolhatod.";
 
-"whatsnew_carplay_title" = "MAPS.ME autós navigáció CarPlayben!";
+"whatsnew_carplay_title" = "OMaps autós navigáció CarPlayben!";
 
 "whatsnew_carplay_message" = "Könyvjelzők, keresés, traffipax és útvonalválasztási lehetőség offline is elérhető";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Sebességjelzés";
 
-"download_map_carplay" = "Kérjük, töltsd le a térképeket a MAPS.ME alkalmazásban az eszközödre";
+"download_map_carplay" = "Kérjük, töltsd le a térképeket a OMaps alkalmazásban az eszközödre";
 
 "carplay_roundabout_exit" = "%s kijárat";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hohó, előfizettél!";
 
-"popup_subscription_success_map_message" = "Most már felfedezheted a legjobb turisztikai dolgokat a MAPS.ME katalógusban";
+"popup_subscription_success_map_message" = "Most már felfedezheted a legjobb turisztikai dolgokat a OMaps katalógusban";
 
 "popup_subscription_success_map_start_button" = "Böngészés megkezdése";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Kezdés";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "A mindenes útitárs";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Katalógus megnyitása";
 
-"new_onboarding_step5.2_message" = "A MAPS.ME útmutató katalógusra való feliratkozás nagyon értékes. Legyen teljes hozzáférés a városi és szabadtéri útmutatókhoz az egész világon!";
+"new_onboarding_step5.2_message" = "A OMaps útmutató katalógusra való feliratkozás nagyon értékes. Legyen teljes hozzáférés a városi és szabadtéri útmutatókhoz az egész világon!";
 
 "new_onboarding_step5.2_button" = "Nézd meg a feltételeinket";
 
-"new_onboarding_step5.3_message" = "Nézd meg a szabadon válaztható városi és szabadtéri túrák ingyenes példáit a MAPS.ME-ről!";
+"new_onboarding_step5.3_message" = "Nézd meg a szabadon válaztható városi és szabadtéri túrák ingyenes példáit a OMaps-ről!";
 
 "new_onboarding_step5.3_button" = "Ingyenes letöltés";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Az Outdooractive téli és nyári utazásai várnak rád a katalógusban!";
 
-"whatsnew_guides_galleries_title" = "Tervezd meg a következő utad a MAPS.ME-vel";
+"whatsnew_guides_galleries_title" = "Tervezd meg a következő utad a OMaps-vel";
 
 "whatsnew_guides_galleries_message" = "Megtalálhatod az ajánlott útmutatókat a népszerű túristavárosok és látnivalók helyoldalain";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terep";
 
-"tips_map_layers_title_countour" = "Újdonság a MAPS.ME-n: offline topográfiai réteg!";
+"tips_map_layers_title_countour" = "Újdonság a OMaps-n: offline topográfiai réteg!";
 
 "tips_map_layers_message_countour" = "Tervezze meg és élvezze a természetjáró kirándulásait, és tudjon meg mindent a környékről";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
index 3a1c24ff98..edd42b09ef 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 02a0668bee..0d8cae6821 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Dapatkan sekarang";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Terima kasih karena menggunakan MAPS.ME! Apakah Anda suka aplikasi ini? Beri tahukan kepada teman-teman Anda! Ini akan menjadi ungkapan terima kasih yang terbaik bagi kami.";
+"share_on_facebook_text" = "Terima kasih karena menggunakan OMaps! Apakah Anda suka aplikasi ini? Beri tahukan kepada teman-teman Anda! Ini akan menjadi ungkapan terima kasih yang terbaik bagi kami.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Coba Lagi";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Tentang MAPS.ME";
+"about_menu_title" = "Tentang OMaps";
 
 "downloading_touch_to_cancel" = "Sedang mengunduh %d%%, sentuh untuk membatalkan";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "Penyimpanan kartu SD/USB dengan peta terunduh tidak tersedia";
 
-"disconnect_usb_cable" = "Mohon lepas kabel USB atau masukkan kartu memori untuk menggunakan MAPS.ME";
+"disconnect_usb_cable" = "Mohon lepas kabel USB atau masukkan kartu memori untuk menggunakan OMaps";
 
 "not_enough_free_space_on_sdcard" = "Mohon bebaskan sejumlah ruang pada kartu SD/penyimpanan USB terlebih dahulu untuk menggunakan aplikasi";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Tersedia pembaruan untuk peta ini:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Anda tidak lagi memerlukan MAPS.ME Lite, sehingga Anda dapat menghapusnya.";
+"suggest_uninstall_lite" = "Anda tidak lagi memerlukan OMaps Lite, sehingga Anda dapat menghapusnya.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ berhasil diunduh";
@@ -249,10 +249,10 @@
 "set" = "Set";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Belum ada yang ditandai.\nSentuh lokasi apa pun pada peta untuk menandai.\nPenanda dari sumber lainnya juga dapat di impor dan ditampilkan pada MAPS.ME. Buka berkas KML/KMZ tersebut dengan penanda yang disimpan dari surel, Dropbox atau tautan jaringan.";
+"bookmarks_usage_hint" = "Belum ada yang ditandai.\nSentuh lokasi apa pun pada peta untuk menandai.\nPenanda dari sumber lainnya juga dapat di impor dan ditampilkan pada OMaps. Buka berkas KML/KMZ tersebut dengan penanda yang disimpan dari surel, Dropbox atau tautan jaringan.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Penanda dari sumber lainnya dapat diimpor dan ditampilkan pada MAPS.ME. Buka berkas KML/KMZ tersebut dengan penanda yang disimpan dari surel, Dropbox atau tautan jaringan.";
+"bookmarks_usage_hint_import_only" = "Penanda dari sumber lainnya dapat diimpor dan ditampilkan pada OMaps. Buka berkas KML/KMZ tersebut dengan penanda yang disimpan dari surel, Dropbox atau tautan jaringan.";
 
 /* Settings button in system menu */
 "settings" = "Pengaturan";
@@ -354,9 +354,9 @@
 "share_by_email" = "Bagikan menggunakan surel";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Bagikan penanda MAPS.ME";
+"share_bookmarks_email_subject" = "Bagikan penanda OMaps";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Memuat Penanda";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Pengunduhan negara sedang berjalan.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Kami harap Anda senang menggunakan MAPS.ME! Jika ya, mohon beri nilai atau ulasan untuk aplikasi ini di App Store. Hanya memakan waktu kurang dari satu menit tetapi hal itu dapat benar-benar membantu kami. Terima kasih atas dukungan Anda!";
+"appStore_message" = "Kami harap Anda senang menggunakan OMaps! Jika ya, mohon beri nilai atau ulasan untuk aplikasi ini di App Store. Hanya memakan waktu kurang dari satu menit tetapi hal itu dapat benar-benar membantu kami. Terima kasih atas dukungan Anda!";
 
 /* No, thanks */
 "no_thanks" = "Tidak, terima kasih";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hei, lihat pinku di MAPS.ME! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: http://maps.me/get";
+"bookmark_share_sms" = "Hei, lihat pinku di OMaps! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hei, lihat lokasiku saat ini di MAPS.ME! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: http://maps.me/get";
+"my_position_share_sms" = "Hei, lihat lokasiku saat ini di OMaps! %1$@ atau %2$@ belum memiliki peta offline? Unduh di sini: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hei, lihat pinku di peta MAPS.ME";
+"bookmark_share_email_subject" = "Hei, lihat pinku di peta OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hei, lihat lokasiku saat ini di peta MAPS.ME!";
+"my_position_share_email_subject" = "Hei, lihat lokasiku saat ini di peta OMaps!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hai,\n\nSekarang saya ada di sini: %1$@. Klik tautan ini %2$@ atau yang ini %3$@ untuk melihat tempatnya di peta.\n\nTerima kasih.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Unduh peta tempat di mana Anda berada sekarang";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Kami sedang mentransfer peta unduhan Anda dari MAPS.ME Lite ke MAPS.ME. Proses ini mungkin membutuhkan waktu beberapa menit.";
+"move_lite_maps_to_pro" = "Kami sedang mentransfer peta unduhan Anda dari OMaps Lite ke OMaps. Proses ini mungkin membutuhkan waktu beberapa menit.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Peta unduhan Anda berhasil ditransfer ke MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Peta unduhan Anda berhasil ditransfer ke OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Peta Anda gagal ditransfer. Silakan hapus MAPS.ME Lite dan unduh peta lagi.";
+"move_lite_maps_to_pro_failed" = "Peta Anda gagal ditransfer. Silakan hapus OMaps Lite dan unduh peta lagi.";
 
 /* Text in menu */
 "settings_and_more" = "Setelan &amp; Lebih Banyak";
@@ -600,7 +600,7 @@
 "website" = "Situs Web";
 
 /* Text in menu */
-"maps_me_community" = "Komunitas MAPS.ME";
+"maps_me_community" = "Komunitas OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Sukai di Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Laporkan gangguan";
 
 /* Email subject */
-"subscribe_me_subject" = "Mohon daftarkan saya untuk berlangganan berita MAPS.ME";
+"subscribe_me_subject" = "Mohon daftarkan saya untuk berlangganan berita OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Saya ingin menjadi yang pertama untuk mengetahui kabar dan promosi terbaru. Saya dapat membatalkan langganan saya kapan saja.";
 
 /* About text */
-"about_text" = "MAPS.ME menawarkan peta offline tercepat dari semua kota, semua negara di dunia. Berpergianlah dengan kepercayaan diri yang penuh: di nana pun Anda berada, MAPS.ME akan membantu Anda mengetahui posisi Anda pada peta, menemukan restoran, hotel, bank, stasiun bahan bakar terdekat, dll. Tidak perlu koneksi internet.Kami selalu membuat fitur-fitur baru dan ingin mendengar pendapat Anda mengenai bagaimana kami dapat membuat MAPS.ME menjadi lebih baik. Jika Anda memiliki masalah apa pun dengan aplikasinya, jangan segan untuk menghubungi kami di support@maps.me. Kami akan merespons setiap permintaan!Apakah Anda menyukai MAPS.ME an ingin membantu kami? Terdapat beberapa cara yang mudah dan sepenuhnya gratis:- tulis ulasan di App Market Anda";
+"about_text" = "OOMapsnawarkan peta offline tercepat dari semua kota, semua negara di dunia. Berpergianlah dengan kepercayaan diri yang penuh: di nana pun Anda berada, OMaps akan membantu Anda mengetahui posisi Anda pada peta, menemukan restoran, hotel, bank, stasiun bahan bakar terdekat, dll. Tidak perlu koneksi internet.Kami selalu membuat fitur-fitur baru dan ingin mendengar pendapat Anda mengenai bagaimana kami dapat membuat OOMapsnjadi lebih baik. Jika Anda memiliki masalah apa pun dengan aplikasinya, jangan segan untuk menghubungi kami di support@omaps.app. Kami akan merespons setiap permintaan!Apakah Anda menyukai OMaps an ingin membantu kami? Terdapat beberapa cara yang mudah dan sepenuhnya gratis:- tulis ulasan di App Market Anda";
 
 /* Alert text */
 "email_error_body" = "Surel pelanggan belum diatur. Mohon konfigurasikan atau gunakan cara lain untuk menghubungi kami di %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Mohon perbarui peta untuk membuat rute";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Versi MAPS.ME yang terbaru memungkinkan pembuatan rute dari posisi Anda saat itu ke titik tujuan. Mohon perbarui peta untuk menggunakan fitur ini.";
+"routing_update_maps" = "Versi OMaps yang terbaru memungkinkan pembuatan rute dari posisi Anda saat itu ke titik tujuan. Mohon perbarui peta untuk menggunakan fitur ini.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Perbarui semua";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Ditemukan";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Dalam membuat rute di aplikasi MAPS.ME, mohon ingat:\n\n- Rute yang disarankan hanya dapat dianggap sebagai rekomendasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Peta bisa saja salah atau sudah usang, dan rute yang dibuat mungkin bukan yang terbaik.\n\nBerhati-hatilah di jalan dan jagalah diri Anda sendiri!";
+"routing_disclaimer" = "Dalam membuat rute di aplikasi OMaps, mohon ingat:\n\n- Rute yang disarankan hanya dapat dianggap sebagai rekomendasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Peta bisa saja salah atau sudah usang, dan rute yang dibuat mungkin bukan yang terbaik.\n\nBerhati-hatilah di jalan dan jagalah diri Anda sendiri!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Usang";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Tidak ada rute yang ditemukan antara tempat asal dan tujuan yang dipilih. Mohon pilih titik mulai atau tujuan yang berbeda.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Terjadi gangguan internal. Mohon coba menghapus dan mengunduh petanya lagi. Jika masih terjadi masalah mohon hubungi kami di support@maps.me.";
+"routing_failed_internal_error" = "Terjadi gangguan internal. Mohon coba menghapus dan mengunduh petanya lagi. Jika masih terjadi masalah mohon hubungi kami di support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Untuh Peta + Rute";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Saya baru saja menilai app Anda";
 
 /* Text for rating dialog */
-"rating_user_since" = "Saya pengguna MAPS.ME sejak %@";
+"rating_user_since" = "Saya pengguna OMaps sejak %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Anda suka MAPS.ME?";
+"rating_do_like_maps" = "Anda suka OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Ketuk bintang untuk menilai app kami.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Dapatkan peta";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Unduh peta yang diperbarui dan data perutean untuk mendapatkan semua fitur MAPS.ME.";
+"routing_download_map_and_routing" = "Unduh peta yang diperbarui dan data perutean untuk mendapatkan semua fitur OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Dapatkan data perutean";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Suka aplikasi ini?";
 
-"rate_alert_default_message" = "Terima kasih karena menggunakan MAPS.ME. Mohon beri peringkat untuk aplikasi ini. Masukan dari Anda membantu kami untuk menjadi lebih baik.";
+"rate_alert_default_message" = "Terima kasih karena menggunakan OMaps. Mohon beri peringkat untuk aplikasi ini. Masukan dari Anda membantu kami untuk menjadi lebih baik.";
 
 "rate_alert_five_star_message" = "Hore! Kami juga sangat menyukai Anda!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Tempat ganda";
 
-"first_launch_congrats_title" = "MAPS.ME siap digunakan";
+"first_launch_congrats_title" = "OMaps siap digunakan";
 
 "first_launch_congrats_text" = "Cari dan bernavigasilah ke mana saja di dunia secara offline, bebas biaya.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Tambahkan tempat-tempat baru di peta, dan edit peta-peta yang ada langsung dari aplikasi.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME menggunakan data komunitas OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OOMapsnggunakan data komunitas OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Anda tidak akan tersesat lagi";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Rencanakan rute mobil dan pejalan kaki yang optimal.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — akses peta seluruh dunia tanpa internet";
+"onboarding_offline_maps_title" = "OMaps — akses peta seluruh dunia tanpa internet";
 
 "onboarding_offline_maps_message" = "Unduh peta untuk daerah yang diinginkan sekali, dan gunakan navigasi dan fungsi pencarian tanpa koneksi internet.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Untuk menggunakan navigasi dan fitur-fitur lainnya, kami perlu mengakses geolokasi Anda.";
 
-"onboarding_permissions_title" = "Izinkan MAPS.ME mengakses penyimpanan dan lokasi";
+"onboarding_permissions_title" = "Izinkan OOMapsngakses penyimpanan dan lokasi";
 
 "onboarding_permissions_message" = "Agar Anda dapat mengunduh peta, melihat tempat dan lalu lintas di dekat Anda, dan menggunakan navigasi.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Untuk mengunduh, Anda perlu ruang lebih banyak. Harap menghapus data yang tidak diperlukan.";
 
-"editor_sharing_title" = "Saya meningkatkan peta MAPS.ME";
+"editor_sharing_title" = "Saya meningkatkan peta OMaps";
 
 "editor_comment_will_be_sent" = "Kami akan mengirim komen Anda ke pembuat peta.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Komentar mendetail";
 
-"editor_detailed_description" = "Saran perubahan Anda akan dikirimkan ke komunitas OpenStreetMap. Jelaskan detail yang tidak dapat diedit di MAPS.ME.";
+"editor_detailed_description" = "Saran perubahan Anda akan dikirimkan ke komunitas OpenStreetMap. Jelaskan detail yang tidak dapat diedit di OMaps.";
 
 "editor_more_about_osm" = "Selengkapnya tentang OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Kami telah memperbarui editor peta";
 
-"whatsnew_update_editor_message" = "Pengguna MAPS.ME telah membuat 200 000 perubahan peta. Bersama-sama kami membuat peta paling detail di Dunia. Bergabunglah bersama kami!";
+"whatsnew_update_editor_message" = "Pengguna OMaps telah membuat 200 000 perubahan peta. Bersama-sama kami membuat peta paling detail di Dunia. Bergabunglah bersama kami!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Untuk menggunakan editor peta, silakan perbarui semua peta.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Teruskan";
 
-"recent_track_background_dialog_message" = "MAPS.ME menggunakan geoposisi di latar belakang untuk merekam rute yang baru Anda lalui.";
+"recent_track_background_dialog_message" = "OOMapsnggunakan geoposisi di latar belakang untuk merekam rute yang baru Anda lalui.";
 
 "whatsnew_car_navigation_header" = "Navigasi kendaraan yang mudah digunakan";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navigasi bersepeda (versi beta)";
 
-"whatsnew_cycle_navigation_message" = "Kami sedang menguji navigasi bersepeda untuk musim baru. Coba rute bersepeda favorit Anda dengan MAPS.ME dan sampaikan pendapat Anda.";
+"whatsnew_cycle_navigation_message" = "Kami sedang menguji navigasi bersepeda untuk musim baru. Coba rute bersepeda favorit Anda dengan OMaps dan sampaikan pendapat Anda.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Beri nilai di Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Beri Tahu Teman";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hai! Instal MAPS.ME yuk!";
+"tell_friends_text" = "Hai! Instal OMaps yuk!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME adalah aplikasi offline yang sangat berguna untuk bepergian. MAPS.ME didasarkan pada data OpenStreetMap dan memungkinkan kita untuk mengeditnya.";
+"about_description" = "OMaps adalah aplikasi offline yang sangat berguna untuk bepergian. OMaps didasarkan pada data OpenStreetMap dan memungkinkan kita untuk mengeditnya.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Buka";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Pesan taksi Uber langsung dari aplikasi!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Perbesar ukuran huruf pada peta";
 
-"traffic_update_app" = "Perbarui MAPS.ME";
+"traffic_update_app" = "Perbarui OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Untuk menampilkan data lalu lintas, aplikasi ini harus diperbarui.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Berikan akses";
 
-"onboarding_storage_permissions_message" = "Ubah pengaturan izin di perangkat Anda. Perlu akses penyimpanan untuk menggunakan MAPS.ME.";
+"onboarding_storage_permissions_message" = "Ubah pengaturan izin di perangkat Anda. Perlu akses penyimpanan untuk menggunakan OMaps.";
 
 "button_exit" = "Keluar";
 
-"onboarding_detail_permissions_title" = "MAPS.ME membutuhkan akses ke";
+"onboarding_detail_permissions_title" = "OOMapsmbutuhkan akses ke";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Penyimpanan";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Masalah akses penyimpanan";
 
-"dialog_error_storage_message" = "Penyimpanan eksternal tidak tersedia, mungkin Kartu SD sudah dilepaskan, rusak, atau sistem berkasnya hanya dapat dibaca. Silakan periksa dan beri tahu kami di alamat support@ maps.me";
+"dialog_error_storage_message" = "Penyimpanan eksternal tidak tersedia, mungkin Kartu SD sudah dilepaskan, rusak, atau sistem berkasnya hanya dapat dibaca. Silakan periksa dan beri tahu kami di alamat support@ omaps.app";
 
 "setting_emulate_bad_storage" = "Emulasi penyimpanan yang buruk";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Saya setuju dengan <a href=\"%s\">Ketentuan Penggunaan</a>";
 
-"sign_agree_news_gdpr" = "Saya setuju untuk menerima berita terbaru tentang produk MAPS.ME";
+"sign_agree_news_gdpr" = "Saya setuju untuk menerima berita terbaru tentang produk OMaps";
 
 "whats_new_localbiz_title" = "Bisnis kecil layak mendapatkan perhatian";
 
-"whats_new_localbiz_message" = "Kafe lokal, hostel nyaman, dan pertokoan adalah yang membuat perjalanan kita tak terlupakan. Kami akan mengoptimalkan halaman Anda di MAPS.ME untuk membuatnya menonjol.";
+"whats_new_localbiz_message" = "Kafe lokal, hostel nyaman, dan pertokoan adalah yang membuat perjalanan kita tak terlupakan. Kami akan mengoptimalkan halaman Anda di OMaps untuk membuatnya menonjol.";
 
 "whats_new_order_button" = "Tinggalkan permintaan";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Unduh tempat baru";
 
-"cached_bookmarks_placeholder_subtitle" = "Tekan tombol untuk mengunduh ribuan tempat dan rute menarik yang dibuat oleh pengguna MAPS.ME. Anda akan memerlukan koneksi internet.";
+"cached_bookmarks_placeholder_subtitle" = "Tekan tombol untuk mengunduh ribuan tempat dan rute menarik yang dibuat oleh pengguna OMaps. Anda akan memerlukan koneksi internet.";
 
 "downloader_download_routers" = "Unduh bookmark";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Laporan tabrakan";
 
-"opt_out_fabric_description" = "Kami dapat menggunakan data Anda untuk meningkatkan pengalaman MAPS.ME. Perubahan akan berlaku setelah Anda memulai ulang aplikasi.";
+"opt_out_fabric_description" = "Kami dapat menggunakan data Anda untuk meningkatkan pengalaman OMaps. Perubahan akan berlaku setelah Anda memulai ulang aplikasi.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Bookmark tidak terunduh";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME sekarang memiliki katalog rute";
+"whats_new_bookmarks_catalog_title" = "OMaps sekarang memiliki katalog rute";
 
 "whats_new_bookmarks_catalog_message" = "Ratusan rute yang detail di seluruh dunia: tempat untuk dikunjungi, untuk melihat-lihat, untuk makan.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Hapus iklan";
 
-"remove_ads_title" = "Hapus semua iklan dan dukungan MAPS.ME";
+"remove_ads_title" = "Hapus semua iklan dan dukungan OMaps";
 
 "paybtn_title" = "Bayar %s/tahun";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Opsi lainnya";
 
-"why_support" = "Kenapa dukungan MAPS.ME?";
+"why_support" = "Kenapa dukungan OMaps?";
 
 "options_dropdown_item1" = "%s/bulan (hemat %s/tahun)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Kami akan menghapus semua iklan untuk Anda";
 
-"why_support_item2" = "Anda membantu kami meningkatkan MAPS.ME";
+"why_support_item2" = "Anda membantu kami meningkatkan OMaps";
 
 "why_support_item3" = "Anda membantu kami meningkatkan peta terbuka OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server tidak tersedia";
 
-"server_unavailable_message" = "Pembelian akan diselesaikan nanti. Jika kesalahan tetap terjadi, silakan hubungi support@maps.me.";
+"server_unavailable_message" = "Pembelian akan diselesaikan nanti. Jika kesalahan tetap terjadi, silakan hubungi support@omaps.app.";
 
 "offline_fiters_check_in" = "Sambungkan ke internet untuk memfilter hotel berdasar tanggal.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Panduan ini akan diunggah ke katalog MAPS.ME umum dan akan tersedia untuk pengguna lain";
+"upload_and_publish_desc" = "Panduan ini akan diunggah ke katalog OMaps umum dan akan tersedia untuk pengguna lain";
 
 "upload_and_publish" = "Unggah dan publikasikan";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Bantu para pelancong dengan meninggalkan ulasan!";
 
-"share_bookmarks_email_body_link" = "Halo!\n\nBerikut tautan untuk mengunduh bookmark Anda: %s. Buka daftar melalui MAPS.ME dan nikmati perjalanan Anda!\n\nDapatkan aplikasi: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Halo!\n\nBerikut tautan untuk mengunduh bookmark Anda: %s. Buka daftar melalui OMaps dan nikmati perjalanan Anda!\n\nDapatkan aplikasi: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigator akan memberi Anda peringatan tentang adanya kamera saat Anda melebihi batas kecepatan %d km/jam";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Mudah untuk membagikan kesan Anda";
 
-"whats_new_ugc_routes_subtitle" = "Simpan tempat-tempat penuh kenangan, buat rute menggunakan markah dan bagikan kepada semua orang di katalog MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Simpan tempat-tempat penuh kenangan, buat rute menggunakan markah dan bagikan kepada semua orang di katalog OMaps.";
 
 "whats_new_webeditor_title" = "Ubah rute Anda menjadi cerita";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Anda setidaknya harus memiliki 3 bookmark untuk dapat mengunggah panduan ke katalog publik";
 
-"bookmark_public_upload_alert_title" = "Tinggal sedikit lagi untuk dapat membagikan bookmark dengan para traveler MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Tinggal sedikit lagi untuk dapat membagikan bookmark dengan para traveler OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Pastikan Anda memiliki nama yang spesifik dan deskripsi untuk daftar Anda, dan semua bookmark memiliki sedikit info tentang tempat-tempat tersebut. Dengan begini, daftar Anda dapat ditemukan dan digunakan oleh orang lain.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Hemat daya maksimum";
 
-"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 MAPS.ME.";
+"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 OMaps.";
 
 "html_error_upload_message_try_again" = "Periksa pengaturan jaringan Anda dan coba lagi";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "ID Anda: %s.";
 
-"gdpr_request_window_message" = "Salin dan kirim permintaan ke support@maps.me";
+"gdpr_request_window_message" = "Salin dan kirim permintaan ke support@omaps.app";
 
 "gdpr_request_window_copy" = "Salin ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Hindari penyeberangan kapal feri";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME menawarkan panduan siap pakai ke tempat pilihan dilengkapi foto dan keterangan pada peta dan tersedia offline.";
+"cached_guides_placeholder_subtitle" = "OOMapsnawarkan panduan siap pakai ke tempat pilihan dilengkapi foto dan keterangan pada peta dan tersedia offline.";
 
 "guides_catalogue_title" = "Katalog panduan";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Masakan Uzbek";
 
-"onboarding_welcome_title" = "Rencanakan dan bepergian dengan MAPS.ME";
+"onboarding_welcome_title" = "Rencanakan dan bepergian dengan OMaps";
 
 "onboarding_welcome_first_subtitle" = "Menandai tempat menarik, memesan hotel, menghitung rute secara offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Unduh";
 
-"onboarding_bydeeplink_guide_title" = "Panduan siap pakai di MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Panduan siap pakai di OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Kunjungi tempat terbaik di peta lengkap dengan foto dan keterangan. Berfungsi offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Pesan kamar hotel?";
 
-"popup_booking_download_guides_message" = "Rencanakan rute perjalanan anda bersama panduan dari MAPS.ME";
+"popup_booking_download_guides_message" = "Rencanakan rute perjalanan anda bersama panduan dari OMaps";
 
 "popup_mwm_download_guides_title" = "Panduan kota offline";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Lihat";
 
-"gallery_pp_download_guides_offline_title" = "Rencanakan liburan anda bersama MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Rencanakan liburan anda bersama OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Jangan lewatkan panduan panduan yang telah dibuat oleh para pelancong";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Pembayaran akan dibebankan ke akun iTunes Anda pada konfirmasi pembelian. Langganan akan diperbarui secara otomatis kecuali jika langganan otomatis dinonaktifkan setidaknya 24 jam sebelum akhir periode berjalan. Akun Anda akan dikenakan biaya sesuai dengan paket langganan Anda untuk perpanjangan dalam 24 jam sebelum akhir periode berjalan. Anda dapat mengelola atau menonaktifkan perpanjangan otomatis pada pengaturan akun ID Apple Anda kapan saja dari pembelian Anda.";
 
-"whatsnew_carplay_title" = "Navigasi MAPS.ME ada di CarPlay!";
+"whatsnew_carplay_title" = "Navigasi OMaps ada di CarPlay!";
 
 "whatsnew_carplay_message" = "Kini fitur penanda, pencarian, kamera kecepatan dan pemilihan rute bisa dilakukan secara offline";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Info kecepatan";
 
-"download_map_carplay" = "Silakan unduh peta di apl MAPS.ME pada perangkat Anda";
+"download_map_carplay" = "Silakan unduh peta di apl OMaps pada perangkat Anda";
 
 "carplay_roundabout_exit" = "Jalan keluar ke %s";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Woohoo, anda telah berlangganan!";
 
-"popup_subscription_success_map_message" = "Kini saatnya menemukan tempat wisata terbaik di katalog MAPS.ME";
+"popup_subscription_success_map_message" = "Kini saatnya menemukan tempat wisata terbaik di katalog OMaps";
 
 "popup_subscription_success_map_start_button" = "Mulai menjelajah";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Memulai";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Teman perjalanan yang lengkap";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Buka katalog";
 
-"new_onboarding_step5.2_message" = "Berlangganan Anda ke katalog panduan MAPS.ME adalah nilai yang bagus. Dapatkan akses penuh ke panduan kota dan luar ruangan di seluruh dunia!";
+"new_onboarding_step5.2_message" = "Berlangganan Anda ke katalog panduan OMaps adalah nilai yang bagus. Dapatkan akses penuh ke panduan kota dan luar ruangan di seluruh dunia!";
 
 "new_onboarding_step5.2_button" = "Lihat ketentuannya";
 
-"new_onboarding_step5.3_message" = "Lihatlah contoh rute perjalanan dan kota secara gratis dengan berbagai macam pilihan dari MAPS.ME!";
+"new_onboarding_step5.3_message" = "Lihatlah contoh rute perjalanan dan kota secara gratis dengan berbagai macam pilihan dari OMaps!";
 
 "new_onboarding_step5.3_button" = "Download Gratis";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Rute dari Outdooractive untuk perjalanan musim dingin dan panas tengah menunggu di katalog!";
 
-"whatsnew_guides_galleries_title" = "Rencanakan perjalanan Anda selanjutnya dengan MAPS.ME";
+"whatsnew_guides_galleries_title" = "Rencanakan perjalanan Anda selanjutnya dengan OMaps";
 
 "whatsnew_guides_galleries_message" = "Kini Anda dapat menemukan panduan yang disarankan di halaman tempat wisata yang paling populer dikunjungi turis";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Isometrik";
 
-"tips_map_layers_title_countour" = "Yang baru di MAPS.ME: lapisan topografi offline!";
+"tips_map_layers_title_countour" = "Yang baru di OMaps: lapisan topografi offline!";
 
 "tips_map_layers_message_countour" = "Rencanakan dan nikmati perjalanan alam Anda dan pastikan Anda tahu segalanya tentang daerah tersebut";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict
index cc9207df99..e560a0f297 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index f2d97aa46a..d989e2c08e 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Prendila ora";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Grazie per aver utilizzato MAPS.ME! Ti piace l’app? Dillo ai tuoi amici! Questo è il miglior segno di gratitudine.";
+"share_on_facebook_text" = "Grazie per aver utilizzato OMaps! Ti piace l’app? Dillo ai tuoi amici! Questo è il miglior segno di gratitudine.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Riprova";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Informazioni su MAPS.ME";
+"about_menu_title" = "Informazioni su OMaps";
 
 "downloading_touch_to_cancel" = "Download di %d%%, tocca per cancellare";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Aggiornamento disponibile per queste mappe:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Non hai più bisogno di MAPS.ME Lite, quindi puoi disinstallarlo.";
+"suggest_uninstall_lite" = "Non hai più bisogno di OMaps Lite, quindi puoi disinstallarlo.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "Scaricato %@ con successo";
@@ -249,10 +249,10 @@
 "set" = "Seleziona";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Non hai ancora nessun segnalibro.\nTocca qualsiasi luogo sulla cartina per aggiungere un segnalibro.\nPossono essere anche importati Preferiti da altre fonti e visualizzate nell'app MAPS.ME. Apri il file KML/KMZ con i pin salvati da una casella di posta, Dropbox o un link web.";
+"bookmarks_usage_hint" = "Non hai ancora nessun segnalibro.\nTocca qualsiasi luogo sulla cartina per aggiungere un segnalibro.\nPossono essere anche importati Preferiti da altre fonti e visualizzate nell'app OMaps. Apri il file KML/KMZ con i pin salvati da una casella di posta, Dropbox o un link web.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Possono essere anche importati Preferiti da altre fonti e visualizzate nell'app MAPS.ME. Apri il file KML/KMZ con i pin salvati da una casella di posta, Dropbox o un link web.";
+"bookmarks_usage_hint_import_only" = "Possono essere anche importati Preferiti da altre fonti e visualizzate nell'app OMaps. Apri il file KML/KMZ con i pin salvati da una casella di posta, Dropbox o un link web.";
 
 /* Settings button in system menu */
 "settings" = "Impostazioni";
@@ -354,9 +354,9 @@
 "share_by_email" = "Condividi via email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Il segnalibri MAPS.ME è stato condiviso con te";
+"share_bookmarks_email_subject" = "Il segnalibri OMaps è stato condiviso con te";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Caricamento segnalibri in corso";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "Il download della nazione è in corso.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Confidiamo nel fatto che sia piacevole utilizzare MAPS.ME! In caso positivo, ti preghiamo di valutare o recensire l'app all'interno dell'app store. Ti porterà via meno di un minuto e la cosa ci aiuterebbe tantissimo. Grazie per il tuo sostegno!";
+"appStore_message" = "Confidiamo nel fatto che sia piacevole utilizzare OMaps! In caso positivo, ti preghiamo di valutare o recensire l'app all'interno dell'app store. Ti porterà via meno di un minuto e la cosa ci aiuterebbe tantissimo. Grazie per il tuo sostegno!";
 
 /* No, thanks */
 "no_thanks" = "No, grazie";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "Vedi dove sono ora. Apri %1$@ o %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Dai uno sguardo al mio pin sulla mappa di MAPS.ME";
+"bookmark_share_email_subject" = "Dai uno sguardo al mio pin sulla mappa di OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Guarda dove mi trovo attualmente sulla mappa MAPS.ME";
+"my_position_share_email_subject" = "Guarda dove mi trovo attualmente sulla mappa OMaps";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Ciao,\n\nSono qui adesso: %1$@. Clicca su questo link %2$@ oppure su questo %3$@ per vedere il posto sulla mappa.\n\nGrazie.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Scarica la mappa del luogo in cui ti trovi";
 
 /* text of notification */
-"pro_version_is_free_today" = "Versione completa di MAPS.ME è oggi gratis! Scaricala ora e dillo ai tuoi amici!";
+"pro_version_is_free_today" = "Versione completa di OMaps è oggi gratis! Scaricala ora e dillo ai tuoi amici!";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Stiamo trasferendo le tue mappe scaricate da MAPS.ME Lite a MAPS.ME. Potrebbe richiedere alcuni minuti.";
+"move_lite_maps_to_pro" = "Stiamo trasferendo le tue mappe scaricate da OMaps Lite a OMaps. Potrebbe richiedere alcuni minuti.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Le mappe che hai scaricato sono state trasferite con successo a MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Le mappe che hai scaricato sono state trasferite con successo a OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Non è stato possibile trasferire le tue mappe. Cancella MAPS.ME Lite e scarica le mappe di nuovo.";
+"move_lite_maps_to_pro_failed" = "Non è stato possibile trasferire le tue mappe. Cancella OMaps Lite e scarica le mappe di nuovo.";
 
 /* Text in menu */
 "settings_and_more" = "Impostazioni e Altro";
@@ -600,7 +600,7 @@
 "website" = "Sito web";
 
 /* Text in menu */
-"maps_me_community" = "Comunità MAPS.ME";
+"maps_me_community" = "Comunità OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Dai Mi Piace su Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Riporta un bug";
 
 /* Email subject */
-"subscribe_me_subject" = "Iscrivimi alla newsletter di MAPS.ME";
+"subscribe_me_subject" = "Iscrivimi alla newsletter di OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Voglio essere tra i primi a sapere delle ultime novità aggiornamenti e promozioni. Potrò annullare l'iscrizione in ogni momento.";
 
 /* About text */
-"about_text" = "MAPS.ME offre le più veloci mappe offline di tutte le città, di tutti i paesi del mondo. Viaggia con piena fiducia: ovunque ti trovi, MAPS.ME ti aiuta a localizzarti sulla mappa, trovare ristoranti, hotel, banche, distributori di benzina ecc.., e non richiede la connessione a internet.\n\nLavoriamo sempre su nuove funzionalità e ci piacerebbe sapere da te in cosa potremmo migliorare MAPS.ME. Se avessi problemi con l'app, non esitare a contattarci a support@maps.me. Rispondiamo ad ogni richiesta!\n\nTi piace MAPS.ME e vuoi sostenerci? Ci sono alcuni modi semplici e assolutamente gratuiti:\n\n- Invia una recensione al tuo App Market\n- Metti mi piace sulla nostra pagina di Facebook http://www.facebook.com/mapswithme\n- O semplicemente fai pubblicità a MAPS.ME con la tua mamma, i tuoi amici e colleghi :)\n\nGrazie per essere stato con noi. Apprezziamo molto il tuo supporto!\n\nP.S. Prendiamo i dati delle mappe da OpenStreetMap, un progetto di mappatura simile a Wikipedia, che permette agli utenti di creare e modificare le mappe. Se vedi che manca qualcosa o se c'è qualcosa di sbagliato sulla mappa, puoi correggere le mappe direttamente su https://www.openstreetmap.org, e le modifiche appariranno nella prossima versione dell'app MAPS.ME.";
+"about_text" = "OMaps offre le più veloci mappe offline di tutte le città, di tutti i paesi del mondo. Viaggia con piena fiducia: ovunque ti trovi, OMaps ti aiuta a localizzarti sulla mappa, trovare ristoranti, hotel, banche, distributori di benzina ecc.., e non richiede la connessione a internet.\n\nLavoriamo sempre su nuove funzionalità e ci piacerebbe sapere da te in cosa potremmo migliorare OMaps. Se avessi problemi con l'app, non esitare a contattarci a support@omaps.app. Rispondiamo ad ogni richiesta!\n\nTi piace OMaps e vuoi sostenerci? Ci sono alcuni modi semplici e assolutamente gratuiti:\n\n- Invia una recensione al tuo App Market\n- Metti mi piace sulla nostra pagina di Facebook http://www.facebook.com/mapswithme\n- O semplicemente fai pubblicità a OMaps con la tua mamma, i tuoi amici e colleghi :)\n\nGrazie per essere stato con noi. Apprezziamo molto il tuo supporto!\n\nP.S. Prendiamo i dati delle mappe da OpenStreetMap, un progetto di mappatura simile a Wikipedia, che permette agli utenti di creare e modificare le mappe. Se vedi che manca qualcosa o se c'è qualcosa di sbagliato sulla mappa, puoi correggere le mappe direttamente su https://www.openstreetmap.org, e le modifiche appariranno nella prossima versione dell'app OMaps.";
 
 /* Alert text */
 "email_error_body" = "Il client email non è stato configurato. Si prega di configurarlo o di usare qualsiasi altro metodo per contattarci all'indirizzo %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Aggiorna la mappa per creare un itinerario.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "La nuova versione di MAPS.ME ti permette di creare itinerari dalla tua posizione attuale a un punto di destinazione. Aggiorna le mappe per utilizzare questa funzione.";
+"routing_update_maps" = "La nuova versione di OMaps ti permette di creare itinerari dalla tua posizione attuale a un punto di destinazione. Aggiorna le mappe per utilizzare questa funzione.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Aggiorna tutte";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Trovate";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Creando percorsi nell'app MAPS.ME tieni a mente quanto segue:\n\n  - I percorsi suggeriti possono essere considerati solo come consigliati.\n - Le condizioni della strada, le regole del traffico e i segnali hanno una priorità maggiore rispetto ai consigli sulla circolazione.\n - La mappa potrebbe essere scorretta o datata e i percorsi potrebbero non aver creato la strada migliore possibile.\n\n  Stai attento sulle strade e prenditi cura di te!";
+"routing_disclaimer" = "Creando percorsi nell'app OMaps tieni a mente quanto segue:\n\n  - I percorsi suggeriti possono essere considerati solo come consigliati.\n - Le condizioni della strada, le regole del traffico e i segnali hanno una priorità maggiore rispetto ai consigli sulla circolazione.\n - La mappa potrebbe essere scorretta o datata e i percorsi potrebbero non aver creato la strada migliore possibile.\n\n  Stai attento sulle strade e prenditi cura di te!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Obsoleto";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Non è stata trovata alcuna strada fra il punto di partenza e d'arrivo selezionati. Seleziona un punto di partenza e d'arrivo diversi.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Si è verificato un errore interno. Prova ad eliminare la mappa e a scaricarla nuovamente. Se il problema dovesse persistere, contattaci all'indirizzo support@maps.me.";
+"routing_failed_internal_error" = "Si è verificato un errore interno. Prova ad eliminare la mappa e a scaricarla nuovamente. Se il problema dovesse persistere, contattaci all'indirizzo support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Scarica mappa e percorso";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Ho appena valutato la tua app";
 
 /* Text for rating dialog */
-"rating_user_since" = "Sono un utente MAPS.ME dal %@";
+"rating_user_since" = "Sono un utente OMaps dal %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Ti piace MAPS.ME?";
+"rating_do_like_maps" = "Ti piace OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Fai tap sulla stella per valutare la nostra app.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Scarica la mappa";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Scarica la mappa aggiornata e i dati del percorso per ottenere tutte le funzionalità MAPS.ME.";
+"routing_download_map_and_routing" = "Scarica la mappa aggiornata e i dati del percorso per ottenere tutte le funzionalità OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Ottieni i dati del percorso";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Ti piace l’app?";
 
-"rate_alert_default_message" = "Grazie per aver utilizzato MAPS.ME. Valuta l’app. Il tuo feedback ci permette di migliorare.";
+"rate_alert_default_message" = "Grazie per aver utilizzato OMaps. Valuta l’app. Il tuo feedback ci permette di migliorare.";
 
 "rate_alert_five_star_message" = "Hooray! Anche noi amiamo i nostri utenti!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Luogo duplicato";
 
-"first_launch_congrats_title" = "MAPS.ME è pronto per essere usato";
+"first_launch_congrats_title" = "OMaps è pronto per essere usato";
 
 "first_launch_congrats_text" = "Cerca e naviga offline, ovunque ti trovi nel mondo, gratis.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Aggiungi nuovi luoghi alla mappa, e modifica quelli già esistenti direttamente dall’app.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME usa i dati della community OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps usa i dati della community OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Non ti perderai mai più";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Pianifica percorsi ottimali in auto o a piedi.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — accedi alla mappa in tutto il mondo senza Internet";
+"onboarding_offline_maps_title" = "OMaps — accedi alla mappa in tutto il mondo senza Internet";
 
 "onboarding_offline_maps_message" = "Scarica una volta le mappe per l’area desiderata e usa la navigazione e le funzioni di ricerca senza una connessione internet.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Per usare la navigazione e altri strumenti, dobbiamo accedere alla tua geolocalizzazione.";
 
-"onboarding_permissions_title" = "Consenti a MAPS.ME di accedere a memoria e posizione";
+"onboarding_permissions_title" = "Consenti a OMaps di accedere a memoria e posizione";
 
 "onboarding_permissions_message" = "Così puoi scaricare mappe, vedere luoghi e traffico vicino a te e usare la funzione di navigazione.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Per scaricare, hai bisogno di più spazio. Sei pregato di eliminare i dati non necessari.";
 
-"editor_sharing_title" = "Ho migliorato le mappe MAPS.ME";
+"editor_sharing_title" = "Ho migliorato le mappe OMaps";
 
 "editor_comment_will_be_sent" = "Invieremo i tuoi commenti ai cartografi.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Commento dettagliato";
 
-"editor_detailed_description" = "Le modifiche suggerite saranno inviate alla community OpenStreetMap. Descrivere i dettagli che non è possibile modificare in MAPS.ME.";
+"editor_detailed_description" = "Le modifiche suggerite saranno inviate alla community OpenStreetMap. Descrivere i dettagli che non è possibile modificare in OMaps.";
 
 "editor_more_about_osm" = "Ulteriori informazioni su OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Abbiamo aggiornato l'editor mappe";
 
-"whatsnew_update_editor_message" = "Gli utenti di MAPS.ME hanno apportato 200.000 modifiche alle mappe. Stiamo costruendo insieme le mappe più dettagliate al mondo. Unisciti a noi!";
+"whatsnew_update_editor_message" = "Gli utenti di OMaps hanno apportato 200.000 modifiche alle mappe. Stiamo costruendo insieme le mappe più dettagliate al mondo. Unisciti a noi!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Per utilizzare l'editor delle mappe, aggiorna tutte le mappe.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continua";
 
-"recent_track_background_dialog_message" = "MAPS.ME usa la tua posizione geografica in background per registrare il tuo percorso effettuato più di recente.";
+"recent_track_background_dialog_message" = "OMaps usa la tua posizione geografica in background per registrare il tuo percorso effettuato più di recente.";
 
 "whatsnew_car_navigation_header" = "Navigazione veicoli user-friendly";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navigazione in bici (versione beta)";
 
-"whatsnew_cycle_navigation_message" = "Stiamo collaudando la navigazione in bici per la nuova stagione. Prova il tuo itinerario ciclistico preferito con MAPS.ME e condividi con noi le tue opinioni.";
+"whatsnew_cycle_navigation_message" = "Stiamo collaudando la navigazione in bici per la nuova stagione. Prova il tuo itinerario ciclistico preferito con OMaps e condividi con noi le tue opinioni.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Vota su Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Dillo a un amico";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Ciao! Installa MAPS.ME!";
+"tell_friends_text" = "Ciao! Installa OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME è un'applicazione offline essenziale per chi ama viaggiare. MAPS.ME si basa sui dati OpenStreetMap e consente di apportare modifiche.";
+"about_description" = "OMaps è un'applicazione offline essenziale per chi ama viaggiare. OMaps si basa sui dati OpenStreetMap e consente di apportare modifiche.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Apri";
 
-"whatsnew_uber_header" = "MAPS.ME e Uber";
+"whatsnew_uber_header" = "OMaps e Uber";
 
 "whatsnew_uber_message" = "Prenota un taxi Uber direttamente dalla app!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Aumenta dimensione carattere sulla mappa";
 
-"traffic_update_app" = "Aggiorna MAPS.ME";
+"traffic_update_app" = "Aggiorna OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Per visualizzare i dati sul traffico, l'applicazione deve essere aggiornata.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Concedi l'accesso";
 
-"onboarding_storage_permissions_message" = "Modifica le impostazioni di autorizzazione sul tuo dispositivo. Si richiede l'accesso alla memoria per utilizzare MAPS.ME.";
+"onboarding_storage_permissions_message" = "Modifica le impostazioni di autorizzazione sul tuo dispositivo. Si richiede l'accesso alla memoria per utilizzare OMaps.";
 
 "button_exit" = "Esci";
 
-"onboarding_detail_permissions_title" = "MAPS.ME richiede l'accesso a";
+"onboarding_detail_permissions_title" = "OMaps richiede l'accesso a";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Memoria";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problema di accesso all'archivio";
 
-"dialog_error_storage_message" = "Archivio esterno non disponibile, probabilmente la scheda SD è stata rimossa, è danneggiata o il file system è di sola lettura. Controllala e contattaci su support@maps.me";
+"dialog_error_storage_message" = "Archivio esterno non disponibile, probabilmente la scheda SD è stata rimossa, è danneggiata o il file system è di sola lettura. Controllala e contattaci su support@omaps.app";
 
 "setting_emulate_bad_storage" = "Simula archivio danneggiato";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Accetto i <a href=\"%s\">Termini di utilizzo</a>";
 
-"sign_agree_news_gdpr" = "Accetto di ricevere le ultime notizie sui prodotti di MAPS.ME";
+"sign_agree_news_gdpr" = "Accetto di ricevere le ultime notizie sui prodotti di OMaps";
 
 "whats_new_localbiz_title" = "La piccola impresa merita attenzione";
 
-"whats_new_localbiz_message" = "Sono le caffetterie locali, gli ostelli accoglienti e i negozi che rendono indimenticabili i nostri viaggi. Ottimizzeremo la tua pagina in MAPS.ME per farla risaltare.";
+"whats_new_localbiz_message" = "Sono le caffetterie locali, gli ostelli accoglienti e i negozi che rendono indimenticabili i nostri viaggi. Ottimizzeremo la tua pagina in OMaps per farla risaltare.";
 
 "whats_new_order_button" = "Lascia una richiesta";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Scarica nuovi posti";
 
-"cached_bookmarks_placeholder_subtitle" = "Premi il pulsante per scaricare migliaia di luoghi e percorsi interessanti creati dagli utenti di MAPS.ME. Avrai bisogno della connessione internet.";
+"cached_bookmarks_placeholder_subtitle" = "Premi il pulsante per scaricare migliaia di luoghi e percorsi interessanti creati dagli utenti di OMaps. Avrai bisogno della connessione internet.";
 
 "downloader_download_routers" = "Scarica i segnalibri";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Rapporto incidenti";
 
-"opt_out_fabric_description" = "Potremmo utilizzare i tuoi dati per migliorare l'esperienza MAPS.ME. Le modifiche avranno effetto dopo il riavvio dell'applicazione.";
+"opt_out_fabric_description" = "Potremmo utilizzare i tuoi dati per migliorare l'esperienza OMaps. Le modifiche avranno effetto dopo il riavvio dell'applicazione.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "I segnalibri non sono stati scaricati";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME ora ha un catalogo di percorsi";
+"whats_new_bookmarks_catalog_title" = "OMaps ora ha un catalogo di percorsi";
 
 "whats_new_bookmarks_catalog_message" = "Centinaia di itinerari dettagliati in tutto il mondo: dove andare, cosa vedere, dove mangiare.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Disattivare la pubblicità";
 
-"remove_ads_title" = "Disattiva tutta la pubblicità e sostieni MAPS.ME";
+"remove_ads_title" = "Disattiva tutta la pubblicità e sostieni OMaps";
 
 "paybtn_title" = "Pagare %s/anno";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Altre opzioni";
 
-"why_support" = "Perché sostenere MAPS.ME?";
+"why_support" = "Perché sostenere OMaps?";
 
 "options_dropdown_item1" = "%s/mese (risparmio %s/anno)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Noi disattiviamo tutta la pubblicità";
 
-"why_support_item2" = "Voi ci aiutate a migliorare MAPS.ME";
+"why_support_item2" = "Voi ci aiutate a migliorare OMaps";
 
 "why_support_item3" = "Ci aiutate a migliorare le mappe OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server non è disponibile";
 
-"server_unavailable_message" = "L'acquisto verrà completato più tardi. Se l'errore persiste, si prega di contattare support@maps.me.";
+"server_unavailable_message" = "L'acquisto verrà completato più tardi. Se l'errore persiste, si prega di contattare support@omaps.app.";
 
 "offline_fiters_check_in" = "Per scegliere la data di check-in e check-out bisogna collegarsi a internet.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "La seguente guida verrà caricata sul catalogo pubblico MAPS.ME in open access";
+"upload_and_publish_desc" = "La seguente guida verrà caricata sul catalogo pubblico OMaps in open access";
 
 "upload_and_publish" = "Caricare e pubblicare";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Lascia una recensione ed aiuta altri viaggiatori!";
 
-"share_bookmarks_email_body_link" = "Ciao,\n\npuoi scaricare i tag dal seguente link: %s. Aprire elenco tramite MAPS.ME e godersi viaggio!\n\nScaricare l'App: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Ciao,\n\npuoi scaricare i tag dal seguente link: %s. Aprire elenco tramite OMaps e godersi viaggio!\n\nScaricare l'App: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Il navigatore avvisa della presenza della telecamere in caso di eccesso velocità di %d km/o";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "È facile condividere le tue impressioni";
 
-"whats_new_ugc_routes_subtitle" = "Salva luoghi memorabili, crea itinerari utilizzando i segnalibri e condividili con tutti nel catalogo MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Salva luoghi memorabili, crea itinerari utilizzando i segnalibri e condividili con tutti nel catalogo OMaps.";
 
 "whats_new_webeditor_title" = "Trasforma i tuoi percorsi in storie";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Per poter caricare l'itinerario sul catalogo pubblico bisogna mettere almeno 3 segnalibri";
 
-"bookmark_public_upload_alert_title" = "Ancora alcuni passi per poter caricare l'itinerario sul catalogo MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Ancora alcuni passi per poter caricare l'itinerario sul catalogo OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Assicurati che l'itinerario abbia un nome ed una descrizione e tutti i segnalibri contengano i dettagli del posto. In questo modo gli utenti potranno trovare l'itinerario e usarlo nel viaggio.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Massimo risparmio energetico";
 
-"enable_logging_warning_message" = "Questa opzione si attiva per registrare tutte le azioni ai fini diagnostici. Ciò aiuta il nostro staff ad ottimizzare il funzionamento dell'applicazione. Attiva l'opzione sulla richiesta dello staff di suporto di MAPS.ME.";
+"enable_logging_warning_message" = "Questa opzione si attiva per registrare tutte le azioni ai fini diagnostici. Ciò aiuta il nostro staff ad ottimizzare il funzionamento dell'applicazione. Attiva l'opzione sulla richiesta dello staff di suporto di OMaps.";
 
 "html_error_upload_message_try_again" = "Controllare la connessione e riprova";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Tuo ID: %s.";
 
-"gdpr_request_window_message" = "Si prega di copiare ID assegnato ed inviare la richiesta a support@maps.me";
+"gdpr_request_window_message" = "Si prega di copiare ID assegnato ed inviare la richiesta a support@omaps.app";
 
 "gdpr_request_window_copy" = "Copia ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Evitare i traghetti";
 
-"cached_guides_placeholder_subtitle" = "Guide pronte su MAPS.ME sono luoghi preferiti con descrizioni e foto visualizzabili sulle mappe e disponibili offline.";
+"cached_guides_placeholder_subtitle" = "Guide pronte su OMaps sono luoghi preferiti con descrizioni e foto visualizzabili sulle mappe e disponibili offline.";
 
 "guides_catalogue_title" = "Catalogo guide";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Cucina uzbeka";
 
-"onboarding_welcome_title" = "Pianifica e viaggia con MAPS.ME";
+"onboarding_welcome_title" = "Pianifica e viaggia con OMaps";
 
 "onboarding_welcome_first_subtitle" = "Salva i luoghi più interessanti, prenota alberghi, pianifica percorsi offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Scarica";
 
-"onboarding_bydeeplink_guide_title" = "Guide pronte in MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Guide pronte in OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Luoghi preferiti con descrizioni e foto sono visualizzati sulla mappa e disponibili offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Hai prenotato un albergo?";
 
-"popup_booking_download_guides_message" = "Pianificare il viaggio con le Guide pronte di MAPS.ME";
+"popup_booking_download_guides_message" = "Pianificare il viaggio con le Guide pronte di OMaps";
 
 "popup_mwm_download_guides_title" = "Guida offline";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Scopri";
 
-"gallery_pp_download_guides_offline_title" = "Pianifica il viaggio con MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Pianifica il viaggio con OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Non perdere i consigli più importanti da viaggiatori esperti";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Il pagamento verrà addebitato sul tuo account iTunes alla conferma dell'acquisto. L'abbonamento verrà rinnovato automaticamente a meno che l'opzione di rinnovo automatico non venga disattivata almeno 24 ore prima del termine dell'attuale periodo di fatturazione. L'addebito sull'account dipenderà dal piano di rinnovo e verrà effettuato nelle 24 ore precedenti alla fine del ciclo di fatturazione esistente. Puoi gestire o disattivare il rinnovo automatico dalle impostazioni dell'account Apple ID in qualsiasi momento.";
 
-"whatsnew_carplay_title" = "CarPlay supporta la navigazione MAPS.ME!";
+"whatsnew_carplay_title" = "CarPlay supporta la navigazione OMaps!";
 
 "whatsnew_carplay_message" = "Segnalibri, ricerca, autovelox e impostazioni di deviazione: tutto perfettamente funzionante offline";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Info autovelox";
 
-"download_map_carplay" = "Scarica l'applicazione MAPS.ME sul tuo smartphone";
+"download_map_carplay" = "Scarica l'applicazione OMaps sul tuo smartphone";
 
 "carplay_roundabout_exit" = "%s uscita";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Grande! Sei abbonato!";
 
-"popup_subscription_success_map_message" = "Esplora ora le migliori attrazioni turistiche del catalogo di MAPS.ME";
+"popup_subscription_success_map_message" = "Esplora ora le migliori attrazioni turistiche del catalogo di OMaps";
 
 "popup_subscription_success_map_start_button" = "Scopri";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Avvia";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Tutto per i viaggi in un'unica app";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Apri il catalogo";
 
-"new_onboarding_step5.2_message" = "Abbonarsi al catalogo guide di MAPS.ME è conveniente. Ottieni l'accesso completo a tutti i percorsi cittadini e nella natura!";
+"new_onboarding_step5.2_message" = "Abbonarsi al catalogo guide di OMaps è conveniente. Ottieni l'accesso completo a tutti i percorsi cittadini e nella natura!";
 
 "new_onboarding_step5.2_button" = "Vedi i termini di utilizzo";
 
-"new_onboarding_step5.3_message" = "Scarica gratuitamente una selezione di percorsi cittadini e di attività all'aria aperta realizzata da MAPS.ME!";
+"new_onboarding_step5.3_message" = "Scarica gratuitamente una selezione di percorsi cittadini e di attività all'aria aperta realizzata da OMaps!";
 
 "new_onboarding_step5.3_button" = "Scarica gratis";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "I percorsi di Outdooractive ti aspettano all'interno del catalogo, sia per vacanze invernali che estive!";
 
-"whatsnew_guides_galleries_title" = "Pianifica il tuo prossimo viaggio con MAPS.ME";
+"whatsnew_guides_galleries_title" = "Pianifica il tuo prossimo viaggio con OMaps";
 
 "whatsnew_guides_galleries_message" = "Adesso puoi trovare le guide consigliate sulle pagine dedicate alle città e alla attrazioni più popolari";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terreno";
 
-"tips_map_layers_title_countour" = "Novità su MAPS.ME modalità topografica offline!";
+"tips_map_layers_title_countour" = "Novità su OMaps modalità topografica offline!";
 
 "tips_map_layers_message_countour" = "La modalità topografica aiuta a programmare il viaggio nella natura e a non perdersi";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
index 94f4065a23..c3d6f40038 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 868426f363..30cddc77c0 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "今すぐ入手";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "MAPS.MEをご利用いただきありがとうございます! このアプリが好きですか? お友達にも教えてあげてください! アプリを広めていただければ大変嬉しく思います。";
+"share_on_facebook_text" = "OMapsをご利用いただきありがとうございます! このアプリが好きですか? お友達にも教えてあげてください! アプリを広めていただければ大変嬉しく思います。";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "再実行";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "MAPS.MEについて";
+"about_menu_title" = "OMapsについて";
 
 "downloading_touch_to_cancel" = "%d%%をダウンロード中です。キャンセルするには画面をタッチしてください。";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "マップをダウンロードしたSDカード/USBストレージへ接続できません";
 
-"disconnect_usb_cable" = "MAPS.MEを利用するにはUSBケーブルを抜くかメモリーカードを挿入してください";
+"disconnect_usb_cable" = "OMapsを利用するにはUSBケーブルを抜くかメモリーカードを挿入してください";
 
 "not_enough_free_space_on_sdcard" = "アプリを起動するにはSDカード/USBストレージの空き容量を確保する必要があります";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "以下のマップが更新されています:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "MAPS.ME Liteは削除してもかまいません";
+"suggest_uninstall_lite" = "OMaps Liteは削除してもかまいません";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@のダウンロードが成功しました";
@@ -249,10 +249,10 @@
 "set" = "セット";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "未だブックマークがありません。\nマップ上をタップすればブックマークを追加できます。\nMAPS.ME以外のアプリで作成したブックマークの表示も可能です。KML/KMZ形式のピン情報をメールやDropbox、URLから取得してください。";
+"bookmarks_usage_hint" = "未だブックマークがありません。\nマップ上をタップすればブックマークを追加できます。\nOMaps以外のアプリで作成したブックマークの表示も可能です。KML/KMZ形式のピン情報をメールやDropbox、URLから取得してください。";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "MAPS.ME以外のアプリで作成したブックマークの表示も可能です。KML/KMZ形式のピン情報をメールやDropbox、URLから取得してください。";
+"bookmarks_usage_hint_import_only" = "OMaps以外のアプリで作成したブックマークの表示も可能です。KML/KMZ形式のピン情報をメールやDropbox、URLから取得してください。";
 
 /* Settings button in system menu */
 "settings" = "設定";
@@ -354,9 +354,9 @@
 "share_by_email" = "Eメールで共有";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.MEの位置情報シェア";
+"share_bookmarks_email_subject" = "OMapsの位置情報シェア";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "ブックマークの読み込み中";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "ダウンロードを実行中です";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "MAPS.MEの使い心地はいかがでしょうか。もしよろしければ、App Storeでレビューや評価をお知らせください。皆様からいただく一言が開発の励みになります。ご支援をよろしくお願いいたします！";
+"appStore_message" = "OMapsの使い心地はいかがでしょうか。もしよろしければ、App Storeでレビューや評価をお知らせください。皆様からいただく一言が開発の励みになります。ご支援をよろしくお願いいたします！";
 
 /* No, thanks */
 "no_thanks" = "いいえ";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "私は今ここにいます。リンク: %1$@, %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "MAPS.MEでピン情報を確認";
+"bookmark_share_email_subject" = "OMapsでピン情報を確認";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "MAPS.MEで現在地を確認";
+"my_position_share_email_subject" = "OMapsで現在地を確認";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "私は今ここにいます: %1$@\n\nリンクをクリックすると詳細がマップに表示されます。\n\n%2$@\n\n%3$@";
@@ -582,16 +582,16 @@
 "download_map_notification" = "あなたがいる場所のマップをダウンロードしよう";
 
 /* text of notification */
-"pro_version_is_free_today" = "MAPS.MEのフルバージョンが本日無料！今すぐダウンロードして友達に教えてあげましょう。";
+"pro_version_is_free_today" = "OMapsのフルバージョンが本日無料！今すぐダウンロードして友達に教えてあげましょう。";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "ダウンロード済みの地図をMAPS.ME LiteからMAPS.MEに転送します。完了までに数分かかるかもしれません。";
+"move_lite_maps_to_pro" = "ダウンロード済みの地図をOMaps LiteからOMapsに転送します。完了までに数分かかるかもしれません。";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "ダウンロード済みの地図は無事MAPS.MEに転送されました";
+"move_lite_maps_to_pro_ok" = "ダウンロード済みの地図は無事OMapsに転送されました";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "地図の転送に失敗しました。MAPS.ME Liteを削除してから地図を再度ダウンロードしてください。";
+"move_lite_maps_to_pro_failed" = "地図の転送に失敗しました。OMaps Liteを削除してから地図を再度ダウンロードしてください。";
 
 /* Text in menu */
 "settings_and_more" = "設定&その他";
@@ -600,7 +600,7 @@
 "website" = "ウェブサイト";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.MEコミュニティ";
+"maps_me_community" = "OMapsコミュニティ";
 
 /* Text in menu */
 "like_on_facebook" = "Facebookでいいねをクリック";
@@ -630,13 +630,13 @@
 "report_a_bug" = "バグを報告";
 
 /* Email subject */
-"subscribe_me_subject" = "MAPS.MEニュースレターを購読します";
+"subscribe_me_subject" = "OMapsニュースレターを購読します";
 
 /* Email body */
 "subscribe_me_body" = "最新ニュース、アップデートとプロモーションにすいてまず知りたいです。いつでも購読をキャンセル出来ます。";
 
 /* About text */
-"about_text" = "MAPS.MEは世界の全ての国、全ての都市が載っている最速のオフラインマップ。どこにいてもMAPS.MEの地図上でユーザーの現在地が分かり、付近のレストラン、ホテル、銀行、ガソリンスタンドなどが見つけられるので、自信を持って旅行ができます。インターネット接続は必要ありません。\n\n弊社では常に新機能の開発に取り組んでいるので、MAPS.MEの改善についてユーザーの皆様からのご意見やご感想をお待ちしています。アプリで問題点が見つかった際は、お気軽にsupport@maps.meまでご連絡ください。どのようなリクエストにでも対応いたします!\n\nMAPS.MEが好きでサポートしていただけますか。シンプルで完全無料の方法がいくつかあります。\n\n- お使いのアプリマーケットでレビューを投稿\n- 弊社のFacebookページで「いいね!」をクリック：http://www.facebook.com/mapswithme\n- MAPS.MEのことをお母様、お友達、同僚の皆様に話す (^_^)\n\n弊社アプリをご利用いただきありがとうございます。皆様からのサポートに大変感謝しております!\n\n追伸：ウィキペディアのようにユーザーによる作成や編集が可能なマッピングプロジェクトOpenStreetMapの地図データを使用しています。地図上で欠けているものや誤りを見つけた場合、https://www.openstreetmap.orgでユーザーが直接修正ができます。このような変更はMAPS.MEのその後のバージョンリリースの際に反映されます。";
+"about_text" = "OMapsは世界の全ての国、全ての都市が載っている最速のオフラインマップ。どこにいてもOMapsの地図上でユーザーの現在地が分かり、付近のレストラン、ホテル、銀行、ガソリンスタンドなどが見つけられるので、自信を持って旅行ができます。インターネット接続は必要ありません。\n\n弊社では常に新機能の開発に取り組んでいるので、OMapsの改善についてユーザーの皆様からのご意見やご感想をお待ちしています。アプリで問題点が見つかった際は、お気軽にsupport@omaps.appまでご連絡ください。どのようなリクエストにでも対応いたします!\n\nOMapsが好きでサポートしていただけますか。シンプルで完全無料の方法がいくつかあります。\n\n- お使いのアプリマーケットでレビューを投稿\n- 弊社のFacebookページで「いいね!」をクリック：http://www.facebook.com/mapswithme\n- OMapsのことをお母様、お友達、同僚の皆様に話す (^_^)\n\n弊社アプリをご利用いただきありがとうございます。皆様からのサポートに大変感謝しております!\n\n追伸：ウィキペディアのようにユーザーによる作成や編集が可能なマッピングプロジェクトOpenStreetMapの地図データを使用しています。地図上で欠けているものや誤りを見つけた場合、https://www.openstreetmap.orgでユーザーが直接修正ができます。このような変更はOMapsのその後のバージョンリリースの際に反映されます。";
 
 /* Alert text */
 "email_error_body" = "このメールクライアントはセットアップされていません。設定するか、他の方法で%@にご連絡ください。";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "ルートを作成するためにマップを更新してください。";
 
 /* Update maps suggestion */
-"routing_update_maps" = "新バージョンのMAPS.MEは現在地から目的地までのルートを作成可能です。 この機能を使うためにマップを更新してください。";
+"routing_update_maps" = "新バージョンのOMapsは現在地から目的地までのルートを作成可能です。 この機能を使うためにマップを更新してください。";
 
 /* Update all button text */
 "downloader_update_all_button" = "全てをアップデート";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "見つかりました";
 
 /* Disclaimer message */
-"routing_disclaimer" = "MAPS.MEアプリでルートを作成する時は、以下のことに留意してください：\n\n  - 提案されたルートは推奨するだけです。\n - 道路状況、交通規則と標識はナビゲーションのアドバイスより優先度が高くなっています。\n - マップが不正確または古くなっている場合や、ルートが最適な方法で作成されていないことがあります。\n\n  安全運転でご自愛ください！";
+"routing_disclaimer" = "OMapsアプリでルートを作成する時は、以下のことに留意してください：\n\n  - 提案されたルートは推奨するだけです。\n - 道路状況、交通規則と標識はナビゲーションのアドバイスより優先度が高くなっています。\n - マップが不正確または古くなっている場合や、ルートが最適な方法で作成されていないことがあります。\n\n  安全運転でご自愛ください！";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "旧式";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "選択した出発地と目的地との間にルートが見つかりません。別の出発地点と到着地点を選択してください。";
 
 /* InternalError */
-"routing_failed_internal_error" = "内部エラーが発生しました。もう一度地図をダウンロードしてください。問題が解決しない場合は、support@maps.meまでご連絡ください。";
+"routing_failed_internal_error" = "内部エラーが発生しました。もう一度地図をダウンロードしてください。問題が解決しない場合は、support@omaps.appまでご連絡ください。";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "地図とルートをダウンロード";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "たった今アプリを評価したところです";
 
 /* Text for rating dialog */
-"rating_user_since" = "私は%@年からMAPS.MEのユーザーです";
+"rating_user_since" = "私は%@年からOMapsのユーザーです";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "MAPS.MEをお気に入りいただいていますか？";
+"rating_do_like_maps" = "OMapsをお気に入りいただいていますか？";
 
 /* Text for rating dialog */
 "rating_tap_star" = "星印をタップしてアプリを評価してください。";
@@ -792,7 +792,7 @@
 "routing_download_map" = "地図を入手";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "最新の地図とルートデータを入手して、MAPS.MEの全機能をご利用ください。";
+"routing_download_map_and_routing" = "最新の地図とルートデータを入手して、OMapsの全機能をご利用ください。";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "ルートデータを入手";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "このアプリが好きですか?";
 
-"rate_alert_default_message" = "MAPS.MEをご使用いただきありがとうございます。アプリの評価をお願いいたします。皆様からのフィードバックはアプリの改善に役立つものです。";
+"rate_alert_default_message" = "OMapsをご使用いただきありがとうございます。アプリの評価をお願いいたします。皆様からのフィードバックはアプリの改善に役立つものです。";
 
 "rate_alert_five_star_message" = "やったー! 相思相愛!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "重複している場所";
 
-"first_launch_congrats_title" = "MAPS.MEを使用する準備が整いました";
+"first_launch_congrats_title" = "OMapsを使用する準備が整いました";
 
 "first_launch_congrats_text" = "世界中どこでも無料で検索・ナビゲーションできます。";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "アプリから直接地図に新しい場所を追加したり、既存の場所を編集できます。";
 
-"whatsnew_editor_message_2" = "* MAPS.MEはOpenStreetMapコミュニティのデータを使用しています。";
+"whatsnew_editor_message_2" = "* OMapsはOpenStreetMapコミュニティのデータを使用しています。";
 
 "onboarding_offline_navigation_title" = "もう道に迷うことは絶対ありません";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "車や徒歩での最短ルートを計画できます。";
 
-"onboarding_offline_maps_title" = "MAPS.ME — 世界中の地図にインターネットなしでアクセス";
+"onboarding_offline_maps_title" = "OMaps — 世界中の地図にインターネットなしでアクセス";
 
 "onboarding_offline_maps_message" = "希望するエリアの地図を一回ダウンロードするだけで、インターネット接続なしでもナビゲーションや検索の機能を使用できます。";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "ナビゲーションやその他の機能の使用のために、アプリがGeolocationにアクセスする必要があります";
 
-"onboarding_permissions_title" = "MAPS.ME によるストレージと位置情報へのアクセスを許可する";
+"onboarding_permissions_title" = "OMaps によるストレージと位置情報へのアクセスを許可する";
 
 "onboarding_permissions_message" = "これにより地図のダウンロード、近隣のスポットや交通情報の確認、およびナビゲーションを利用できるようになります。";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "ダウンロードするには空き容量がさらに必要です。不必要なデータを削除してください。";
 
-"editor_sharing_title" = "MAPS.MEの地図を改善しました";
+"editor_sharing_title" = "OMapsの地図を改善しました";
 
 "editor_comment_will_be_sent" = "いただいたコメントを地図製作者に送ります。";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "詳細なコメント";
 
-"editor_detailed_description" = "あなたが提案した変更は、OpenStreetMapのコミュニティに送信されます。MAPS.MEで編集できない詳細を説明してください。";
+"editor_detailed_description" = "あなたが提案した変更は、OpenStreetMapのコミュニティに送信されます。OMapsで編集できない詳細を説明してください。";
 
 "editor_more_about_osm" = "OpenStreetMapについての詳細";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "マップエディタを更新しました";
 
-"whatsnew_update_editor_message" = "MAPS.MEユーザーは200000マップの変更を行いました。我々は協力して、世界で最も詳細な地図を作っています。参加しませんか！";
+"whatsnew_update_editor_message" = "OMapsユーザーは200000マップの変更を行いました。我々は協力して、世界で最も詳細な地図を作っています。参加しませんか！";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "マップエディタを利用するには、全てのアップをアップデートしてください。";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "続行";
 
-"recent_track_background_dialog_message" = "MAPS.MEは、あなたの位置情報をバックグラウンドで使用して最近の走行ルートを記録します。";
+"recent_track_background_dialog_message" = "OMapsは、あなたの位置情報をバックグラウンドで使用して最近の走行ルートを記録します。";
 
 "whatsnew_car_navigation_header" = "ユーザーフレンドリーなカーナビゲーション";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "バイクナビゲーション（ベータ版）";
 
-"whatsnew_cycle_navigation_message" = "新シーズンに向けてバイクナビゲーションをテスト中です。MAPS.MEで、お気に入りのサイクリングルートを試してみませんか。ご感想をお待ちしています。";
+"whatsnew_cycle_navigation_message" = "新シーズンに向けてバイクナビゲーションをテスト中です。OMapsで、お気に入りのサイクリングルートを試してみませんか。ご感想をお待ちしています。";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Google Play で評価";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "友達に教える";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "こんにちは！MAPS.ME をインストールしましょう！";
+"tell_friends_text" = "こんにちは！OMaps をインストールしましょう！";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME は旅に必要不可欠なオフラインアプリケーションです。MAPS.ME は OpenStreetMap データに基づいており、データを編集することができます。";
+"about_description" = "OMaps は旅に必要不可欠なオフラインアプリケーションです。OMaps は OpenStreetMap データに基づいており、データを編集することができます。";
 
 /* Text in menu */
 "blog" = "ブログ";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "開始";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "アプリから直接Uberの配車リクエストができます！";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "地図上のフォントサイズを大きく";
 
-"traffic_update_app" = "MAPS.ME をアップデートしてください";
+"traffic_update_app" = "OMaps をアップデートしてください";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "交通データを表示するには、アプリケーションをアップデートする必要があります。";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "アクセス権の付与";
 
-"onboarding_storage_permissions_message" = "お使いのデバイスのアクセス許可設定を変更してください。MAPS.ME を使用するには、ストレージへのアクセス権限が必要です。";
+"onboarding_storage_permissions_message" = "お使いのデバイスのアクセス許可設定を変更してください。OMaps を使用するには、ストレージへのアクセス権限が必要です。";
 
 "button_exit" = "終了";
 
-"onboarding_detail_permissions_title" = "MAPS.ME がアクセス許可を必要とする項目";
+"onboarding_detail_permissions_title" = "OMaps がアクセス許可を必要とする項目";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "ストレージ";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "ストレージアクセスの問題";
 
-"dialog_error_storage_message" = "外部ストレージは使用できません。おそらく SD カードが取り外されたか、破損している、あるいはファイルシステムが読み取り専用になっています。確認後、support@maps.me までご連絡ください。";
+"dialog_error_storage_message" = "外部ストレージは使用できません。おそらく SD カードが取り外されたか、破損している、あるいはファイルシステムが読み取り専用になっています。確認後、support@omaps.app までご連絡ください。";
 
 "setting_emulate_bad_storage" = "壊れたストレージをエミュレート";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "<a href=\"%s\">利用規約</a>に同意します";
 
-"sign_agree_news_gdpr" = "MAPS.ME製品に関する最新ニュースを受け取ることに同意します";
+"sign_agree_news_gdpr" = "OMaps製品に関する最新ニュースを受け取ることに同意します";
 
 "whats_new_localbiz_title" = "小企業に注目の価値あり";
 
-"whats_new_localbiz_message" = "旅を忘れがたきものにしてくれる現地のカフェ、居心地の良いホテルと店。MAPS.MEで、お客様のページが際立つように最適化いたします。";
+"whats_new_localbiz_message" = "旅を忘れがたきものにしてくれる現地のカフェ、居心地の良いホテルと店。OMapsで、お客様のページが際立つように最適化いたします。";
 
 "whats_new_order_button" = "リクエストを残す";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "新しい場所をダウンロード";
 
-"cached_bookmarks_placeholder_subtitle" = "MAPS.MEユーザーが作成した数千ものおもしろい場所やルートをダウンロードするには、このボタンを押します。インターネット接続が必要です。";
+"cached_bookmarks_placeholder_subtitle" = "OMapsユーザーが作成した数千ものおもしろい場所やルートをダウンロードするには、このボタンを押します。インターネット接続が必要です。";
 
 "downloader_download_routers" = "ブックマークをダウンロード";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "クラッシュレポート";
 
-"opt_out_fabric_description" = "MAPS.ME体験を向上させるため、お客様のデータを使用する可能性があります。変更は、アプリを再起動した後に、反映されます。";
+"opt_out_fabric_description" = "OMaps体験を向上させるため、お客様のデータを使用する可能性があります。変更は、アプリを再起動した後に、反映されます。";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "ブックマークはダウンロードされませんでした";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.MEにルートカタログができました";
+"whats_new_bookmarks_catalog_title" = "OMapsにルートカタログができました";
 
 "whats_new_bookmarks_catalog_message" = "世界各地の数百もの詳細なルート：どこに行って、何を見て、何を食べようか。";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "広告を削除";
 
-"remove_ads_title" = "すべての広告を削除してMAPS.MEをサポート";
+"remove_ads_title" = "すべての広告を削除してOMapsをサポート";
 
 "paybtn_title" = "年間%sの支払い";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "他のオプション";
 
-"why_support" = "MAPS.MEをサポートする理由？";
+"why_support" = "OMapsをサポートする理由？";
 
 "options_dropdown_item1" = "%s/月（%s/年の割引）";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "お客さまのためにすべての広告を削除いたします";
 
-"why_support_item2" = "MAPS.MEの改善にご協力いただいております";
+"why_support_item2" = "OMapsの改善にご協力いただいております";
 
 "why_support_item3" = "オープンマップOpenStreetMap.orgの改善にご協力いただいております";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "サーバーは利用できません";
 
-"server_unavailable_message" = "ご購入は後ほど完了します。エラーが続く場合は、support@maps.meまでご連絡ください。";
+"server_unavailable_message" = "ご購入は後ほど完了します。エラーが続く場合は、support@omaps.appまでご連絡ください。";
 
 "offline_fiters_check_in" = "インターネットに接続して、ホテルを日付で絞り込み検索します。";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "このガイドはパブリックのMAPS.MEカタログにアップロードされ、他のユーザーに対して利用可能になります";
+"upload_and_publish_desc" = "このガイドはパブリックのOMapsカタログにアップロードされ、他のユーザーに対して利用可能になります";
 
 "upload_and_publish" = "アップロードおよび公開";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "レビューを残して旅行者を助けましょう！";
 
-"share_bookmarks_email_body_link" = "こんにちは!\n\nこれはあなたのブックマークをダウンロードできるリンクです:%s。MAPS.MEを通じてリストを開いて旅をお楽しみください!\n\nアプリの入手: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "こんにちは!\n\nこれはあなたのブックマークをダウンロードできるリンクです:%s。OMapsを通じてリストを開いて旅をお楽しみください!\n\nアプリの入手: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "%d km/hの速度制限を超えているときナビゲーターが自動速度違反取締装置について警告します";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "印象を共有するのは簡単です";
 
-"whats_new_ugc_routes_subtitle" = "記憶に残る場所を保存して、ブックマークでルートを作成し MAPS.MEカタログを利用するすべての人達と共有しましょう。";
+"whats_new_ugc_routes_subtitle" = "記憶に残る場所を保存して、ブックマークでルートを作成し OMapsカタログを利用するすべての人達と共有しましょう。";
 
 "whats_new_webeditor_title" = "ルートをストーリーに変えましょう";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "パブリックカタログにあなたのガイドをアップロードするには少なくとも3つのブックマークが必要です";
 
-"bookmark_public_upload_alert_title" = "全てのMAPS.MEの旅行者とあなたのブックマークを共有するために必要なステップはあと少しです！";
+"bookmark_public_upload_alert_title" = "全てのOMapsの旅行者とあなたのブックマークを共有するために必要なステップはあと少しです！";
 
 "bookmark_public_upload_alert_subtitle" = "リストに具体的な名前と説明が記載されている事、全てのブックマークに場所についての情報が記載されている事をお確かめください。そうする事であなたのリストを他の人が発見および利用できるようになります。";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "最大電力節約";
 
-"enable_logging_warning_message" = "このオプションは診断目的でのデータ記録を有効にします。これはこのアプリケーションのトラブルシューティングを担当する当社のサポートスタッフの助けになります。このオプションはMAPS.MEにリクエストされた場合にのみ有効にしてください。";
+"enable_logging_warning_message" = "このオプションは診断目的でのデータ記録を有効にします。これはこのアプリケーションのトラブルシューティングを担当する当社のサポートスタッフの助けになります。このオプションはOMapsにリクエストされた場合にのみ有効にしてください。";
 
 "html_error_upload_message_try_again" = "ネットワーク設定をチェックして、もう一度お試しください";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "あなたのID：%s。";
 
-"gdpr_request_window_message" = "これをコピーしてsupport@maps.meにリクエストを送信してください";
+"gdpr_request_window_message" = "これをコピーしてsupport@omaps.appにリクエストを送信してください";
 
 "gdpr_request_window_copy" = "IDをコピー";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "フェリー航路を回避";
 
-"cached_guides_placeholder_subtitle" = "MAPS.MEはマップに表示されたオフラインで利用できる写真と説明文がついた選択された場所への便利なガイドを提供しています。";
+"cached_guides_placeholder_subtitle" = "OMapsはマップに表示されたオフラインで利用できる写真と説明文がついた選択された場所への便利なガイドを提供しています。";
 
 "guides_catalogue_title" = "ガイドのカタログ";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "ウズベキスタン料理";
 
-"onboarding_welcome_title" = "MAPS.MEで計画および旅行";
+"onboarding_welcome_title" = "OMapsで計画および旅行";
 
 "onboarding_welcome_first_subtitle" = "興味のある場所をブックマークし、ホテルを予約して、オフラインでルートを検索";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "ダウンロード";
 
-"onboarding_bydeeplink_guide_title" = "MAPS.MEのすぐに利用できるガイド";
+"onboarding_bydeeplink_guide_title" = "OMapsのすぐに利用できるガイド";
 
 "onboarding_bydeeplink_guide_subtitle" = "写真と説明文がついたマップ上に表示された名所。オフラインでも機能します。";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "ホテルを予約しましたか？";
 
-"popup_booking_download_guides_message" = "MAPS.MEのレディメイドなガイドでルートを計画しましょう";
+"popup_booking_download_guides_message" = "OMapsのレディメイドなガイドでルートを計画しましょう";
 
 "popup_mwm_download_guides_title" = "オフライン都市ガイド";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "ご覧ください";
 
-"gallery_pp_download_guides_offline_title" = "MAPS.MEで休暇の計画をたてましょう!";
+"gallery_pp_download_guides_offline_title" = "OMapsで休暇の計画をたてましょう!";
 
 "gallery_pp_download_guides_offline_subtitle" = "熟練の旅行者が作ったガイドをお見逃しなく";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "ご購入確定時にお客様のiTunesアカウントにお支払いが請求されます。現在のご利用期間が終了する最低でも24時間前に自動更新が解除されなければ、サブスクリプションは自動的に更新されます。現在のご利用期間が終了する24時間以内に、ご利用プランの更新がアカウントに請求されます。ご購入期間中にApple IDアカウント設定より自動更新を管理または解除することができます。";
 
-"whatsnew_carplay_title" = "CarPlay対応MAPS.MEのカーナビゲーションです！";
+"whatsnew_carplay_title" = "CarPlay対応OMapsのカーナビゲーションです！";
 
 "whatsnew_carplay_message" = "ブックマークや、検索、自動速度違反取締装置、運転オプションがオフラインで利用できます";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "速度警告";
 
-"download_map_carplay" = "あなたの機器のMAPS.MEのアプリにマップをダウンロードしてください";
+"download_map_carplay" = "あなたの機器のOMapsのアプリにマップをダウンロードしてください";
 
 "carplay_roundabout_exit" = "第%s出口";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "おめでとうございます、サブスクライブしました!";
 
-"popup_subscription_success_map_message" = "MAPS.MEのカタログで最高の観光地を見つけましょう";
+"popup_subscription_success_map_message" = "OMapsのカタログで最高の観光地を見つけましょう";
 
 "popup_subscription_success_map_start_button" = "ブラウジングを開始";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "開始";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "オールインワンの旅の友";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "カタログを開く";
 
-"new_onboarding_step5.2_message" = "MAPS.MEのガイドのカタログのサブスクリプションは大変お得です。世界中の都市とアウトドアのガイドへのフルアクセスをゲットしましょう！";
+"new_onboarding_step5.2_message" = "OMapsのガイドのカタログのサブスクリプションは大変お得です。世界中の都市とアウトドアのガイドへのフルアクセスをゲットしましょう！";
 
 "new_onboarding_step5.2_button" = "規約をご確認ください";
 
-"new_onboarding_step5.3_message" = "MAPS.MEの無料セレクションでレディメイドな都市とアウトドアのルートのサンプルをご覧ください！";
+"new_onboarding_step5.3_message" = "OMapsの無料セレクションでレディメイドな都市とアウトドアのルートのサンプルをご覧ください！";
 
 "new_onboarding_step5.3_button" = "無料ダウンロード";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Outdooractiveが提供する冬と夏の旅のためのルートをカタログから利用できます!";
 
-"whatsnew_guides_galleries_title" = "MAPS.MEで今後の旅の計画を立てましょう";
+"whatsnew_guides_galleries_title" = "OMapsで今後の旅の計画を立てましょう";
 
 "whatsnew_guides_galleries_message" = "人気の観光都市と景色の場所のページでお勧めのガイドを見つける事ができるようになりました";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "地形";
 
-"tips_map_layers_title_countour" = "MAPS.MEの新要素：オフラインのトポグラフィーレイヤー！";
+"tips_map_layers_title_countour" = "OMapsの新要素：オフラインのトポグラフィーレイヤー！";
 
 "tips_map_layers_message_countour" = "自然の旅で訪れる地域を全てを把握しながら計画を立て楽しみましょう";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
index e1c381cf76..74d0440e7d 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.stringsdict
@@ -135,4 +135,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index d503db79f9..8fa9191568 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "지금 가져오기";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "MAPS.ME를 사용해 주셔서 감사합니다! 앱을 좋아하십니까? 이 앱에 대해 친구들에게 널리 알려 주십시오! 그러면 저희는 매우 감사할 것입니다.";
+"share_on_facebook_text" = "OMaps를 사용해 주셔서 감사합니다! 앱을 좋아하십니까? 이 앱에 대해 친구들에게 널리 알려 주십시오! 그러면 저희는 매우 감사할 것입니다.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,7 +138,7 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "다시 시도";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
 "about_menu_title" = "소개";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "다운로드된지도와 SD 카드 / USB 저장 장치를 사용할 수 없습니다";
 
-"disconnect_usb_cable" = "MAPS.ME를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오";
+"disconnect_usb_cable" = "OMaps를 사용하려면 USB 케이블이나 삽입 메모리 카드를 분리하십시오";
 
 "not_enough_free_space_on_sdcard" = "응용 프로그램을 사용하기 위해서는 첫째 SD 카드 / USB 저장 장치에 여유 공간을 확보하십시오";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "이지도에 사용할 수있는 업데이트:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "당신은 더 이상 MAPS.ME 라이트는 필요 없어, 당신은 그것을 제거할 수 있습니다.";
+"suggest_uninstall_lite" = "당신은 더 이상 OMaps 라이트는 필요 없어, 당신은 그것을 제거할 수 있습니다.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@이 성공적으로 다운로드";
@@ -249,10 +249,10 @@
 "set" = "집합";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "즐겨찾기가 없습니다.\n즐겨찾기를 추가하도록 지도에 어떤 장소를 누릅니다.\n다른 소스에서 북마크는 MAPS.ME 앱에서 가져와서 표시할 수 있습니다. 메일, 드롭박스 또는 웹링크에서 저장한 핀으로 KML/KMZ 파일을 열 수 있습니다.";
+"bookmarks_usage_hint" = "즐겨찾기가 없습니다.\n즐겨찾기를 추가하도록 지도에 어떤 장소를 누릅니다.\n다른 소스에서 북마크는 OMaps 앱에서 가져와서 표시할 수 있습니다. 메일, 드롭박스 또는 웹링크에서 저장한 핀으로 KML/KMZ 파일을 열 수 있습니다.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "다른 소스에서 북마크는 MAPS.ME 앱에서 가져와서 표시할 수 있습니다. 메일, 드롭박스 또는 웹링크에서 저장한 핀으로 KML/KMZ 파일을 열 수 있습니다.";
+"bookmarks_usage_hint_import_only" = "다른 소스에서 북마크는 OMaps 앱에서 가져와서 표시할 수 있습니다. 메일, 드롭박스 또는 웹링크에서 저장한 핀으로 KML/KMZ 파일을 열 수 있습니다.";
 
 /* Settings button in system menu */
 "settings" = "설정";
@@ -354,9 +354,9 @@
 "share_by_email" = "이메일로 공유";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "귀하와 공유된 MAPS.ME 즐겨찾기";
+"share_bookmarks_email_subject" = "귀하와 공유된 OMaps 즐겨찾기";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "즐겨찾기 로드";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "국가 다운로드가 지금 진행 중입니다.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "MAPS.ME로 즐거운 시간을 보내시기 바랍니다! MAPS.ME가 마음에 드신다면 앱스토어에서 평가를 남겨 주시기 바랍니다. 평가하는 데는 1분이 채 걸리지 않지만 저희에게 큰 도움이 됩니다. 성원해 주셔서 감사합니다!";
+"appStore_message" = "OMaps로 즐거운 시간을 보내시기 바랍니다! OMaps가 마음에 드신다면 앱스토어에서 평가를 남겨 주시기 바랍니다. 평가하는 데는 1분이 채 걸리지 않지만 저희에게 큰 도움이 됩니다. 성원해 주셔서 감사합니다!";
 
 /* No, thanks */
 "no_thanks" = "평가하지 않겠습니다";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "현재 위치를 알아 보십시오. %1$@ 또는 %2$@ 열기";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "MAPS.ME 지도에서 내 핀 보기";
+"bookmark_share_email_subject" = "OMaps 지도에서 내 핀 보기";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "MAPS.ME 지도에서 제 현재 위치를 살펴 보시기 바랍니다";
+"my_position_share_email_subject" = "OMaps 지도에서 제 현재 위치를 살펴 보시기 바랍니다";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "안녕하세요.\n\n지금 다음 위치에 있습니다: %1$@. %2$@ 또는 %3$@ 링크를 클릭하여 지도상에서 해당 장소를 살펴보시기 바랍니다.\n\n감사합니다.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "당신이 있는 장소의지도를 다운로드 하십시오";
 
 /* text of notification */
-"pro_version_is_free_today" = "MAPS.ME의 전체 버전 오늘 무료! 지금 다운로드하고 친구들에게 알리세요.";
+"pro_version_is_free_today" = "OMaps의 전체 버전 오늘 무료! 지금 다운로드하고 친구들에게 알리세요.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "우리는 MAPS.ME. Lite에서 MAPS.ME로 다운로드된 지도를 전송하고 있습니다. 이는 몇 분 정도 걸릴 수 있습니다.";
+"move_lite_maps_to_pro" = "우리는 OMaps. Lite에서 OMaps로 다운로드된 지도를 전송하고 있습니다. 이는 몇 분 정도 걸릴 수 있습니다.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "다운로드된 지도가 성공적으로 MAPS.ME에 전송됨";
+"move_lite_maps_to_pro_ok" = "다운로드된 지도가 성공적으로 OMaps에 전송됨";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "지도를 전송하지 못했습니다. MAPS.ME Lite를 삭제하고 다시지도를 다운로드하십시오.";
+"move_lite_maps_to_pro_failed" = "지도를 전송하지 못했습니다. OMaps Lite를 삭제하고 다시지도를 다운로드하십시오.";
 
 /* Text in menu */
 "settings_and_more" = "설정 및 기타";
@@ -600,7 +600,7 @@
 "website" = "웹사이트";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME 커뮤니티";
+"maps_me_community" = "OMaps 커뮤니티";
 
 /* Text in menu */
 "like_on_facebook" = "Facebook에서 좋아요";
@@ -630,13 +630,13 @@
 "report_a_bug" = "오류 신고";
 
 /* Email subject */
-"subscribe_me_subject" = "MAPS.ME 뉴스 레터로 나를 구독해 주십시오.";
+"subscribe_me_subject" = "OMaps 뉴스 레터로 나를 구독해 주십시오.";
 
 /* Email body */
 "subscribe_me_body" = "나는 최신 뉴스 업데이트 및 프로모션에 대해 알게될 첫번째 사람이 되고 싶습니다. 나는 언제나 구독을 취소할 수 있습니다.";
 
 /* About text */
-"about_text" = "MAPS.ME는 가장 빠른 전 세계 모든 국가 및 도시의 오프라인 지도를 제공하고 있습니다. 자신있게 여행하세요. 계신 곳이 어디이든 MAPS.ME는 지도상에서 위치하고 계신 곳이 어디 있지 알려 주고 가장 가까운 식당, 호텔 및 주유소 등을 찾아 줍니다. 인터넷 접속이 필요없는 서비스입니다.\n\nMAPS.ME는 항상 새로운 기능들에 대해 연구하고 있습니다. MAPS.ME가 더 훌륭한 서비스를 제공할 수 있도록 많은 의견 주시면 감사하겠습니다. 앱을 사용하시다 불편한 점이 있으시면, 주저 마시고 support@maps.me으로 문의해 주세요. MAPS.ME는 어떤 요청에도 기꺼이 응답할 것입니다.\n\nMAPS.ME가 좋은 앱이라고 생각하시나요? MAPS.ME을 후원할 수 있는 간단하면서도 비용이 전혀 들지 않는 몇 가지 방법을 소개합니다.\n\n- 앱 마켓에 리뷰를 올려주세요.\n- MAPS.ME의 페이스북 페이지 http://www.facebook.com/mapswithme 에 “좋아요”를 남겨 주세요.\n- 가족, 친구 및 동료들에게 MAPS.ME를 자랑해 주세요.\n\nMAPS.ME와 함께 해 주셔서 감사합니다. 여러분의 후원에 정말 감사드립니다!\n\nP.S. MAPS.ME는 OpenStreetMap으로부터 맵 데이터를 수집하고 있습니다. OpenStreetMap은 위키피디아처럼 유저들이 맵을 만들고 편집할 수 있는 맵핑 프로젝트입니다.\n\n혹 맵에서 누락된 곳이나 잘못된 점을 발견하실 경우, https://www.openstreetmap.org에서 직접 맵을 수정하실 수 있습니다. 수정한 부분은 다음 버전으로 출시되는 MAPS.ME 앱에 반영될 것입니다.";
+"about_text" = "OMaps는 가장 빠른 전 세계 모든 국가 및 도시의 오프라인 지도를 제공하고 있습니다. 자신있게 여행하세요. 계신 곳이 어디이든 OMaps는 지도상에서 위치하고 계신 곳이 어디 있지 알려 주고 가장 가까운 식당, 호텔 및 주유소 등을 찾아 줍니다. 인터넷 접속이 필요없는 서비스입니다.\n\nOMaps는 항상 새로운 기능들에 대해 연구하고 있습니다. OMaps가 더 훌륭한 서비스를 제공할 수 있도록 많은 의견 주시면 감사하겠습니다. 앱을 사용하시다 불편한 점이 있으시면, 주저 마시고 support@omaps.app으로 문의해 주세요. OMaps는 어떤 요청에도 기꺼이 응답할 것입니다.\n\nOMaps가 좋은 앱이라고 생각하시나요? OMaps을 후원할 수 있는 간단하면서도 비용이 전혀 들지 않는 몇 가지 방법을 소개합니다.\n\n- 앱 마켓에 리뷰를 올려주세요.\n- OMaps의 페이스북 페이지 http://www.facebook.com/mapswithme 에 “좋아요”를 남겨 주세요.\n- 가족, 친구 및 동료들에게 OMaps를 자랑해 주세요.\n\nOMaps와 함께 해 주셔서 감사합니다. 여러분의 후원에 정말 감사드립니다!\n\nP.S. OMaps는 OpenStreetMap으로부터 맵 데이터를 수집하고 있습니다. OpenStreetMap은 위키피디아처럼 유저들이 맵을 만들고 편집할 수 있는 맵핑 프로젝트입니다.\n\n혹 맵에서 누락된 곳이나 잘못된 점을 발견하실 경우, https://www.openstreetmap.org에서 직접 맵을 수정하실 수 있습니다. 수정한 부분은 다음 버전으로 출시되는 OMaps 앱에 반영될 것입니다.";
 
 /* Alert text */
 "email_error_body" = "이메일 클라이언트가 설정되지 않았습니다. 이를 구성하거나 %@로 연락할 다른 방법을 사용하십시오.";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "경로를 생성하도록 지도를 업데이트하십시오.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "MAPS.ME의 새로운 버전으로 당신의 현재 위치에서 목적지 지점으로 경로를 생성할 수 있습니다. 이 기능을 사용하려면 지도를 업데이트하십시오.";
+"routing_update_maps" = "OMaps의 새로운 버전으로 당신의 현재 위치에서 목적지 지점으로 경로를 생성할 수 있습니다. 이 기능을 사용하려면 지도를 업데이트하십시오.";
 
 /* Update all button text */
 "downloader_update_all_button" = "모두 업데이트";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "검색 결과";
 
 /* Disclaimer message */
-"routing_disclaimer" = "MAPS.ME 앱에서 경로를 작성할 때, 다음에 유의하시기 바랍니다:\n\n  - 추천 루트는 권장 사항으로만 간주될 수 있습니다.\n - 도로 조건, 교통 규칙 및 징후는 탐색 조언보다 더 높은 우선 순위를 갖습니다.\n -지도는 잘못되었거나 만료되었을 수 있으며, 경로는 최상의 방법을 만들어지지 않을 수 있습니다.\n\n  도로에서 안전하게 몸조심하세요!";
+"routing_disclaimer" = "OMaps 앱에서 경로를 작성할 때, 다음에 유의하시기 바랍니다:\n\n  - 추천 루트는 권장 사항으로만 간주될 수 있습니다.\n - 도로 조건, 교통 규칙 및 징후는 탐색 조언보다 더 높은 우선 순위를 갖습니다.\n -지도는 잘못되었거나 만료되었을 수 있으며, 경로는 최상의 방법을 만들어지지 않을 수 있습니다.\n\n  도로에서 안전하게 몸조심하세요!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "만료됨";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "선택한 출발지와 목적지 사이에서 발견있는 경로가 없습니다. 다른 출발지 또는 도착지를 선택하십시오.";
 
 /* InternalError */
-"routing_failed_internal_error" = "내부 오류가 발생했습니다. 다시지도를 삭제하고 다운로드하도록 시도하십시오. 문제가 지속되면 support@maps.me로 문의하시기 바랍니다.";
+"routing_failed_internal_error" = "내부 오류가 발생했습니다. 다시지도를 삭제하고 다운로드하도록 시도하십시오. 문제가 지속되면 support@omaps.app로 문의하시기 바랍니다.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "지도 + 라우팅 다운로드";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "앱 평가 완료";
 
 /* Text for rating dialog */
-"rating_user_since" = "%@ 이후로 MAPS.ME 사용자임";
+"rating_user_since" = "%@ 이후로 OMaps 사용자임";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "MAPS.ME를 좋아하나요?";
+"rating_do_like_maps" = "OMaps를 좋아하나요?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "별을 눌러 우리의 앱을 평가하세요.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "지도 가져오기";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "업데이트된 지도와 라우팅 데이터를 다운로드하여 모든 MAPS.ME 기능을 가져옵니다.";
+"routing_download_map_and_routing" = "업데이트된 지도와 라우팅 데이터를 다운로드하여 모든 OMaps 기능을 가져옵니다.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "라우팅 데이터 가져오기";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "앱을 좋아하나요?";
 
-"rate_alert_default_message" = "MAPS.ME를 사용해 주셔서 감사합니다. 이 앱을 평가해 주십시오. 당신의 피드백은 이 앱을 더 낫게 만드는데 도움을 줍니다.";
+"rate_alert_default_message" = "OMaps를 사용해 주셔서 감사합니다. 이 앱을 평가해 주십시오. 당신의 피드백은 이 앱을 더 낫게 만드는데 도움을 줍니다.";
 
 "rate_alert_five_star_message" = "야호! 저희는 당신도 사랑합니다!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "중복된 장소";
 
-"first_launch_congrats_title" = "MAPS.ME를 사용할 준비가 완료되었습니다";
+"first_launch_congrats_title" = "OMaps를 사용할 준비가 완료되었습니다";
 
 "first_launch_congrats_text" = "무료로 세계 어디에서나 오프라인으로 검색하고 탐색할 수 있습니다.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "지도에 새로운 장소를 추가하고 응용 프로그램에서 직접 기존 편집 할 수 있습니다.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME는 OpenStreetMap 커뮤니티 데이터를 사용합니다.";
+"whatsnew_editor_message_2" = "* OMaps는 OpenStreetMap 커뮤니티 데이터를 사용합니다.";
 
 "onboarding_offline_navigation_title" = "다시 손실되지 않을 것임";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "최적의 자동차와 보행자 경로를 계획합니다.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — 인터넷 연결 없이 전 세계 지도 사용";
+"onboarding_offline_maps_title" = "OMaps — 인터넷 연결 없이 전 세계 지도 사용";
 
 "onboarding_offline_maps_message" = "한 번에 원하는 지역의 지도를 다운로드하고, 인터넷 연결없이 탐색 및 검색 기능을 사용합니다.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "탐색 및 기타 기능을 사용하려면, 위치 정보에 액세스해야 합니다.";
 
-"onboarding_permissions_title" = "저장소 및 위치에 대한 MAPS.ME 액세스 허용";
+"onboarding_permissions_title" = "저장소 및 위치에 대한 OMaps 액세스 허용";
 
 "onboarding_permissions_message" = "따라서 지도를 다운로드하고, 근처의 장소와 교통 상황을 보고, 네비게이션을 사용할 수 있습니다.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "다운로드하려면, 더 많은 여유 공간이 필요합니다. 불필요한 데이터를 삭제하십시오.";
 
-"editor_sharing_title" = "나는 MAPS.ME 지도를 향상함";
+"editor_sharing_title" = "나는 OMaps 지도를 향상함";
 
 "editor_comment_will_be_sent" = "지도 제작자에게 의견을 보낼 것입니다.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "상세 설명";
 
-"editor_detailed_description" = "귀하가 제안한 변경 사항은 OpenStreetMap 커뮤니티로 전송됩니다. MAPS.ME에서 편집할 수 없는 세부정보를 작성해 주세요.";
+"editor_detailed_description" = "귀하가 제안한 변경 사항은 OpenStreetMap 커뮤니티로 전송됩니다. OMaps에서 편집할 수 없는 세부정보를 작성해 주세요.";
 
 "editor_more_about_osm" = "OpenStreetMap 정보";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "지도 편집기를 업데이트했습니다";
 
-"whatsnew_update_editor_message" = "MAPS.ME 사용자는 200000개의 지도를 변경했습니다. 전 세계에서 가장 정확한 지도를 만들고 있습니다. 사용해 보세요!";
+"whatsnew_update_editor_message" = "OMaps 사용자는 200000개의 지도를 변경했습니다. 전 세계에서 가장 정확한 지도를 만들고 있습니다. 사용해 보세요!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "지도 편집기를 사용하려면, 모든 지도를 업데이트하십시오.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "계속";
 
-"recent_track_background_dialog_message" = "MAPS.ME는 최근 여행한 경로를 녹음하기 위해 배경 화면에서 지역 위치 서비스를 사용합니다.";
+"recent_track_background_dialog_message" = "OMaps는 최근 여행한 경로를 녹음하기 위해 배경 화면에서 지역 위치 서비스를 사용합니다.";
 
 "whatsnew_car_navigation_header" = "사용자 친화적인 차량 네비게이션";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "자전거 네비게이션 (베타 버전)";
 
-"whatsnew_cycle_navigation_message" = "저희는 새로운 시즌을 맞이하여 자전거 네비게이션을 테스트하고 있습니다. MAPS.ME에서 귀하가 자주 이용하는 자전거 경로를 사용해 보고, 사용 소감을 알려주세요.";
+"whatsnew_cycle_navigation_message" = "저희는 새로운 시즌을 맞이하여 자전거 네비게이션을 테스트하고 있습니다. OMaps에서 귀하가 자주 이용하는 자전거 경로를 사용해 보고, 사용 소감을 알려주세요.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Google Play에서 평가";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "친구에게 알려주기";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "안녕하세요! MAPS.ME를 설치하세요!";
+"tell_friends_text" = "안녕하세요! OMaps를 설치하세요!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME는 여행용 필수 오프라인 응용 프로그램입니다. MAPS.ME는 OpenStreetMap 데이터를 기반으로 하며 이 데이터 편집을 허용합니다.";
+"about_description" = "OMaps는 여행용 필수 오프라인 응용 프로그램입니다. OMaps는 OpenStreetMap 데이터를 기반으로 하며 이 데이터 편집을 허용합니다.";
 
 /* Text in menu */
 "blog" = "블로그";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "열기";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Uber 택시를 직접 앱에서 예약하세요.";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "지도에서 글꼴 크기 늘리기";
 
-"traffic_update_app" = "MAPS.ME를 업데이트하세요.";
+"traffic_update_app" = "OMaps를 업데이트하세요.";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "교통 데이터를 표시하려면 응용 프로그램을 업데이트해야 합니다.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "액세스 승인";
 
-"onboarding_storage_permissions_message" = "장치에서 권한 설정을 변경하세요. MAPS.ME를 사용하려면 저장소 액세스가 필요합니다.";
+"onboarding_storage_permissions_message" = "장치에서 권한 설정을 변경하세요. OMaps를 사용하려면 저장소 액세스가 필요합니다.";
 
 "button_exit" = "끝내기";
 
-"onboarding_detail_permissions_title" = "MAPS.ME에는 다음에 대한 액세스가 필요합니다:";
+"onboarding_detail_permissions_title" = "OMaps에는 다음에 대한 액세스가 필요합니다:";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "저장소";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "저장소 액세스 문제";
 
-"dialog_error_storage_message" = "외부 저장소를 사용할 수 없습니다. SD 카드가 제거되었거나 손상되었거나 파일 시스템이 읽기 전용일 수 있습니다. 확인 후 support@maps.me로 문의하세요.";
+"dialog_error_storage_message" = "외부 저장소를 사용할 수 없습니다. SD 카드가 제거되었거나 손상되었거나 파일 시스템이 읽기 전용일 수 있습니다. 확인 후 support@omaps.app로 문의하세요.";
 
 "setting_emulate_bad_storage" = "불량 저장소 에뮬레이션";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "<a href=\"%s\">이용 약관</a>에 동의합니다.";
 
-"sign_agree_news_gdpr" = "MAPS.ME 제품에 대한 최신 뉴스를받는 것에 동의합니다.";
+"sign_agree_news_gdpr" = "OMaps 제품에 대한 최신 뉴스를받는 것에 동의합니다.";
 
 "whats_new_localbiz_title" = "스몰 비즈니스는 관심을 받을 가치가 있습니다.";
 
-"whats_new_localbiz_message" = "이는 우리의 여행을 잊혀지지 않도록 해주는 지역 카페, 아늑한 호스텔 그리고 상점입니다. 당사는 귀사의 페이지를 MAPS.ME에서 최적화하여 두드러지게 할 것입니다.";
+"whats_new_localbiz_message" = "이는 우리의 여행을 잊혀지지 않도록 해주는 지역 카페, 아늑한 호스텔 그리고 상점입니다. 당사는 귀사의 페이지를 OMaps에서 최적화하여 두드러지게 할 것입니다.";
 
 "whats_new_order_button" = "요청사항을 남겨주세요.";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "새로운 장소를 다운로드 하세요.";
 
-"cached_bookmarks_placeholder_subtitle" = "버튼을 눌러 MAPS.ME 사용자들이 작성한 수천 개의 흥미로운 장소와 경로를 다운로드 하세요. 인터넷 연결이 필요합니다.";
+"cached_bookmarks_placeholder_subtitle" = "버튼을 눌러 OMaps 사용자들이 작성한 수천 개의 흥미로운 장소와 경로를 다운로드 하세요. 인터넷 연결이 필요합니다.";
 
 "downloader_download_routers" = "북마크를 다운로드 하세요.";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "오류 보고서";
 
-"opt_out_fabric_description" = "당사는 MAPS.ME 경험을 개선하기 위해 귀하의 데이터를 활용할 수 있습니다. 앱을 다시 시작한 후 변경사항이 적용됩니다.";
+"opt_out_fabric_description" = "당사는 OMaps 경험을 개선하기 위해 귀하의 데이터를 활용할 수 있습니다. 앱을 다시 시작한 후 변경사항이 적용됩니다.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "북마크가 다운로드 되지 않았습니다.";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME가 현재 경로 카탈로그를 보유하고 있습니다.";
+"whats_new_bookmarks_catalog_title" = "OMaps가 현재 경로 카탈로그를 보유하고 있습니다.";
 
 "whats_new_bookmarks_catalog_message" = "전세계 수백 개의 세부 경로: 가볼 장소, 볼거리, 먹거리.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "광고 없애기";
 
-"remove_ads_title" = "모든 광고를 없애고 MAPS.ME를 지원";
+"remove_ads_title" = "모든 광고를 없애고 OMaps를 지원";
 
 "paybtn_title" = "%s/년 내세요";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "더 많은 옵션";
 
-"why_support" = "왜 MAPS.ME를 지원하죠?";
+"why_support" = "왜 OMaps를 지원하죠?";
 
 "options_dropdown_item1" = "%s/달 ( %s/년 저축)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "당신을 위해 모든 광고를 없애줄께요";
 
-"why_support_item2" = "당신은 MAPS.ME를 개선하는데 우리를 도와주세요";
+"why_support_item2" = "당신은 OMaps를 개선하는데 우리를 도와주세요";
 
 "why_support_item3" = "오픈 지도들 OpenStreetMap.org를 개선하는데 도와주세요";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "서버를 사용할 수 없습니다";
 
-"server_unavailable_message" = "구매가 나중에 완료됩니다. 계속 에러 지속시, support@maps.me로 연락 바랍니다.";
+"server_unavailable_message" = "구매가 나중에 완료됩니다. 계속 에러 지속시, support@omaps.app로 연락 바랍니다.";
 
 "offline_fiters_check_in" = "인터넷에 연결해 날짜를 통해서 호텔들을 필터 하세요.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "이 가이드는 MAPS.ME 카탈로그에 업로드되며 다른 사용자들에게 제공됩니다";
+"upload_and_publish_desc" = "이 가이드는 OMaps 카탈로그에 업로드되며 다른 사용자들에게 제공됩니다";
 
 "upload_and_publish" = "업로드와 발간";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "리뷰를 남겨서 여행자들을 도와주세요!";
 
-"share_bookmarks_email_body_link" = "안녕하세요!\n\n여기 즐겨찾기들을 다운로드 받을 수 있는 링크입니다: %s. MAPS.ME 를 통해 리스트를 열고 당신의 여행을 즐기세요!\n\n어플리케이션을 받으세요: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "안녕하세요!\n\n여기 즐겨찾기들을 다운로드 받을 수 있는 링크입니다: %s. OMaps 를 통해 리스트를 열고 당신의 여행을 즐기세요!\n\n어플리케이션을 받으세요: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "네비게이터가 %d km/h의 속도 제한을 초과시 카메라에 대해 경고 할 것입니다";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "당신의 감동을 공유하기 좋습니다";
 
-"whats_new_ugc_routes_subtitle" = "잊지 못할 장소들을 저장하고 즐겨찾기를 사용해 길을 만들어 MAPS.ME의 모두와 나눠보세요.";
+"whats_new_ugc_routes_subtitle" = "잊지 못할 장소들을 저장하고 즐겨찾기를 사용해 길을 만들어 OMaps의 모두와 나눠보세요.";
 
 "whats_new_webeditor_title" = "당신의 지나온 길들을 이야기로 바꿔보세요";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "공공 카탈로그에 가이드를 업로드를 하시려면 적어도 3개의 즐겨찾기를 갖고 계셔야 합니다";
 
-"bookmark_public_upload_alert_title" = "모든 MAPS.ME 여행객들과 즐겨찾기를 공유하기까지 몇 단계 밖에 남지 않았습니다!";
+"bookmark_public_upload_alert_title" = "모든 OMaps 여행객들과 즐겨찾기를 공유하기까지 몇 단계 밖에 남지 않았습니다!";
 
 "bookmark_public_upload_alert_subtitle" = "귀하의 목록을 위한 특정한 이름과 설명이 있는지 확인해주세요. 모든 즐겨찾기는 장소에 대한 정보를 갖고 있습니다. 귀하의 목록이 다른 사용자들에게 발견되고 사용됩니다.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "최대 전력 절약";
 
-"enable_logging_warning_message" = "이 옵션은 진단을 목적으로 로그를 엽니다 이를 통해 앱에 대한 문제를 분석하는 우리의 스탭을 도울 수 있습니다 이 옵션은 오직 MAPS.ME 지원 요청에서만 가능합니다.";
+"enable_logging_warning_message" = "이 옵션은 진단을 목적으로 로그를 엽니다 이를 통해 앱에 대한 문제를 분석하는 우리의 스탭을 도울 수 있습니다 이 옵션은 오직 OMaps 지원 요청에서만 가능합니다.";
 
 "html_error_upload_message_try_again" = "네트워크 설정을 확인하신 후 다시 시도해주세요";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "귀하의 ID: %s.";
 
-"gdpr_request_window_message" = "복사하신 뒤 support@maps.me 에 요청을 보내세요";
+"gdpr_request_window_message" = "복사하신 뒤 support@omaps.app 에 요청을 보내세요";
 
 "gdpr_request_window_copy" = "ID 복사하기";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "여객선 횡단길 피하기";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME는 선택된 장소의 사진과 묘사가 지도에 표시되는 미리 만들어진 가이드를 제공하고 오프라인에서도 사용이 가능합니다.";
+"cached_guides_placeholder_subtitle" = "OMaps는 선택된 장소의 사진과 묘사가 지도에 표시되는 미리 만들어진 가이드를 제공하고 오프라인에서도 사용이 가능합니다.";
 
 "guides_catalogue_title" = "가이드 카탈로그";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "우즈벡 요리";
 
-"onboarding_welcome_title" = "MAPS.ME와 계획하고 여행하세요";
+"onboarding_welcome_title" = "OMaps와 계획하고 여행하세요";
 
 "onboarding_welcome_first_subtitle" = "흥미로운 장소들 즐겨찾기, 호텔 예약 하기, 루트 계산하기를 오프라인으로";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "다운로드";
 
-"onboarding_bydeeplink_guide_title" = "MAPS.ME의 가이드가 사용 준비되었습니다";
+"onboarding_bydeeplink_guide_title" = "OMaps의 가이드가 사용 준비되었습니다";
 
 "onboarding_bydeeplink_guide_subtitle" = "사진과 묘사가 있는 지도에 방문하기에 최고의 장소가 표시됩니다. 오프라인으로 작동하기.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "호텔을 예약하셨나요?";
 
-"popup_booking_download_guides_message" = "귀하의 루트를 MAPS.ME의 준비된 가이드들로 계획해보세요";
+"popup_booking_download_guides_message" = "귀하의 루트를 OMaps의 준비된 가이드들로 계획해보세요";
 
 "popup_mwm_download_guides_title" = "오프라인 도시 가이드";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "살펴보세요";
 
-"gallery_pp_download_guides_offline_title" = "휴가를 MAPS.ME와 함께 계획해보세요!";
+"gallery_pp_download_guides_offline_title" = "휴가를 OMaps와 함께 계획해보세요!";
 
 "gallery_pp_download_guides_offline_subtitle" = "경험 많은 여행자들이 만든 가이드의 모든 것을 놓치지 마세요";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "결제 확인시 iTunes 계정에 요금이 부과됩니다. 현재 구독 기간 종료 최소 24 시간 전에 자동 갱신을 해제하지 않을 경우, 구독은 자동으로 갱신됩니다. 현재 구독 기간 종료 최소 24 시간 이전에 갱신하신 플랜의 상세 정보에 따라 계정의 비용이 청구될 것입니다. 구입 시 Apple ID 계정 설정에서 자동 갱신을 관리하거나 해제할 수 있습니다.";
 
-"whatsnew_carplay_title" = "CarPlay의 MAPS.ME 자동차 내비게이션!";
+"whatsnew_carplay_title" = "CarPlay의 OMaps 자동차 내비게이션!";
 
 "whatsnew_carplay_message" = "북마크, 찾기, 속도 감시 카메라 및 루트 옵션이 오프라인에서 가능합니다";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "속도단속 카메라";
 
-"download_map_carplay" = "MAPS.ME 앱 안의 지도들을 디바이스에 다운로드하세요";
+"download_map_carplay" = "OMaps 앱 안의 지도들을 디바이스에 다운로드하세요";
 
 "carplay_roundabout_exit" = "%s번 출구";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "우후, 구독을 하셨군요!";
 
-"popup_subscription_success_map_message" = "지금 MAPS.ME 카탈로그와 함께 최고의 여행 명소를 찾아보세요";
+"popup_subscription_success_map_message" = "지금 OMaps 카탈로그와 함께 최고의 여행 명소를 찾아보세요";
 
 "popup_subscription_success_map_start_button" = "보기 시작";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "시작하기";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "여행 친구는 이 친구 하나면 됩니다";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "카탈로그 열기";
 
-"new_onboarding_step5.2_message" = "MAPS.ME 카탈로그를 구독하신다면 만족하실 겁니다. 전세계의 도시 및 아웃도어 가이드에 완전한 액세스를 하실 수 있습니다!";
+"new_onboarding_step5.2_message" = "OMaps 카탈로그를 구독하신다면 만족하실 겁니다. 전세계의 도시 및 아웃도어 가이드에 완전한 액세스를 하실 수 있습니다!";
 
 "new_onboarding_step5.2_button" = "약관 확인하기";
 
-"new_onboarding_step5.3_message" = "MAPS.ME의 무료 모음집에서 미리 준비된 도시 및 야외 경로의 무료 샘플을 확인하세요!";
+"new_onboarding_step5.3_message" = "OMaps의 무료 모음집에서 미리 준비된 도시 및 야외 경로의 무료 샘플을 확인하세요!";
 
 "new_onboarding_step5.3_button" = "무료 다운로드";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "여름과 겨울 여행을 위한 Outdooractive에서 온 경로들이 카탈로그에서 기다리고 있습니다!";
 
-"whatsnew_guides_galleries_title" = "MAPS.ME와 함께 앞으로의 여행을 계획해보세요";
+"whatsnew_guides_galleries_title" = "OMaps와 함께 앞으로의 여행을 계획해보세요";
 
 "whatsnew_guides_galleries_message" = "이제 인기 있는 관광 도시와 명소들의 장소 페이지에서 추천 가이드를 찾을 수 있습니다";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "지형";
 
-"tips_map_layers_title_countour" = "MAPS.ME의 새 기능: 오프라인 지형 레이어!";
+"tips_map_layers_title_countour" = "OMaps의 새 기능: 오프라인 지형 레이어!";
 
 "tips_map_layers_message_countour" = "이 지역에 대한 모든 것을 알고 있는지 확인하면서 자연 여행을 계획하고 즐기세요";
 
@@ -3387,7 +3387,7 @@
 
 "whatsnew_lp_title" = "더 많은 감동을 느껴보세요";
 
-"whatsnew_lp_message" = "이제 Lonely Planet 가이드를 Maps.me에서 이용하실 수 있습니다! 7천개가 넘는 도시들의 최고로 매력적인 관광명소, 테마별 걷기와 개성이 넘치는 여행 장소들이 기다리고 있습니다.";
+"whatsnew_lp_message" = "이제 Lonely Planet 가이드를 OMaps에서 이용하실 수 있습니다! 7천개가 넘는 도시들의 최고로 매력적인 관광명소, 테마별 걷기와 개성이 넘치는 여행 장소들이 기다리고 있습니다.";
 
 "collections_title" = "콜렉션";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict
index 6ff566dc0e..cd88aeca30 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.stringsdict
@@ -135,4 +135,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 847f4a3458..11ffd0b9a7 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Hent nå";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Tusen takk for at du bruker MAPS.ME! Liker du appen? Fortell vennene dine om den! Det er den beste takken vi kan få.";
+"share_on_facebook_text" = "Tusen takk for at du bruker OMaps! Liker du appen? Fortell vennene dine om den! Det er den beste takken vi kan få.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Prøv på nytt";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Om MAPS.ME";
+"about_menu_title" = "Om OMaps";
 
 "downloading_touch_to_cancel" = "Laster ned %d%% – trykk for å avbryte";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD-kort/USB-enhet med nedlastede kart er ikke tilgjengelig";
 
-"disconnect_usb_cable" = "Koble fra USB-kabelen eller sett inn minnekortet for å bruke MAPS.ME";
+"disconnect_usb_cable" = "Koble fra USB-kabelen eller sett inn minnekortet for å bruke OMaps";
 
 "not_enough_free_space_on_sdcard" = "Frigjør plass på SD-kortet/USB-enheten først for å bruke appen";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Oppdatering tilgjengelig for disse kartene:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Du trenger ikke MAPS.ME Lite lenger, så du kan gjerne avinstallere det.";
+"suggest_uninstall_lite" = "Du trenger ikke OMaps Lite lenger, så du kan gjerne avinstallere det.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ ble lastet ned";
@@ -249,10 +249,10 @@
 "set" = "Sett";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Du har ingen bokmerker enda.\nTrykk på et hvilket som helst sted på kartet for å legge til et bokmerke.\nBokmerker fra andre kilder kan også importeres og vises i MAPS.ME. Åpne KML-/KMZ-filer med lagrede bokmerker fra e-post, Dropbox eller internettkobling.";
+"bookmarks_usage_hint" = "Du har ingen bokmerker enda.\nTrykk på et hvilket som helst sted på kartet for å legge til et bokmerke.\nBokmerker fra andre kilder kan også importeres og vises i OMaps. Åpne KML-/KMZ-filer med lagrede bokmerker fra e-post, Dropbox eller internettkobling.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Bokmerker fra andre kilder kan også importeres og vises i MAPS.ME. Åpne KML-/KMZ-filer med lagrede bokmerker fra e-post, Dropbox eller internettkobling.";
+"bookmarks_usage_hint_import_only" = "Bokmerker fra andre kilder kan også importeres og vises i OMaps. Åpne KML-/KMZ-filer med lagrede bokmerker fra e-post, Dropbox eller internettkobling.";
 
 /* Settings button in system menu */
 "settings" = "Innstillinger";
@@ -354,9 +354,9 @@
 "share_by_email" = "Del på e-post";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Delte MAPS.ME-bokmerker";
+"share_bookmarks_email_subject" = "Delte OMaps-bokmerker";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Laster inn bokmerker";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Nedlasting av land pågår nå.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Håper du liker å bruke MAPS.ME! Hvis du gjør det er det flott om du rangerer eller vurderer appen på App Store. Det tar deg mindre enn ett minutt, men kan virkelig hjelpe oss. Takk for støtten!";
+"appStore_message" = "Håper du liker å bruke OMaps! Hvis du gjør det er det flott om du rangerer eller vurderer appen på App Store. Det tar deg mindre enn ett minutt, men kan virkelig hjelpe oss. Takk for støtten!";
 
 /* No, thanks */
 "no_thanks" = "Nei takk";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hei, se merket mitt på MAPS.ME! %1$@ eller %2$@ Har du ikke installert offline-kart? Last dem ned her: http://maps.me/get";
+"bookmark_share_sms" = "Hei, se merket mitt på OMaps! %1$@ eller %2$@ Har du ikke installert offline-kart? Last dem ned her: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hei, se posisjonen min på MAPS.ME! %1$@ eller %2$@ Har du ikke offline-kart? Last dem ned her: http://maps.me/get";
+"my_position_share_sms" = "Hei, se posisjonen min på OMaps! %1$@ eller %2$@ Har du ikke offline-kart? Last dem ned her: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hei, se merket mitt på MAPS.ME-kartet";
+"bookmark_share_email_subject" = "Hei, se merket mitt på OMaps-kartet";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hei, se posisjonen min på MAPS.ME-kartet!";
+"my_position_share_email_subject" = "Hei, se posisjonen min på OMaps-kartet!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hei,Jeg er her nå: %1$@. Klikk på denne koblingen %2$@ eller denne %3$@ for å se stedet på kartet.\n\nTakk.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Last ned kart over stedet der du befinner deg";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Vi overfører dine nedlastede kart fra MAPS.ME Lite til MAPS.ME. Det kan ta noen minutter.";
+"move_lite_maps_to_pro" = "Vi overfører dine nedlastede kart fra OMaps Lite til OMaps. Det kan ta noen minutter.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Nedlastede kart er overført til MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Nedlastede kart er overført til OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Kartene dine ble ikke overført. Slett MAPS.ME Lite og last ned kartene på nytt.";
+"move_lite_maps_to_pro_failed" = "Kartene dine ble ikke overført. Slett OMaps Lite og last ned kartene på nytt.";
 
 /* Text in menu */
 "settings_and_more" = "Innstillinger med mer";
@@ -600,7 +600,7 @@
 "website" = "Nettside";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME-samfunnet";
+"maps_me_community" = "OMaps-samfunnet";
 
 /* Text in menu */
 "like_on_facebook" = "Lik på Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Rapporter en feil";
 
 /* Email subject */
-"subscribe_me_subject" = "Jeg vil abonnere på MAPS.ME-nyhetsbrevet";
+"subscribe_me_subject" = "Jeg vil abonnere på OMaps-nyhetsbrevet";
 
 /* Email body */
 "subscribe_me_body" = "Jeg ønsker å være den første som får vite om siste nytt og nye kampanjer. Jeg kan avbestille abonnementet når som helst.";
 
 /* About text */
-"about_text" = "MAPS.ME tilbyr de raskeste offline-kartene over alle byer i alle land i verden. Reis trygt: Uansett hvor du er, kan MAPS.ME hjelpe deg med å finne ut hvor du er på kartet eller finne nærmeste restaurant, hotell, bank, bensinstasjon osv. Det kreves ingen internettforbindelse.\n\nVi jobber alltid med å legge inn nye funksjoner, og vi vil gjerne høre hvordan du synes at vi kan forbedre MAPS.ME. Hvis du får problemer med appen, ikke nøl med å kontakte oss på support@maps.me. Vi svarer på alle forespørsler!\n\nLiker du MAPS.ME og ønsker å støtte oss? Det er noen enkle og helt gratis måter å gjøre det på:\n\n- Legg inn en vurdering på app-butikken\n- Lik Facebook-siden vår på http://www.facebook.com/mapswithme\n- Eller bare fortell mamma, venner og kolleger om MAPS.ME :)\n\nTakk for at du er med oss. Vi setter stor pris på støtten!\n\nPS! Vi henter kartdata fra OpenStreetMap, et kartprosjekt som ligner på Wikipedia, der brukerne selv kan opprette og redigere kart. Hvis du finner mangler eller feil på kartet, kan du korrigere kartet direkte på https://www.openstreetmap.org, og endringene vil vises i MAPS.ME-appen når neste versjon kommer.";
+"about_text" = "OMaps tilbyr de raskeste offline-kartene over alle byer i alle land i verden. Reis trygt: Uansett hvor du er, kan OMaps hjelpe deg med å finne ut hvor du er på kartet eller finne nærmeste restaurant, hotell, bank, bensinstasjon osv. Det kreves ingen internettforbindelse.\n\nVi jobber alltid med å legge inn nye funksjoner, og vi vil gjerne høre hvordan du synes at vi kan forbedre OMaps. Hvis du får problemer med appen, ikke nøl med å kontakte oss på support@omaps.app. Vi svarer på alle forespørsler!\n\nLiker du OMaps og ønsker å støtte oss? Det er noen enkle og helt gratis måter å gjøre det på:\n\n- Legg inn en vurdering på app-butikken\n- Lik Facebook-siden vår på http://www.facebook.com/mapswithme\n- Eller bare fortell mamma, venner og kolleger om OMaps :)\n\nTakk for at du er med oss. Vi setter stor pris på støtten!\n\nPS! Vi henter kartdata fra OpenStreetMap, et kartprosjekt som ligner på Wikipedia, der brukerne selv kan opprette og redigere kart. Hvis du finner mangler eller feil på kartet, kan du korrigere kartet direkte på https://www.openstreetmap.org, og endringene vil vises i OMaps-appen når neste versjon kommer.";
 
 /* Alert text */
 "email_error_body" = "E-postklienten har ikke blitt konfigurert. Konfigurer den eller bruk en annen måte å kontakte oss på %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Oppdater kartet for å opprette en rute";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Med den nye versjonen av MAPS.ME kan du opprette ruter fra din nåværende posisjon til et ankomststed på kartet. Oppdater kartene for å bruke denne funksjonen.";
+"routing_update_maps" = "Med den nye versjonen av OMaps kan du opprette ruter fra din nåværende posisjon til et ankomststed på kartet. Oppdater kartene for å bruke denne funksjonen.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Oppdater alle";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Funnet";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Når du oppretter ruter i MAPS.ME-appen må du huske på følgende:\n\n- Foreslåtte ruter må bare betraktes som anbefalinger.\n- Veiforhold, trafikkregler og skilt må gis høyere prioritet enn navigasjonsråd.\n- Kartet kan være feil eller utdatert, og det er ikke sikkert at rutene opprettes på best mulig måte.\n\nVær nøye med veisikkerheten og pass på deg selv!";
+"routing_disclaimer" = "Når du oppretter ruter i OMaps-appen må du huske på følgende:\n\n- Foreslåtte ruter må bare betraktes som anbefalinger.\n- Veiforhold, trafikkregler og skilt må gis høyere prioritet enn navigasjonsråd.\n- Kartet kan være feil eller utdatert, og det er ikke sikkert at rutene opprettes på best mulig måte.\n\nVær nøye med veisikkerheten og pass på deg selv!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Utdatert";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Finner ingen rute mellom valgt startsted og destinasjon. Velg et annet start- eller sluttpunkt.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Det oppsto en intern feil. Prøv å slette og laste ned kartet på nytt. Hvis problemet vedvarer kan du kontakte oss på support@maps.me.";
+"routing_failed_internal_error" = "Det oppsto en intern feil. Prøv å slette og laste ned kartet på nytt. Hvis problemet vedvarer kan du kontakte oss på support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Last ned kart + rutetilordning";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Jeg har nettopp vurdert appen";
 
 /* Text for rating dialog */
-"rating_user_since" = "Jeg har vært MAPS.ME-bruker siden %@";
+"rating_user_since" = "Jeg har vært OMaps-bruker siden %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Liker du MAPS.ME?";
+"rating_do_like_maps" = "Liker du OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Trykk på en stjerne for å vurdere appen.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Skaff kart";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Last ned oppdatert kart og ruteinformasjon for å få alle MAPS.ME funksjonene";
+"routing_download_map_and_routing" = "Last ned oppdatert kart og ruteinformasjon for å få alle OMaps funksjonene";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Skaff ruteinformasjon";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Liker du appen?";
 
-"rate_alert_default_message" = "Takk for at du bruker MAPS.ME. Vi setter stor pris på om du rangerer appen. Tilbakemeldinger hjelper oss med å bli bedre.";
+"rate_alert_default_message" = "Takk for at du bruker OMaps. Vi setter stor pris på om du rangerer appen. Tilbakemeldinger hjelper oss med å bli bedre.";
 
 "rate_alert_five_star_message" = "Hurra! Vi elsker deg også!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplisert sted";
 
-"first_launch_congrats_title" = "MAPS.ME er klar til bruk";
+"first_launch_congrats_title" = "OMaps er klar til bruk";
 
 "first_launch_congrats_text" = "Søk og naviger i frakoblet status, hvor som helst i verden, helt gratis.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Legg til nye steder i kartet og rediger eksisterende steder direkte fra appen.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME bruker data fra OpenStreetMap-samfunnet.";
+"whatsnew_editor_message_2" = "* OMaps bruker data fra OpenStreetMap-samfunnet.";
 
 "onboarding_offline_navigation_title" = "Du vil aldri havne på villspor igjen";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planlegg optimale reiseruter med bil og til fots.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — se verdensvide kart uten Internett";
+"onboarding_offline_maps_title" = "OMaps — se verdensvide kart uten Internett";
 
 "onboarding_offline_maps_message" = "Last ned kartene for et ønsket område én gang, og bruk navigeringen og andre søkefunksjoner uten internettforbindelse.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "For å bruke navigering og andre funksjoner må vi ha tilgang til posisjonen din.";
 
-"onboarding_permissions_title" = "Tillat MAPS.ME tilgang til minnet og plasseringen";
+"onboarding_permissions_title" = "Tillat OMaps tilgang til minnet og plasseringen";
 
 "onboarding_permissions_message" = "Du kan laste ned kart, se steder og trafikk nær deg og bruke navigasjon.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Du må frigjøre mer lagringsplass for å laste ned. Slett unødvendig data.";
 
-"editor_sharing_title" = "Jeg har forbedret MAPS.ME kartene";
+"editor_sharing_title" = "Jeg har forbedret OMaps kartene";
 
 "editor_comment_will_be_sent" = "Vi vil sende kommentaren din til kartografene.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Detaljert kommentar";
 
-"editor_detailed_description" = "De foreslåtte endringene vil sendes til OpenStreetMap-gruppen. Beskriv detaljene som ikke kan redigeres i MAPS.ME.";
+"editor_detailed_description" = "De foreslåtte endringene vil sendes til OpenStreetMap-gruppen. Beskriv detaljene som ikke kan redigeres i OMaps.";
 
 "editor_more_about_osm" = "Mer om OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Vi har oppdatert kartredigeringsprogrammet";
 
-"whatsnew_update_editor_message" = "MAPS.ME-brukere har foretatt 200 000 kartendringer. I fellesskap lager vi de mest detaljerte kartene i verden. Bli med du også!";
+"whatsnew_update_editor_message" = "OMaps-brukere har foretatt 200 000 kartendringer. I fellesskap lager vi de mest detaljerte kartene i verden. Bli med du også!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "For å bruke kartredigerings-funksjonen, vennligst oppdater alle kartene.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Fortsett";
 
-"recent_track_background_dialog_message" = "MAPS.ME bruker geografiske funksjoner i bakgrunnen for å registrere din nylig reiste rute.";
+"recent_track_background_dialog_message" = "OMaps bruker geografiske funksjoner i bakgrunnen for å registrere din nylig reiste rute.";
 
 "whatsnew_car_navigation_header" = "Brukervennlig navigeringssystem for kjøretøy";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Sykkelnavigering (betaversjon)";
 
-"whatsnew_cycle_navigation_message" = "Vi tester sykkelnavigering for den nye sesongen. Prøv din favorittrute med MAPS.ME, og del din vurdering med oss.";
+"whatsnew_cycle_navigation_message" = "Vi tester sykkelnavigering for den nye sesongen. Prøv din favorittrute med OMaps, og del din vurdering med oss.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Gi vurdering på Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Fortell en venn";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hei! Installer MAPS.ME!";
+"tell_friends_text" = "Hei! Installer OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME er en offline app for reising. MAPS.ME bygger på OpenStreetMap-data og tillater redigering av den.";
+"about_description" = "OMaps er en offline app for reising. OMaps bygger på OpenStreetMap-data og tillater redigering av den.";
 
 /* Text in menu */
 "blog" = "Blogg";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Åpne";
 
-"whatsnew_uber_header" = "MAPS.ME og Uber";
+"whatsnew_uber_header" = "OMaps og Uber";
 
 "whatsnew_uber_message" = "Bestill en Uber-drosje direkte fra appen!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Forstørr skriften på kartet";
 
-"traffic_update_app" = "Vennligst oppdater MAPS.ME";
+"traffic_update_app" = "Vennligst oppdater OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Du må oppdatere applikasjonen for å kunne se trafikkdata.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Gi tilgang";
 
-"onboarding_storage_permissions_message" = "Endre innstillinger for tillatelser på enheten din. Det er nødvendig med tilgang til minnet for å kunne bruke MAPS.ME.";
+"onboarding_storage_permissions_message" = "Endre innstillinger for tillatelser på enheten din. Det er nødvendig med tilgang til minnet for å kunne bruke OMaps.";
 
 "button_exit" = "Avslutt";
 
-"onboarding_detail_permissions_title" = "MAPS.ME trenger tilgang til";
+"onboarding_detail_permissions_title" = "OMaps trenger tilgang til";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Minnet";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problemer med tilgang til lagring";
 
-"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@maps.me";
+"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@omaps.app";
 
 "setting_emulate_bad_storage" = "Emulere skadet lagring";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Jeg godtar <a href=\"%s\">bruksbetingelsene</a>";
 
-"sign_agree_news_gdpr" = "Jeg godtar å motta de siste nyhetene om MAPS.ME-produkter";
+"sign_agree_news_gdpr" = "Jeg godtar å motta de siste nyhetene om OMaps-produkter";
 
 "whats_new_localbiz_title" = "Small business deserves attention";
 
-"whats_new_localbiz_message" = "It is local cafes, cozy hostels and shops that make our journeys unforgettable. We will optimize your page in MAPS.ME to make it stand out.";
+"whats_new_localbiz_message" = "It is local cafes, cozy hostels and shops that make our journeys unforgettable. We will optimize your page in OMaps to make it stand out.";
 
 "whats_new_order_button" = "Leave a request";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Download new places";
 
-"cached_bookmarks_placeholder_subtitle" = "Press the button to download thousands of interesting places and routes created by MAPS.ME users. You will need the internet connection.";
+"cached_bookmarks_placeholder_subtitle" = "Press the button to download thousands of interesting places and routes created by OMaps users. You will need the internet connection.";
 
 "downloader_download_routers" = "Download bookmarks";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Crash report";
 
-"opt_out_fabric_description" = "We may use your data to improve MAPS.ME experience. Changes will take effect after you restart the app.";
+"opt_out_fabric_description" = "We may use your data to improve OMaps experience. Changes will take effect after you restart the app.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Bookmarks were not downloaded";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME now has a route library";
+"whats_new_bookmarks_catalog_title" = "OMaps now has a route library";
 
 "whats_new_bookmarks_catalog_message" = "Hundreds of detailed routes all around the world: where to go, what to see, where to eat.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Remove ads";
 
-"remove_ads_title" = "Remove all ads and support MAPS.ME";
+"remove_ads_title" = "Remove all ads and support OMaps";
 
 "paybtn_title" = "Pay %s/year";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "More options";
 
-"why_support" = "Why support MAPS.ME?";
+"why_support" = "Why support OMaps?";
 
 "options_dropdown_item1" = "%s/month (save %s/year)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "We will remove all ads for you";
 
-"why_support_item2" = "You help us to improve MAPS.ME";
+"why_support_item2" = "You help us to improve OMaps";
 
 "why_support_item3" = "You help us improve open maps OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server is unavailable";
 
-"server_unavailable_message" = "The purchase will be completed later. If the error persists, please contact support@maps.me.";
+"server_unavailable_message" = "The purchase will be completed later. If the error persists, please contact support@omaps.app.";
 
 "offline_fiters_check_in" = "Connect to the internet to filter hotels by dates.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Denne veiledningen vil bli lastet opp til den offentlige MAPS.ME katalogen og vil være tilgjengelig for andre brukere";
+"upload_and_publish_desc" = "Denne veiledningen vil bli lastet opp til den offentlige OMaps katalogen og vil være tilgjengelig for andre brukere";
 
 "upload_and_publish" = "Last opp og publiser";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Hjelp andre ved å legge igjen en anmeldelse.";
 
-"share_bookmarks_email_body_link" = "Hei!\n\nHer er lenken der du kan laste ned bokmerkene dine: %s. Åpne listen via MAPS.ME og nyt reisen!\n\nFå tak i app: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hei!\n\nHer er lenken der du kan laste ned bokmerkene dine: %s. Åpne listen via OMaps og nyt reisen!\n\nFå tak i app: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigatøren vil advare deg om kameraer når du overskrider fartsgrensen på %d km/t";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Del inntrykkene dine med andre, enkelt";
 
-"whats_new_ugc_routes_subtitle" = "Lagre minneverdige steder, lag ruteveiledninger med bokmerker og del dem med alle på MAPS.ME-katalogen.";
+"whats_new_ugc_routes_subtitle" = "Lagre minneverdige steder, lag ruteveiledninger med bokmerker og del dem med alle på OMaps-katalogen.";
 
 "whats_new_webeditor_title" = "Gjør rutene dine om til historier";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Du bør ha minst 3 bokmerker for å kunne laste opp din guide til den offentlige katalogen";
 
-"bookmark_public_upload_alert_title" = "Du er noen få skritt unna å dele bokmerkene dine med alle MAPS.ME reisende!";
+"bookmark_public_upload_alert_title" = "Du er noen få skritt unna å dele bokmerkene dine med alle OMaps reisende!";
 
 "bookmark_public_upload_alert_subtitle" = "Sørg for at du har et bestemt navn og en beskrivelse for listen din, og alle bokmerker har litt info om steder. På den måten kan listen din bli funnet og brukt av andre reisende.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maksimum strømsparing";
 
-"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 MAPS.ME-brukerstøtte.";
+"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 OMaps-brukerstøtte.";
 
 "html_error_upload_message_try_again" = "Vennligst sjekk nettverksinnstillingene og prøv igjen";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Din ID: %s.";
 
-"gdpr_request_window_message" = "Vennligst kopi det og send forespørselen til support@maps.me";
+"gdpr_request_window_message" = "Vennligst kopi det og send forespørselen til support@omaps.app";
 
 "gdpr_request_window_copy" = "Kopier ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Unngå fergeoverganger";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME tilbyr ferdige guider til utvalgte steder med bilder og beskrivelser som vises på kartet og er tilgjengelig offline.";
+"cached_guides_placeholder_subtitle" = "OMaps tilbyr ferdige guider til utvalgte steder med bilder og beskrivelser som vises på kartet og er tilgjengelig offline.";
 
 "guides_catalogue_title" = "Guide katalog";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Usbekisk mat";
 
-"onboarding_welcome_title" = "Planlegg og reis med MAPS.ME";
+"onboarding_welcome_title" = "Planlegg og reis med OMaps";
 
 "onboarding_welcome_first_subtitle" = "Bokmerk interessante steder, bestill hotell, beregn ruter også offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Last ned";
 
-"onboarding_bydeeplink_guide_title" = "Guider klar til bruk i MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Guider klar til bruk i OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Beste steder å besøke, vist på kart med bilder og beskrivelser. Jobb offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Du har booket en hotell?";
 
-"popup_booking_download_guides_message" = "Planlegg en rute ved hjelp av ferdige guider fra MAPS.ME";
+"popup_booking_download_guides_message" = "Planlegg en rute ved hjelp av ferdige guider fra OMaps";
 
 "popup_mwm_download_guides_title" = "Uten nett-guider";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Se";
 
-"gallery_pp_download_guides_offline_title" = "Planlegg din ferie sammen med MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Planlegg din ferie sammen med OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Ikke gå glipp av det viktigste og bruk ruter laget av erfarte reisende";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.";
 
-"whatsnew_carplay_title" = "Autonavigering MAPS.ME i CarPlay!";
+"whatsnew_carplay_title" = "Autonavigering OMaps i CarPlay!";
 
 "whatsnew_carplay_message" = "Bokmerker, søk, hastighets kameraer og omvei innstilinger- alt fungerer uten Internett";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Kamera-advarsel";
 
-"download_map_carplay" = "Vennligst last ned kart i MAPS.ME appen på enheten din";
+"download_map_carplay" = "Vennligst last ned kart i OMaps appen på enheten din";
 
 "carplay_roundabout_exit" = "%s avkjøring";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hurra! Du har abonnert!";
 
-"popup_subscription_success_map_message" = "Nå kan du utforske de beste turistseverdighetene i MAPS.ME-katalogen";
+"popup_subscription_success_map_message" = "Nå kan du utforske de beste turistseverdighetene i OMaps-katalogen";
 
 "popup_subscription_success_map_start_button" = "Ta en titt";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Komme i gang";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Universell reisehjelper";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Åpne katalogen";
 
-"new_onboarding_step5.2_message" = "Abonnementet ditt på MAPS.ME guide katalogen har stor verdi. Få full tilgang til by- og friluftsguider rundt om i verden!";
+"new_onboarding_step5.2_message" = "Abonnementet ditt på OMaps guide katalogen har stor verdi. Få full tilgang til by- og friluftsguider rundt om i verden!";
 
 "new_onboarding_step5.2_button" = "Sjekke vilkår";
 
-"new_onboarding_step5.3_message" = "Last ned og sjekk ut ruter for byturer og friluftsliv med gratis MAPS.ME utvalg!";
+"new_onboarding_step5.3_message" = "Last ned og sjekk ut ruter for byturer og friluftsliv med gratis OMaps utvalg!";
 
 "new_onboarding_step5.3_button" = "Laste ned gratis";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Outdooractive ruter for vinter- og sommerferier venter i katalogen!";
 
-"whatsnew_guides_galleries_title" = "Planlegg din neste reise med MAPS.ME";
+"whatsnew_guides_galleries_title" = "Planlegg din neste reise med OMaps";
 
 "whatsnew_guides_galleries_message" = "Nå kan du finne anbefalte guider i stedssidene med populære byer og severdigheter";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Høyder";
 
-"tips_map_layers_title_countour" = "Høydekurver uten nett med MAPS.ME!";
+"tips_map_layers_title_countour" = "Høydekurver uten nett med OMaps!";
 
 "tips_map_layers_message_countour" = "Høydekurver hjelper deg å planlegge turen din og ikke gå seg vill";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
index 7da1d05392..6f780e4300 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 152c08fc65..87d55491c4 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Installeren";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Bedankt om MAPS.ME te gebruiken! Vindt u de app leuk? Vertel uw vrienden erover! Dit is voor ons het beste dankgebaar.";
+"share_on_facebook_text" = "Bedankt om OMaps te gebruiken! Vindt u de app leuk? Vertel uw vrienden erover! Dit is voor ons het beste dankgebaar.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "KB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Probeer opnieuw";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Over MAPS.ME";
+"about_menu_title" = "Over OMaps";
 
 "downloading_touch_to_cancel" = "%d%% aan het downloaden, klik om te annuleren";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD kaart/USB opslag met gedownloade kaarten is niet beschikbaar";
 
-"disconnect_usb_cable" = "Verwijder de USB kabel of plaats een geheugen kaart om MAPS.ME te gebruiken";
+"disconnect_usb_cable" = "Verwijder de USB kabel of plaats een geheugen kaart om OMaps te gebruiken";
 
 "not_enough_free_space_on_sdcard" = "Maak eerst ruimte vrij op de SD kaart/USB opslag om de app te gebruiken";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Update beschikbaar voor deze kaarten:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "U heeft MAPS.ME Lite niet meer nodig, dus u kunt de app deïnstalleren";
+"suggest_uninstall_lite" = "U heeft OMaps Lite niet meer nodig, dus u kunt de app deïnstalleren";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ is succesvol gedownload";
@@ -249,10 +249,10 @@
 "set" = "Groep";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Je hebt nog geen bladwijzers.\nTik op een plek op de kaart om een bladwijzer toe te voegen.\nBladwijzers uit andere bronnen kunnen ook worden geïmporteerd en weergegeven in de MAPS.ME app. Open KML/KMZ bestand met opgeslagen speldjes uit mail, Dropbox of weblink.";
+"bookmarks_usage_hint" = "Je hebt nog geen bladwijzers.\nTik op een plek op de kaart om een bladwijzer toe te voegen.\nBladwijzers uit andere bronnen kunnen ook worden geïmporteerd en weergegeven in de OMaps app. Open KML/KMZ bestand met opgeslagen speldjes uit mail, Dropbox of weblink.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Bladwijzers uit andere bronnen kunnen worden geïmporteerd en weergegeven in de MAPS.ME app. Open KML/KMZ bestand met opgeslagen speldjes uit mail, Dropbox of weblink.";
+"bookmarks_usage_hint_import_only" = "Bladwijzers uit andere bronnen kunnen worden geïmporteerd en weergegeven in de OMaps app. Open KML/KMZ bestand met opgeslagen speldjes uit mail, Dropbox of weblink.";
 
 /* Settings button in system menu */
 "settings" = "Instellingen";
@@ -354,9 +354,9 @@
 "share_by_email" = "Delen via email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Bladwijzers van MAPS.ME met u gedeeld";
+"share_bookmarks_email_subject" = "Bladwijzers van OOMapst u gedeeld";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Bladwijzers aan het uploaden";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "Het downloaden van het land is nu aan de gang.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Ik hoop dat u veel plezier hebt met MAPS.ME! Zo ja, geef de app dan een cijfer in de App Store of schrijf een recensie. Dit duurt minder dan een minuut, maar kan ons echt helpen. Bedankt voor uw steun!";
+"appStore_message" = "Ik hoop dat u veel plezier hebt met OMaps! Zo ja, geef de app dan een cijfer in de App Store of schrijf een recensie. Dit duurt minder dan een minuut, maar kan ons echt helpen. Bedankt voor uw steun!";
 
 /* No, thanks */
 "no_thanks" = "Nee, bedankt";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "Kijk waar ik nu ben. Open %1$@ of %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Kijk naar mijn pin op MAPS.ME kaart";
+"bookmark_share_email_subject" = "Kijk naar mijn pin op OMaps kaart";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Kijk naar mijn huidige locatie op MAPS.ME kaart";
+"my_position_share_email_subject" = "Kijk naar mijn huidige locatie op OMaps kaart";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hoi,\n\nMomenteel ben ik hier: %1$@. Klik op deze %2$@ of deze %3$@ om de plaats op de kaart te zien.\n\nBedankt.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Download de kaart van de plaats waar u bent";
 
 /* text of notification */
-"pro_version_is_free_today" = "Volledige versie van MAPS.ME is nu gratis! Download nu en vertel het je vrienden.";
+"pro_version_is_free_today" = "Volledige versie van OMaps is nu gratis! Download nu en vertel het je vrienden.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "We verplaatsen uw gedownloade kaarten van MAPS.ME Lite naar MAPS.ME. Dit kan enkele minuten duren.";
+"move_lite_maps_to_pro" = "We verplaatsen uw gedownloade kaarten van OMaps Lite naar OMaps. Dit kan enkele minuten duren.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Uw gedownloade kaarten werden met succes verplaatst naar MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Uw gedownloade kaarten werden met succes verplaatst naar OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Verplaatsing van uw kaarten mislukt. Gelieve MAPS.ME Lite te verwijderen en de kaarten opnieuw te downloaden.";
+"move_lite_maps_to_pro_failed" = "Verplaatsing van uw kaarten mislukt. Gelieve OMaps Lite te verwijderen en de kaarten opnieuw te downloaden.";
 
 /* Text in menu */
 "settings_and_more" = "Instellingen & meer";
@@ -600,7 +600,7 @@
 "website" = "Website";
 
 /* Text in menu */
-"maps_me_community" = "Gemeenschap van MAPS.ME";
+"maps_me_community" = "Gemeenschap van OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Ons leuk vinden op Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Meld een fout";
 
 /* Email subject */
-"subscribe_me_subject" = "Ik meld mij aan voor de nieuwsbrief MAPS.ME";
+"subscribe_me_subject" = "Ik meld mij aan voor de nieuwsbrief OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Ik wil graag als eerste horen over het laatste nieuws updates en acties. Ik kan mijn abonnement te allen tijde annuleren.";
 
 /* About text */
-"about_text" = "MAPS.ME biedt de snelste offline kaarten van alle steden en alle landen ter wereld. Reis vol vertrouwen: waar je ook bent,\n\nMAPS.ME zal je helpen om jezelf op de kaart terug te vinden en het dichstbijzijnde restaurant, hotel, bank, benzinestation etc. te vinden. Er is geen internetverbinding voor nodig.\n\nWe werken voortdurend aan nieuwe functies en we zouden graag van je willen horen hoe we MAPS.ME volgens jou zouden kunnen verbeteren. Als je eventueel problemen hebt met de app, aarzel dan niet om contact met ons op te nemen op support@maps.me. We reageren op elke aanvraag!\n\nVindt je MAPS.ME leuk en wil je ons steunen? Dat kan op een aantal simpele en absoluut gratis manieren:\n- plaats een beoordeling op je App Market\n- like onze Facebook-pagina http://www.facebook.com/mapswithme\n- of vertel gewoon je ma, vrienden en collega’s over MAPS.ME :) Dank je dat je ons steunt. Wij waarderen dit heel erg!\n\nP.S. We halen onze kaartgegevens van OpenStreetMap, een kaartproject dat lijkt op Wikipedia, waarbij gebruikers kaarten kunnen maken en aanpassen. Als je ziet dat er iets ontbreekt of een fout ontdekt in een kaart, dan kun je de kaart direct verbeteren op https://www.openstreetmap.org, en dan zullen je verbeteringen bij het uitbrengen van de volgende versie in MAPS.ME verschijnen.";
+"about_text" = "OMaps biedt de snelste offline kaarten van alle steden en alle landen ter wereld. Reis vol vertrouwen: waar je ook bent,\n\nOMaps zal je helpen om jezelf op de kaart terug te vinden en het dichstbijzijnde restaurant, hotel, bank, benzinestation etc. te vinden. Er is geen internetverbinding voor nodig.\n\nWe werken voortdurend aan nieuwe functies en we zouden graag van je willen horen hoe we OMaps volgens jou zouden kunnen verbeteren. Als je eventueel problemen hebt met de app, aarzel dan niet om contact met ons op te nemen op support@omaps.app. We reageren op elke aanvraag!\n\nVindt je OMaps leuk en wil je ons steunen? Dat kan op een aantal simpele en absoluut gratis manieren:\n- plaats een beoordeling op je App Market\n- like onze Facebook-pagina http://www.facebook.com/mapswithme\n- of vertel gewoon je ma, vrienden en collega’s over OMaps :) Dank je dat je ons steunt. Wij waarderen dit heel erg!\n\nP.S. We halen onze kaartgegevens van OpenStreetMap, een kaartproject dat lijkt op Wikipedia, waarbij gebruikers kaarten kunnen maken en aanpassen. Als je ziet dat er iets ontbreekt of een fout ontdekt in een kaart, dan kun je de kaart direct verbeteren op https://www.openstreetmap.org, en dan zullen je verbeteringen bij het uitbrengen van de volgende versie in OMaps verschijnen.";
 
 /* Alert text */
 "email_error_body" = "De emailcliënt is niet ingesteld. Gelieve de cliënt te configureren of op een andere manier contact met ons op te nemen op %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Werk de kaart bij om een route te maken.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Met de nieuwe versie van MAPS.ME kunt u routes maken vanaf uw huidige positie naar een punt van bestemming. Werk kaarten bij om deze functie te gebruiken.";
+"routing_update_maps" = "Met de nieuwe versie van OMaps kunt u routes maken vanaf uw huidige positie naar een punt van bestemming. Werk kaarten bij om deze functie te gebruiken.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Update alles";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Gevonden";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Bij het creëren van routes in MAPS.ME-app, dient u rekening te houden met het volgende:\n\n  - Voorgestelde routes kunnen uitsluitend als aanbevelingen beschouwd worden.\n - Wegconditie, verkeersregels en borden hebben een hogere prioriteit dan het navigatie-advies.\n - De kaart kan onjuist of verouderd zijn en de routes kunnen niet op de beste mogelijke manier gecreëerd zijn.\n\n  Wees veilig op wegen en zorg goed voor uzelf!";
+"routing_disclaimer" = "Bij het creëren van routes in OMaps-app, dient u rekening te houden met het volgende:\n\n  - Voorgestelde routes kunnen uitsluitend als aanbevelingen beschouwd worden.\n - Wegconditie, verkeersregels en borden hebben een hogere prioriteit dan het navigatie-advies.\n - De kaart kan onjuist of verouderd zijn en de routes kunnen niet op de beste mogelijke manier gecreëerd zijn.\n\n  Wees veilig op wegen en zorg goed voor uzelf!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Verouderd";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Er is geen route gevonden tussen het geselecteerde beginpunt en de bestemming. Gelieve een andere beginpunt of een eindbestemming te kiezen.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Er is een interne fout opgetreden. Probeer het kaart te verwijderen en opnieuw te downloaden. Indien het probleem blijft optreden, neem dan contact met ons op support@maps.me.";
+"routing_failed_internal_error" = "Er is een interne fout opgetreden. Probeer het kaart te verwijderen en opnieuw te downloaden. Indien het probleem blijft optreden, neem dan contact met ons op support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Download kaart + routering";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Ik heb je app zojuist gewaardeerd";
 
 /* Text for rating dialog */
-"rating_user_since" = "Ik ben een MAPS.ME-gebruiker vanaf %@";
+"rating_user_since" = "Ik ben een OMaps-gebruiker vanaf %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Vind je MAPS.ME leuk?";
+"rating_do_like_maps" = "Vind je OMaps leuk?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Druk op een ster om onze app te waarderen.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Krijg kaart";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Download bijgewerkte kaart en routegegevens om alle functies van MAPS.ME te krijgen.";
+"routing_download_map_and_routing" = "Download bijgewerkte kaart en routegegevens om alle functies van OMaps te krijgen.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Krijg routegegevens";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Vindt u de app leuk?";
 
-"rate_alert_default_message" = "Bedankt om MAPS.ME te gebruiken. Gelieve de app te beoordelen. Uw feedback helpt ons beter te worden.";
+"rate_alert_default_message" = "Bedankt om OMaps te gebruiken. Gelieve de app te beoordelen. Uw feedback helpt ons beter te worden.";
 
 "rate_alert_five_star_message" = "Hoera! Wij houden ook van u!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Dubbele plaats";
 
-"first_launch_congrats_title" = "MAPS.ME is klaar voor gebruik";
+"first_launch_congrats_title" = "OMaps is klaar voor gebruik";
 
 "first_launch_congrats_text" = "Zoek en navigeer overal ter wereld offline, gratis.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Voeg nieuwe plaatsen toe aan de kaart en bewerk de bestaande rechtstreeks vanuit de app.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME gebruikt OpenStreetMap-communitiedata.";
+"whatsnew_editor_message_2" = "* OMaps gebruikt OpenStreetMap-communitiedata.";
 
 "onboarding_offline_navigation_title" = "Je zult nooit meer verdwalen";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Plan optimale auto- en wandelroutes.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — toegang tot kaarten van de hele wereld, zonder verbinding met het internet";
+"onboarding_offline_maps_title" = "OMaps — toegang tot kaarten van de hele wereld, zonder verbinding met het internet";
 
 "onboarding_offline_maps_message" = "Download eenmaal de kaarten voor het gewenste gebied en gebruik de navigatie- en zoekfuncties zonder een internetverbinding.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Om de navigatie en andere functies te kunnen gebruiken, hebben we toegang tot je geolocatie nodig.";
 
-"onboarding_permissions_title" = "MAPS.ME toegang geven tot opslag en locatie";
+"onboarding_permissions_title" = "OMaps toegang geven tot opslag en locatie";
 
 "onboarding_permissions_message" = "Zodat u kaarten kunt downloaden, plaatsen en verkeer rondom u kunt zien, en navigatie kunt gebruiken.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Om te kunnen downloaden, heb je meer ruimte nodig. Verwijder overbodige gegevens.";
 
-"editor_sharing_title" = "Ik heb de MAPS.ME-kaarten verbeterd";
+"editor_sharing_title" = "Ik heb de OMaps-kaarten verbeterd";
 
 "editor_comment_will_be_sent" = "We zullen uw opmerking doorsturen naar de kaartmakers.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Gedetailleerde reactie";
 
-"editor_detailed_description" = "Uw voorgestelde wijzigingen worden verzonden naar de OpenStreetMap-community. Beschrijf de details die niet kunnen worden bewerkt in MAPS.ME.";
+"editor_detailed_description" = "Uw voorgestelde wijzigingen worden verzonden naar de OpenStreetMap-community. Beschrijf de details die niet kunnen worden bewerkt in OMaps.";
 
 "editor_more_about_osm" = "Meer over OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "We hebben de kaarteditor bijgewerkt";
 
-"whatsnew_update_editor_message" = "MAPS.ME-gebruikers hebben 200.000 kaartwijzigingen doorgevoerd. Samen maken we de meest gedetailleerde kaarten ter wereld. Doe met ons mee!";
+"whatsnew_update_editor_message" = "OMaps-gebruikers hebben 200.000 kaartwijzigingen doorgevoerd. Samen maken we de meest gedetailleerde kaarten ter wereld. Doe met ons mee!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Om de kaartaanpasser te kunnen gebruiken, moet je alle kaarten actualiseren.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Verdergaan";
 
-"recent_track_background_dialog_message" = "MAPS.ME gebruikt uw geografische positie op de achtergrond om uw onlangs afgelegde route vast te leggen.";
+"recent_track_background_dialog_message" = "OMaps gebruikt uw geografische positie op de achtergrond om uw onlangs afgelegde route vast te leggen.";
 
 "whatsnew_car_navigation_header" = "Gebruikersvriendelijke voertuignavigatie";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Fietsnavigatie (bèta-versie)";
 
-"whatsnew_cycle_navigation_message" = "We testen de fietsnavigatie voor het nieuwe seizoen. Probeer uw favoriete fietsroute met MAPS.ME en deel uw ervaringen met ons.";
+"whatsnew_cycle_navigation_message" = "We testen de fietsnavigatie voor het nieuwe seizoen. Probeer uw favoriete fietsroute met OMaps en deel uw ervaringen met ons.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Beoordeel op Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Vertel een Vriend";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hallo! Installeer MAPS.ME!";
+"tell_friends_text" = "Hallo! Installeer OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME is een essentiële offline applicatie om te reizen. MAPS.ME is gebaseerd op OpenStreetMap gegevens en laat bewerking toe.";
+"about_description" = "OMaps is een essentiële offline applicatie om te reizen. OMaps is gebaseerd op OpenStreetMap gegevens en laat bewerking toe.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Openen";
 
-"whatsnew_uber_header" = "MAPS.ME en Uber";
+"whatsnew_uber_header" = "OMaps en Uber";
 
 "whatsnew_uber_message" = "Bestel een Uber-taxi rechtstreeks vanuit de app!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Lettergrootte op de kaart vergroten";
 
-"traffic_update_app" = "Gelieve MAPS.ME bij te werken";
+"traffic_update_app" = "Gelieve OMaps bij te werken";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Om de verkeersgegevens weer te geven, moet de applicatie bijgewerkt worden.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Toegang verlenen";
 
-"onboarding_storage_permissions_message" = "Wijzig instellingen machtigingen op uw toestel. Toegang tot opslag nodig voor gebruik MAPS.ME.";
+"onboarding_storage_permissions_message" = "Wijzig instellingen machtigingen op uw toestel. Toegang tot opslag nodig voor gebruik OMaps.";
 
 "button_exit" = "Verlaten";
 
-"onboarding_detail_permissions_title" = "MAPS.ME heeft toegang nodig tot";
+"onboarding_detail_permissions_title" = "OMaps heeft toegang nodig tot";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Opslag";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Probleem met opslagtoegang";
 
-"dialog_error_storage_message" = "Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve het te controleren en ons te contacteren via support@maps.me";
+"dialog_error_storage_message" = "Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve het te controleren en ons te contacteren via support@omaps.app";
 
 "setting_emulate_bad_storage" = "Slechte opslag emuleren";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Ik accepteer <a href=\"%s\">de gebruiksvoorwaarden</a>";
 
-"sign_agree_news_gdpr" = "Ik ga ermee akkoord dat ik het recentste nieuws over de producten van MAPS.ME zal ontvangen";
+"sign_agree_news_gdpr" = "Ik ga ermee akkoord dat ik het recentste nieuws over de producten van OMaps zal ontvangen";
 
 "whats_new_localbiz_title" = "Kleine ondernemingen verdienen aandacht";
 
-"whats_new_localbiz_message" = "Het zijn de lokale cafés, gezellige herbergen en winkels die onze reizen onvergetelijk maken. We optimaliseren uw pagina in MAPS.ME zodat deze opvalt.";
+"whats_new_localbiz_message" = "Het zijn de lokale cafés, gezellige herbergen en winkels die onze reizen onvergetelijk maken. We optimaliseren uw pagina in OMaps zodat deze opvalt.";
 
 "whats_new_order_button" = "Dien een aanvraag in";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Download nieuwe plaatsen";
 
-"cached_bookmarks_placeholder_subtitle" = "Druk op de knop om duizenden interessante plaatsen en routes te downloaden, gecreëerd door MAPS.ME-gebruikers. U hebt een internet-verbinding nodig.";
+"cached_bookmarks_placeholder_subtitle" = "Druk op de knop om duizenden interessante plaatsen en routes te downloaden, gecreëerd door OMaps-gebruikers. U hebt een internet-verbinding nodig.";
 
 "downloader_download_routers" = "Download bladwijzers";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Crash rapport";
 
-"opt_out_fabric_description" = "Wij kunnen uw gegevens gebruiken om MAPS.ME te verbeteren. Wijzigingen treden in werking na het opnieuw opstarten van de app.";
+"opt_out_fabric_description" = "Wij kunnen uw gegevens gebruiken om OMaps te verbeteren. Wijzigingen treden in werking na het opnieuw opstarten van de app.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Bladwijzers werden niet gedownload";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME heeft nu een route catalogus";
+"whats_new_bookmarks_catalog_title" = "OMaps heeft nu een route catalogus";
 
 "whats_new_bookmarks_catalog_message" = "Honderden gedetailleerde routes over de hele wereld: waar te gaan, wat te zien, waar te eten.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Schakel advertenties uit";
 
-"remove_ads_title" = "Schakel alle advertenties uit en steun MAPS.ME";
+"remove_ads_title" = "Schakel alle advertenties uit en steun OMaps";
 
 "paybtn_title" = "Betaal %s/jaar";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Andere opties";
 
-"why_support" = "Waarom MAPS.ME ondersteunen?";
+"why_support" = "Waarom OMaps ondersteunen?";
 
 "options_dropdown_item1" = "%s/maand (besparing %s/jaar)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "We zullen alle advertenties voor u uitschakelen";
 
-"why_support_item2" = "U helpt ons MAPS.ME te verbeteren";
+"why_support_item2" = "U helpt ons OMaps te verbeteren";
 
 "why_support_item3" = "U helpt ons de kaarten van OpenStreetMap.org te verbeteren";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server niet beschikbaar";
 
-"server_unavailable_message" = "De aankoop zal later worden voltooid. Neem contact op met support@maps.me als de fout aanhoudt.";
+"server_unavailable_message" = "De aankoop zal later worden voltooid. Neem contact op met support@omaps.app als de fout aanhoudt.";
 
 "offline_fiters_check_in" = "Verbind met internet om de datum van aankomst en vertrek te selecteren.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Deze gids zal worden geüpload naar de openbare MAPS.ME catalogus en zal voor andere gebruikers beschikbaar zijn";
+"upload_and_publish_desc" = "Deze gids zal worden geüpload naar de openbare OMaps catalogus en zal voor andere gebruikers beschikbaar zijn";
 
 "upload_and_publish" = "Upload en publiceer";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Help reizigers door een beoordeling achter te laten!";
 
-"share_bookmarks_email_body_link" = "Hello!\n\nHier is de link waar u uw bladwijzers kunt downloaden: %s. Open de lijst via MAPS.ME en geniet van uw reis!\n\nHaal de applicatie op: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hello!\n\nHier is de link waar u uw bladwijzers kunt downloaden: %s. Open de lijst via OMaps en geniet van uw reis!\n\nHaal de applicatie op: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigator waarschuwt u over camera's wanneer u de maximumsnelheid van %d km/h overschrijdt";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Het is eenvoudig om je indrukken te delen";
 
-"whats_new_ugc_routes_subtitle" = "Bewaar gedenkwaardige plaatsen, maak routes met behulp van bladwijzers en deel ze met iedereen in de MAPS.ME-catalogus.";
+"whats_new_ugc_routes_subtitle" = "Bewaar gedenkwaardige plaatsen, maak routes met behulp van bladwijzers en deel ze met iedereen in de OMaps-catalogus.";
 
 "whats_new_webeditor_title" = "Maak verhalen van je routes";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Uw route moet minimaal 3 tags bevatten, zodat deze kan worden geüpload naar de openbare map";
 
-"bookmark_public_upload_alert_title" = "U bent slechts een paar stappen verwijderd van het laden van uw route in de MAPS.ME catalogus!";
+"bookmark_public_upload_alert_title" = "U bent slechts een paar stappen verwijderd van het laden van uw route in de OMaps catalogus!";
 
 "bookmark_public_upload_alert_subtitle" = "Zorg ervoor dat de route een naam en beschrijving heeft en dat alle tags informatie over de plaatsen bevatten. Dankzij dit zullen gebruikers de route vinden en deze tijdens een reis kunnen gebruiken.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximale energiebesparing";
 
-"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 MAPS.ME-ondersteuning.";
+"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 OMaps-ondersteuning.";
 
 "html_error_upload_message_try_again" = "Controleer de netwerktoegang en probeer het opnieuw";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Uw ID: %s.";
 
-"gdpr_request_window_message" = "Alstublieft, kopieer het en stuur een verzoek naar support@maps.me";
+"gdpr_request_window_message" = "Alstublieft, kopieer het en stuur een verzoek naar support@omaps.app";
 
 "gdpr_request_window_copy" = "ID kopiëren";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Ferries vermijden";
 
-"cached_guides_placeholder_subtitle" = "Klare reisgids op MAPS.ME bevatten geselecteerde plaatsen met foto's en beschrijvingen die op de kaart worden weergegeven en offline beschikbaar zijn.";
+"cached_guides_placeholder_subtitle" = "Klare reisgids op OMaps bevatten geselecteerde plaatsen met foto's en beschrijvingen die op de kaart worden weergegeven en offline beschikbaar zijn.";
 
 "guides_catalogue_title" = "Reisgidscatalogus";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Oezbeekse keuken";
 
-"onboarding_welcome_title" = "Plan en reis met MAPS.ME";
+"onboarding_welcome_title" = "Plan en reis met OMaps";
 
 "onboarding_welcome_first_subtitle" = "Slaat op interessante plaatsen, boek hotels, bouw routen offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Downloaden";
 
-"onboarding_bydeeplink_guide_title" = "Klare reisgids op MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Klare reisgids op OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Geselecteerde plaatsen met foto's en beschrijvingen worden op de kaart weergegeven en zijn offline beschikbaar.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Hebt u een hotel geboekt?";
 
-"popup_booking_download_guides_message" = "Plan uw route met kant-en-klare reisgidsen van MAPS.ME";
+"popup_booking_download_guides_message" = "Plan uw route met kant-en-klare reisgidsen van OMaps";
 
 "popup_mwm_download_guides_title" = "Offline handleidingen";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Kijken";
 
-"gallery_pp_download_guides_offline_title" = "Plan uw vakantie met MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Plan uw vakantie met OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Pas op voor de belangrijkste routes van ervaren reizigers";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Payment will be charged to your iTunes account at confirmation of purchase. The subscription will automatically renew unless auto-renew is turned off at least 24 hours before the end of the current period. Your account will be charged according to your plan for renewal within 24 hours prior to the end of the current period. You can manage or turn off auto-renew in your Apple ID account settings at any time of your purchase.";
 
-"whatsnew_carplay_title" = "Automatische navigatie MAPS.ME met CarPlay!";
+"whatsnew_carplay_title" = "Automatische navigatie OOMapst CarPlay!";
 
 "whatsnew_carplay_message" = "Bladwijzers, zoeken, snelheidscamera's en omweginstellingen – alles werkt zonder internet";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Over cameras";
 
-"download_map_carplay" = "Download kaarten in de MAPS.ME app op uw apparaat";
+"download_map_carplay" = "Download kaarten in de OMaps app op uw apparaat";
 
 "carplay_roundabout_exit" = "Afrit nr. %s";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hoera! U bent opgeschreven!";
 
-"popup_subscription_success_map_message" = "Ontdekt u nu de beste toeristische attracties in de MAPS.ME catalogus";
+"popup_subscription_success_map_message" = "Ontdekt u nu de beste toeristische attracties in de OMaps catalogus";
 
 "popup_subscription_success_map_start_button" = "Kijken";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Start";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Een universele reisadviseur";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Catalogus openen";
 
-"new_onboarding_step5.2_message" = "Uw abonnement op de MAPS.ME-reisgidsencatalogus is van grote waarde. Krijg volledige toegang tot stads- en buitengidsen over de hele wereld!";
+"new_onboarding_step5.2_message" = "Uw abonnement op de OMaps-reisgidsencatalogus is van grote waarde. Krijg volledige toegang tot stads- en buitengidsen over de hele wereld!";
 
 "new_onboarding_step5.2_button" = "Bekijk de voorwaarden";
 
-"new_onboarding_step5.3_message" = "Bekijk gratis voorbeelden van kant-en-klare stads- en buitenroutes met een gratis selectie van MAPS.ME!";
+"new_onboarding_step5.3_message" = "Bekijk gratis voorbeelden van kant-en-klare stads- en buitenroutes met een gratis selectie van OMaps!";
 
 "new_onboarding_step5.3_button" = "Gratis downloaden";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Routes van Outdooractive voor winter- en zomerreizen wachten op u in de catalogus!";
 
-"whatsnew_guides_galleries_title" = "Plan uw volgende reis met MAPS.ME";
+"whatsnew_guides_galleries_title" = "Plan uw volgende reis met OMaps";
 
 "whatsnew_guides_galleries_message" = "Nu kunt u de aanbevolen handleidingen in de populaire steden en sightseeing kaarten vinden";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Hoogtes";
 
-"tips_map_layers_title_countour" = "Hoogtelijnen offline in MAPS.ME!";
+"tips_map_layers_title_countour" = "Hoogtelijnen offline in OMaps!";
 
 "tips_map_layers_message_countour" = "Dankzij de hoogtelijnen kunt u probleemloos natuurreizen plannen en er zeker van zijn dat u niet verdwalen zult";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
index 171038ce42..b453549b42 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.stringsdict
@@ -133,4 +133,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 3ed7346a35..139de3e962 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Pobierz";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Dziękujemy za korzystanie z MAPS.ME! Czy podoba Ci się nasza aplikacja? Opowiedz o niej swoim znajomym! W taki sposób najlepiej nam podziękujesz.";
+"share_on_facebook_text" = "Dziękujemy za korzystanie z OMaps! Czy podoba Ci się nasza aplikacja? Opowiedz o niej swoim znajomym! W taki sposób najlepiej nam podziękujesz.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "KB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Spróbuj ponownie";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "O aplikacji MAPS.ME";
+"about_menu_title" = "O aplikacji OMaps";
 
 "downloading_touch_to_cancel" = "Pobieranie %d%%. Proszę nacisnąć, aby anulować.";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "Karta SD/Pamięć USB z pobranymi mapami nie jest dostępna";
 
-"disconnect_usb_cable" = "Proszę odłączyć kabel USB albo włożyć kartę pamięci, aby korzystać z MAPS.ME";
+"disconnect_usb_cable" = "Proszę odłączyć kabel USB albo włożyć kartę pamięci, aby korzystać z OMaps";
 
 "not_enough_free_space_on_sdcard" = "Proszę zwolnić trochę pamięci na karcie SD/pamięci USB, aby korzystać z aplikacji";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Dostępne uaktualnienia dla tych map:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Nie potrzeba już więcej MAPS.ME Lite, więc można je usunąć.";
+"suggest_uninstall_lite" = "Nie potrzeba już więcej OMaps Lite, więc można je usunąć.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "Pobrano %@";
@@ -354,9 +354,9 @@
 "share_by_email" = "Udostępnij przez email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Udostępnione zakładki z MAPS.ME";
+"share_bookmarks_email_subject" = "Udostępnione zakładki z OMaps";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Wczytywanie zakładek";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Trwa pobieranie mapy kraju.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Mamy nadzieję, że podoba ci się aplikacja MAPS.ME! Jeśli tak to proszę oceń ją lub napisz recenzję w AppStore. To zajmie mniej niż minutę, a bardzo nam pomoże. Dziękujemy za wsparcie!";
+"appStore_message" = "Mamy nadzieję, że podoba ci się aplikacja OMaps! Jeśli tak to proszę oceń ją lub napisz recenzję w AppStore. To zajmie mniej niż minutę, a bardzo nam pomoże. Dziękujemy za wsparcie!";
 
 /* No, thanks */
 "no_thanks" = "Nie, dziękuję";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Mój znacznik w MAPS.ME %1$@ i %2$@";
+"bookmark_share_sms" = "Mój znacznik w OMaps %1$@ i %2$@";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
 "my_position_share_sms" = "Zobacz gdzie jestem. Link %1$@ lub %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Obejrzyj mój znacznik na mapie w MAPS.ME";
+"bookmark_share_email_subject" = "Obejrzyj mój znacznik na mapie w OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Zobacz moją aktualną lokalizację na mapie przy użyciu MAPS.ME";
+"my_position_share_email_subject" = "Zobacz moją aktualną lokalizację na mapie przy użyciu OMaps";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Cześć,\n\nJestem teraz tutaj: %1$@. Naciśnij na ten link %2$@ lub ten %3$@, aby zobaczyć to miejsce na mapie.\n\nDziękuję.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Pobierz mapę miejsca, w którym się zajdujesz";
 
 /* text of notification */
-"pro_version_is_free_today" = "Pełna wersja MAPS.ME jest dziś za darmo! Pobierz teraz i powiedz znajomym.";
+"pro_version_is_free_today" = "Pełna wersja OMaps jest dziś za darmo! Pobierz teraz i powiedz znajomym.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Przenosimy twoje pobrane mapy z MAPS.ME Lite do MAPS.ME. Może to zająć kilka minut.";
+"move_lite_maps_to_pro" = "Przenosimy twoje pobrane mapy z OMaps Lite do OMaps. Może to zająć kilka minut.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Pomyślnie przeniesiono twoje pobrane mapy do MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Pomyślnie przeniesiono twoje pobrane mapy do OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Nie udało się przenieść twoich map. Proszę skasować MAPS.ME Lite i pobrać mapy ponownie.";
+"move_lite_maps_to_pro_failed" = "Nie udało się przenieść twoich map. Proszę skasować OMaps Lite i pobrać mapy ponownie.";
 
 /* Text in menu */
 "settings_and_more" = "Ustawienia i inne";
@@ -600,7 +600,7 @@
 "website" = "Strona internetowa";
 
 /* Text in menu */
-"maps_me_community" = "Społeczność MAPS.ME";
+"maps_me_community" = "Społeczność OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Polub nas na Facebooku";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Zgłoś błąd";
 
 /* Email subject */
-"subscribe_me_subject" = "Chcę subskrybować biuletyn MAPS.ME";
+"subscribe_me_subject" = "Chcę subskrybować biuletyn OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Chcę w pierwszej kolejności otrzymywać powiadomienia o nowościach aktualizacjach i promocjach. Mogę w każdej chwili anulować swoją subskrypcję.";
 
 /* About text */
-"about_text" = "MAPS.ME oferuje najszybsze mapy offline wszystkich miast we wszystkich krajach świata. Podróżuj bez obaw: gdziekolwiek jesteś, MAPS.ME pomoże Ci odszukać się na mapie, znaleźć najbliższą restaurację, hotel, bank, stację benzynową itp. Aplikacja nie wymaga połączenia z Internetem.\n\nNieustannie pracujemy nad nowymi funkcjami i chcielibyśmy dowiedzieć się, jak Twoim zdaniem moglibyśmy poprawić MAPS.ME. Jeśli masz jakieś problemy z aplikacją, skontaktuj się z nami, pisząc na adres support@maps.me. Odpowiemy na każde zapytanie!\n\nLubisz aplikację MAPS.ME i chcesz udzielić nam wsparcia? Istnieje kilka prostych i absolutnie darmowych sposobów, jak to zrobić:\n\n- napisz recenzję w swoim sklepie z aplikacjami\n- polub naszą stronę na Facebooku: http://www.facebook.com/mapswithme\n- albo po prostu opowiedz o MAPS.ME swojej mamie, znajomym i kolegom :)\n\nDziękujemy, że jesteś z nami. Jesteśmy bardzo wdzięczni za Twoje wsparcie!\n\nP.S. Dane mapy pochodzą z OpenStreetMap, projektu kartograficznego podobnego do Wikipedii, który umożliwia użytkownikom tworzenie i edytowanie map. Jeśli zauważysz, że na mapie czegoś brakuje albo jest błąd, możesz nanieść poprawki bezpośrednio na stronie https://www.openstreetmap.org, a Twoje zmiany pojawią się w aplikacji MAPS.ME po wydaniu kolejnej wersji.";
+"about_text" = "OMaps oferuje najszybsze mapy offline wszystkich miast we wszystkich krajach świata. Podróżuj bez obaw: gdziekolwiek jesteś, OMaps pomoże Ci odszukać się na mapie, znaleźć najbliższą restaurację, hotel, bank, stację benzynową itp. Aplikacja nie wymaga połączenia z Internetem.\n\nNieustannie pracujemy nad nowymi funkcjami i chcielibyśmy dowiedzieć się, jak Twoim zdaniem moglibyśmy poprawić OMaps. Jeśli masz jakieś problemy z aplikacją, skontaktuj się z nami, pisząc na adres support@omaps.app. Odpowiemy na każde zapytanie!\n\nLubisz aplikację OMaps i chcesz udzielić nam wsparcia? Istnieje kilka prostych i absolutnie darmowych sposobów, jak to zrobić:\n\n- napisz recenzję w swoim sklepie z aplikacjami\n- polub naszą stronę na Facebooku: http://www.facebook.com/mapswithme\n- albo po prostu opowiedz o OMaps swojej mamie, znajomym i kolegom :)\n\nDziękujemy, że jesteś z nami. Jesteśmy bardzo wdzięczni za Twoje wsparcie!\n\nP.S. Dane mapy pochodzą z OpenStreetMap, projektu kartograficznego podobnego do Wikipedii, który umożliwia użytkownikom tworzenie i edytowanie map. Jeśli zauważysz, że na mapie czegoś brakuje albo jest błąd, możesz nanieść poprawki bezpośrednio na stronie https://www.openstreetmap.org, a Twoje zmiany pojawią się w aplikacji OMaps po wydaniu kolejnej wersji.";
 
 /* Alert text */
 "email_error_body" = "Email klienta nie został założony. Proszę skonfigurować adres email, bądź skorzystać z innych opcji, aby się z nami skontaktować na %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Proszę zaktualizować mapę, by utworzyć trasę.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Nowa wersja aplikacji MAPS.ME pozwala na tworzenie tras z Twojej bieżącej lokalizacji do punktu docelowego. Proszę zaktualizować mapy, by móc korzystać z tej funkcji.";
+"routing_update_maps" = "Nowa wersja aplikacji OMaps pozwala na tworzenie tras z Twojej bieżącej lokalizacji do punktu docelowego. Proszę zaktualizować mapy, by móc korzystać z tej funkcji.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Aktualizuj wszystkie";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Znaleziono";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Podczas tworzenia tras w aplikacji MAPS.ME pamiętaj o poniższych zasadach:\n\n  - Sugerowane trasy mogą być traktowane jedynie jako propozycje.\n - Warunki na drodze, przepisy ruchu drogowego i znaki mają większy priorytet niż wskazówki nawigacyjne.\n - Mapa może okazać się nieprawidłowa lub nieaktualna a trasy mogą nie zostać utworzone w sposób najlepszy z możliwych.\n\n  Szerokiej drogi, uważaj na siebie!";
+"routing_disclaimer" = "Podczas tworzenia tras w aplikacji OMaps pamiętaj o poniższych zasadach:\n\n  - Sugerowane trasy mogą być traktowane jedynie jako propozycje.\n - Warunki na drodze, przepisy ruchu drogowego i znaki mają większy priorytet niż wskazówki nawigacyjne.\n - Mapa może okazać się nieprawidłowa lub nieaktualna a trasy mogą nie zostać utworzone w sposób najlepszy z możliwych.\n\n  Szerokiej drogi, uważaj na siebie!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Nieaktualne";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Nie znaleziono trasy pomiędzy wybranym punktem rozpoczęcia podróży a jej celem. Wybierz inny punkt początkowy lub końcowy.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Wystąpił wewnętrzny błąd. Spróbuj usunąć mapę i pobrać ją ponownie. Jeśli problem będzie się nadal powtarzał, skontaktuj się z nami pod adresem support@maps.me.";
+"routing_failed_internal_error" = "Wystąpił wewnętrzny błąd. Spróbuj usunąć mapę i pobrać ją ponownie. Jeśli problem będzie się nadal powtarzał, skontaktuj się z nami pod adresem support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Pobierz mapę + wyznaczanie tras";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Właśnie oceniłem Waszą aplikację";
 
 /* Text for rating dialog */
-"rating_user_since" = "Jestem użytkownikiem MAPS.ME od %@ r.";
+"rating_user_since" = "Jestem użytkownikiem OMaps od %@ r.";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Lubisz MAPS.ME?";
+"rating_do_like_maps" = "Lubisz OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Stuknij gwiazdkę, by ocenić naszą aplikację.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Pobierz mapę";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Pobierz zaktualizowaną mapę i dane ustalania tras, by mieć dostęp do wszystkich funkcji MAPS.ME.";
+"routing_download_map_and_routing" = "Pobierz zaktualizowaną mapę i dane ustalania tras, by mieć dostęp do wszystkich funkcji OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Pobierz dane ustalania tras";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Lubisz tę aplikację?";
 
-"rate_alert_default_message" = "Dziękujemy za korzystanie z MAPS.ME. Prosimy wystawić aplikacji ocenę. Twoja opinia pozwoli nam udoskonalać nasze produkty.";
+"rate_alert_default_message" = "Dziękujemy za korzystanie z OMaps. Prosimy wystawić aplikacji ocenę. Twoja opinia pozwoli nam udoskonalać nasze produkty.";
 
 "rate_alert_five_star_message" = "Hurra! My też Cię uwielbiamy!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Powielone miejsce";
 
-"first_launch_congrats_title" = "Aplikacja MAPS.ME jest gotowa";
+"first_launch_congrats_title" = "Aplikacja OMaps jest gotowa";
 
 "first_launch_congrats_text" = "Wyszukuj i nawiguj w każdym zakątku świata — offline i bezpłatnie.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Dodawaj nowe miejsca do mapy i edytuj już istniejące bezpośrednio z poziomu aplikacji.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME korzysta z danych społeczności OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps korzysta z danych społeczności OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Nigdy się już nie zgubisz";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planuj optymalne trasy samochodowe i piesze.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — uzyskaj dostęp do map świata bez łączenia się z Internetem";
+"onboarding_offline_maps_title" = "OMaps — uzyskaj dostęp do map świata bez łączenia się z Internetem";
 
 "onboarding_offline_maps_message" = "Pobierz jednorazowo mapy dla wybranego obszaru, aby korzystać z nawigacji i wyszukiwania bez połączenia sieciowego.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Abyś mógł korzystać z nawigacji i innych funkcji, musimy uzyskać dostęp do twojej geolokalizacji.";
 
-"onboarding_permissions_title" = "Zezwól MAPS.ME na dostęp do pamięci masowej i lokalizacji";
+"onboarding_permissions_title" = "Zezwól OMaps na dostęp do pamięci masowej i lokalizacji";
 
 "onboarding_permissions_message" = "Aby pobierać mapy, sprawdzać miejsca i ruch drogowy w twojej okolicy i móc korzystać z nawigacji.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Aby pobrać, potrzebujesz więcej miejsca. Usuń niepotrzebne dane.";
 
-"editor_sharing_title" = "Dokonałem poprawek map na MAPS.ME";
+"editor_sharing_title" = "Dokonałem poprawek map na OMaps";
 
 "editor_comment_will_be_sent" = "Prześlemy Twoje komentarze kartografom.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Szczegółowy komentarz";
 
-"editor_detailed_description" = "Twoje sugestie zmian zostaną wysłane do społeczności OpenStreetMap. Opisz szczegóły, których nie można edytować w MAPS.ME.";
+"editor_detailed_description" = "Twoje sugestie zmian zostaną wysłane do społeczności OpenStreetMap. Opisz szczegóły, których nie można edytować w OMaps.";
 
 "editor_more_about_osm" = "Więcej o OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Zaktualizowaliśmy edytor map";
 
-"whatsnew_update_editor_message" = "Użytkownicy MAPS.ME dokonali 200 000 zmian w mapach. Wspólnie tworzymy najbardziej szczegółowe mapy na świecie. Przyłącz się do nas!";
+"whatsnew_update_editor_message" = "Użytkownicy OMaps dokonali 200 000 zmian w mapach. Wspólnie tworzymy najbardziej szczegółowe mapy na świecie. Przyłącz się do nas!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Aby korzystać z edytora map, zaktualizuj wszystkie mapy.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Kontynuuj";
 
-"recent_track_background_dialog_message" = "MAPS.ME używa w tle geolokalizacji w celu rejestrowania niedawno przebytej trasy.";
+"recent_track_background_dialog_message" = "OMaps używa w tle geolokalizacji w celu rejestrowania niedawno przebytej trasy.";
 
 "whatsnew_car_navigation_header" = "Przyjazna użytkownikowi nawigacja dla pojazdów";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Nawigacja rowerowa (wersja beta)";
 
-"whatsnew_cycle_navigation_message" = "Testujemy nawigację rowerową na nowy sezon. Wypróbuj swoją ulubioną trasę z MAPS.ME i napisz nam, co myślisz o naszej nawigacji.";
+"whatsnew_cycle_navigation_message" = "Testujemy nawigację rowerową na nowy sezon. Wypróbuj swoją ulubioną trasę z OMaps i napisz nam, co myślisz o naszej nawigacji.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Oceń w Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Powiadom znajomego";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Cześć! Zainstaluj MAPS.ME!";
+"tell_friends_text" = "Cześć! Zainstaluj OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME to niezbędna aplikacja do podróży działająca w trybie offline. MAPS.ME opiera się o dane OpenStreetMap oraz umożliwia ich edycję.";
+"about_description" = "OMaps to niezbędna aplikacja do podróży działająca w trybie offline. OMaps opiera się o dane OpenStreetMap oraz umożliwia ich edycję.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Otwórz";
 
-"whatsnew_uber_header" = "MAPS.ME i Uber";
+"whatsnew_uber_header" = "OMaps i Uber";
 
 "whatsnew_uber_message" = "Zamów taksówkę Uber bezpośrednio z aplikacji!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Powiększ rozmiar czcionki na mapie";
 
-"traffic_update_app" = "Zaktualizuj MAPS.ME";
+"traffic_update_app" = "Zaktualizuj OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Aby wyświetlić dane o ruchu, należy zaktualizować aplikację.";
@@ -1943,7 +1943,7 @@
 
 "onboarding_storage_permissions_title" = "Udziel dostępu";
 
-"onboarding_storage_permissions_message" = "Zmień ustawienia uprawnień w urządzeniu. Do korzystania z MAPS.ME wymagany jest dostęp do pamięci masowej.";
+"onboarding_storage_permissions_message" = "Zmień ustawienia uprawnień w urządzeniu. Do korzystania z OMaps wymagany jest dostęp do pamięci masowej.";
 
 "button_exit" = "Wyjdź";
 
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problem z dostępem do pamięci masowej";
 
-"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@maps.me";
+"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@omaps.app";
 
 "setting_emulate_bad_storage" = "Emuluj wadliwą pamięć masową";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Akceptuję <a href=\"%s\">Terms of Use</a>";
 
-"sign_agree_news_gdpr" = "Chcę otrzymywać aktualności na temat produktów MAPS.ME";
+"sign_agree_news_gdpr" = "Chcę otrzymywać aktualności na temat produktów OMaps";
 
 "whats_new_localbiz_title" = "Mały biznes wymaga uwagi";
 
-"whats_new_localbiz_message" = "To lokalne kawiarnie, przytulne hotele i sklepy sprawiają, że nasze podróże są niezapomniane. Zoptymalizujemy Twoją stronę w MAPS.ME, aby się wyróżniała.";
+"whats_new_localbiz_message" = "To lokalne kawiarnie, przytulne hotele i sklepy sprawiają, że nasze podróże są niezapomniane. Zoptymalizujemy Twoją stronę w OMaps, aby się wyróżniała.";
 
 "whats_new_order_button" = "Zostaw żądanie";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Pobierz nowe miejsca";
 
-"cached_bookmarks_placeholder_subtitle" = "Naciśnij przycisk, aby pobrać tysiące interesujących miejsc i tras utworzonych przez użytkowników MAPS.ME. Wymagane jest połączenie internetowe.";
+"cached_bookmarks_placeholder_subtitle" = "Naciśnij przycisk, aby pobrać tysiące interesujących miejsc i tras utworzonych przez użytkowników OMaps. Wymagane jest połączenie internetowe.";
 
 "downloader_download_routers" = "Pobierz zakładki";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Raport o błędzie";
 
-"opt_out_fabric_description" = "Możemy używać Twoich danych do usprawnienia działania MAPS.ME. Zmiany zostaną zastosowane po ponownym uruchomieniu aplikacji.";
+"opt_out_fabric_description" = "Możemy używać Twoich danych do usprawnienia działania OMaps. Zmiany zostaną zastosowane po ponownym uruchomieniu aplikacji.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Zakładki nie zostały pobrane";
 
-"whats_new_bookmarks_catalog_title" = "W aplikacji MAPS.ME jest teraz dostępny katalog tras";
+"whats_new_bookmarks_catalog_title" = "W aplikacji OMaps jest teraz dostępny katalog tras";
 
 "whats_new_bookmarks_catalog_message" = "Setki szczegółowych map całego świata: dokąd pójść, co zobaczyć, gdzie zjeść.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Wyłączyć reklamę";
 
-"remove_ads_title" = "Wyłącz wszystkie reklamy i wspieraj MAPS.ME";
+"remove_ads_title" = "Wyłącz wszystkie reklamy i wspieraj OMaps";
 
 "paybtn_title" = "Zapłacić %s/rok";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Inne opcje";
 
-"why_support" = "Po co wspierać MAPS.ME?";
+"why_support" = "Po co wspierać OMaps?";
 
 "options_dropdown_item1" = "%s/miesiąc (oszczędzaj %s/rok)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Wyłączymy wszystkie reklamy dla Ciebie";
 
-"why_support_item2" = "Pomagasz nam udoskonalać MAPS.ME";
+"why_support_item2" = "Pomagasz nam udoskonalać OMaps";
 
 "why_support_item3" = "Pomagasz nam udoskonalać mapy OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Serwer jest niedostępny";
 
-"server_unavailable_message" = "Zakup zostanie sfinalizowany później. Jeśli błąd wystąpi ponownie, prosimy o kontakt z support@maps.me.";
+"server_unavailable_message" = "Zakup zostanie sfinalizowany później. Jeśli błąd wystąpi ponownie, prosimy o kontakt z support@omaps.app.";
 
 "offline_fiters_check_in" = "Połącz się z іnternetem aby wybrać datę zameldowania i wymeldowania.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Ten przewodnik zostanie pobrany do publicznego katalogu MAPS.ME i będzie dostępny dla innych użytkowników";
+"upload_and_publish_desc" = "Ten przewodnik zostanie pobrany do publicznego katalogu OMaps i będzie dostępny dla innych użytkowników";
 
 "upload_and_publish" = "Prześlij i udostępnij";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Zostaw recenzję i pomóż podróżującym!";
 
-"share_bookmarks_email_body_link" = "Witaj!\n\nTwoje znaczniki można pobrać, używając link: %s. Otwórz listę, używając MAPS.ME i ciesz się podrożą!\n\nPobierz aplikację: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Witaj!\n\nTwoje znaczniki można pobrać, używając link: %s. Otwórz listę, używając OMaps i ciesz się podrożą!\n\nPobierz aplikację: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Nawigator powiadomi Cibie o kamerach, gdy przekrocz prędkość na %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Chce się podzielić wrażeniami? To proste!";
 
-"whats_new_ugc_routes_subtitle" = "Zapisuj zapamiętane miejsca, twórz trasy ze znaczników i udostępniaj je wszystkim w katalogu MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Zapisuj zapamiętane miejsca, twórz trasy ze znaczników i udostępniaj je wszystkim w katalogu OMaps.";
 
 "whats_new_webeditor_title" = "Przeistaczaj trasy w historii";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Twoja trasa musi zawierać co najmniej 3 znaczniki, wtedy będziesz mogli wysłać ją do katalogu publicznego";
 
-"bookmark_public_upload_alert_title" = "Jesteś zaledwie o kilka kroków od załadowania trasy do katalogu MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Jesteś zaledwie o kilka kroków od załadowania trasy do katalogu OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Upewnij się, że trasa zawiera nazwę i opis, a wszystkie znaczniki zawierają informacje o miejscach. Dzięki temu, użytkownicy znajdą trasę i będą mogli z niej skorzystać podczas podróży.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maksymalna oszczędność energii";
 
-"enable_logging_warning_message" = "Ta opcja zostaje włączona do logowania działań w celach diagnostycznych. Pomaga to zespołowi zidentyfikować problemy z aplikacją. Włączaj opcję tylko na żądanie wsparcia technicznego MAPS.ME.";
+"enable_logging_warning_message" = "Ta opcja zostaje włączona do logowania działań w celach diagnostycznych. Pomaga to zespołowi zidentyfikować problemy z aplikacją. Włączaj opcję tylko na żądanie wsparcia technicznego OMaps.";
 
 "html_error_upload_message_try_again" = "Sprawdź dostęp do sieci i spróbuj ponownie";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Twój ID: %s.";
 
-"gdpr_request_window_message" = "Skopiuj jego i wyślij zapytanie pod adres support@maps.me";
+"gdpr_request_window_message" = "Skopiuj jego i wyślij zapytanie pod adres support@omaps.app";
 
 "gdpr_request_window_copy" = "Skopiuj ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Unikać przepraw promowych";
 
-"cached_guides_placeholder_subtitle" = "Gotowe przewodniki w MAPS.ME – to wybrane miejsca ze zdjęciami oraz opisami, które są wyświetlane na mapie i są dostępne w trybie offline.";
+"cached_guides_placeholder_subtitle" = "Gotowe przewodniki w OMaps – to wybrane miejsca ze zdjęciami oraz opisami, które są wyświetlane na mapie i są dostępne w trybie offline.";
 
 "guides_catalogue_title" = "Katalog przewodników";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Kuchnia uzbecka";
 
-"onboarding_welcome_title" = "Planuj i podróżuj z MAPS.ME";
+"onboarding_welcome_title" = "Planuj i podróżuj z OMaps";
 
 "onboarding_welcome_first_subtitle" = "Zapisuj ciekawe miejsca, rezerwuj hotele, buduj trasy offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Pobierz";
 
-"onboarding_bydeeplink_guide_title" = "Gotowe przewodniki w MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Gotowe przewodniki w OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Wybrane miejsca ze zdjęciami i opisami są wyświetlane na mapie i są dostępne w trybie offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Zarezerwowałeś hotel?";
 
-"popup_booking_download_guides_message" = "Zaplanuj trasę, korzystając z gotowych przewodników MAPS.ME";
+"popup_booking_download_guides_message" = "Zaplanuj trasę, korzystając z gotowych przewodników OMaps";
 
 "popup_mwm_download_guides_title" = "Przewodniki offline";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Zobacz";
 
-"gallery_pp_download_guides_offline_title" = "Zaplanuj swoje wakacje z MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Zaplanuj swoje wakacje z OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Nie przegap tego, co najważniejsze wraz z trasami od doświadczonych podróżników";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Po zatwierdzeniu płatności zostanie nią obciążone Twoje konto iTunes. Subskrypcja odnowi się automatycznie, chyba że opcja automatycznego odnawiania zostanie wyłączona co najmniej 24 godziny przed końcem bieżącego okresu rozliczeniowego. Twoje konto zostanie obciążone kwotą za odnowienie subskrypcji zgodnie z wybranym planem w przeciągu 24 godzin przed końcem bieżącego okresu rozliczeniowego. Automatycznym odnawianiem zarządzać można lub wyłączyć je w ustawieniach konta Apple ID w dowolnej chwili po dokonaniu zakupu.";
 
-"whatsnew_carplay_title" = "Nawigacja automatyczna MAPS.ME w CarPlay!";
+"whatsnew_carplay_title" = "Nawigacja automatyczna OMaps w CarPlay!";
 
 "whatsnew_carplay_message" = "Zakładki, wyszukiwanie, fotoradary i ustawienia objazdu — wszystko działa bez Internetu";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Info o kamerach";
 
-"download_map_carplay" = "Pobierz mapy do aplikacji MAPS.ME na swoje urządzenie";
+"download_map_carplay" = "Pobierz mapy do aplikacji OMaps na swoje urządzenie";
 
 "carplay_roundabout_exit" = "%s zjazd";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hura! Jesteś subskrybentem!";
 
-"popup_subscription_success_map_message" = "Teraz odkryj najlepsze atrakcje turystyczne w katalogu MAPS.ME";
+"popup_subscription_success_map_message" = "Teraz odkryj najlepsze atrakcje turystyczne w katalogu OMaps";
 
 "popup_subscription_success_map_start_button" = "Rozpocznij przeglądanie";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Rozpocznij";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Uniwersalny pomocnik w podróżach";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Otwórz katalog";
 
-"new_onboarding_step5.2_message" = "Subskrypcja katalogu przewodników turystycznych MAPS.ME jest opłacalna. Uzyskaj pełny dostęp do tras spacerowych po mieście i wypoczynku aktywnego!";
+"new_onboarding_step5.2_message" = "Subskrypcja katalogu przewodników turystycznych OMaps jest opłacalna. Uzyskaj pełny dostęp do tras spacerowych po mieście i wypoczynku aktywnego!";
 
 "new_onboarding_step5.2_button" = "Sprawdź warunki";
 
-"new_onboarding_step5.3_message" = "Pobierz i oceń trasy do zwiedzania i aktywnego wypoczynku poza miastem z bezpłatnym doborem MAPS.ME!";
+"new_onboarding_step5.3_message" = "Pobierz i oceń trasy do zwiedzania i aktywnego wypoczynku poza miastem z bezpłatnym doborem OMaps!";
 
 "new_onboarding_step5.3_button" = "Darmowe pobieranie";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Trasy z Outdooractive do zimowych i letnich wakacji czekają w katalogu!";
 
-"whatsnew_guides_galleries_title" = "Zaplanuj swoją nadchodzącą podróż z MAPS.ME";
+"whatsnew_guides_galleries_title" = "Zaplanuj swoją nadchodzącą podróż z OMaps";
 
 "whatsnew_guides_galleries_message" = "Teraz możesz znaleźć polecane przewodniki na stronach popularnych miast turystycznych i zabytków";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Wysokości";
 
-"tips_map_layers_title_countour" = "Linie wysokości w trybie offline w MAPS.ME!";
+"tips_map_layers_title_countour" = "Linie wysokości w trybie offline w OMaps!";
 
 "tips_map_layers_message_countour" = "Linie wysokości pomogą zaplanować podróż i nie zgubić się w terenie";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict
index 06ccabc483..e95b853300 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.stringsdict
@@ -139,4 +139,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 2462527c8f..6547cf4489 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Instale agora";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Obrigado por usar MAPS.ME! Gosta do aplicativo? Conte para seus amigos! Será a melhor forma de nos agradecer.";
+"share_on_facebook_text" = "Obrigado por usar OMaps! Gosta do aplicativo? Conte para seus amigos! Será a melhor forma de nos agradecer.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Tente de novo";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Sobre o MAPS.ME";
+"about_menu_title" = "Sobre o OMaps";
 
 "downloading_touch_to_cancel" = "A descarregar %d%%, toque para cancelar";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "Não está disponível um cartão SD/armazenamento USB com os mapas descarregados";
 
-"disconnect_usb_cable" = "Por favor desligue o cabo USB ou introduza um cartão de memória para utilizar MAPS.ME";
+"disconnect_usb_cable" = "Por favor desligue o cabo USB ou introduza um cartão de memória para utilizar OMaps";
 
 "not_enough_free_space_on_sdcard" = "Por favor liberte primeiro algum espaço no cartão SD/armazenamento USB para utilizar a app";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Atualização disponível para estes mapas:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Não precisa mais do MAPS.ME Lite, podendo portanto desinstalá-la.";
+"suggest_uninstall_lite" = "Não precisa mais do OMaps Lite, podendo portanto desinstalá-la.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ descarregados com sucesso";
@@ -249,10 +249,10 @@
 "set" = "Conjunto";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Ainda não tem marcadores.\nToque em qualquer lugar no mapa para adicionar um marcador.\nOs marcadores de outras fontes também podem ser importados e exibidos na aplicação MAPS.ME. Abrir ficheiro KML/KMZ com pinos guardados a partir do mail, Dropbox ou ligação web.";
+"bookmarks_usage_hint" = "Ainda não tem marcadores.\nToque em qualquer lugar no mapa para adicionar um marcador.\nOs marcadores de outras fontes também podem ser importados e exibidos na aplicação OMaps. Abrir ficheiro KML/KMZ com pinos guardados a partir do mail, Dropbox ou ligação web.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Os marcadores de outras fontes podem ser importados e exibidos na aplicação MAPS.ME. Abrir ficheiro KML/KMZ com pinos guardados a partir do mail, Dropbox ou ligação web.";
+"bookmarks_usage_hint_import_only" = "Os marcadores de outras fontes podem ser importados e exibidos na aplicação OMaps. Abrir ficheiro KML/KMZ com pinos guardados a partir do mail, Dropbox ou ligação web.";
 
 /* Settings button in system menu */
 "settings" = "Configurações";
@@ -354,9 +354,9 @@
 "share_by_email" = "Partilhar por email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Os favoritos do MAPS.ME foram partilhados consigo";
+"share_bookmarks_email_subject" = "Os favoritos do OMaps foram partilhados consigo";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "A carregar favoritos";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "A descarga do país está atualmente em progresso.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Esperamos que esteja a disfrutar da utilização do MAPS.ME! Se assim for, por favor classifique ou dê a sua opinião sobre a app na App Store. Vai demorar menos de um minuto mas pode mesmo ajudar-nos. Obrigado pelo seu apoio!";
+"appStore_message" = "Esperamos que esteja a disfrutar da utilização do OMaps! Se assim for, por favor classifique ou dê a sua opinião sobre a app na App Store. Vai demorar menos de um minuto mas pode mesmo ajudar-nos. Obrigado pelo seu apoio!";
 
 /* No, thanks */
 "no_thanks" = "Não, obrigado";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Veja o meu marcador no mapa do MAPS.ME. Abra a hiperligação: %1$@ ou %2$@";
+"bookmark_share_sms" = "Veja o meu marcador no mapa do OMaps. Abra a hiperligação: %1$@ ou %2$@";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
 "my_position_share_sms" = "Veja onde estou agora. Abra a hiperligação: %1$@ ou %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Veja o meu marcador no mapa do MAPS.ME.";
+"bookmark_share_email_subject" = "Veja o meu marcador no mapa do OMaps.";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Veja a minha localização atual no mapa MAPS.ME!";
+"my_position_share_email_subject" = "Veja a minha localização atual no mapa OMaps!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Olá,\n\nEstou aqui agora: %1$@. Clique nesta ligação %2$@ ou nesta %3$@ para ver o local no mapa.\n\nObrigado.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Descarregue o mapa do local onde estiver";
 
 /* text of notification */
-"pro_version_is_free_today" = "A versão completa do MAPS.ME é hoje grátis! Descarregue e conte aos seus amigos.";
+"pro_version_is_free_today" = "A versão completa do OMaps é hoje grátis! Descarregue e conte aos seus amigos.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Estamos a transferir os seus mapas descarregados da MAPS.ME Lite para a MAPS.ME. Isto pode demorar alguns minutos.";
+"move_lite_maps_to_pro" = "Estamos a transferir os seus mapas descarregados da OMaps Lite para a OMaps. Isto pode demorar alguns minutos.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Os seus mapas descarregados estão transferidos com sucesso para a MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Os seus mapas descarregados estão transferidos com sucesso para a OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Falhou a transferência dos seus mapas. Por favor, elimine a MAPS.ME Lite e descarregue os mapas novamente.";
+"move_lite_maps_to_pro_failed" = "Falhou a transferência dos seus mapas. Por favor, elimine a OMaps Lite e descarregue os mapas novamente.";
 
 /* Text in menu */
 "settings_and_more" = "Definições e Mais";
@@ -600,7 +600,7 @@
 "website" = "Site";
 
 /* Text in menu */
-"maps_me_community" = "Comunidade MAPS.ME";
+"maps_me_community" = "Comunidade OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Gostar no Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Relatar um problema";
 
 /* Email subject */
-"subscribe_me_subject" = "Por favor inscrevam-me na newsletter da MAPS.ME";
+"subscribe_me_subject" = "Por favor inscrevam-me na newsletter da OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Quero ser o(a) primeiro(a) a saber sobre as últimas notícias, actualizações e promoções. Posso cancelar a minha subscrição a qualquer altura.";
 
 /* About text */
-"about_text" = "A MAPS.ME oferece os mapas offline mais rápidos de todas as cidades, de todos os países do mundo. Viaje com plena confiança: onde estiver, a MAPS.ME ajuda a localizar-se no mapa, a encontrar o restaurante, hotel, banco, posto de gasolina, etc. mais próximos. Não requer ligação à Internet.\n\nEstamos sempre a trabalhar em novas funcionalidades e gostaríamos de saber a sua opinião sobre como poderíamos melhorar a MAPS.ME. Se tiver algum problema com a app, não hesite em contactar-nos em support@maps.me. Respondemos a cada pedido!\n\nGosta da MAPS.ME e quer apoiar-nos? Há algumas maneiras simples e absolutamente gratuitas:\n\n- publique um comentário no seu App Market\n- faça \"gosto\" na nossa página do Facebook http://www.facebook.com/mapswithme\n- ou fale da MAPS.ME à sua mãe, amigos e colegas :)\n\nObrigado por estar connosco. Agradecemos imenso o seu apoio!\n\nP. S. Tiramos os dados do OpenStreetMap, um projeto de mapeamento semelhante à Wikipedia, que permite aos utilizadores criarem e editarem mapas. Se vir que algo está em falta ou errado no mapa, pode corrigir diretamente os mapas em https://www.openstreetmap.org e as suas alterações irão aparecer na app MAPS.ME com o lançamento da próxima versão.";
+"about_text" = "A OMaps oferece os mapas offline mais rápidos de todas as cidades, de todos os países do mundo. Viaje com plena confiança: onde estiver, a OMaps ajuda a localizar-se no mapa, a encontrar o restaurante, hotel, banco, posto de gasolina, etc. mais próximos. Não requer ligação à Internet.\n\nEstamos sempre a trabalhar em novas funcionalidades e gostaríamos de saber a sua opinião sobre como poderíamos melhorar a OMaps. Se tiver algum problema com a app, não hesite em contactar-nos em support@omaps.app. Respondemos a cada pedido!\n\nGosta da OMaps e quer apoiar-nos? Há algumas maneiras simples e absolutamente gratuitas:\n\n- publique um comentário no seu App Market\n- faça \"gosto\" na nossa página do Facebook http://www.facebook.com/mapswithme\n- ou fale da OMaps à sua mãe, amigos e colegas :)\n\nObrigado por estar connosco. Agradecemos imenso o seu apoio!\n\nP. S. Tiramos os dados do OpenStreetMap, um projeto de mapeamento semelhante à Wikipedia, que permite aos utilizadores criarem e editarem mapas. Se vir que algo está em falta ou errado no mapa, pode corrigir diretamente os mapas em https://www.openstreetmap.org e as suas alterações irão aparecer na app OMaps com o lançamento da próxima versão.";
 
 /* Alert text */
 "email_error_body" = "O cliente de email não está configurado. Por favor, configure-o ou utilize qualquer outro modo para nos contactar através de %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Por favor, atualize o mapa para criar uma rota.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "A nova versão do MAPS.ME permite criar rotas a partir da sua posição atual até um ponto de destino. Por favor, atualize o maps para utilizar esta funcionalidade.";
+"routing_update_maps" = "A nova versão do OMaps permite criar rotas a partir da sua posição atual até um ponto de destino. Por favor, atualize o maps para utilizar esta funcionalidade.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Atualizar tudo";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Encontrado";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Ao criar rotas no app MAPS.ME, por favor, lembre-se do seguinte:\n\n  - As rotas sugeridas podem apenas ser consideradas como recomendações.\n - As condições da estrada, regras de trânsito e sinais têm maior prioridade do que os conselhos de navegação.\n - O mapa poderá estar errado, ou desatualizado, e as rotas poderão não ser criadas da melhor forma possível.\n\n  Circule em segurança nas estradas e cuide do seu bem estar!";
+"routing_disclaimer" = "Ao criar rotas no app OMaps, por favor, lembre-se do seguinte:\n\n  - As rotas sugeridas podem apenas ser consideradas como recomendações.\n - As condições da estrada, regras de trânsito e sinais têm maior prioridade do que os conselhos de navegação.\n - O mapa poderá estar errado, ou desatualizado, e as rotas poderão não ser criadas da melhor forma possível.\n\n  Circule em segurança nas estradas e cuide do seu bem estar!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Desatualizado";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Não foi encontrado um trajeto entre a origem e o destino selecionados. Por favor selecione um ponto de partida ou de chegada diferente.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Ocorreu um erro interno. Por favor experimente apagar o mapa e depois descarregue-o novamente. Se o problema persistir, contacte-nos através de support@maps.me.";
+"routing_failed_internal_error" = "Ocorreu um erro interno. Por favor experimente apagar o mapa e depois descarregue-o novamente. Se o problema persistir, contacte-nos através de support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Descarregar Mapa + Roteamento";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Acabei de avaliar o seu app";
 
 /* Text for rating dialog */
-"rating_user_since" = "Sou usuário do MAPS.ME desde %@";
+"rating_user_since" = "Sou usuário do OMaps desde %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Você gosta de MAPS.ME?";
+"rating_do_like_maps" = "Você gosta de OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Toque em alguma estrela para classificar o nosso app.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Obter mapa";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Descarregue o mapa e os dados de itinerário atualizados para acessar todos os recursos do MAPS.ME.";
+"routing_download_map_and_routing" = "Descarregue o mapa e os dados de itinerário atualizados para acessar todos os recursos do OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Obter dados de itinerário";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Gosta do aplicativo?";
 
-"rate_alert_default_message" = "Obrigado por usar MAPS.ME. Por favor, classifique o aplicativo. Seu feedback nos ajuda a melhorar.";
+"rate_alert_default_message" = "Obrigado por usar OMaps. Por favor, classifique o aplicativo. Seu feedback nos ajuda a melhorar.";
 
 "rate_alert_five_star_message" = "Viva! Também amamos você!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Lugar em duplicado";
 
-"first_launch_congrats_title" = "MAPS.ME está pronto para utilização";
+"first_launch_congrats_title" = "OMaps está pronto para utilização";
 
 "first_launch_congrats_text" = "Busque qualquer lugar do mundo e navegue offline, gratuitamente.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Adicione novos lugares ao mapa e edite os já existentes diretamente a partir do app.";
 
-"whatsnew_editor_message_2" = "* A MAPS.ME utiliza dados da comunidade OpenStreetMap.";
+"whatsnew_editor_message_2" = "* A OMaps utiliza dados da comunidade OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Nunca mais voltará a perder-se";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planeie itinerários ideais de automóvel e a pé.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — acesse os mapas do mundo inteiro sem internet";
+"onboarding_offline_maps_title" = "OMaps — acesse os mapas do mundo inteiro sem internet";
 
 "onboarding_offline_maps_message" = "Descarregue uma vez os mapas para a área desejada e utilize as funções de navegação e de pesquisa sem uma ligação à Internet.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Para utilizar a navegação e outros recursos, precisamos de aceder à sua localização geográfica.";
 
-"onboarding_permissions_title" = "Permitir que o MAPS.ME tenha acesso ao armazenamento e localização";
+"onboarding_permissions_title" = "Permitir que o OMaps tenha acesso ao armazenamento e localização";
 
 "onboarding_permissions_message" = "Para que possa transferir mapas, ver locais e o trânsito perto e si e utilizar a navegação.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Para descarregar, é necessário mais espaço. Por favor, elimine os dados desnecessários.";
 
-"editor_sharing_title" = "Melhorei os mapas do MAPS.ME";
+"editor_sharing_title" = "Melhorei os mapas do OMaps";
 
 "editor_comment_will_be_sent" = "Encaminharemos o seu comentário aos cartógrafos.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Comentário detalhado";
 
-"editor_detailed_description" = "As suas alterações sugeridas irão ser enviadas para a comunidade OpenStreetMap. Descreva os dados que não podem ser editados no MAPS.ME";
+"editor_detailed_description" = "As suas alterações sugeridas irão ser enviadas para a comunidade OpenStreetMap. Descreva os dados que não podem ser editados no OMaps";
 
 "editor_more_about_osm" = "Mais sobre o OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Atualizámos o editor do mapa";
 
-"whatsnew_update_editor_message" = "Os utilizadores do MAPS.ME fizeram 200 000 alterações no mapa. Juntos, estamos a fazer os mapas mais detalhados do mundo. Junte-se a nós!";
+"whatsnew_update_editor_message" = "Os utilizadores do OMaps fizeram 200 000 alterações no mapa. Juntos, estamos a fazer os mapas mais detalhados do mundo. Junte-se a nós!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Atualize todos os mapas para utilizar o Editor de Mapa.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continuar";
 
-"recent_track_background_dialog_message" = "O MAPS.ME usa sua localização geográfica em segundo plano para registrar sua rota recente.";
+"recent_track_background_dialog_message" = "O OMaps usa sua localização geográfica em segundo plano para registrar sua rota recente.";
 
 "whatsnew_car_navigation_header" = "Navegação de veículos de fácil utilização";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navegação para bicicleta (versão beta)";
 
-"whatsnew_cycle_navigation_message" = "Estamos a testar a navegação para bicicleta para a nova temporada. Experimente o seu trilho preferido em bicicleta com a MAPS.ME e partilhe a sua opinião connosco.";
+"whatsnew_cycle_navigation_message" = "Estamos a testar a navegação para bicicleta para a nova temporada. Experimente o seu trilho preferido em bicicleta com a OMaps e partilhe a sua opinião connosco.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Classificar em Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Indique a um amigo";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Olá! Instale o MAPS.ME!";
+"tell_friends_text" = "Olá! Instale o OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "O MAPS.ME é uma aplicação offline essencial para viajar. O MAPS.ME baseia-se nos dados do OpenStreetMap e permite editá-los.";
+"about_description" = "O OMaps é uma aplicação offline essencial para viajar. O OMaps baseia-se nos dados do OpenStreetMap e permite editá-los.";
 
 /* Text in menu */
 "blog" = "Blogue";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Abrir";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Chame um táxi Uber diretamente do aplicativo!";
 
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Conceder acesso";
 
-"onboarding_storage_permissions_message" = "Alterar configurações de permissões no seu dispositivo. Necessário acesso ao armazenamento para utilizar o MAPS.ME.";
+"onboarding_storage_permissions_message" = "Alterar configurações de permissões no seu dispositivo. Necessário acesso ao armazenamento para utilizar o OMaps.";
 
 "button_exit" = "Sair";
 
-"onboarding_detail_permissions_title" = "O MAPS.ME precisa de aceder a";
+"onboarding_detail_permissions_title" = "O OMaps precisa de aceder a";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Armazenamento";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problema de acesso ao armazenamento";
 
-"dialog_error_storage_message" = "Armazenamento externo não disponível. Provavelmente porque o Cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e entre em contacto conosco através do email support@maps.me";
+"dialog_error_storage_message" = "Armazenamento externo não disponível. Provavelmente porque o Cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e entre em contacto conosco através do email support@omaps.app";
 
 "setting_emulate_bad_storage" = "Emular o mau armazenamento";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Eu concordo com os <a href=\"%s\">Termos de Uso</a>";
 
-"sign_agree_news_gdpr" = "Concordo em receber as últimas novidades sobre os produtos MAPS.ME";
+"sign_agree_news_gdpr" = "Concordo em receber as últimas novidades sobre os produtos OMaps";
 
 "whats_new_localbiz_title" = "Pequenos negócios necessitam de atenção";
 
-"whats_new_localbiz_message" = "São os café locais, hostels acolhedores e lojas que tornam nossas viagens inesquecíveis. Iremos otimizar sua página no MAPS.ME para que ela ganhe destaque.";
+"whats_new_localbiz_message" = "São os café locais, hostels acolhedores e lojas que tornam nossas viagens inesquecíveis. Iremos otimizar sua página no OMaps para que ela ganhe destaque.";
 
 "whats_new_order_button" = "Deixe seu pedido";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Baixar novos lugares";
 
-"cached_bookmarks_placeholder_subtitle" = "Aperte o botão para baixar milhares de lugares e rotas interessantes criados pelos usuários de MAPS.ME. Você precisará de conexão com a internet.";
+"cached_bookmarks_placeholder_subtitle" = "Aperte o botão para baixar milhares de lugares e rotas interessantes criados pelos usuários de OMaps. Você precisará de conexão com a internet.";
 
 "downloader_download_routers" = "Baixar favoritos";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Relatório de erros";
 
-"opt_out_fabric_description" = "Podemos utilizar seus dados para melhorar a experiência no MAPS.ME. As mudanças entrarão em vigor após você reiniciar o aplicativo.";
+"opt_out_fabric_description" = "Podemos utilizar seus dados para melhorar a experiência no OMaps. As mudanças entrarão em vigor após você reiniciar o aplicativo.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Favoritos não foram baixados";
 
-"whats_new_bookmarks_catalog_title" = "Agora, o MAPS.ME tem um catálogo de rotas";
+"whats_new_bookmarks_catalog_title" = "Agora, o OMaps tem um catálogo de rotas";
 
 "whats_new_bookmarks_catalog_message" = "Centenas de rotas detalhadas do mundo inteiro: onde ir, o que ver, onde comer.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Remover anúncios";
 
-"remove_ads_title" = "Remover todos os anúncios e apoie o MAPS.ME";
+"remove_ads_title" = "Remover todos os anúncios e apoie o OMaps";
 
 "paybtn_title" = "Pague %s/ano";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Mais opções";
 
-"why_support" = "Porquê apoiar o MAPS.ME?";
+"why_support" = "Porquê apoiar o OMaps?";
 
 "options_dropdown_item1" = "%s/mês (poupa %s/ano)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Iremos remover os anúncios para si";
 
-"why_support_item2" = "Ajude-nos a melhorar o MAPS.ME";
+"why_support_item2" = "Ajude-nos a melhorar o OMaps";
 
 "why_support_item3" = "Ajude-nos a melhorar mapas livres em OpenStreeMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "O servidor está indisponível";
 
-"server_unavailable_message" = "A compra será completada mais tarde. Se o error persistir, entre em contacto com support@maps.me.";
+"server_unavailable_message" = "A compra será completada mais tarde. Se o error persistir, entre em contacto com support@omaps.app.";
 
 "offline_fiters_check_in" = "Ligue-se à іnternet para filtrar os hotéis por datas.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Esse guia será carregado para catalogo público de MAPS.ME e estará disponível para outros usuários";
+"upload_and_publish_desc" = "Esse guia será carregado para catalogo público de OMaps e estará disponível para outros usuários";
 
 "upload_and_publish" = "Carregar e publicar";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Deixe um comentário e ajude os viajantes!";
 
-"share_bookmarks_email_body_link" = "Olá!\n\nSeus rótulos podem ser baixado aqui: %s. Abra a lista usando MAPS.ME e desfrute do passeio!\n\nBaixar aplicação: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Olá!\n\nSeus rótulos podem ser baixado aqui: %s. Abra a lista usando OMaps e desfrute do passeio!\n\nBaixar aplicação: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "O navegador irá notificá-lo sobre as câmeras quando o limite de velocidade for excedido em %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "É fácil compartilhar as impressões";
 
-"whats_new_ugc_routes_subtitle" = "Salve locais preferidos, crie percursos a partir de tags e compartilhe-os com todos no diretório de MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Salve locais preferidos, crie percursos a partir de tags e compartilhe-os com todos no diretório de OMaps.";
 
 "whats_new_webeditor_title" = "Transforma os percursos em história";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Seu percurso deve ter pelo menos 3 tags para carregá-lo no catálogo público";
 
-"bookmark_public_upload_alert_title" = "Está apenas em alguns passos de carregar seu percurso no catálogo MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Está apenas em alguns passos de carregar seu percurso no catálogo OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Verifique que o percurso tem nome e descrição e que todas as tags contenham informações sobre os locais. Graças a isso, os usuários poderão encontrar o percurso e usá-lo na viagem.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Máxima economia de energia";
 
-"enable_logging_warning_message" = "Esta opção é ativada para registro das ações para fins de diagnóstico. Isso permite que a equipe localiza problemas com aplicação. Ative opção apenas a pedido do suporte da MAPS.ME.";
+"enable_logging_warning_message" = "Esta opção é ativada para registro das ações para fins de diagnóstico. Isso permite que a equipe localiza problemas com aplicação. Ative opção apenas a pedido do suporte da OMaps.";
 
 "html_error_upload_message_try_again" = "Verifique o acesso à rede e volte a tentar";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Seu ID: %s.";
 
-"gdpr_request_window_message" = "Por favor, copia-lo e envie o pedido para support@maps.me";
+"gdpr_request_window_message" = "Por favor, copia-lo e envie o pedido para support@omaps.app";
 
 "gdpr_request_window_copy" = "Copiar ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Evitar ferryboat";
 
-"cached_guides_placeholder_subtitle" = "Guias prontos MAPS.ME são os locais selecionados com fotos e descrições que são exibidas no mapa e estão disponíveis offline.";
+"cached_guides_placeholder_subtitle" = "Guias prontos OMaps são os locais selecionados com fotos e descrições que são exibidas no mapa e estão disponíveis offline.";
 
 "guides_catalogue_title" = "Catálogo de guias";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Cozinha uzbeque";
 
-"onboarding_welcome_title" = "Planeje e viaje com a MAPS.ME";
+"onboarding_welcome_title" = "Planeje e viaje com a OMaps";
 
 "onboarding_welcome_first_subtitle" = "Salve lugares interessantes, reserve hotéis, crie percursos offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Baixar";
 
-"onboarding_bydeeplink_guide_title" = "Guias prontos em MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Guias prontos em OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Locais selecionados com fotos e descrições são exibidas no mapa e estão disponíveis offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Reservar hotel?";
 
-"popup_booking_download_guides_message" = "Planeja o seu percurso com guias prontas da MAPS.ME";
+"popup_booking_download_guides_message" = "Planeja o seu percurso com guias prontas da OMaps";
 
 "popup_mwm_download_guides_title" = "Guias off-line";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Ver";
 
-"gallery_pp_download_guides_offline_title" = "Planeja as suas férias com MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Planeja as suas férias com OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Não deixe escapar nada com os percursos dos viajantes experientes";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "O pagamento será cobrado na sua conta do iTunes na confirmação da compra. A subscrição será automaticamente renovada, exceto se a renovação automática for desativada, pelo menos, 24 horas antes do fim do período atual. A sua conta será cobrada de acordo com o seu plano de renovação no prazo de 24 horas antes do fim do período atual. Pode gerir ou desativar a renovação automática nas definições da sua conta de ID da Apple, a qualquer momento, após a sua compra.";
 
-"whatsnew_carplay_title" = "Autonavegação da MAPS.ME no CarPlay!";
+"whatsnew_carplay_title" = "Autonavegação da OMaps no CarPlay!";
 
 "whatsnew_carplay_message" = "Favoritos, pesquisa, câmaras de velocidade e configurações do desvio – tudo funciona sem a ligação a Internet";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Avisos de radar";
 
-"download_map_carplay" = "Baixar mapas de aplicação MAPS.ME para o seu dispositivo";
+"download_map_carplay" = "Baixar mapas de aplicação OMaps para o seu dispositivo";
 
 "carplay_roundabout_exit" = "%s saída";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Boa! Está subscrito!";
 
-"popup_subscription_success_map_message" = "Agora explore as melhores atrações turísticas no catálogo da MAPS.ME";
+"popup_subscription_success_map_message" = "Agora explore as melhores atrações turísticas no catálogo da OMaps";
 
 "popup_subscription_success_map_start_button" = "Ver";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Iniciar";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Assistente universal nas viagens";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Abrir o catálogo";
 
-"new_onboarding_step5.2_message" = "A subscrição para catálogo de guias no MAPS.ME tem vantagens. Obtenha o acesso total aos percursos para passeios urbanos e férias ativas!";
+"new_onboarding_step5.2_message" = "A subscrição para catálogo de guias no OMaps tem vantagens. Obtenha o acesso total aos percursos para passeios urbanos e férias ativas!";
 
 "new_onboarding_step5.2_button" = "Ver os termos";
 
-"new_onboarding_step5.3_message" = "Faça o download e avalie percursos para passeios pela cidade e recreação com uma seleção gratuita do MAPS.ME!";
+"new_onboarding_step5.3_message" = "Faça o download e avalie percursos para passeios pela cidade e recreação com uma seleção gratuita do OMaps!";
 
 "new_onboarding_step5.3_button" = "Download grátis";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Percursos do Outdooractive para férias de inverno e de verão esperem no catálogo!";
 
-"whatsnew_guides_galleries_title" = "Planeja a próxima viagem com MAPS.ME";
+"whatsnew_guides_galleries_title" = "Planeja a próxima viagem com OMaps";
 
 "whatsnew_guides_galleries_message" = "Agora pode encontrar guias recomendados nos cartões de cidades e pontos turísticos populares";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Alturas";
 
-"tips_map_layers_title_countour" = "Linhas de alturas offline na MAPS.ME!";
+"tips_map_layers_title_countour" = "Linhas de alturas offline na OMaps!";
 
 "tips_map_layers_message_countour" = "As linhas de alturas offline ajudarão planejar sua viagem à natureza e não se perder no local";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
index c056a411b4..902f527f5e 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 6434577c04..12dd7a9dd5 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Obțineți acum";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Vă mulțumim că folosiți MAPS.ME! Vă place aplicația? Spuneți-le prietenilor despre ea! Aceasta va fi cea mai mare mulțumire pentru noi.";
+"share_on_facebook_text" = "Vă mulțumim că folosiți OMaps! Vă place aplicația? Spuneți-le prietenilor despre ea! Aceasta va fi cea mai mare mulțumire pentru noi.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Încercați din nou";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Despre MAPS.ME";
+"about_menu_title" = "Despre OMaps";
 
 "downloading_touch_to_cancel" = "Se descarcă %d%%. Atingeți pentru a anula.";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "Cartela SD/dispozitivul de stocare USB cu hărțile descărcate nu este disponibil.";
 
-"disconnect_usb_cable" = "Vă rugăm să deconectați cablul USB sau să introduceți cartela de memorie pentru a putea utiliza MAPS.ME.";
+"disconnect_usb_cable" = "Vă rugăm să deconectați cablul USB sau să introduceți cartela de memorie pentru a putea utiliza OMaps.";
 
 "not_enough_free_space_on_sdcard" = "Vă rugăm să eliberați spațiu pe cartela SD/dispozitivul de stocare USB pentru a putea utiliza aplicația.";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Actualizări disponibile pentru aceste hărți:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Nu mai aveți nevoie de MAPS.ME Lite, îl puteți dezinstala.";
+"suggest_uninstall_lite" = "Nu mai aveți nevoie de OMaps Lite, îl puteți dezinstala.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@, descărcată cu succes";
@@ -249,10 +249,10 @@
 "set" = "Set";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Încă nu aveți niciun marcaj.\nAtingeți orice loc de pe hartă pentru a adăuga un marcaj.\nPot fi importate și afișate pe MAPS.ME și marcaje din alte surse. Deschideți fișierul KML/KMZ, cu marcajele salvate din email, Dropbox sau de la un link web.";
+"bookmarks_usage_hint" = "Încă nu aveți niciun marcaj.\nAtingeți orice loc de pe hartă pentru a adăuga un marcaj.\nPot fi importate și afișate pe OMaps și marcaje din alte surse. Deschideți fișierul KML/KMZ, cu marcajele salvate din email, Dropbox sau de la un link web.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Pot fi importate și afișate pe MAPS.ME și marcaje din alte surse. Deschideți fișierul KML/KMZ, cu marcajele salvate din email, Dropbox sau de la un link web.";
+"bookmarks_usage_hint_import_only" = "Pot fi importate și afișate pe OMaps și marcaje din alte surse. Deschideți fișierul KML/KMZ, cu marcajele salvate din email, Dropbox sau de la un link web.";
 
 /* Settings button in system menu */
 "settings" = "Setări";
@@ -354,9 +354,9 @@
 "share_by_email" = "Partajare prin email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Marcaje MAPS.ME partajate";
+"share_bookmarks_email_subject" = "Marcaje OMaps partajate";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Se încarcă marcajele";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Descărcarea hărților pentru țara dorită este în curs.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Sperăm că vă place MAPS.ME! Dacă da, vă rugăm să o votați sau să scrieți o recenzie în App Store. Durează mai puțin de un minut, dar pe noi ne ajută foarte mult. Vă mulțumim pentru susținere!";
+"appStore_message" = "Sperăm că vă place OMaps! Dacă da, vă rugăm să o votați sau să scrieți o recenzie în App Store. Durează mai puțin de un minut, dar pe noi ne ajută foarte mult. Vă mulțumim pentru susținere!";
 
 /* No, thanks */
 "no_thanks" = "Nu, mulțumesc";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hei, poți vedea care este poziția mea pe MAPS.ME! %1$@ sau %2$@ Nu ai instalate hărțile offline? Descarcă de aici: http://maps.me/get";
+"bookmark_share_sms" = "Hei, poți vedea care este poziția mea pe OMaps! %1$@ sau %2$@ Nu ai instalate hărțile offline? Descarcă de aici: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hei, îmi poți vedea poziția actuală pe MAPS.ME! %1$@ sau %2$@ Nu ai hărțile offline? Descarcă de aici: http://maps.me/get";
+"my_position_share_sms" = "Hei, îmi poți vedea poziția actuală pe OMaps! %1$@ sau %2$@ Nu ai hărțile offline? Descarcă de aici: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hei, poți vedea care este poziția mea pe harta MAPS.ME!";
+"bookmark_share_email_subject" = "Hei, poți vedea care este poziția mea pe harta OMaps!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hei, îmi poți vedea poziția actuală pe harta MAPS.ME!";
+"my_position_share_email_subject" = "Hei, îmi poți vedea poziția actuală pe harta OMaps!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Chào,\n\nTôi hiện đang ở đây: %1$@. Hãy nhấn vào liên kết này %2$@ hoặc liên kết này %3$@ để xem địa điểm trên bản đồ.\n\nCám ơn.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Descărcați harta locului în care vă aflați";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Transferăm hărțile dvs. descărcate din MAPS.ME Lite în MAPS.ME. Acest lucru poate dura câteva minute.";
+"move_lite_maps_to_pro" = "Transferăm hărțile dvs. descărcate din OMaps Lite în OMaps. Acest lucru poate dura câteva minute.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Hărțile dvs. descărcate sunt transferate cu succes către MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Hărțile dvs. descărcate sunt transferate cu succes către OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete MAPS.ME Lite and download the maps again.";
+"move_lite_maps_to_pro_failed" = "Your maps failed to transfer. Please delete OMaps Lite and download the maps again.";
 
 /* Text in menu */
 "settings_and_more" = "Setări și altele";
@@ -600,7 +600,7 @@
 "website" = "Site web";
 
 /* Text in menu */
-"maps_me_community" = "Comunitatea MAPS.ME";
+"maps_me_community" = "Comunitatea OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Apreciați-ne pe Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Raportați o eroare";
 
 /* Email subject */
-"subscribe_me_subject" = "Abonează-mă la buletinul informativ MAPS.ME.";
+"subscribe_me_subject" = "Abonează-mă la buletinul informativ OMaps.";
 
 /* Email body */
 "subscribe_me_body" = "Vreau să fiu primul care află despre cele mai recente actualizări și promoții. Îmi pot anula abonamentul în orice moment.";
 
 /* About text */
-"about_text" = "MAPS.ME oferă cele mai rapide hărți offline ale tuturor orașelor, tuturor țărilor din lume. Călătoriți cu încredere deplină: oriunde v-ați afla, MAPS.ME vă ajută să vă reperați poziția pe hartă, să găsiți cel mai apropiat restaurant sau hotel, cea mai apropiată bancă sau benzinărie etc. Nu necesită conexiune la internet.\n\nLucrăm încontinuu să introducem funcții noi și ne-ar face mare plăcere să ne comunicați cum credeți dvs. că am putea îmbunătăți MAPS.ME. Dacă aveți probleme cu aplicația, nu ezitați să ne contactați la adresa support@maps.me. Răspundem la fiecare solicitare!\n\nVă place MAPS.ME și doriți să ne susțineți? Iată câteva moduri simple și complet gratuite:\n- publicați o recenzie în magazinul de aplicații\n- apreciați-ne pagina de Facebook: http://www.facebook.com/mapswithme\n- sau spuneți și mamei, prietenilor și colegilor despre MAPS.ME. :)\n\nVă mulțumim că ne sunteți alături. Vă apreciem foarte mult susținerea!\n\nP.S. Noi preluăm datele din OpenStreetMap, un proiect de cartografiere similar Wikipediei, ce permite utilizatorilor să creeze și să editeze hărți. Dacă vedeți că ceva lipsește sau este greșit pe hartă, puteți corecta hărțile direct la adresa: https://www.openstreetmap.org, iar modificările dvs. vor apărea în aplicația MAPS.ME atunci când va fi lansată versiunea următoare.";
+"about_text" = "OMaps oferă cele mai rapide hărți offline ale tuturor orașelor, tuturor țărilor din lume. Călătoriți cu încredere deplină: oriunde v-ați afla, OMaps vă ajută să vă reperați poziția pe hartă, să găsiți cel mai apropiat restaurant sau hotel, cea mai apropiată bancă sau benzinărie etc. Nu necesită conexiune la internet.\n\nLucrăm încontinuu să introducem funcții noi și ne-ar face mare plăcere să ne comunicați cum credeți dvs. că am putea îmbunătăți OMaps. Dacă aveți probleme cu aplicația, nu ezitați să ne contactați la adresa support@omaps.app. Răspundem la fiecare solicitare!\n\nVă place OMaps și doriți să ne susțineți? Iată câteva moduri simple și complet gratuite:\n- publicați o recenzie în magazinul de aplicații\n- apreciați-ne pagina de Facebook: http://www.facebook.com/mapswithme\n- sau spuneți și mamei, prietenilor și colegilor despre OMaps. :)\n\nVă mulțumim că ne sunteți alături. Vă apreciem foarte mult susținerea!\n\nP.S. Noi preluăm datele din OpenStreetMap, un proiect de cartografiere similar Wikipediei, ce permite utilizatorilor să creeze și să editeze hărți. Dacă vedeți că ceva lipsește sau este greșit pe hartă, puteți corecta hărțile direct la adresa: https://www.openstreetmap.org, iar modificările dvs. vor apărea în aplicația OMaps atunci când va fi lansată versiunea următoare.";
 
 /* Alert text */
 "email_error_body" = "Nu a fost setat clientul de email. Vă rugăm să o configurați sau să utilizați un alt mod de a ne contacta la %@.";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Vă rugăm să actualizați harta pentru a crea o rută.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Noua versiune a MAPS.ME vă permite să creați rute din poziția dvs. actuală către un punct de destinație. Vă rugăm să actualizați harta pentru a utiliza această funcție.";
+"routing_update_maps" = "Noua versiune a OMaps vă permite să creați rute din poziția dvs. actuală către un punct de destinație. Vă rugăm să actualizați harta pentru a utiliza această funcție.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Actualizați toate";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "S-au găsit";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Atunci când creați rute în aplicația MAPS.ME, vă rugăm să nu uitați următoarele:\n\n- Rutele sugerate pot fi luate în considerare numai ca recomandări.\n- Harta poate fi incorectă sau neactualizată, iar rutele pot să nu fie create în cel mai bun mod posibil.\n- Condițiile de trafic, regulile și semnele de circulație au prioritate mai mare decât sugestiile de navigare.\n\nCirculați cu atenție și aveți grijă de dvs.!";
+"routing_disclaimer" = "Atunci când creați rute în aplicația OMaps, vă rugăm să nu uitați următoarele:\n\n- Rutele sugerate pot fi luate în considerare numai ca recomandări.\n- Harta poate fi incorectă sau neactualizată, iar rutele pot să nu fie create în cel mai bun mod posibil.\n- Condițiile de trafic, regulile și semnele de circulație au prioritate mai mare decât sugestiile de navigare.\n\nCirculați cu atenție și aveți grijă de dvs.!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Neactualizată";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Nu am găsit nicio rută între punctul de pornire și destinația selectată. Vă rugăm să alegeți un alt punct de pornire sau de destinație.";
 
 /* InternalError */
-"routing_failed_internal_error" = "A survenit o eroare internă. Vă rugăm să încercați să ștergeți și să descărcați harta din nou. Dacă problema persistă, vă rugăm să ne contactați la adresa support@maps.me.";
+"routing_failed_internal_error" = "A survenit o eroare internă. Vă rugăm să încercați să ștergeți și să descărcați harta din nou. Dacă problema persistă, vă rugăm să ne contactați la adresa support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Descărcare hartă + traseu";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Tocmai ți-am votat aplicația";
 
 /* Text for rating dialog */
-"rating_user_since" = "Sunt utilizator MAPS.ME din %@";
+"rating_user_since" = "Sunt utilizator OMaps din %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Îți place MAPS.ME?";
+"rating_do_like_maps" = "Îți place OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Apasă pe una dintre stele pentru a ne vota aplicația";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Descărcați harta";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Descărcați harta actualizată și informațiile pentru direcționare, pentru a beneficia de toate funcțiile MAPS.ME.";
+"routing_download_map_and_routing" = "Descărcați harta actualizată și informațiile pentru direcționare, pentru a beneficia de toate funcțiile OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Descărcați informațiile pentru direcționare";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Vă place aplicația?";
 
-"rate_alert_default_message" = "Vă mulțumim că folosiți MAPS.ME. Vă rugăm să dați o notă aplicației. Comentariile dvs. ne ajută să devenim mai buni.";
+"rate_alert_default_message" = "Vă mulțumim că folosiți OMaps. Vă rugăm să dați o notă aplicației. Comentariile dvs. ne ajută să devenim mai buni.";
 
 "rate_alert_five_star_message" = "Ura! Și noi vă iubim!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Locație dublată";
 
-"first_launch_congrats_title" = "MAPS.ME este gata pentru utilizare";
+"first_launch_congrats_title" = "OMaps este gata pentru utilizare";
 
 "first_launch_congrats_text" = "Căutați și navigați în regim offline oriunde în lume, în mod gratuit.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Adăugați locuri noi pe hartă și modificați-le pe cele existente direct din aplicație.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME folosește datele comunității OpenStreetMap community.";
+"whatsnew_editor_message_2" = "* OMaps folosește datele comunității OpenStreetMap community.";
 
 "onboarding_offline_navigation_title" = "Niciodată nu vă veți rătăci din nou";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planificați traseele optime cu mașina și cele pietonale.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — accesați hărți din întreaga lume fără conexiune Internet";
+"onboarding_offline_maps_title" = "OMaps — accesați hărți din întreaga lume fără conexiune Internet";
 
 "onboarding_offline_maps_message" = "Descărcați o dată hărțile pentru zona dorită, pentru a naviga și folosi funcțiile de căutare fără conexiune la Internet.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Ca să puteți naviga și folosi alte funcții, trebuie să accesăm poziționarea dvs. geografică.";
 
-"onboarding_permissions_title" = "Permiteți aplicației MAPS.ME accesul la spațiul de stocare și locație";
+"onboarding_permissions_title" = "Permiteți aplicației OMaps accesul la spațiul de stocare și locație";
 
 "onboarding_permissions_message" = "Puteți să descărcați hărți, să vedeți locurile și starea traficului din apropiere și să utilizați navigația.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Aveți nevoie de mai mult spațiu ca să descărcați. Vă rugăm să ștergeți toate informațiile inutile.";
 
-"editor_sharing_title" = "Am îmbunătățit hărțile MAPS.ME";
+"editor_sharing_title" = "Am îmbunătățit hărțile OMaps";
 
 "editor_comment_will_be_sent" = "Vom trimite comentariul dumneavoastră cartografilor.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Comentariu detaliat";
 
-"editor_detailed_description" = "Modificările sugerate vor trimise către comunitatea OpenStreetMap. Descrieți detalii ce nu pot fi adăugate în be the details which cannot be edited in MAPS.ME.";
+"editor_detailed_description" = "Modificările sugerate vor trimise către comunitatea OpenStreetMap. Descrieți detalii ce nu pot fi adăugate în be the details which cannot be edited in OMaps.";
 
 "editor_more_about_osm" = "Mai multe despre OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Am actualizat editorul de hărți";
 
-"whatsnew_update_editor_message" = "Utilizatorii MAPS.ME au făcut 200.000 de modificări de hărți. Împreună alcătuim cele mai detaliate hărți din lume. Alăturați-vă comunității!";
+"whatsnew_update_editor_message" = "Utilizatorii OMaps au făcut 200.000 de modificări de hărți. Împreună alcătuim cele mai detaliate hărți din lume. Alăturați-vă comunității!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Pentru a utiliza funcția editor hartă, vă rugăm să actualizați toate hărțile.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Continuare";
 
-"recent_track_background_dialog_message" = "MAPS.ME folosește în fundal geo-locația pentru a înregistra cel mai recent traseu urmat.";
+"recent_track_background_dialog_message" = "OMaps folosește în fundal geo-locația pentru a înregistra cel mai recent traseu urmat.";
 
 "whatsnew_car_navigation_header" = "Navigație pentru vehicule, ușor de folosit";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navigaţie pentru biciclete (versiune beta)";
 
-"whatsnew_cycle_navigation_message" = "În prezent testăm navigaţia pentru biciclete pentru noul sezon. Încercaţi traseul dvs. favorit cu MAPS.ME şi împărtăşiţi-ne opinia dvs.";
+"whatsnew_cycle_navigation_message" = "În prezent testăm navigaţia pentru biciclete pentru noul sezon. Încercaţi traseul dvs. favorit cu OMaps şi împărtăşiţi-ne opinia dvs.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Dați un calificativ pe Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Spuneți unui prieten";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Bună! Instalați MAPS.ME!";
+"tell_friends_text" = "Bună! Instalați OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME este o aplicație offline esențială când călătoriți. MAPS.ME utilizează datele OpenStreeMap și permite editarea acestora.";
+"about_description" = "OMaps este o aplicație offline esențială când călătoriți. OMaps utilizează datele OpenStreeMap și permite editarea acestora.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Deschideți";
 
-"whatsnew_uber_header" = "MAPS.ME și Uber";
+"whatsnew_uber_header" = "OMaps și Uber";
 
 "whatsnew_uber_message" = "Comandați un taxi Uber direct din aplicație!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Măriți dimensiunea fontului pe hartă";
 
-"traffic_update_app" = "Vă rugăm să actualizaţi MAPS.ME";
+"traffic_update_app" = "Vă rugăm să actualizaţi OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Pentru a afişa datele privind traficul, aplicația trebuie actualizată.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Acordați acces";
 
-"onboarding_storage_permissions_message" = "Schimbați setările permisiunilor de pe dispozitiv. Pentru a utiliza MAPS.ME este nevoie de acces la spațiul de stocare.";
+"onboarding_storage_permissions_message" = "Schimbați setările permisiunilor de pe dispozitiv. Pentru a utiliza OMaps este nevoie de acces la spațiul de stocare.";
 
 "button_exit" = "Ieșire";
 
-"onboarding_detail_permissions_title" = "MAPS.ME necesită acces la";
+"onboarding_detail_permissions_title" = "OMaps necesită acces la";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Stocare";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problemă de accesare spațiu de stocare";
 
-"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 read-only. Verifică și contactează-ne la support@maps.me";
+"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 read-only. Verifică și contactează-ne la support@omaps.app";
 
 "setting_emulate_bad_storage" = "Emulare stocare eronată";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Sunt de acord cu <a href=\"%s\">Termenii și condițiile</a>";
 
-"sign_agree_news_gdpr" = "Sunt de acord să primesc ultimele știri despre produsele MAPS.ME";
+"sign_agree_news_gdpr" = "Sunt de acord să primesc ultimele știri despre produsele OMaps";
 
 "whats_new_localbiz_title" = "Întreprinderile mici merită atenție";
 
-"whats_new_localbiz_message" = "Anume cafenelele, hostelele și magazinele locale fac călătoriile de neuitat. Optimizăm gratuit pagina dvs. de afaceri în MAPS.ME, astfel încât să o putem observa.";
+"whats_new_localbiz_message" = "Anume cafenelele, hostelele și magazinele locale fac călătoriile de neuitat. Optimizăm gratuit pagina dvs. de afaceri în OMaps, astfel încât să o putem observa.";
 
 "whats_new_order_button" = "Solicitați";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Încărcați locuri noi";
 
-"cached_bookmarks_placeholder_subtitle" = "Faceți clic pe butonul pentru a descărca mii de locuri interesante și rute create de utilizatori MAPS.ME. Veți avea nevoie de o conexiune la Internet.";
+"cached_bookmarks_placeholder_subtitle" = "Faceți clic pe butonul pentru a descărca mii de locuri interesante și rute create de utilizatori OMaps. Veți avea nevoie de o conexiune la Internet.";
 
 "downloader_download_routers" = "Descărcați tag-urile";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Rapoarte de eroare";
 
-"opt_out_fabric_description" = "Putem folosi datele dvs. pentru a dezvolta și de a îmbunătăți MAPS.ME. Modificările vor intra în vigoare după repornirea aplicației.";
+"opt_out_fabric_description" = "Putem folosi datele dvs. pentru a dezvolta și de a îmbunătăți OMaps. Modificările vor intra în vigoare după repornirea aplicației.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Tag-urile nu au fost încărcate";
 
-"whats_new_bookmarks_catalog_title" = "În MAPS.ME a apărut un director de rute";
+"whats_new_bookmarks_catalog_title" = "În OMaps a apărut un director de rute";
 
 "whats_new_bookmarks_catalog_message" = "Zeci de trasee detaliate din întreaga lume: unde să mergi, ce să vezi, în unde să mănânci.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Dezactivați reclama";
 
-"remove_ads_title" = "Dezactivați toată reclama și susțineți MAPS.ME";
+"remove_ads_title" = "Dezactivați toată reclama și susțineți OMaps";
 
 "paybtn_title" = "Achitați %s/an";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Alte variante";
 
-"why_support" = "Pentru ce să susțineți MAPS.ME?";
+"why_support" = "Pentru ce să susțineți OMaps?";
 
 "options_dropdown_item1" = "%s/lună (economia %s/an)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Vom dezactiva toate reclamele pentru dvs";
 
-"why_support_item2" = "Voi ne ajutați să îmbunătățim MAPS.ME";
+"why_support_item2" = "Voi ne ajutați să îmbunătățim OMaps";
 
 "why_support_item3" = "Voi ne ajutați să îmbunătățim hărțile OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Serverul nu este disponibil";
 
-"server_unavailable_message" = "Achiziția va fi finalizată mai târziu. Dacă eroarea se repetă, contactați support@maps.me.";
+"server_unavailable_message" = "Achiziția va fi finalizată mai târziu. Dacă eroarea se repetă, contactați support@omaps.app.";
 
 "offline_fiters_check_in" = "Conectați-vă la internet pentru a putea alege data sosirii și plecării.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Acest ghid va fi încărcat în catalogul public MAPS.ME și va fi disponibil altor utilizatori";
+"upload_and_publish_desc" = "Acest ghid va fi încărcat în catalogul public OMaps și va fi disponibil altor utilizatori";
 
 "upload_and_publish" = "Descărcați și publicați";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Lăsați comentariile dvs. și ajutați alți călători!";
 
-"share_bookmarks_email_body_link" = "Bună ziua!\n\nEtichetele dvs. le puteți descărca de pe linki-ul: %s. Deschideți lista cu ajutorul MAPS.ME și primiți plăcere de la călătorie!\n\nDescărcați aplicația: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Bună ziua!\n\nEtichetele dvs. le puteți descărca de pe linki-ul: %s. Deschideți lista cu ajutorul OMaps și primiți plăcere de la călătorie!\n\nDescărcați aplicația: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigatorul o să avertizeze despre camerele video în cazul depășirii limitei de viteză cu %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Este ușor să vă împărtășiți impresiile";
 
-"whats_new_ugc_routes_subtitle" = "Salvați locurile memorabile, creați rute cu ajutorul marcajelor și distribuiți-le tuturor în catalogul MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Salvați locurile memorabile, creați rute cu ajutorul marcajelor și distribuiți-le tuturor în catalogul OMaps.";
 
 "whats_new_webeditor_title" = "Transformați-vă rutele în povești";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Pe traseul dvs. trebuie să fie cel puțin 3 etichete, pentru a le încărca în catalogul public";
 
-"bookmark_public_upload_alert_title" = "Sunteți doar la câțiva pași de încărcarea traseului dvs. în catalogul MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Sunteți doar la câțiva pași de încărcarea traseului dvs. în catalogul OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Verificați ca traseul dvs. să aibă un nume și o descriere, iar etichetele să conțină informație despre locurile date. Datorită acestui fapt, utilizatorii vor găsi traseul și vor putea să se folosească de el în timpul călătoriei.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Economisire maximă a energiei";
 
-"enable_logging_warning_message" = "Aceasta opțiune se pornește pentru logarea acțiunii în scopul diagnosticării. Aceasta va ajuta echipei să găsească problemele legate de aplicație. Conectați opțiunea numai la solicitarea serviciului de suport MAPS.ME.";
+"enable_logging_warning_message" = "Aceasta opțiune se pornește pentru logarea acțiunii în scopul diagnosticării. Aceasta va ajuta echipei să găsească problemele legate de aplicație. Conectați opțiunea numai la solicitarea serviciului de suport OMaps.";
 
 "html_error_upload_message_try_again" = "Verificați accesul la rețea și încercați încă o dată";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "ID dvs.: %s.";
 
-"gdpr_request_window_message" = "Vă rugăm să copiați și să expediați cererea pe support@maps.me";
+"gdpr_request_window_message" = "Vă rugăm să copiați și să expediați cererea pe support@omaps.app";
 
 "gdpr_request_window_copy" = "Copierea ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "De evitat trecerile cu bac";
 
-"cached_guides_placeholder_subtitle" = "Ghiduri pregătire de MAPS.ME sunt locuri selectare cu fotografii și descrieri, care se reflectă pe hartă și sunt accesibile off-line.";
+"cached_guides_placeholder_subtitle" = "Ghiduri pregătire de OMaps sunt locuri selectare cu fotografii și descrieri, care se reflectă pe hartă și sunt accesibile off-line.";
 
 "guides_catalogue_title" = "Catalogul ghidurilor";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Bucătărie uzbecă";
 
-"onboarding_welcome_title" = "Planifică și călătorește cu MAPS.ME";
+"onboarding_welcome_title" = "Planifică și călătorește cu OMaps";
 
 "onboarding_welcome_first_subtitle" = "Salvați locurile interesante, rezervați hotele, elaborați trasee";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "De descărcat";
 
-"onboarding_bydeeplink_guide_title" = "Ghiduri elaborate în MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Ghiduri elaborate în OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Locuri alese cu fotografii și descrieri se reflectă pe hartă și sunt accesibile off-line.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Rezervare hotel?";
 
-"popup_booking_download_guides_message" = "Planificați traseul cu ghidurile MAPS.ME";
+"popup_booking_download_guides_message" = "Planificați traseul cu ghidurile OMaps";
 
 "popup_mwm_download_guides_title" = "Ghiduri offline";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Privește";
 
-"gallery_pp_download_guides_offline_title" = "Planifică odihna ta cu MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Planifică odihna ta cu OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Nu ratați cel mai important cu traseele de la călători experimentați";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Plata va fi percepută din contul dvs. iTunes la confirmarea achiziției. Abonamentul va fi reînnoit în mod automat, cu excepția cazului în care reînnoirea automată este oprită cu cel puțin 24 de ore înainte de sfârșitul perioadei curente. Plata va fi percepută din contul dvs. în conformitate cu planul dvs. de reînnoire într-un interval de timp de 24 de ore înainte de încheierea perioadei curente. Puteți administra sau dezactiva reînnoirea automată din setările contului dvs. Apple ID în orice moment al achiziției.";
 
-"whatsnew_carplay_title" = "Autonavigare MAPS.ME în CarPlay!";
+"whatsnew_carplay_title" = "Autonavigare OMaps în CarPlay!";
 
 "whatsnew_carplay_message" = "Marcaje, căutare, camere-radar și setări de ocolire - totul funcționează fără Internet";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Info camere";
 
-"download_map_carplay" = "Vă rugăm să descărcați hărțile în aplicația MAPS.ME de pe dispozitivul dvs.";
+"download_map_carplay" = "Vă rugăm să descărcați hărțile în aplicația OMaps de pe dispozitivul dvs.";
 
 "carplay_roundabout_exit" = "%s ieșire";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Ura! Sunteți abonat!";
 
-"popup_subscription_success_map_message" = "Explorați acum cele mai faimoase obiective turistice în catalogul MAPS.ME";
+"popup_subscription_success_map_message" = "Explorați acum cele mai faimoase obiective turistice în catalogul OMaps";
 
 "popup_subscription_success_map_start_button" = "Uitați-vă";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Începeți";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Asistent universal în călătorii";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Deschide directorul";
 
-"new_onboarding_step5.2_message" = "Abonamentul la catalogul ghidurilor de călătorie din MAPS.ME – este profitabil. Obțineți acces complet la rute pentru plimbări prin oraș și activități în aer liber!";
+"new_onboarding_step5.2_message" = "Abonamentul la catalogul ghidurilor de călătorie din OMaps – este profitabil. Obțineți acces complet la rute pentru plimbări prin oraș și activități în aer liber!";
 
 "new_onboarding_step5.2_button" = "Vezi termenii";
 
-"new_onboarding_step5.3_message" = "Descărcați și evaluați rutele pentru plimbări prin oraș și activități în aer liber, cu o selecție gratuită din MAPS.ME!";
+"new_onboarding_step5.3_message" = "Descărcați și evaluați rutele pentru plimbări prin oraș și activități în aer liber, cu o selecție gratuită din OMaps!";
 
 "new_onboarding_step5.3_button" = "Descarcă gratuit";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Rute Outdooractive de vacanță de iarnă și de vară te așteaptă în catalog!";
 
-"whatsnew_guides_galleries_title" = "Planificați-vă următoarea călătorie cu MAPS.ME";
+"whatsnew_guides_galleries_title" = "Planificați-vă următoarea călătorie cu OMaps";
 
 "whatsnew_guides_galleries_message" = "Acum puteți găsi ghiduri recomandate în cartelele orașelor și atracțiilor populare";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Înălțimi";
 
-"tips_map_layers_title_countour" = "Linii de înălțimi offline pe MAPS.ME!";
+"tips_map_layers_title_countour" = "Linii de înălțimi offline pe OMaps!";
 
 "tips_map_layers_message_countour" = "Liniile de înălțimi vă vor ajuta să planificați o călătorie în natură și să nu vă pierdeți";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict
index 0765922503..acabfb2740 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 5e9a0f0710..0e7c6b5136 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Установить";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Спасибо, что пользуетесь MAPS.ME! Нравится приложение? Расскажите о нём своим друзьям. Это будет лучшей благодарностью для нас.";
+"share_on_facebook_text" = "Спасибо, что пользуетесь OMaps! Нравится приложение? Расскажите о нём своим друзьям. Это будет лучшей благодарностью для нас.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "кБ";
@@ -138,7 +138,7 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Попробуйте еще раз";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
 "about_menu_title" = "О программе";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Доступно обновление для следующих карт:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "MAPS.ME Lite больше не нужна. Рекомендуем её удалить.";
+"suggest_uninstall_lite" = "OMaps Lite больше не нужна. Рекомендуем её удалить.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ успешно загружена";
@@ -249,10 +249,10 @@
 "set" = "Группа";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "У вас пока нет меток.\nВыберите любое место на карте, чтобы добавить его.\nТакже метки можно импортировать из MAPS.ME либо других приложений и сайтов. Для этого откройте KML/KMZ файл из Dropbox, почты или по веб-ссылке.";
+"bookmarks_usage_hint" = "У вас пока нет меток.\nВыберите любое место на карте, чтобы добавить его.\nТакже метки можно импортировать из OMaps либо других приложений и сайтов. Для этого откройте KML/KMZ файл из Dropbox, почты или по веб-ссылке.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Метки можно импортировать из MAPS.ME либо других приложений и сайтов. Для этого откройте KML/KMZ файл из Dropbox, почты или по веб-ссылке.";
+"bookmarks_usage_hint_import_only" = "Метки можно импортировать из OMaps либо других приложений и сайтов. Для этого откройте KML/KMZ файл из Dropbox, почты или по веб-ссылке.";
 
 /* Settings button in system menu */
 "settings" = "Настройки";
@@ -354,9 +354,9 @@
 "share_by_email" = "Послать по email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "С вами поделились метками MAPS.ME";
+"share_bookmarks_email_subject" = "С вами поделились метками OMaps";
 
-"share_bookmarks_email_body" = "Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт MAPS.ME. Для того чтобы открыть этот файл, вам потребуется приложение MAPS.ME, которое можно установить по ссылке: http://maps.me/get?kmz\n\nСпасибо!";
+"share_bookmarks_email_body" = "Здравствуйте!\n\nВ прикрепленном файле мои метки из офлайновых карт OMaps. Для того чтобы открыть этот файл, вам потребуется приложение OMaps, которое можно установить по ссылке: http://omaps.app/get?kmz\n\nСпасибо!";
 
 /* message title of loading file */
 "load_kmz_title" = "Загрузка меток";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "Идет процесс загрузки карт.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Надеемся, вам нравится пользоваться MAPS.ME! Если так, то оставьте, пожалуйста, отзыв в магазине приложений. Это занимает меньше минуты, но может нам реально помочь. Спасибо вам за поддержку!";
+"appStore_message" = "Надеемся, вам нравится пользоваться OMaps! Если так, то оставьте, пожалуйста, отзыв в магазине приложений. Это занимает меньше минуты, но может нам реально помочь. Спасибо вам за поддержку!";
 
 /* No, thanks */
 "no_thanks" = "Нет, спасибо";
@@ -398,13 +398,13 @@
 "my_position_share_sms" = "Смотри где я сейчас. Жми %1$@ или %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Смотри мою метку на карте MAPS.ME";
+"bookmark_share_email_subject" = "Смотри мою метку на карте OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Посмотри на карте MAPS.ME, где я сейчас нахожусь";
+"my_position_share_email_subject" = "Посмотри на карте OMaps, где я сейчас нахожусь";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
-"my_position_share_email" = "Привет!\n\nЯ сейчас здесь: %1$@. Чтобы увидеть это место на карте MAPS.ME, открой эту ссылку %2$@ или эту %3$@\n\nСпасибо.";
+"my_position_share_email" = "Привет!\n\nЯ сейчас здесь: %1$@. Чтобы увидеть это место на карте OMaps, открой эту ссылку %2$@ или эту %3$@\n\nСпасибо.";
 
 /* Android share by Message/SMS button text (including SMS) */
 "share_by_message" = "Отправить сообщением";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Скачайте карту места, где вы находитесь";
 
 /* text of notification */
-"pro_version_is_free_today" = "Полная версия MAPS.ME сегодня бесплатна! Скачай сейчас и расскажи друзьям.";
+"pro_version_is_free_today" = "Полная версия OMaps сегодня бесплатна! Скачай сейчас и расскажи друзьям.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Мы переносим загруженные карты из MAPS.ME Lite в MAPS.ME. Это может занять несколько минут.";
+"move_lite_maps_to_pro" = "Мы переносим загруженные карты из OMaps Lite в OMaps. Это может занять несколько минут.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Ваши карты успешно перенесены в MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Ваши карты успешно перенесены в OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "При переносе карт возникла ошибка. Пожалуйста, удалите MAPS.ME Lite и загрузите карты заново.";
+"move_lite_maps_to_pro_failed" = "При переносе карт возникла ошибка. Пожалуйста, удалите OMaps Lite и загрузите карты заново.";
 
 /* Text in menu */
 "settings_and_more" = "Настройки и другое";
@@ -600,13 +600,13 @@
 "website" = "Вебсайт";
 
 /* Text in menu */
-"maps_me_community" = "Сообщество MAPS.ME";
+"maps_me_community" = "Сообщество OMaps";
 
 /* Text in menu */
-"like_on_facebook" = "MAPS.ME в Facebook";
+"like_on_facebook" = "OMaps в Facebook";
 
 /* Text in menu */
-"follow_on_twitter" = "MAPS.ME в Twitter";
+"follow_on_twitter" = "OMaps в Twitter";
 
 /* Text in menu */
 "contact_us" = "Свяжитесь с нами";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Сообщить о проблеме";
 
 /* Email subject */
-"subscribe_me_subject" = "Подпишите меня на email-рассылку MAPS.ME";
+"subscribe_me_subject" = "Подпишите меня на email-рассылку OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Я хочу первым узнавать обо всех новостях, обновлениях приложения и акциях. Я могу отписаться от рассылки в любой момент.";
 
 /* About text */
-"about_text" = "MAPS.ME предлагает карты всех городов, всех стран мира, которые работают без подключения к интернету. Путешествуйте с уверенностью: где бы вы ни находились, MAPS.ME помогут решить любую вашу проблему - помогут определить ваше местоположение, найти ресторан, отель, заправку, банк, туалет и т.д.\n\nМы постоянно работаем над добавлением новых функций, поэтому если у вас есть идеи или предложения по улучшению MAPS.ME, пишите нам. Если у вас возникла проблема с приложением, сообщите нам, пожалуйста, о ней. Наш емэйл support@maps.me. Мы отвечаем на все письма! Если вам нравится приложение и вы хотите поддержать нас, есть несколько простых и абсолютно бесплатных способов:\n\n- оставьте отзыв в вашем магазине приложений\n- подпишитесь на наши новости на Facebook странице http://www.facebook.com/mapswithme\n- или просто расскажите о MAPS.ME своей маме, друзьям и коллегам :)\n\nСпасибо за вашу поддержку!\n\nP.S. В приложении мы используем картографические данные проекта OpenStreetMap, который работает по принципу Википедии, давая возможность пользователям со всего мира создавать и редактировать карты. Если вы заметили, что на карте что-то не соответствует действительности либо отсутствует, вы можете откорректировать это прямо на сайте https://www.openstreetmap.org, и эти исправления появятся во время следующего обновления MAPS.ME.";
+"about_text" = "OMaps предлагает карты всех городов, всех стран мира, которые работают без подключения к интернету. Путешествуйте с уверенностью: где бы вы ни находились, OMaps помогут решить любую вашу проблему - помогут определить ваше местоположение, найти ресторан, отель, заправку, банк, туалет и т.д.\n\nМы постоянно работаем над добавлением новых функций, поэтому если у вас есть идеи или предложения по улучшению OMaps, пишите нам. Если у вас возникла проблема с приложением, сообщите нам, пожалуйста, о ней. Наш емэйл support@omaps.app. Мы отвечаем на все письма! Если вам нравится приложение и вы хотите поддержать нас, есть несколько простых и абсолютно бесплатных способов:\n\n- оставьте отзыв в вашем магазине приложений\n- подпишитесь на наши новости на Facebook странице http://www.facebook.com/mapswithme\n- или просто расскажите о OMaps своей маме, друзьям и коллегам :)\n\nСпасибо за вашу поддержку!\n\nP.S. В приложении мы используем картографические данные проекта OpenStreetMap, который работает по принципу Википедии, давая возможность пользователям со всего мира создавать и редактировать карты. Если вы заметили, что на карте что-то не соответствует действительности либо отсутствует, вы можете откорректировать это прямо на сайте https://www.openstreetmap.org, и эти исправления появятся во время следующего обновления OMaps.";
 
 /* Alert text */
 "email_error_body" = "Почтовый клиент не настроен. Настройте его или используйте другие способы для связи. Наш адрес - %@.";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Пожалуйста, обновите карту для того, чтобы проложить маршрут.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "В новой версии MAPS.ME вы сможете строить маршруты от текущего местоположения до точки назначения. Чтобы воспользоваться этой функцией, обновите, пожалуйста, карты.";
+"routing_update_maps" = "В новой версии OMaps вы сможете строить маршруты от текущего местоположения до точки назначения. Чтобы воспользоваться этой функцией, обновите, пожалуйста, карты.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Обновить все";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Найдено";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Используя маршруты в приложении MAPS.ME, пожалуйста, учитывайте следующее:\n\n  - Предлагаемые маршруты могут рассматриваться только в качестве рекомендации.\n - Дорожная обстановка, правила дорожного движения, знаки являются более приоритетными по сравнению с советами навигационной программы.\n - Карта может быть неточной или неактуальной, а предложенный маршрут не самым оптимальным.\n\n  Будьте внимательны на дорогах и берегите себя!";
+"routing_disclaimer" = "Используя маршруты в приложении OMaps, пожалуйста, учитывайте следующее:\n\n  - Предлагаемые маршруты могут рассматриваться только в качестве рекомендации.\n - Дорожная обстановка, правила дорожного движения, знаки являются более приоритетными по сравнению с советами навигационной программы.\n - Карта может быть неточной или неактуальной, а предложенный маршрут не самым оптимальным.\n\n  Будьте внимательны на дорогах и берегите себя!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Неактуальные";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Невозможно проложить маршрут между выбранными точками. Пожалуйста, измените начало или конец маршрута.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Внутренняя ошибка. Пожалуйста, удалите карту и скачайте её еще раз. Если это не помогло, напишите нам на support@maps.me";
+"routing_failed_internal_error" = "Внутренняя ошибка. Пожалуйста, удалите карту и скачайте её еще раз. Если это не помогло, напишите нам на support@omaps.app";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Загрузить карту + маршруты";
@@ -762,16 +762,16 @@
 "pref_use_google_play" = "Использовать Google Play Services для определения позиции";
 
 /* Text for rating dialog */
-"rating_just_rated" = "Я только что оценил MAPS.ME";
+"rating_just_rated" = "Я только что оценил OMaps";
 
 /* Text for rating dialog */
-"rating_user_since" = "Я пользуюсь MAPS.ME c %@";
+"rating_user_since" = "Я пользуюсь OMaps c %@";
 
 /* Text for rating dialog */
 "rating_do_like_maps" = "Нравится приложение?";
 
 /* Text for rating dialog */
-"rating_tap_star" = "Оцените MAPS.ME.";
+"rating_tap_star" = "Оцените OMaps.";
 
 /* Text for rating dialog */
 "rating_thanks" = "Спасибо!";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Нравится приложение?";
 
-"rate_alert_default_message" = "Спасибо что пользуетесь картами MAPS.ME. Пожалуйста, оцените приложение. Ваши оценки и отзывы помогают нам становиться лучше.";
+"rate_alert_default_message" = "Спасибо что пользуетесь картами OMaps. Пожалуйста, оцените приложение. Ваши оценки и отзывы помогают нам становиться лучше.";
 
 "rate_alert_five_star_message" = "Ура! Мы вас тоже любим!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Повторяющееся место";
 
-"first_launch_congrats_title" = "MAPS.ME готов к работе";
+"first_launch_congrats_title" = "OMaps готов к работе";
 
 "first_launch_congrats_text" = "Пользуйтесь поиском и навигацией по всему миру без интернета и бесплатно.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Добавляйте новые объекты и редактируйте старые прямо из приложения.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME использует данные открытых карт сообщества OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps использует данные открытых карт сообщества OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Вы никогда больше не заблудитесь";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Прокладывайте оптимальные автомобильные и пешеходные маршруты.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — используй карты всего мира без интернета";
+"onboarding_offline_maps_title" = "OMaps — используй карты всего мира без интернета";
 
 "onboarding_offline_maps_message" = "Загрузите карты необходимого региона один раз и пользуйтесь навигацией и поиском без подключения к интернету.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Чтобы пользоваться навигацией и другими функциями приложения, нам необходим доступ к вашей геопозиции.";
 
-"onboarding_permissions_title" = "Предоставьте MAPS.ME доступ к памяти и местоположению.";
+"onboarding_permissions_title" = "Предоставьте OMaps доступ к памяти и местоположению.";
 
 "onboarding_permissions_message" = "Чтобы скачивать карты, смотреть места вокруг вас и пользоваться навигацией.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Для загрузки требуется больше свободного места. Пожалуйста, удалите ненужные данные.";
 
-"editor_sharing_title" = "Я улучшил карты MAPS.ME";
+"editor_sharing_title" = "Я улучшил карты OMaps";
 
 "editor_comment_will_be_sent" = "Мы обязательно отправим ваш комментарий картографам.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Подробный комментарий";
 
-"editor_detailed_description" = "Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Опишите дополнительные сведения об объекте, которые MAPS.ME не позволяет отредактировать.";
+"editor_detailed_description" = "Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Опишите дополнительные сведения об объекте, которые OMaps не позволяет отредактировать.";
 
 "editor_more_about_osm" = "Подробнее об OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Мы обновили редактор";
 
-"whatsnew_update_editor_message" = "Пользователи MAPS.ME внесли уже 200 000 правок на карту. Вместе мы сделаем карты самыми подробными в мире. Присоединяйся!";
+"whatsnew_update_editor_message" = "Пользователи OMaps внесли уже 200 000 правок на карту. Вместе мы сделаем карты самыми подробными в мире. Присоединяйся!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Обновите все карты, чтобы использовать редактор.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Продолжить";
 
-"recent_track_background_dialog_message" = "MAPS.ME использует вашу геопозицию в фоновом режиме для записи недавно пройденного пути.";
+"recent_track_background_dialog_message" = "OMaps использует вашу геопозицию в фоновом режиме для записи недавно пройденного пути.";
 
 "whatsnew_car_navigation_header" = "Режим автонавигации стал удобнее";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Велонавигация (бета-версия)";
 
-"whatsnew_cycle_navigation_message" = "К открытию сезона мы тестируем велонавигацию. Прокатитесь по своему любимому веломаршруту с MAPS.ME и поделитесь с нами впечатлениями.";
+"whatsnew_cycle_navigation_message" = "К открытию сезона мы тестируем велонавигацию. Прокатитесь по своему любимому веломаршруту с OMaps и поделитесь с нами впечатлениями.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Оценить в Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Рассказать друзьям";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Привет! Установи MAPS.ME!";
+"tell_friends_text" = "Привет! Установи OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME — незаменимое приложение для путешествий, работающее без подключения к интернету. MAPS.ME использует данные OpenStreetMap и позволяет их улучшать.";
+"about_description" = "OMaps — незаменимое приложение для путешествий, работающее без подключения к интернету. OMaps использует данные OpenStreetMap и позволяет их улучшать.";
 
 /* Text in menu */
 "blog" = "Блог";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Открыть";
 
-"whatsnew_uber_header" = "MAPS.ME и Uber";
+"whatsnew_uber_header" = "OMaps и Uber";
 
 "whatsnew_uber_message" = "Закажите такси прямо из приложения!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Увеличить шрифт на карте";
 
-"traffic_update_app" = "Обновите MAPS.ME";
+"traffic_update_app" = "Обновите OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Для отображения пробок необходимо обновить приложение.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Предоставьте доступ";
 
-"onboarding_storage_permissions_message" = "Предоставьте MAPS.ME доступ к памяти в настройках вашего устройства, иначе использовать MAPS.ME будет невозможно.";
+"onboarding_storage_permissions_message" = "Предоставьте OMaps доступ к памяти в настройках вашего устройства, иначе использовать OMaps будет невозможно.";
 
 "button_exit" = "Выход";
 
-"onboarding_detail_permissions_title" = "MAPS.ME нужен доступ к";
+"onboarding_detail_permissions_title" = "OMaps нужен доступ к";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Память";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Проблема с доступом к хранилищу";
 
-"dialog_error_storage_message" = "Внешняя память устройства недоступна, возможно SD карта была удалена, повреждена или файловая система доступна только для чтения. Проверьте это и свяжитесь, пожалуйста, с нами support@maps.me";
+"dialog_error_storage_message" = "Внешняя память устройства недоступна, возможно SD карта была удалена, повреждена или файловая система доступна только для чтения. Проверьте это и свяжитесь, пожалуйста, с нами support@omaps.app";
 
 "setting_emulate_bad_storage" = "Эмуляция ошибки с внешней памятью";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Я согласен с <a href=\"%s\">Условиями использования</a>";
 
-"sign_agree_news_gdpr" = "Я согласен получать последние новости о MAPS.ME";
+"sign_agree_news_gdpr" = "Я согласен получать последние новости о OMaps";
 
 "whats_new_localbiz_title" = "Малый бизнес заслуживает внимания";
 
-"whats_new_localbiz_message" = "Именно локальные кафе, хостелы и магазинчики делают путешествия незабываемыми. Мы бесплатно оптимизируем страницу вашего бизнеса в MAPS.ME, чтобы его заметили.";
+"whats_new_localbiz_message" = "Именно локальные кафе, хостелы и магазинчики делают путешествия незабываемыми. Мы бесплатно оптимизируем страницу вашего бизнеса в OMaps, чтобы его заметили.";
 
 "whats_new_order_button" = "Оставить заявку";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Загрузите новые места";
 
-"cached_bookmarks_placeholder_subtitle" = "Нажмите кнопку, чтобы загрузить тысячи интересных мест и маршрутов, созданных пользователями MAPS.ME. Вам понадобится подключение к интернету.";
+"cached_bookmarks_placeholder_subtitle" = "Нажмите кнопку, чтобы загрузить тысячи интересных мест и маршрутов, созданных пользователями OMaps. Вам понадобится подключение к интернету.";
 
 "downloader_download_routers" = "Загрузить метки";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Отчеты об ошибках";
 
-"opt_out_fabric_description" = "Мы можем использовать ваши данные, чтобы развивать и улучшать MAPS.ME. Изменения вступят в силу после перезапуска приложения.";
+"opt_out_fabric_description" = "Мы можем использовать ваши данные, чтобы развивать и улучшать OMaps. Изменения вступят в силу после перезапуска приложения.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Метки не были загружены";
 
-"whats_new_bookmarks_catalog_title" = "В MAPS.ME появился каталог маршрутов";
+"whats_new_bookmarks_catalog_title" = "В OMaps появился каталог маршрутов";
 
 "whats_new_bookmarks_catalog_message" = "Десятки подробных маршрутов по всем миру: куда сходить, что посмотреть, где поесть.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Отключить рекламу";
 
-"remove_ads_title" = "Отключите всю рекламу и поддержите MAPS.ME";
+"remove_ads_title" = "Отключите всю рекламу и поддержите OMaps";
 
 "paybtn_title" = "Заплатить %s/год";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Другие варианты";
 
-"why_support" = "Зачем поддерживать MAPS.ME?";
+"why_support" = "Зачем поддерживать OMaps?";
 
 "options_dropdown_item1" = "%s/месяц (экономия %s/год)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Мы отключим для вас всю рекламу";
 
-"why_support_item2" = "Вы помогаете нам улучшать MAPS.ME";
+"why_support_item2" = "Вы помогаете нам улучшать OMaps";
 
 "why_support_item3" = "Вы помогаете нам улучшать карты OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Сервер недоступен";
 
-"server_unavailable_message" = "Покупка будет завершена позже. Если ошибка повторится, свяжитесь с support@maps.me.";
+"server_unavailable_message" = "Покупка будет завершена позже. Если ошибка повторится, свяжитесь с support@omaps.app.";
 
 "offline_fiters_check_in" = "Подключитесь к интернету, чтобы выбрать дату заезда и выезда.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Этот путеводитель будет загружен в публичный каталог MAPS.ME и будет доступен другим пользователям";
+"upload_and_publish_desc" = "Этот путеводитель будет загружен в публичный каталог OMaps и будет доступен другим пользователям";
 
 "upload_and_publish" = "Загрузить и опубликовать";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Оставьте отзыв и помогите путешественникам!";
 
-"share_bookmarks_email_body_link" = "Здравствуйте!\n\nМетки можно скачать по ссылке: %s. Открывайте список с помощью MAPS.ME и наслаждайтесь поездкой!\n\nСкачать приложение: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Здравствуйте!\n\nМетки можно скачать по ссылке: %s. Открывайте список с помощью OMaps и наслаждайтесь поездкой!\n\nСкачать приложение: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Навигатор оповестит вас о камерах при превышении скоростного лимита на %d км/ч";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Делиться впечатлениями просто";
 
-"whats_new_ugc_routes_subtitle" = "Сохраняй запомнившиеся места, создавай из меток маршруты и делись со всеми в каталоге MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Сохраняй запомнившиеся места, создавай из меток маршруты и делись со всеми в каталоге OMaps.";
 
 "whats_new_webeditor_title" = "Превращай маршруты в истории";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "В вашем маршруте должно быть как минимум 3 метки, чтобы загрузить его в публичный каталог";
 
-"bookmark_public_upload_alert_title" = "Вы всего в паре шагов от загрузки вашего маршрута в каталог MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Вы всего в паре шагов от загрузки вашего маршрута в каталог OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Убедитесь, что у маршрута есть название и описание, а все метки содержат информацию о местах. Благодаря этому, пользователи найдут маршрут и смогут воспользоваться им в поездке.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Максимальное энергосбережение";
 
-"enable_logging_warning_message" = "Данная настройка включается для записи действий в целях диагностики. Это помогает команде выявить проблемы с приложением. Включайте настройку только по просьбе поддержки MAPS.ME.";
+"enable_logging_warning_message" = "Данная настройка включается для записи действий в целях диагностики. Это помогает команде выявить проблемы с приложением. Включайте настройку только по просьбе поддержки OMaps.";
 
 "html_error_upload_message_try_again" = "Проверьте доступ к сети и повторите попытку";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Ваш ID: %s.";
 
-"gdpr_request_window_message" = "Пожалуйста, скопируйте его и отправьте запрос на support@maps.me";
+"gdpr_request_window_message" = "Пожалуйста, скопируйте его и отправьте запрос на support@omaps.app";
 
 "gdpr_request_window_copy" = "Скопировать ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Избегать паромных переправ";
 
-"cached_guides_placeholder_subtitle" = "Готовые путеводители в MAPS.ME – это избранные места с фотографиями и описаниями, которые отображаются на карте и доступны офлайн.";
+"cached_guides_placeholder_subtitle" = "Готовые путеводители в OMaps – это избранные места с фотографиями и описаниями, которые отображаются на карте и доступны офлайн.";
 
 "guides_catalogue_title" = "Каталог путеводителей";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Узбекская кухня";
 
-"onboarding_welcome_title" = "Планируйте и путешествуйте с MAPS.ME";
+"onboarding_welcome_title" = "Планируйте и путешествуйте с OMaps";
 
 "onboarding_welcome_first_subtitle" = "Сохраняйте интересные места, бронируйте отели, стройте маршруты офлайн";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Скачать";
 
-"onboarding_bydeeplink_guide_title" = "Готовые путеводители в MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Готовые путеводители в OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Избранные места с фотографиями и описаниями отображаются на карте и доступны офлайн.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Забронирован отель?";
 
-"popup_booking_download_guides_message" = "Спланируйте маршрут с готовыми путеводителями MAPS.ME";
+"popup_booking_download_guides_message" = "Спланируйте маршрут с готовыми путеводителями OMaps";
 
 "popup_mwm_download_guides_title" = "Офлайн путеводители";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Посмотреть";
 
-"gallery_pp_download_guides_offline_title" = "Планируйте свой отдых с MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Планируйте свой отдых с OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Не упустите самое важное с маршрутами от опытных путешественников";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Оплата будет списана с вашего счета iTunes при подтверждении покупки. Подписка автоматически возобновится, если автоматическое продление не будет отключено по крайней мере за 24 часа до окончания текущего периода. Деньги будут списываться с вашей учетной записи в соответствии с вашим планом продления в течение 24 часов до конца текущего периода. Вы можете управлять или отключать автоматическое продление в настройках учетной записи Apple ID в любое время после покупки.";
 
-"whatsnew_carplay_title" = "Автонавигация MAPS.ME в CarPlay!";
+"whatsnew_carplay_title" = "Автонавигация OMaps в CarPlay!";
 
 "whatsnew_carplay_message" = "Метки, поиск, камеры скорости и настройки объезда — все работает без Интернета";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Инфо о камерах";
 
-"download_map_carplay" = "Скачайте карты в приложении MAPS.ME на своем устройстве";
+"download_map_carplay" = "Скачайте карты в приложении OMaps на своем устройстве";
 
 "carplay_roundabout_exit" = "%s съезд";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Ура! Вы подписаны!";
 
-"popup_subscription_success_map_message" = "Теперь исследуйте лучшие туристические достопримечательности в каталоге MAPS.ME";
+"popup_subscription_success_map_message" = "Теперь исследуйте лучшие туристические достопримечательности в каталоге OMaps";
 
 "popup_subscription_success_map_start_button" = "Просмотреть";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Начать";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Универсальный помощник в путешествиях";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Открыть каталог";
 
-"new_onboarding_step5.2_message" = "Подписка на каталог путеводителей в MAPS.ME – это выгодно. Получите полный доступ к маршрутам для городских прогулок и активного отдыха!";
+"new_onboarding_step5.2_message" = "Подписка на каталог путеводителей в OMaps – это выгодно. Получите полный доступ к маршрутам для городских прогулок и активного отдыха!";
 
 "new_onboarding_step5.2_button" = "Посмотреть условия";
 
-"new_onboarding_step5.3_message" = "Скачайте и оцените маршруты для городских прогулок и активного отдыха с бесплатной подборкой MAPS.ME!";
+"new_onboarding_step5.3_message" = "Скачайте и оцените маршруты для городских прогулок и активного отдыха с бесплатной подборкой OMaps!";
 
 "new_onboarding_step5.3_button" = "Скачать бесплатно";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Маршруты от Outdooractive для зимних и летних отпусков ждут в каталоге!";
 
-"whatsnew_guides_galleries_title" = "Планируйте ближайшую поездку с MAPS.ME";
+"whatsnew_guides_galleries_title" = "Планируйте ближайшую поездку с OMaps";
 
 "whatsnew_guides_galleries_message" = "Теперь вы можете найти рекомендованные путеводители в карточках популярных городов и достопримечательностей";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Высоты";
 
-"tips_map_layers_title_countour" = "Линии высот офлайн в MAPS.ME!";
+"tips_map_layers_title_countour" = "Линии высот офлайн в OMaps!";
 
 "tips_map_layers_message_countour" = "Линии высот помогут спланировать путешествие на природу и не потеряться на местности";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
index 87c75df790..dcd46b1563 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
@@ -167,4 +167,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index b2cff5ce8b..aefba3ad18 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Získať teraz";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Ďakujeme, že používate MAPS.ME! Páči sa vám táto aplikácia? Povedzte o nej svojim priateľom! Bude to pre nás najlepšia odmena.";
+"share_on_facebook_text" = "Ďakujeme, že používate OMaps! Páči sa vám táto aplikácia? Povedzte o nej svojim priateľom! Bude to pre nás najlepšia odmena.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Skúsiť znova";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "O aplikácii MAPS.ME";
+"about_menu_title" = "O aplikácii OMaps";
 
 "downloading_touch_to_cancel" = "Sťahovanie %d%%,stlačte pre zrušenie";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD karta/USB úložisko s uloženými mapami nie je k dispozícii";
 
-"disconnect_usb_cable" = "Prosím, odpojte USB kábel alebo vložte pamäťovú kartu pre použitie s MAPS.ME";
+"disconnect_usb_cable" = "Prosím, odpojte USB kábel alebo vložte pamäťovú kartu pre použitie s OMaps";
 
 "not_enough_free_space_on_sdcard" = "Prosím, uvoľnite najprv miesto na SD karte/USB úložisku";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "K dispozícii je aktualizácia pre tieto mapy:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Aplikáciu MAPS.ME Lite uz teraz nepotrebujete, takže si ju môžete kľudne odinštalovať.";
+"suggest_uninstall_lite" = "Aplikáciu OMaps Lite uz teraz nepotrebujete, takže si ju môžete kľudne odinštalovať.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "Úspešne stiahnuté: %@";
@@ -249,10 +249,10 @@
 "set" = "Skupina";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Zatiaľ nemáte žiadne záložky.\nZáložku môžete pridať pridržaním ľubovolného miesta na mape.\nV MAPS.ME môžu byť tiež zobrazené importované záložky z iných zdrojov. Súbor vo formáte KML/KMZ s uloženými záložkami môžete otvoriť napr. z emailu, Dropboxu alebo z webového odkazu.";
+"bookmarks_usage_hint" = "Zatiaľ nemáte žiadne záložky.\nZáložku môžete pridať pridržaním ľubovolného miesta na mape.\nV OMaps môžu byť tiež zobrazené importované záložky z iných zdrojov. Súbor vo formáte KML/KMZ s uloženými záložkami môžete otvoriť napr. z emailu, Dropboxu alebo z webového odkazu.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "V MAPS.ME môžu byť tiež zobrazené importované záložky z iných zdrojov. Súbor vo formáte KML/KMZ s uloženými záložkami môžete otvoriť napr. z emailu, Dropboxu alebo z webového odkazu.";
+"bookmarks_usage_hint_import_only" = "V OMaps môžu byť tiež zobrazené importované záložky z iných zdrojov. Súbor vo formáte KML/KMZ s uloženými záložkami môžete otvoriť napr. z emailu, Dropboxu alebo z webového odkazu.";
 
 /* Settings button in system menu */
 "settings" = "Nastavenia";
@@ -354,9 +354,9 @@
 "share_by_email" = "Share by email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Zdielané záložky MAPS.ME";
+"share_bookmarks_email_subject" = "Zdielané záložky OMaps";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Načítavanie záložiek";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "Práve prebieha sťahovanie krajiny.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Dúfame, že sa vám používánie MAPS.ME páči! Ak to je tak, ohodnoťte prosím našu aplikáciu alebo napíšte na ňu recenziu v Obchode s aplikáciami. Nezaberie vám to ani minútu času, ale nám s tým môžete veľmi pomôoť. Ďakujeme vám za vašu podporu!";
+"appStore_message" = "Dúfame, že sa vám používánie OMaps páči! Ak to je tak, ohodnoťte prosím našu aplikáciu alebo napíšte na ňu recenziu v Obchode s aplikáciami. Nezaberie vám to ani minútu času, ale nám s tým môžete veľmi pomôoť. Ďakujeme vám za vašu podporu!";
 
 /* No, thanks */
 "no_thanks" = "Nie, ďakujem";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "Pozri kde som. Otvor odkaz: %1$@ alebo %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Pozri na moju značku na mape MAPS.ME";
+"bookmark_share_email_subject" = "Pozri na moju značku na mape OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Pozrite si moju aktuálnu polohu na mape MAPS.ME";
+"my_position_share_email_subject" = "Pozrite si moju aktuálnu polohu na mape OMaps";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Ahoj,\n\nPráve som tu: %1$@. Stlačte jeden z týchto odkazov %2$@, %3$@ a uvidíte toto miesto na mape.\n\nVďaka";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Stiahnite si mapu miesta, kde sa práve nachádzate";
 
 /* text of notification */
-"pro_version_is_free_today" = "Plná verzia MAPS.ME dnes zadarmo! Stiahnite si teraz a povedzte to svojim priateľom.";
+"pro_version_is_free_today" = "Plná verzia OMaps dnes zadarmo! Stiahnite si teraz a povedzte to svojim priateľom.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Práve prenášame Vaše stiahnuté mapy z MAPS.ME lite na MAPS.ME. Môže to trvať niekoľko minút.";
+"move_lite_maps_to_pro" = "Práve prenášame Vaše stiahnuté mapy z OMaps lite na OMaps. Môže to trvať niekoľko minút.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Vaše stiahnuté mapy sú úspešne prenesené na MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Vaše stiahnuté mapy sú úspešne prenesené na OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Vaše mapy sa nepodarilo preniesť. Vymažte prosím MAPS.ME Lite a stiahnite si mapy znova.";
+"move_lite_maps_to_pro_failed" = "Vaše mapy sa nepodarilo preniesť. Vymažte prosím OMaps Lite a stiahnite si mapy znova.";
 
 /* Text in menu */
 "settings_and_more" = "Nastavenia a viac";
@@ -600,7 +600,7 @@
 "website" = "Webové stránky";
 
 /* Text in menu */
-"maps_me_community" = "Komunita MAPS.ME";
+"maps_me_community" = "Komunita OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Označiť pomocou Páči sa mi to na Facebooku";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Nahlásiť chybu";
 
 /* Email subject */
-"subscribe_me_subject" = "Prihláste ma prosím k odberu spravodaja MAPS.ME";
+"subscribe_me_subject" = "Prihláste ma prosím k odberu spravodaja OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Chcem sa vždy ako prvý dozvedať o najnovších správach, aktualizáciách a akčných ponukách. Svoje prihlásenie k odberu môžem kedykoľvek zrušiť.";
 
 /* About text */
-"about_text" = "MAPS.ME ponúka najrýchlejšie offline mapy všetkých miest a krajín po celom svete. Cestujte s úplnou dôverou: kdekoľvek ste, MAPS.ME vám pomôže sa nájsť na mape, nájsť najbližšiu reštauráciu, hotel, banku, benzínovú pumpu atď. Nevyžaduje pripojenie k internetu.\n\nNeustále pracujeme na nových funkciách a radi by sme počuli váš názor, ako môžeme vylepšiť MAPS.ME. Pokiaľ máte s touto aplikáciou akékoľvek problémy, tak nás neváhajte kontaktovať na support@maps.me. Odpovedáme na každú požiadavku!\n\nPáči sa vám MAPS.ME a chceli by ste nás podporiť? Existuje niekoľko ľahkých spôsobov celkom zadarmo:\n\n-napíšte recenziu vo svojom obchode s aplikáciami\n-označte našu stránku http://www.facebook.com/mapswithme pomocou Páči sa mi to\n- alebo len povedzte o MAPS.ME svojej mame, priateľom a kolegom :)\n\nĎakujeme, že ste s nami. Veľmi oceňujeme vašu podporu!\n\nP.S. Mapové dáta získavame z OpenStreetMap, čo je mapový projekt podobný Wikipédii, ktorý umožňuje užívateľom vytvárať a upravovať mapy. Pokiaľ zistíte, že na mape niečo chýba alebo je nesprávné, môžete to opraviť priamo na https://www.openstreetmap.org, a vaše zmeny sa objavia v budúcej verzii MAPS.ME.";
+"about_text" = "OMaps ponúka najrýchlejšie offline mapy všetkých miest a krajín po celom svete. Cestujte s úplnou dôverou: kdekoľvek ste, OMaps vám pomôže sa nájsť na mape, nájsť najbližšiu reštauráciu, hotel, banku, benzínovú pumpu atď. Nevyžaduje pripojenie k internetu.\n\nNeustále pracujeme na nových funkciách a radi by sme počuli váš názor, ako môžeme vylepšiť OMaps. Pokiaľ máte s touto aplikáciou akékoľvek problémy, tak nás neváhajte kontaktovať na support@omaps.app. Odpovedáme na každú požiadavku!\n\nPáči sa vám OMaps a chceli by ste nás podporiť? Existuje niekoľko ľahkých spôsobov celkom zadarmo:\n\n-napíšte recenziu vo svojom obchode s aplikáciami\n-označte našu stránku http://www.facebook.com/mapswithme pomocou Páči sa mi to\n- alebo len povedzte o OMaps svojej mame, priateľom a kolegom :)\n\nĎakujeme, že ste s nami. Veľmi oceňujeme vašu podporu!\n\nP.S. Mapové dáta získavame z OpenStreetMap, čo je mapový projekt podobný Wikipédii, ktorý umožňuje užívateľom vytvárať a upravovať mapy. Pokiaľ zistíte, že na mape niečo chýba alebo je nesprávné, môžete to opraviť priamo na https://www.openstreetmap.org, a vaše zmeny sa objavia v budúcej verzii OMaps.";
 
 /* Alert text */
 "email_error_body" = "Emailový klient nebol nastavený. Nakonfigurujte ho prosím alebo použite iný spôsob k tomu, abyste nás kontaktovali na %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Pre vytvorenie trasy si, prosím, aktualizujte mapu.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Nová verzia aplikácie MAPS.ME umožňuje vytvárať trasy z vašej aktuálnej polohy do cieľového bodu. Pre použitie tejto funkcie si, prosím, aktualizujte mapy.";
+"routing_update_maps" = "Nová verzia aplikácie OMaps umožňuje vytvárať trasy z vašej aktuálnej polohy do cieľového bodu. Pre použitie tejto funkcie si, prosím, aktualizujte mapy.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Aktualizovať všetko";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Nájdených";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Tvorenie trás v aplikácii MAPS.ME, prosím, majte na pamäti nasledovné:\n\n  - Navrhnuté trasy možno považovať iba za odporúčanie.\n - Stav vozovky, dopravné predpisy a značenie majú vyššiu prioritu, ako navigačné rady.\n - Mapa môže byť nesprávna alebo zastaraná a trasy nemusia byť vytvorené tým najlepším možným spôsobom.\n\n  Buďte na cestách v bezpečí a postarajte sa o seba!";
+"routing_disclaimer" = "Tvorenie trás v aplikácii OMaps, prosím, majte na pamäti nasledovné:\n\n  - Navrhnuté trasy možno považovať iba za odporúčanie.\n - Stav vozovky, dopravné predpisy a značenie majú vyššiu prioritu, ako navigačné rady.\n - Mapa môže byť nesprávna alebo zastaraná a trasy nemusia byť vytvorené tým najlepším možným spôsobom.\n\n  Buďte na cestách v bezpečí a postarajte sa o seba!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Zastarané";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Nebol nájdená trasa medzi vybraným východiskom a cieľom. Prosím vyberte iný počiatočný a koncový bod.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Došlo k vnútornej chybe. Prosím, skúste zmazať a znovu stiahnuť mapu. Ak problém pretrvá, prosím, kontaktujte nás na support@maps.me.";
+"routing_failed_internal_error" = "Došlo k vnútornej chybe. Prosím, skúste zmazať a znovu stiahnuť mapu. Ak problém pretrvá, prosím, kontaktujte nás na support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Na stiahnutie Mapa + Trasa";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Práve som hodnotil vašu aplikáciu";
 
 /* Text for rating dialog */
-"rating_user_since" = "Som používateľ MAPS.ME od roku %@";
+"rating_user_since" = "Som používateľ OMaps od roku %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Páči sa vám MAPS.ME?";
+"rating_do_like_maps" = "Páči sa vám OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Kliknutím na hviezdu ohodnotíte našu aplikáciu.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Stiahnuť mapu";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Aktualizovať mapu a trasové dáta na to aby ste mohli získajte všetky funkcie MAPS.ME.";
+"routing_download_map_and_routing" = "Aktualizovať mapu a trasové dáta na to aby ste mohli získajte všetky funkcie OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Získať trasové dáta";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Páči sa vám aplikácia?";
 
-"rate_alert_default_message" = "Ďakujeme, že používate MAPS.ME. Prosím, ohodnoťte aplikáciu. Vaše názory nám pomôžu zlepšiť sa.";
+"rate_alert_default_message" = "Ďakujeme, že používate OMaps. Prosím, ohodnoťte aplikáciu. Vaše názory nám pomôžu zlepšiť sa.";
 
 "rate_alert_five_star_message" = "Hurá! Aj my vás taky páči!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplicitné miesto";
 
-"first_launch_congrats_title" = "Aplikácia MAPS.ME je pripravená na použitie";
+"first_launch_congrats_title" = "Aplikácia OMaps je pripravená na použitie";
 
 "first_launch_congrats_text" = "Vyhľadávajte a určujte trasu bez pripojenia všade na svete bez poplatkov.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Na mapu môžete pridávať nové miesta a upravovať tie, ktoré sú už pridané.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME využíva dáta komunity OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps využíva dáta komunity OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Už sa nikdy nestratíte";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Naplánujte si vhodné trasy na cestu autom alebo peši.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — globálny prístup k mapám bez internetu";
+"onboarding_offline_maps_title" = "OMaps — globálny prístup k mapám bez internetu";
 
 "onboarding_offline_maps_message" = "Stiahnite si jednorázovo potrebné mapy - navigáciu a funkcie vyhľadávania môžete využívať aj bez internetového pripojenia.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Ak chcete používať navigáciu a ostatné funkcie, potrebujeme prístup k vašej aktuálnej polohe.";
 
-"onboarding_permissions_title" = "Povoliť aplikácii MAPS.ME prístup do ukladacieho priestoru a k polohe";
+"onboarding_permissions_title" = "Povoliť aplikácii OMaps prístup do ukladacieho priestoru a k polohe";
 
 "onboarding_permissions_message" = "Tak si budete môcť sťahovať mapy, prezerať miesta a dopravnú situáciu vo svojom okolí a používať navigáciu.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Ak chcete pokračovať v sťahovaní, musíte uvoľniť viac miesta na ukladacom priestore. Prosím, odstráňte prebytočné dáta.";
 
-"editor_sharing_title" = "Vďaka mne sú mapy na MAPS.ME lepšie";
+"editor_sharing_title" = "Vďaka mne sú mapy na OMaps lepšie";
 
 "editor_comment_will_be_sent" = "Pošleme Váš príspevok kartografom.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Zmazaná poznámka";
 
-"editor_detailed_description" = "Vami navrhované zmeny sa odošlú do komunity OpenStreetMap. Popíšte detaily, ktoré sa nedajú upraviť v MAPS.ME.";
+"editor_detailed_description" = "Vami navrhované zmeny sa odošlú do komunity OpenStreetMap. Popíšte detaily, ktoré sa nedajú upraviť v OMaps.";
 
 "editor_more_about_osm" = "Viac o OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Aktualizovali sme program na úpravu máp";
 
-"whatsnew_update_editor_message" = "Používatelia MAPS.ME urobili 200 000 zmien v mapách. Spoločne vytvárame najpodrobnejšie mapy na svete. Pridajte sa!";
+"whatsnew_update_editor_message" = "Používatelia OMaps urobili 200 000 zmien v mapách. Spoločne vytvárame najpodrobnejšie mapy na svete. Pridajte sa!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Ak chcete použiť editor máp, prosím, aktualizujte všetky mapy.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Pokračovať";
 
-"recent_track_background_dialog_message" = "MAPS.ME používa vašu geopozíciu na pozadí pre zaznamenávanie vami nedávno precestovanej trasy.";
+"recent_track_background_dialog_message" = "OMaps používa vašu geopozíciu na pozadí pre zaznamenávanie vami nedávno precestovanej trasy.";
 
 "whatsnew_car_navigation_header" = "Užívateľsky prívetivá navigácia do vozidiel";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Navigácia pre cyklistov (beta verzia)";
 
-"whatsnew_cycle_navigation_message" = "Testujeme navigáciu pre cyklistov na novú sezónu. Vyskúšajte svoju obľúbenú cyklotrasu s aplikáciou MAPS.ME a podeľte sa s nami o svoj názor.";
+"whatsnew_cycle_navigation_message" = "Testujeme navigáciu pre cyklistov na novú sezónu. Vyskúšajte svoju obľúbenú cyklotrasu s aplikáciou OMaps a podeľte sa s nami o svoj názor.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Ohodnotiť v službe Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Povedať priateľovi";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Ahoj! Nainštaluj si aplikáciu MAPS.ME";
+"tell_friends_text" = "Ahoj! Nainštaluj si aplikáciu OMaps";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME je offine aplikácia na cestovanie. Základom aplikácie MAPS.ME sú dáta OpenStreetMap, pričom aplikácia nám ich umožňuje upravovať.";
+"about_description" = "OMaps je offine aplikácia na cestovanie. Základom aplikácie OMaps sú dáta OpenStreetMap, pričom aplikácia nám ich umožňuje upravovať.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Otvoriť";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Objednajte si Uber priamo z aplikácie!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Zväčšiť veľkosť písma na mape";
 
-"traffic_update_app" = "Aktualizujte si aplikáciu MAPS.ME";
+"traffic_update_app" = "Aktualizujte si aplikáciu OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Ak chcete zobraziť dopravné informácie, musíte si aktualizovať aplikáciu.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Prideliť prístup";
 
-"onboarding_storage_permissions_message" = "Zmeňte si nastavenia povolení vo svojom zariadení. Na používanie aplikácie MAPS.ME je potrebné povoliť prístup do ukladacieho priestoru.";
+"onboarding_storage_permissions_message" = "Zmeňte si nastavenia povolení vo svojom zariadení. Na používanie aplikácie OMaps je potrebné povoliť prístup do ukladacieho priestoru.";
 
 "button_exit" = "Ukončiť";
 
-"onboarding_detail_permissions_title" = "Aplikácia MAPS.ME si vyžaduje prístup k";
+"onboarding_detail_permissions_title" = "Aplikácia OMaps si vyžaduje prístup k";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Ukladací priestor";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Problém s prístupom k úložisku";
 
-"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@maps.me";
+"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@omaps.app";
 
 "setting_emulate_bad_storage" = "Imitovať poškodené úložisko";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Súhlasím s <a href=\"%s\">zmluvnými podmienkami</a>";
 
-"sign_agree_news_gdpr" = "Súhlasím so zasielaním najnovších správ o produktoch MAPS.ME";
+"sign_agree_news_gdpr" = "Súhlasím so zasielaním najnovších správ o produktoch OMaps";
 
 "whats_new_localbiz_title" = "Malé podniky si zaslúžia pozornosť";
 
-"whats_new_localbiz_message" = "Jedná sa o miestne kaviarne, útulné hostely a obchody, ktoré spravia z vašich ciest nezabudnuteľné. Vašu stránku optimalizujeme v MAPS.ME, aby vynikla.";
+"whats_new_localbiz_message" = "Jedná sa o miestne kaviarne, útulné hostely a obchody, ktoré spravia z vašich ciest nezabudnuteľné. Vašu stránku optimalizujeme v OMaps, aby vynikla.";
 
 "whats_new_order_button" = "Zanechať žiadosť";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Prevziať nové miesta";
 
-"cached_bookmarks_placeholder_subtitle" = "Stlačením tlačidla stiahnete tisíce zaujímavých miest a trás vytvorených používateľmi MAPS.ME. Budete potrebovať internetové pripojenie.";
+"cached_bookmarks_placeholder_subtitle" = "Stlačením tlačidla stiahnete tisíce zaujímavých miest a trás vytvorených používateľmi OMaps. Budete potrebovať internetové pripojenie.";
 
 "downloader_download_routers" = "Prevziať záložky";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Hlásenie chýb";
 
-"opt_out_fabric_description" = "Vaše údaje môžeme použiť na zlepšenie skúseností s programom MAPS.ME. Zmeny sa prejavia po reštartovaní aplikácie.";
+"opt_out_fabric_description" = "Vaše údaje môžeme použiť na zlepšenie skúseností s programom OMaps. Zmeny sa prejavia po reštartovaní aplikácie.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Záložky neboli stiahnuté";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME má teraz katalóg trás";
+"whats_new_bookmarks_catalog_title" = "OMaps má teraz katalóg trás";
 
 "whats_new_bookmarks_catalog_message" = "Stovky podrobných trás po celom svete: kam ísť, čo vidieť, kde sa ísť najesť.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Odstrániť reklamy";
 
-"remove_ads_title" = "Odstráňte všetky reklamy a podporte MAPS.ME";
+"remove_ads_title" = "Odstráňte všetky reklamy a podporte OMaps";
 
 "paybtn_title" = "Zaplaťte %s/rok";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Viac možností";
 
-"why_support" = "Prečo podporiť MAPS.ME?";
+"why_support" = "Prečo podporiť OMaps?";
 
 "options_dropdown_item1" = "%s/mesačne (ušetrite %s/ročne)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Odstránime pre vás všetky reklamy";
 
-"why_support_item2" = "Pomôžete nám zlepšiť MAPS.ME";
+"why_support_item2" = "Pomôžete nám zlepšiť OMaps";
 
 "why_support_item3" = "Pomôžete nám vylepšiť otvorené mapy OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Server je nedostupný";
 
-"server_unavailable_message" = "Nákup bude dokončený neskôr. Ak chyba pretrváva, kontaktujte support@maps.me.";
+"server_unavailable_message" = "Nákup bude dokončený neskôr. Ak chyba pretrváva, kontaktujte support@omaps.app.";
 
 "offline_fiters_check_in" = "Pripojte sa na internet, aby ste filtrovali hotely podľa dátumov.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Táto príručka bude nahraná do verejného katalógu MAPS.ME a bude dostupná ostatným používateľom";
+"upload_and_publish_desc" = "Táto príručka bude nahraná do verejného katalógu OMaps a bude dostupná ostatným používateľom";
 
 "upload_and_publish" = "Nahrať a publikovať";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Pomôžte cestujúcim tým, že zanecháte recenziu!";
 
-"share_bookmarks_email_body_link" = "Dobrý deň!\n\nTu je odkaz, kde si môžete stiahnuť svoje záložky: %s. Otvorte zoznam prostredníctvom služby MAPS.ME a užite si výlet!\n\nZískajte aplikáciu: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Dobrý deň!\n\nTu je odkaz, kde si môžete stiahnuť svoje záložky: %s. Otvorte zoznam prostredníctvom služby OMaps a užite si výlet!\n\nZískajte aplikáciu: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigátor vás upozorní na kamery, keď prekročíte rýchlostný limit %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Je ľahké podeliť sa o vaše dojmy";
 
-"whats_new_ugc_routes_subtitle" = "Uložte si nezabudnuteľné miesta, vytvorte trasy pomocou záložiek a zdieľajte ich so všetkými v katalógu MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Uložte si nezabudnuteľné miesta, vytvorte trasy pomocou záložiek a zdieľajte ich so všetkými v katalógu OMaps.";
 
 "whats_new_webeditor_title" = "Premeňte svoje trasy na príbehy";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Mali by ste mať minimálne 3 záložky, aby ste mohli nahrať sprievodcu do verejného katalógu";
 
-"bookmark_public_upload_alert_title" = "Ste pár krokov od zdieľania vašich záložiek so všetkými cestujúcimi MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Ste pár krokov od zdieľania vašich záložiek so všetkými cestujúcimi OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Uistite sa, že máte presný názov a popis svojho zoznamu a všetky záložky obsahujú určité informácie o miestach. Týmto spôsobom môžu váš zoznam nájsť a používať iní.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximálna úspora batérie";
 
-"enable_logging_warning_message" = "Táto možnosť zapína zaznamenávanie na diagnostické účely. Môže to byť užitočné pre našu technickú podporu, ktorá rieši problémy s aplikáciou. Povoliť túto možnosť iba na požiadanie podpory MAPS.ME.";
+"enable_logging_warning_message" = "Táto možnosť zapína zaznamenávanie na diagnostické účely. Môže to byť užitočné pre našu technickú podporu, ktorá rieši problémy s aplikáciou. Povoliť túto možnosť iba na požiadanie podpory OMaps.";
 
 "html_error_upload_message_try_again" = "Skontrolujte svoje sieťové nastavenia a skúste to znova";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Vaše ID: %s.";
 
-"gdpr_request_window_message" = "Skopírujte ho a pošlite žiadosť na adresu support@maps.me";
+"gdpr_request_window_message" = "Skopírujte ho a pošlite žiadosť na adresu support@omaps.app";
 
 "gdpr_request_window_copy" = "Skopírujte ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Vyhnúť sa prechodom na trajekte";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME ponúka hotových sprievodcov pre vybrané miesta s fotografiami a popismi, ktoré sú zobrazené na mape a sú dostupné v režime offline.";
+"cached_guides_placeholder_subtitle" = "OMaps ponúka hotových sprievodcov pre vybrané miesta s fotografiami a popismi, ktoré sú zobrazené na mape a sú dostupné v režime offline.";
 
 "guides_catalogue_title" = "Katalóg sprievodcov";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Uzbecká kuchyňa";
 
-"onboarding_welcome_title" = "Plánujte a cestujte s MAPS.ME";
+"onboarding_welcome_title" = "Plánujte a cestujte s OMaps";
 
 "onboarding_welcome_first_subtitle" = "Pridajte si k záložkám zaujímavé miesta, zarezervujte si hotely, vypočítajte si trasy offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Stiahnuť";
 
-"onboarding_bydeeplink_guide_title" = "Sprievodcovia pripravení na používanie v aplikácii MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Sprievodcovia pripravení na používanie v aplikácii OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Najlepšie miesta na navštívenie zobrazené na mape s fotografiami a popismi. Pracujú offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Rezervovaný hotel?";
 
-"popup_booking_download_guides_message" = "Naplánujte si trasu s hotovými sprievodcami z MAPS.ME";
+"popup_booking_download_guides_message" = "Naplánujte si trasu s hotovými sprievodcami z OMaps";
 
 "popup_mwm_download_guides_title" = "Offline mestskí sprievodcovia";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Pozrite sa";
 
-"gallery_pp_download_guides_offline_title" = "Naplánujte si dovolenku s MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Naplánujte si dovolenku s OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Nenechajte si ujsť nič so sprievodcami skúsených cestovateľov";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Platba bude účtovaná na váš účet iTunes pri potvrdení nákupu. Predplatné sa automaticky obnoví, pokiaľ nebude automatické obnovenie vypnuté minimálne 24 hodín pred koncom aktuálneho obdobia. Váš účet sa bude účtovať podľa vášho plánu obnovy do 24 hodín pred koncom aktuálneho obdobia. Automatickú obnovu vo vašom ID nastavení účtu Apple môžete spravovať alebo vypnúť kedykoľvek pri kúpe.";
 
-"whatsnew_carplay_title" = "MAPS.ME automobilová navigácia v CarPlay!";
+"whatsnew_carplay_title" = "OMaps automobilová navigácia v CarPlay!";
 
 "whatsnew_carplay_message" = "Záložky, vyhľadávanie, rýchlostné kamery a možnosti navigovania sú k dispozícii v režime offline";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Rýchl. upozorn.";
 
-"download_map_carplay" = "Prosím stiahnite si mapy v aplikácii MAPS.ME vo vašom zariadení";
+"download_map_carplay" = "Prosím stiahnite si mapy v aplikácii OMaps vo vašom zariadení";
 
 "carplay_roundabout_exit" = "%s výjazd";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Woohoo, ste prihlásení!";
 
-"popup_subscription_success_map_message" = "Teraz objavte najlepšie turistické body v katalógu MAPS.ME";
+"popup_subscription_success_map_message" = "Teraz objavte najlepšie turistické body v katalógu OMaps";
 
 "popup_subscription_success_map_start_button" = "Začnite si prehliadať";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Začať";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Všestranný pomocník na cestovanie";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Otvoriť katalóg";
 
-"new_onboarding_step5.2_message" = "Vaše predplatné katalógu sprievodcov MAPS.ME má skvelú hodnotu. Získajte plný prístup k mestským a outdoorovým sprievodcom po celom svete!";
+"new_onboarding_step5.2_message" = "Vaše predplatné katalógu sprievodcov OMaps má skvelú hodnotu. Získajte plný prístup k mestským a outdoorovým sprievodcom po celom svete!";
 
 "new_onboarding_step5.2_button" = "Skontrolovať podmienky";
 
-"new_onboarding_step5.3_message" = "Vyskúšajte bezplatné ukážky hotových mestských a vonkajších trás s bezplatným výberom MAPS.ME!";
+"new_onboarding_step5.3_message" = "Vyskúšajte bezplatné ukážky hotových mestských a vonkajších trás s bezplatným výberom OMaps!";
 
 "new_onboarding_step5.3_button" = "Bezplatné stiahnutie";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "V katalógu čakajú trasy z Outdooractive na zimné a letné cesty!";
 
-"whatsnew_guides_galleries_title" = "Naplánujte si svoj nadchádzajúci výlet s MAPS.ME";
+"whatsnew_guides_galleries_title" = "Naplánujte si svoj nadchádzajúci výlet s OMaps";
 
 "whatsnew_guides_galleries_message" = "Teraz nájdete odporúčaných sprievodcov na stránkach obľúbených turistických miest a pamiatok";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terén";
 
-"tips_map_layers_title_countour" = "Nové v MAPS.ME: offline topografická vrstva!";
+"tips_map_layers_title_countour" = "Nové v OMaps: offline topografická vrstva!";
 
 "tips_map_layers_message_countour" = "Naplánujte a užite si výlety do prírody s istotou, že viete o tejto oblasti všetko";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict
index 9b4c5c06bd..0dcd3a12ce 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.stringsdict
@@ -139,4 +139,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 1d0505ce8e..0d7927c536 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Skaffa det nu";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Tack för att du använder MAPS.ME! Gillar du appen? Berätta för dina vänner om den! Det skulle vara höjden av tacksamhet för oss.";
+"share_on_facebook_text" = "Tack för att du använder OMaps! Gillar du appen? Berätta för dina vänner om den! Det skulle vara höjden av tacksamhet för oss.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Försök igen";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Om MAPS.ME";
+"about_menu_title" = "Om OMaps";
 
 "downloading_touch_to_cancel" = "Laddar ner %d%%, tryck för att avbryta";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD-kort/USB-lagring med nedladdade kartor är inte tillgänglig.";
 
-"disconnect_usb_cable" = "Vänligen koppla ifrån USB-kabeln eller sätt in ett minneskort för att använda MAPS.ME";
+"disconnect_usb_cable" = "Vänligen koppla ifrån USB-kabeln eller sätt in ett minneskort för att använda OMaps";
 
 "not_enough_free_space_on_sdcard" = "Vänligen frigör utrymme på SD-kortet/USB-lagringen först för att använda denna app.";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Uppdatering tillgänglig för dessa kartor:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Du behöver inte MAPS.ME Lite mer, så du kan avinstallera den.";
+"suggest_uninstall_lite" = "Du behöver inte OMaps Lite mer, så du kan avinstallera den.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ nedladdat lyckat";
@@ -249,10 +249,10 @@
 "set" = "Samling";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Du har inga bokmärken än.\nTryck var som helst på kartan för att lägga till ett bokmärke.\nBokmärken från andra källor kan också importeras och visas i MAPS.ME. Öppna KML/KMZ filer med sparade bokmärken från mail, Dropbox eller webadress.";
+"bookmarks_usage_hint" = "Du har inga bokmärken än.\nTryck var som helst på kartan för att lägga till ett bokmärke.\nBokmärken från andra källor kan också importeras och visas i OMaps. Öppna KML/KMZ filer med sparade bokmärken från mail, Dropbox eller webadress.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Bokmärken från andra källor kan importeras och visas i MAPS.ME. Öppna KML/KMZ filer med sparade bokmärken från mail, Dropbox eller webadress.";
+"bookmarks_usage_hint_import_only" = "Bokmärken från andra källor kan importeras och visas i OMaps. Öppna KML/KMZ filer med sparade bokmärken från mail, Dropbox eller webadress.";
 
 /* Settings button in system menu */
 "settings" = "Inställningar";
@@ -354,9 +354,9 @@
 "share_by_email" = "Dela via email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.ME bokmärken har delats med dig";
+"share_bookmarks_email_subject" = "OMaps bokmärken har delats med dig";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Läser in bokmärken";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Nedladdning av landet är startat nu.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Hoppas du gillar att använda MAPS.ME! I så fall, skriv en recension eller ge ett betyg på App Store. Det tar mindre än en minut men kan verkligen hjälpa oss. Tack för din hjälp!";
+"appStore_message" = "Hoppas du gillar att använda OMaps! I så fall, skriv en recension eller ge ett betyg på App Store. Det tar mindre än en minut men kan verkligen hjälpa oss. Tack för din hjälp!";
 
 /* No, thanks */
 "no_thanks" = "Nej, tack";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hej, kolla på min pin på MAPS.ME! %1$@ eller %2$@ Har du inte offline-kartor installerat? Ladda ner här: http://maps.me/get";
+"bookmark_share_sms" = "Hej, kolla på min pin på OMaps! %1$@ eller %2$@ Har du inte offline-kartor installerat? Ladda ner här: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hej, kolla på min nuvarande position på MAPS.ME! %1$@ eller %2$@ Har du inte offline-kartor? Ladda ner här: http://maps.me/get";
+"my_position_share_sms" = "Hej, kolla på min nuvarande position på OMaps! %1$@ eller %2$@ Har du inte offline-kartor? Ladda ner här: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hej, kolla på min pin på MAPS.ME kartan";
+"bookmark_share_email_subject" = "Hej, kolla på min pin på OMaps kartan";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hej, kolla på min nuvarande position på MAPS.ME kartan!";
+"my_position_share_email_subject" = "Hej, kolla på min nuvarande position på OMaps kartan!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Hej,\n\nJag är här nu: %1$@. Klicka på denna länk %2$@ eller denna %3$@ för att se platsen på kartan.\n\nTack.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Ladda ner kartan över din nuvarande plats";
 
 /* text of notification */
-"pro_version_is_free_today" = "Fullständig version av MAPS.ME är gratis idag! Ladda ner den nu och berätta för dina vänner.";
+"pro_version_is_free_today" = "Fullständig version av OMaps är gratis idag! Ladda ner den nu och berätta för dina vänner.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Vi flyttar dina nedladdade kartor från MAPS.ME Lite till MAPS.ME. Det kan ta några minuter.";
+"move_lite_maps_to_pro" = "Vi flyttar dina nedladdade kartor från OMaps Lite till OMaps. Det kan ta några minuter.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Dina nedladdade kartor flyttades till MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Dina nedladdade kartor flyttades till OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Flytten av dina kartor misslyckades. Vänligen ta bort MAPS.ME Lite och ladda ner kartorna igen.";
+"move_lite_maps_to_pro_failed" = "Flytten av dina kartor misslyckades. Vänligen ta bort OMaps Lite och ladda ner kartorna igen.";
 
 /* Text in menu */
 "settings_and_more" = "Inställningar & Mer";
@@ -600,7 +600,7 @@
 "website" = "Webbplats";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME Gemenskap";
+"maps_me_community" = "OMaps Gemenskap";
 
 /* Text in menu */
 "like_on_facebook" = "Gilla på Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Rapportera en bugg";
 
 /* Email subject */
-"subscribe_me_subject" = "Anmäl mig till MAPS.ME nyhetsbrev";
+"subscribe_me_subject" = "Anmäl mig till OMaps nyhetsbrev";
 
 /* Email body */
 "subscribe_me_body" = "Jag vill bli först att veta om de senaste uppdateringarna och erbjudandena. Jag kan avbryta min prenumeration när som helst.";
 
 /* About text */
-"about_text" = "MAPS.ME erbjuder de snabbaste offline-kartorna över alla städer och länder i hela världen. Res med förtroende: oavsett var du är hjälper MAPS.ME dig att placera dig på kartan, hitta den närmaste restaurangen, hotellet, banken, bensinstationen m.m. Den kräver inte internetanslutning.\n\nVi arbetar ständigt med nya funktioner och vill gärna veta hur du tycker att vi kan förbättra MAPS.ME. Ifall du har problem med appen, tveka inte att kontakta oss på support@maps.me. Vi svarar på alla mail!\n\nGillar du MAPS.ME och vill hjälpa oss? Det finns några enkla och kostnadsfria sätt:\n\n- posta en recension på din Appmarknad\n- gilla vår Facebooksida http://www.facebook.com/mapswithme\n- eller berätta bara om MAPS.ME för din mamma, vänner eller kollegor :)\n\nTack för att du är med oss. Vi uppskattar ditt stöd väldigt mycket!\n\nP.S. Vi använder oss av kartdata från OpenStreetMap, ett kartprojket som liknar Wikipedia och som tillåter användare att skapa och redigera kartor. Ifall du ser något som saknas eller är fel på kartan så kan du korrigera kartan direkt på https://www.openstreetmap.org och dina ändringar kommer att finns i MAPS.ME appen när nästa version släpps.";
+"about_text" = "OMaps erbjuder de snabbaste offline-kartorna över alla städer och länder i hela världen. Res med förtroende: oavsett var du är hjälper OMaps dig att placera dig på kartan, hitta den närmaste restaurangen, hotellet, banken, bensinstationen m.m. Den kräver inte internetanslutning.\n\nVi arbetar ständigt med nya funktioner och vill gärna veta hur du tycker att vi kan förbättra OMaps. Ifall du har problem med appen, tveka inte att kontakta oss på support@omaps.app. Vi svarar på alla mail!\n\nGillar du OMaps och vill hjälpa oss? Det finns några enkla och kostnadsfria sätt:\n\n- posta en recension på din Appmarknad\n- gilla vår Facebooksida http://www.facebook.com/mapswithme\n- eller berätta bara om OMaps för din mamma, vänner eller kollegor :)\n\nTack för att du är med oss. Vi uppskattar ditt stöd väldigt mycket!\n\nP.S. Vi använder oss av kartdata från OpenStreetMap, ett kartprojket som liknar Wikipedia och som tillåter användare att skapa och redigera kartor. Ifall du ser något som saknas eller är fel på kartan så kan du korrigera kartan direkt på https://www.openstreetmap.org och dina ändringar kommer att finns i OMaps appen när nästa version släpps.";
 
 /* Alert text */
 "email_error_body" = "Emailklienten har inte konfigurerats. Konfigurera den eller använd ett annat sätt att kontakta oss på %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Uppdatera kartan för att skapa en rutt.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Den nya versionen av MAPS.ME låter dig skapa rutter från din nuvarande position till en destinationspunkt. Uppdatera kartan för att använda den här funktionen.";
+"routing_update_maps" = "Den nya versionen av OMaps låter dig skapa rutter från din nuvarande position till en destinationspunkt. Uppdatera kartan för att använda den här funktionen.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Uppdatera alla";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Hittat";
 
 /* Disclaimer message */
-"routing_disclaimer" = "När du skapar rutter i appen MAPS.ME, vänligen tänk på följande:\n\n  - Föreslagna rutter kan endast ses som rekommendationer.\n - Vägskick, trafikregler och skyltar har högre prioritet än navigeringsråd.\n - Kartan kan vara felaktig eller förlegad, och rutter skapas inte alltid på bästa tänkbara sätt.\n\n  Kör säkert på vägarna och ta hand om dig själv!";
+"routing_disclaimer" = "När du skapar rutter i appen OMaps, vänligen tänk på följande:\n\n  - Föreslagna rutter kan endast ses som rekommendationer.\n - Vägskick, trafikregler och skyltar har högre prioritet än navigeringsråd.\n - Kartan kan vara felaktig eller förlegad, och rutter skapas inte alltid på bästa tänkbara sätt.\n\n  Kör säkert på vägarna och ta hand om dig själv!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Gammal";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Ingen rutt hittades mellan vald startpunkt och målet. Välj en annan start- eller slutpunkt.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Ett internt fel inträffade. Försök att radera och ladda ner kartan igen. Kontakta oss på support@maps.me om problemet kvarstår.";
+"routing_failed_internal_error" = "Ett internt fel inträffade. Försök att radera och ladda ner kartan igen. Kontakta oss på support@omaps.app om problemet kvarstår.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Ladda ner karta + anvisningar";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Jag har precis betygsatt er app";
 
 /* Text for rating dialog */
-"rating_user_since" = "Jag har använt MAPS.ME sedan %@";
+"rating_user_since" = "Jag har använt OMaps sedan %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Gillar du MAPS.ME?";
+"rating_do_like_maps" = "Gillar du OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Tryck på en stjärna för att betygsätta vår app.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Hämta karta";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Ladda ner uppdaterad karta och navigeringsdata för att få tillgång till alla MAPS.ME funktioner.";
+"routing_download_map_and_routing" = "Ladda ner uppdaterad karta och navigeringsdata för att få tillgång till alla OMaps funktioner.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Hämta navigeringsdata";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Gillar du appen?";
 
-"rate_alert_default_message" = "Tack för att du använder MAPS.ME. Betygsätt gärna appen. Din feedback hjälper oss att bli bättre.";
+"rate_alert_default_message" = "Tack för att du använder OMaps. Betygsätt gärna appen. Din feedback hjälper oss att bli bättre.";
 
 "rate_alert_five_star_message" = "Hurra! Vi älskar dig också!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Duplicerad plats";
 
-"first_launch_congrats_title" = "Du kan nu använda MAPS.ME";
+"first_launch_congrats_title" = "Du kan nu använda OMaps";
 
 "first_launch_congrats_text" = "Sök och navigera offline var som helst i världen, helt gratis.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Lägg till nya platser till kartan och redigera de befintliga direkt från appen.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME använder data från OpenStreetMaps community.";
+"whatsnew_editor_message_2" = "* OMaps använder data från OpenStreetMaps community.";
 
 "onboarding_offline_navigation_title" = "Du kommer aldrig att gå vilse igen";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Planera optimala bil- och promenadrutter.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — se världsomspännande kartor utan internet";
+"onboarding_offline_maps_title" = "OMaps — se världsomspännande kartor utan internet";
 
 "onboarding_offline_maps_message" = "Ladda ned kartorna för önskat område en gång och använd funktionerna för navigering och sökning utan en internetanslutning.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "För att använda navigering och andra funktioner behöver vi tillgång till din geografiska plats.";
 
-"onboarding_permissions_title" = "Ge MAPS.ME åtkomst till lagring och plats";
+"onboarding_permissions_title" = "Ge OMaps åtkomst till lagring och plats";
 
 "onboarding_permissions_message" = "Så att du kan ladda ned kartor, visa platser och trafik i närheten och använda navigering.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Du behöver mer utrymme för att ladda ned. Radera onödig data.";
 
-"editor_sharing_title" = "Jag förbättrade kartorna hos MAPS.ME";
+"editor_sharing_title" = "Jag förbättrade kartorna hos OMaps";
 
 "editor_comment_will_be_sent" = "Vi vidarebefordrar din kommentar till kartritarna.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Detaljerad kommentar";
 
-"editor_detailed_description" = "Dina föreslagna ändringar kommer att skcikas till OpenStreetMap-communityt. Beskriv detaljerna som inte kan redigeras i MAPS.ME.";
+"editor_detailed_description" = "Dina föreslagna ändringar kommer att skcikas till OpenStreetMap-communityt. Beskriv detaljerna som inte kan redigeras i OMaps.";
 
 "editor_more_about_osm" = "Mer om OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Vi har uppdaterat kartredigeraren";
 
-"whatsnew_update_editor_message" = "MAPS.ME-användare har gjort 200 000 kartändringar. Tillsammans skapar vi de mest detaljerade kartonera i världen. Var med!";
+"whatsnew_update_editor_message" = "OMaps-användare har gjort 200 000 kartändringar. Tillsammans skapar vi de mest detaljerade kartonera i världen. Var med!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Uppdatera alla kartor för att använda kartredigeraren.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Fortsätt";
 
-"recent_track_background_dialog_message" = "MAPS.ME använder din geografiska position i bakgrunden för att spela in din senaste resta rutt.";
+"recent_track_background_dialog_message" = "OMaps använder din geografiska position i bakgrunden för att spela in din senaste resta rutt.";
 
 "whatsnew_car_navigation_header" = "Användarvänlig fordonsnavigering";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Cykelnavigering (betaversion)";
 
-"whatsnew_cycle_navigation_message" = "Vi testar cykelnavigeringen för den nya säsongen. Testa din favoritcykelrutt med MAPS.ME och berätta för oss vad du tycker.";
+"whatsnew_cycle_navigation_message" = "Vi testar cykelnavigeringen för den nya säsongen. Testa din favoritcykelrutt med OMaps och berätta för oss vad du tycker.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Betygsätt på Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Tipsa en vän";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Hej! Installera MAPS.ME!";
+"tell_friends_text" = "Hej! Installera OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME är en offline-applikation som du behöver när du reser. MAPS.ME baseras på OpenStreetMap-data och tillåter redigering i den.";
+"about_description" = "OMaps är en offline-applikation som du behöver när du reser. OMaps baseras på OpenStreetMap-data och tillåter redigering i den.";
 
 /* Text in menu */
 "blog" = "Blogg";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Öppna";
 
-"whatsnew_uber_header" = "MAPS.ME och Uber";
+"whatsnew_uber_header" = "OMaps och Uber";
 
 "whatsnew_uber_message" = "Beställ en Uber direkt från appen!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Öka teckenstorlek på kartan";
 
-"traffic_update_app" = "Uppdatera MAPS.ME";
+"traffic_update_app" = "Uppdatera OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Applikationen måste uppdateras för att trafikdata ska kunna visas.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Bevilja åtkomst";
 
-"onboarding_storage_permissions_message" = "Ändra behörighetsinställningarna på din enhet. Lagringsåtkomst krävs för att använda MAPS.ME.";
+"onboarding_storage_permissions_message" = "Ändra behörighetsinställningarna på din enhet. Lagringsåtkomst krävs för att använda OMaps.";
 
 "button_exit" = "Avsluta";
 
-"onboarding_detail_permissions_title" = "MAPS.ME behöver åtkomst till";
+"onboarding_detail_permissions_title" = "OMaps behöver åtkomst till";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Lagring";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Lagringsåtkomstproblem";
 
-"dialog_error_storage_message" = "Extern lagring är inte tillgänglig. SD-kortet är borttaget, skadat eller så är filsystemet är skrivskyddat. Kontrollera det och kontakta oss på support@maps.me";
+"dialog_error_storage_message" = "Extern lagring är inte tillgänglig. SD-kortet är borttaget, skadat eller så är filsystemet är skrivskyddat. Kontrollera det och kontakta oss på support@omaps.app";
 
 "setting_emulate_bad_storage" = "Emulera dålig lagring";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Jag godkänner <a href=\"%s\">användarvillkoren</a>";
 
-"sign_agree_news_gdpr" = "Jag håller med om att få de senaste nyheterna om MAPS.ME produkter";
+"sign_agree_news_gdpr" = "Jag håller med om att få de senaste nyheterna om OMaps produkter";
 
 "whats_new_localbiz_title" = "Småföretag förtjänar uppmärksamhet";
 
-"whats_new_localbiz_message" = "Det är lokala kaféer, mysiga hotell och affärer som gör din resa oförglömlig. Vi vill optimera din sida på MAPS.Me för att den ska sticka ut.";
+"whats_new_localbiz_message" = "Det är lokala kaféer, mysiga hotell och affärer som gör din resa oförglömlig. Vi vill optimera din sida på OMaps för att den ska sticka ut.";
 
 "whats_new_order_button" = "Lämna en förfrågan";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Ladda ner nya platser";
 
-"cached_bookmarks_placeholder_subtitle" = "Tryck på knappen för att ladda ner tusentals intressanta platser och rutter skapade av MAPS.ME användare. Du behöver internetanslutning.";
+"cached_bookmarks_placeholder_subtitle" = "Tryck på knappen för att ladda ner tusentals intressanta platser och rutter skapade av OMaps användare. Du behöver internetanslutning.";
 
 "downloader_download_routers" = "Ladda ner bokmärken";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Olycksrapport";
 
-"opt_out_fabric_description" = "Vi kan komma att använda din data för att förbättra MAPS.ME upplevelsen. Ändringarna kommer träda i kraft när du startar om appen.";
+"opt_out_fabric_description" = "Vi kan komma att använda din data för att förbättra OMaps upplevelsen. Ändringarna kommer träda i kraft när du startar om appen.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Bokmärkena laddades inte ner";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME har nu en ruttkatalog";
+"whats_new_bookmarks_catalog_title" = "OMaps har nu en ruttkatalog";
 
 "whats_new_bookmarks_catalog_message" = "Hundratals av detaljerade rutter, runt om i världen; Var du än är, vad du än vill se, var du än vill äta.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Ta bort reklam";
 
-"remove_ads_title" = "Ta bort all reklam och stöd MAPS.ME";
+"remove_ads_title" = "Ta bort all reklam och stöd OMaps";
 
 "paybtn_title" = "Betala %s/år";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Fler val";
 
-"why_support" = "Varför stödja MAPS.ME?";
+"why_support" = "Varför stödja OMaps?";
 
 "options_dropdown_item1" = "%s/månad (spara %s/år)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Vi tar bort all reklam för dig";
 
-"why_support_item2" = "Du hjälper oss att förbättra MAPS.ME";
+"why_support_item2" = "Du hjälper oss att förbättra OMaps";
 
 "why_support_item3" = "Du hjälper oss att förbättra de offentliga kartorna OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Servern är inte tillgänglig";
 
-"server_unavailable_message" = "Köpet fullbordas senare. Om felet kvarstår, vänligen kontakta support@maps.me.";
+"server_unavailable_message" = "Köpet fullbordas senare. Om felet kvarstår, vänligen kontakta support@omaps.app.";
 
 "offline_fiters_check_in" = "Koppla upp dig mot internet för att filtrera hotellen per datum.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Den här reseguiden kommer att laddas upp i den offentliga katalogen MAPS.ME och kommer att vara tillgänglig för andra användare";
+"upload_and_publish_desc" = "Den här reseguiden kommer att laddas upp i den offentliga katalogen OMaps och kommer att vara tillgänglig för andra användare";
 
 "upload_and_publish" = "Ladda upp och publicera";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Lämna en recension och hjälp resenärer!";
 
-"share_bookmarks_email_body_link" = "Hej!\n\nDina etiketter kan laddas ner från länken: %s. Öppna listan med hjälp av MAPS.ME och njut av resan!\n\nLadda ner appen: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Hej!\n\nDina etiketter kan laddas ner från länken: %s. Öppna listan med hjälp av OMaps och njut av resan!\n\nLadda ner appen: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Navigatören ska meddela dig om kameror när hastighetsgränsen överskrids med %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Det är lätt att dela dina intryck";
 
-"whats_new_ugc_routes_subtitle" = "Spara minnesvärda platser, skapa rutter genom att använda bokmärken och dela dem med alla i MAPS:ME katalogen.";
+"whats_new_ugc_routes_subtitle" = "Spara minnesvärda platser, skapa rutter genom att använda bokmärken och dela dem med alla i OMaps katalogen.";
 
 "whats_new_webeditor_title" = "Gör dina rutter till berättelser";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Din resrutt måste ha minst 3 etiketter för att laddas upp till den offentliga katalogen";
 
-"bookmark_public_upload_alert_title" = "Det är bara ett par steg från att ladda din resrutt till MAPS.ME katalog!";
+"bookmark_public_upload_alert_title" = "Det är bara ett par steg från att ladda din resrutt till OMaps katalog!";
 
 "bookmark_public_upload_alert_subtitle" = "Se till att resrutten har ett namn och en beskrivning och alla etiketter innehåller information om platser. På grund av detta kommer användare att hitta resrutten och kunna använda den på resan.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maximal energibesparing";
 
-"enable_logging_warning_message" = "Denna funktion aktiveras för loggning av åtgärder för diagnostiska ändamål. Detta hjälper laget att identifiera problem med applikationen. Slå på funktionen endast på begäran av MAPS.ME supporttjänst.";
+"enable_logging_warning_message" = "Denna funktion aktiveras för loggning av åtgärder för diagnostiska ändamål. Detta hjälper laget att identifiera problem med applikationen. Slå på funktionen endast på begäran av OMaps supporttjänst.";
 
 "html_error_upload_message_try_again" = "Kontrollera nätverksåtkomst och försök igen";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Ditt ID: %s.";
 
-"gdpr_request_window_message" = "Vänligen kopiera det och skicka förfrågan till support@maps.me";
+"gdpr_request_window_message" = "Vänligen kopiera det och skicka förfrågan till support@omaps.app";
 
 "gdpr_request_window_copy" = "Kopiera ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Undvik färjetrafik";
 
-"cached_guides_placeholder_subtitle" = "Färdiga guider i MAPS.ME är valda platser med bilder och beskrivningar som visas på kartan och är tillgängliga offline.";
+"cached_guides_placeholder_subtitle" = "Färdiga guider i OMaps är valda platser med bilder och beskrivningar som visas på kartan och är tillgängliga offline.";
 
 "guides_catalogue_title" = "Guidebok katalogen";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Uzbekiska mat";
 
-"onboarding_welcome_title" = "Planera och resa med MAPS.ME";
+"onboarding_welcome_title" = "Planera och resa med OMaps";
 
 "onboarding_welcome_first_subtitle" = "Spara intressanta platser, boka hotell, bygga rutten offline";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Ladda ner";
 
-"onboarding_bydeeplink_guide_title" = "Färdiga guider i MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Färdiga guider i OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Valda platser med bilder och beskrivningar visas på kartan och är tillgängliga offline.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Har bokat ett hotell?";
 
-"popup_booking_download_guides_message" = "Planera din rutt med färdiga reseguider MAPS.ME";
+"popup_booking_download_guides_message" = "Planera din rutt med färdiga reseguider OMaps";
 
 "popup_mwm_download_guides_title" = "Offline guider";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Se";
 
-"gallery_pp_download_guides_offline_title" = "Planera din semester med MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Planera din semester med OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Missa inte det viktigaste med rutter från erfarna resenärer";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Betalning kommer att debiteras ditt iTunes-konto vid bekräftelsen av köpet. Prenumerationen kommer att förnyas automatiskt om inte automat-förnyelse är avstängt minst 24 timmar före utgången av innevarande period. Ditt konto kommer att debiteras enligt din plan för förnyelse inom 24 timmar före utgången av innevarande period. Du kan hantera eller stänga av automatisk förnyelse för ditt inköp när som helst i ditt Apple-ID-konto.";
 
-"whatsnew_carplay_title" = "MAPS.ME autonavigering i CarPlay!";
+"whatsnew_carplay_title" = "OMaps autonavigering i CarPlay!";
 
 "whatsnew_carplay_message" = "Bokmärken, sök, hastighetskameror och omvägsinställningar - allt fungerar utan internet";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Info om kameror";
 
-"download_map_carplay" = "Ladda ner kartor i applikation MAPS.ME på din enhet";
+"download_map_carplay" = "Ladda ner kartor i applikation OMaps på din enhet";
 
 "carplay_roundabout_exit" = "%s utgången";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Hurra! Du är prenumererad!";
 
-"popup_subscription_success_map_message" = "Nu kan du utforska de bästa turistiska sevärdheterna i MAPS.ME-katalogen";
+"popup_subscription_success_map_message" = "Nu kan du utforska de bästa turistiska sevärdheterna i OMaps-katalogen";
 
 "popup_subscription_success_map_start_button" = "Börja surfa";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Börja";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Universell reseassistent";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Öppna katalog";
 
-"new_onboarding_step5.2_message" = "Prenumerationen på guidebok katalogen i MAPS.ME är lönsam. Få full tillgång till rutter för stadspromenader och utomhusaktiviteter!";
+"new_onboarding_step5.2_message" = "Prenumerationen på guidebok katalogen i OMaps är lönsam. Få full tillgång till rutter för stadspromenader och utomhusaktiviteter!";
 
 "new_onboarding_step5.2_button" = "Kolla villkoren";
 
-"new_onboarding_step5.3_message" = "Ladda ner och betygsätt rutter för stadspromenader och utomhusaktiviteter med ett gratis urval av MAPS.ME!";
+"new_onboarding_step5.3_message" = "Ladda ner och betygsätt rutter för stadspromenader och utomhusaktiviteter med ett gratis urval av OMaps!";
 
 "new_onboarding_step5.3_button" = "Ladda ner gratis";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Rutter från Outdooractive för vinter- och sommarresor väntar i katalogen!";
 
-"whatsnew_guides_galleries_title" = "Planera din kommande resa med MAPS.ME";
+"whatsnew_guides_galleries_title" = "Planera din kommande resa med OMaps";
 
 "whatsnew_guides_galleries_message" = "Nu kan du hitta rekommenderade guider på platssidor för populära städer och attraktioner";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Terräng";
 
-"tips_map_layers_title_countour" = "Höjningslinjer offline i MAPS.ME!";
+"tips_map_layers_title_countour" = "Höjningslinjer offline i OMaps!";
 
 "tips_map_layers_message_countour" = "Höjdlinjer hjälper dig att planera din resa till naturen och inte gå vilse på marken";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
index 5defdf50a7..91f2bc71a6 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 6b10238fdf..171618b4c9 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "รับมันตอนนี้";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "ขอบพระคุณสำหรับการใช้ MAPS.ME! คุณชอบแอปหรือไม่? บอกเพื่อนของคุณเกี่ยวกับมัน! นี่จะเป็นการขอบคุณที่ดีที่สุดสำหรับเรา";
+"share_on_facebook_text" = "ขอบพระคุณสำหรับการใช้ OMaps! คุณชอบแอปหรือไม่? บอกเพื่อนของคุณเกี่ยวกับมัน! นี่จะเป็นการขอบคุณที่ดีที่สุดสำหรับเรา";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "กิโลไบต์";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "ลองอีกครั้ง";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "เกี่ยวกับ MAPS.ME";
+"about_menu_title" = "เกี่ยวกับ OMaps";
 
 "downloading_touch_to_cancel" = "กำลังดาวน์โหลด %d%%, แตะเพื่อยกเลิก";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "ไม่สามารถใช้การ์ด SD /พื้นที่จัดเก็บ USB ที่มีดาวน์โหลดแผนที่ได้";
 
-"disconnect_usb_cable" = "โปรดยกเลิกการเชื่อมต่อสาย USB หรือใส่การ์ดหน่วยความจำเพื่อใช้ MAPS.ME";
+"disconnect_usb_cable" = "โปรดยกเลิกการเชื่อมต่อสาย USB หรือใส่การ์ดหน่วยความจำเพื่อใช้ OMaps";
 
 "not_enough_free_space_on_sdcard" = "โปรดเพิ่มพื้นที่บางส่วนบนการ์ด SD /พื้นที่จัดเก็บ USB ก่อนเพื่อใช้แอป";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "สามารถใช้การอัปเดตสำหรับแผนที่เหล่านี้:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "คุณไม่จำเป็นต้องใช้ MAPS.ME ไลท์ (Lite) อีกต่อไปแล้ว ดังนั้นคุณสามารถถอนการติดตั้ง";
+"suggest_uninstall_lite" = "คุณไม่จำเป็นต้องใช้ OMaps ไลท์ (Lite) อีกต่อไปแล้ว ดังนั้นคุณสามารถถอนการติดตั้ง";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ ได้รับการดาวน์โหลดสำเร็จแล้ว";
@@ -249,10 +249,10 @@
 "set" = "ชุด";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "คุณยังไม่มีบุ๊กมาร์ก\nแตะที่ใด ๆ บนแผนที่เพื่อเพิ่มบุ๊กมาร์ก\nสามารถนำเข้าบุ๊กมาร์กจากแหล่งอื่น ๆ และแสดงบน MAPS.ME เปิดไฟล์ KML/KMZ ด้วยหมุดที่บันทึกไว้จากอีเมล ดรอปบ็อกซ์ หรือเว็บลิงก์";
+"bookmarks_usage_hint" = "คุณยังไม่มีบุ๊กมาร์ก\nแตะที่ใด ๆ บนแผนที่เพื่อเพิ่มบุ๊กมาร์ก\nสามารถนำเข้าบุ๊กมาร์กจากแหล่งอื่น ๆ และแสดงบน OMaps เปิดไฟล์ KML/KMZ ด้วยหมุดที่บันทึกไว้จากอีเมล ดรอปบ็อกซ์ หรือเว็บลิงก์";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "สามารถนำเข้าบุ๊กมาร์กจากแหล่งอื่น ๆ และแสดงบน MAPS.ME เปิดไฟล์ KML/KMZ ด้วยหมุดที่บันทึกไว้จากอีเมล ดรอปบ็อกซ์ หรือเว็บลิงก์";
+"bookmarks_usage_hint_import_only" = "สามารถนำเข้าบุ๊กมาร์กจากแหล่งอื่น ๆ และแสดงบน OMaps เปิดไฟล์ KML/KMZ ด้วยหมุดที่บันทึกไว้จากอีเมล ดรอปบ็อกซ์ หรือเว็บลิงก์";
 
 /* Settings button in system menu */
 "settings" = "การตั้งค่า";
@@ -354,9 +354,9 @@
 "share_by_email" = "แชร์จากอีเมล";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "แชร์บุ๊กมาร์กของ MAPS.ME แล้ว";
+"share_bookmarks_email_subject" = "แชร์บุ๊กมาร์กของ OMaps แล้ว";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "กำลังโหลดบุ๊กมาร์ก";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "กำลังดำเนินการดาวน์โหลดประเทศในตอนนี้";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "หวังว่าคุณจะสนุกกับการใช้ MAPS.ME! หากเป็นเช่นนั้น โปรดให้คะแนนหรือวิจารณ์แอปได้ที่แอปสโตร์ (App Store) มันจะใช้เวลาไม่เกินหนึ่งนาทีแต่สามารถช่วยเหลือเราได้ ขอบคุณสำหรับการสนับสนุนของคุณ!";
+"appStore_message" = "หวังว่าคุณจะสนุกกับการใช้ OMaps! หากเป็นเช่นนั้น โปรดให้คะแนนหรือวิจารณ์แอปได้ที่แอปสโตร์ (App Store) มันจะใช้เวลาไม่เกินหนึ่งนาทีแต่สามารถช่วยเหลือเราได้ ขอบคุณสำหรับการสนับสนุนของคุณ!";
 
 /* No, thanks */
 "no_thanks" = "ไม่ ขอบคุณ";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "เฮ้ ตรวจสอบหมุดของฉันที่ MAPS.ME! %1$@ หรือ %2$@";
+"bookmark_share_sms" = "เฮ้ ตรวจสอบหมุดของฉันที่ OMaps! %1$@ หรือ %2$@";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ MAPS.ME! %1$@ หรือ %2$@ ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: http://maps.me/get";
+"my_position_share_sms" = "เฮ้อ ตรวจสอบตำแหน่งที่ตั้งปัจจุบันของฉันที่ OMaps! %1$@ หรือ %2$@ ไม่มีการติดตั้งแผนที่แบบออฟไลน์? ดาวน์โหลดที่นี่: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "เฮ้ ตรวจสอบหมุดของฉันที่ แผนที่ MAPS.ME!";
+"bookmark_share_email_subject" = "เฮ้ ตรวจสอบหมุดของฉันที่ แผนที่ OMaps!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "นี่ มาดูตำแหน่งปัจจุบันของฉันที่แผนที่ MAPS.ME สิ!";
+"my_position_share_email_subject" = "นี่ มาดูตำแหน่งปัจจุบันของฉันที่แผนที่ OMaps สิ!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "หวัดดี\n\nฉันอยู่ที่นี่ตอนนี้: %1$@. คลิกลิงก์นี้ %2$@ หรือลิงก์นี้ %3$@ เพื่อดูสถานที่บนแผนที่\n\nขอบคุณ";
@@ -549,7 +549,7 @@
 "search_show_on_map" = "ดูบนแผนที่";
 
 /* Used to warn user when fixing KitKat issue */
-"kitkat_migrate_ok" = "มีการปรับประสิทธิภาพพื้นที่จัดเก็บข้อมูลของแผนที่ โปรดรีสตาร์ทแอป\n\nโฟลเดอร์ MAPS.ME ในรากของการ์ด SD ไม่จำเป็นอีกต่อไป คุณสามารถลบได้";
+"kitkat_migrate_ok" = "มีการปรับประสิทธิภาพพื้นที่จัดเก็บข้อมูลของแผนที่ โปรดรีสตาร์ทแอป\n\nโฟลเดอร์ OMaps ในรากของการ์ด SD ไม่จำเป็นอีกต่อไป คุณสามารถลบได้";
 
 /* Used to warn user when fixing KitKat issue */
 "kitkat_migrate_failed" = "เนื่องจากการเปลี่ยนแปลงในแอนดรอยด์ 4.4 เราจำเป็นต้องทำการปรับประสิทธิภาพพื้นที่จัดเก็บข้อมูลของแผนที่ แต่มีพื้นที่ไม่เพียงพอสำหรับการคัดลอกข้อมูลแผนที่\n\nโปรดเพิ่มหน่วยความจำ มิฉะนั้นแล้วจะสามารถใช้แผนที่ได้ในโหมด อ่านอย่างเดียว";
@@ -582,16 +582,16 @@
 "download_map_notification" = "ดาวน์โหลดแผนที่เกี่ยวกับสถานที่ที่คุณอยู่";
 
 /* text of notification */
-"pro_version_is_free_today" = "เวอร์ชันเต็มของ MAPS.ME วันนี้ฟรี! ดาวน์โหลดตอนนี้แล้วบอกเพื่อน ๆ ของคุณ";
+"pro_version_is_free_today" = "เวอร์ชันเต็มของ OMaps วันนี้ฟรี! ดาวน์โหลดตอนนี้แล้วบอกเพื่อน ๆ ของคุณ";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "เรากำลังโอนแผนที่ที่ดาวน์โหลดของคุณจาก MAPS.ME Lite ไปยัง MAPS.ME อาจใช้เวลาสองสามวินาที";
+"move_lite_maps_to_pro" = "เรากำลังโอนแผนที่ที่ดาวน์โหลดของคุณจาก OMaps Lite ไปยัง OMaps อาจใช้เวลาสองสามวินาที";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "แผนที่ที่ดาวน์โหลดของคุณโอนไปยัง MAPS.ME สำเร็จ";
+"move_lite_maps_to_pro_ok" = "แผนที่ที่ดาวน์โหลดของคุณโอนไปยัง OMaps สำเร็จ";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "ล้มเหลวในการโอนแผนที่ของคุณ โปรดลบ MAPS.ME Lite และดาวน์โหลดแผนที่อีกครั้ง";
+"move_lite_maps_to_pro_failed" = "ล้มเหลวในการโอนแผนที่ของคุณ โปรดลบ OMaps Lite และดาวน์โหลดแผนที่อีกครั้ง";
 
 /* Text in menu */
 "settings_and_more" = "การตั้งค่า & อื่น ๆ";
@@ -600,7 +600,7 @@
 "website" = "เว็บไซต์";
 
 /* Text in menu */
-"maps_me_community" = "ชุมชน MAPS.ME";
+"maps_me_community" = "ชุมชน OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "ถูกใจบน Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "แจ้งข้อผิดพลาด";
 
 /* Email subject */
-"subscribe_me_subject" = "โปรดลงชื่อฉันเพื่อรับจดหมายข่าว MAPS.ME";
+"subscribe_me_subject" = "โปรดลงชื่อฉันเพื่อรับจดหมายข่าว OMaps";
 
 /* Email body */
 "subscribe_me_body" = "ฉันอยากเป็นคนแรกที่รู้เกี่ยวกับข่าว อัปเดตและโปรโมชั่นล่าสุด ฉันสามารถยกเลิกการเป็นสมาชิกของฉันได้ตลอดเวลา";
 
 /* About text */
-"about_text" = "MAPS.ME ขอเสนอแผนที่ออฟไลน์ของทุกเมือง ทุกประเทศในโลกที่รวดเร็วที่สุด เดินทางด้วยความมั่นใจ: ไม่ว่าคุณจะอยู่ที่ไหน MAPS.ME จะช่วยระบุตำแหน่งที่ตั้งของตัวคุณบนแผนที่ ค้นหาร้านอาหาร โรงแรม ธนาคาร ปั๊มน้ำมัน และอื่น ๆ ที่ใกล้ที่สุด โดยไม่จำเป็นต้องใช้การเชื่อมต่ออินเทอร์เน็ต\n\nเราทำงานเพื่อพัฒนาฟีเจอร์ใหม่ ๆ อยู่เสมอและยินดีรับฟังว่าคุณมีความคิดเห็นว่าเราจะพัฒนา MAPS.ME ได้อย่างไร หากคุณมีปัญหาใด ๆ กับแอป อย่าลังเลที่จะติดต่อเราที่ support@maps.me โดยเราจะตอบรับทุกคำขอ!\n\nคุณชอบ MAPS.ME และต้องการสนับสนุนเราหรือไม่? มีวิธีง่าย ๆ และฟรีอยู่บ้าง:\n\n- โพสต์คำวิจารณ์ของคุณที่ ตลาดแอป (App Market)\n- ถูกใจเพจ Facebook ของเรา http://www.facebook.com/mapswithme\n- หรือเพียงแค่บอกแม่ เพื่อน ๆ และเพื่อนร่วมงานของคุณเกี่ยวกับ MAPS.ME :)\n\nขอบคุณที่ใช้บริการของเรา เราซาบซึ้งในการสนับสนุนของคุณมาก!\n\nป.ล. เรานำข้อมูลแผนที่มาจาก OpenStreetMap ซึ่งเป็นโครงการจัดทำแผนที่ที่เหมือนกับ Wikipedia ที่ช่วยให้ผู้ใช้สามารถสร้างและแก้ไขแผนที่ได้ หากคุณเห็นว่ามีสิ่งใดที่ขาดหายหรือไม่ถูกต้องบนแผนที่ คุณสามารถแก้ไขแผนที่ได้โดยตรงที่ https://www.openstreetmap.org และการเปลี่ยนแปลงของคุณจะปรากฏในแอป MAPS.ME ในการปล่อยเวอร์ชันถัดไป";
+"about_text" = "OMaps ขอเสนอแผนที่ออฟไลน์ของทุกเมือง ทุกประเทศในโลกที่รวดเร็วที่สุด เดินทางด้วยความมั่นใจ: ไม่ว่าคุณจะอยู่ที่ไหน OMaps จะช่วยระบุตำแหน่งที่ตั้งของตัวคุณบนแผนที่ ค้นหาร้านอาหาร โรงแรม ธนาคาร ปั๊มน้ำมัน และอื่น ๆ ที่ใกล้ที่สุด โดยไม่จำเป็นต้องใช้การเชื่อมต่ออินเทอร์เน็ต\n\nเราทำงานเพื่อพัฒนาฟีเจอร์ใหม่ ๆ อยู่เสมอและยินดีรับฟังว่าคุณมีความคิดเห็นว่าเราจะพัฒนา OMaps ได้อย่างไร หากคุณมีปัญหาใด ๆ กับแอป อย่าลังเลที่จะติดต่อเราที่ support@omaps.app โดยเราจะตอบรับทุกคำขอ!\n\nคุณชอบ OMaps และต้องการสนับสนุนเราหรือไม่? มีวิธีง่าย ๆ และฟรีอยู่บ้าง:\n\n- โพสต์คำวิจารณ์ของคุณที่ ตลาดแอป (App Market)\n- ถูกใจเพจ Facebook ของเรา http://www.facebook.com/mapswithme\n- หรือเพียงแค่บอกแม่ เพื่อน ๆ และเพื่อนร่วมงานของคุณเกี่ยวกับ OMaps :)\n\nขอบคุณที่ใช้บริการของเรา เราซาบซึ้งในการสนับสนุนของคุณมาก!\n\nป.ล. เรานำข้อมูลแผนที่มาจาก OpenStreetMap ซึ่งเป็นโครงการจัดทำแผนที่ที่เหมือนกับ Wikipedia ที่ช่วยให้ผู้ใช้สามารถสร้างและแก้ไขแผนที่ได้ หากคุณเห็นว่ามีสิ่งใดที่ขาดหายหรือไม่ถูกต้องบนแผนที่ คุณสามารถแก้ไขแผนที่ได้โดยตรงที่ https://www.openstreetmap.org และการเปลี่ยนแปลงของคุณจะปรากฏในแอป OMaps ในการปล่อยเวอร์ชันถัดไป";
 
 /* Alert text */
 "email_error_body" = "อีเมลลูกค้ายังไม่ได้รับการจัดตั้งขึ้น กรุณาตั้งค่าหรือใช้วิธีอื่นที่จะติดต่อเราที่ %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "โปรดอัปเดตแผนที่เพื่อสร้างเส้นทาง";
 
 /* Update maps suggestion */
-"routing_update_maps" = "เวอร์ชันใหม่ของ MAPS.ME อนุญาติให้สร้างเส้นทางจากตำแหน่งปัจจุบันของคุณไปยังจุดปลายทาง โปรดอัปเดตแผนเพื่อใช้ฟีเจอร์นี้";
+"routing_update_maps" = "เวอร์ชันใหม่ของ OMaps อนุญาติให้สร้างเส้นทางจากตำแหน่งปัจจุบันของคุณไปยังจุดปลายทาง โปรดอัปเดตแผนเพื่อใช้ฟีเจอร์นี้";
 
 /* Update all button text */
 "downloader_update_all_button" = "อัปเดตทั้งหมด";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "พบ";
 
 /* Disclaimer message */
-"routing_disclaimer" = "การสร้างเส้นทางในแอป MAPS.ME มีสิ่งที่ควรทราบดังต่อไปนี้:\n\n  - พึงพิจารณาเส้นทางที่แนะนำไว้ในฐานะที่เป็นการแนะนำเท่านั้น\n - สภาพถนน กฎจราจรและป้ายมีความสำคัญมากกว่าคำแนะนำในการนำทาง\n - แผนที่อาจไม่ถูกต้องหรือล้าสมัย และอาจไม่ได้มีการสร้างเส้นทางในรูปแบบพอจะเป็นไปได้ที่ดีที่สุด\n\n  ขอให้ปลอดภัยบนท้องถนนและดูแลตัวคุณเองด้วย!";
+"routing_disclaimer" = "การสร้างเส้นทางในแอป OMaps มีสิ่งที่ควรทราบดังต่อไปนี้:\n\n  - พึงพิจารณาเส้นทางที่แนะนำไว้ในฐานะที่เป็นการแนะนำเท่านั้น\n - สภาพถนน กฎจราจรและป้ายมีความสำคัญมากกว่าคำแนะนำในการนำทาง\n - แผนที่อาจไม่ถูกต้องหรือล้าสมัย และอาจไม่ได้มีการสร้างเส้นทางในรูปแบบพอจะเป็นไปได้ที่ดีที่สุด\n\n  ขอให้ปลอดภัยบนท้องถนนและดูแลตัวคุณเองด้วย!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "ล้าสมัย";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "ไม่พบเส้นทางที่อยู่ระหว่างต้นทางและปลายทางที่เลือก โปรดเลือกจุดเริ่มต้นและจุดสิ้นสุดอื่น";
 
 /* InternalError */
-"routing_failed_internal_error" = "เกิดข้อผิดพลาดขึ้นภายใน โปรดลองลบและดาวน์โหลดแผนที่อีกครั้ง โปรดติดต่อเราได้ที่ support@maps.me.";
+"routing_failed_internal_error" = "เกิดข้อผิดพลาดขึ้นภายใน โปรดลองลบและดาวน์โหลดแผนที่อีกครั้ง โปรดติดต่อเราได้ที่ support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "ดาวน์โหลดแผนที่ + การเลือกเส้นทาง";
@@ -792,7 +792,7 @@
 "routing_download_map" = "รับแผนที่";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "ดาวน์โหลดแผนที่มีการอัปเดตและการกำหนดเส้นทางข้อมูลเพื่อรับฟีเจอร์ MAPS.ME ทั้งหมด";
+"routing_download_map_and_routing" = "ดาวน์โหลดแผนที่มีการอัปเดตและการกำหนดเส้นทางข้อมูลเพื่อรับฟีเจอร์ OMaps ทั้งหมด";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "รับข้อมูลการกำหนดเส้นทาง";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "ชอบแอปหรือไม่?";
 
-"rate_alert_default_message" = "ขอบพระคุณสำหรับการใช้ MAPS.ME โปรดให้คะแนนแอป ข้อเสนอแนะของคุณจะช่วยทำให้เราทำได้ดียิ่งขึ้น";
+"rate_alert_default_message" = "ขอบพระคุณสำหรับการใช้ OMaps โปรดให้คะแนนแอป ข้อเสนอแนะของคุณจะช่วยทำให้เราทำได้ดียิ่งขึ้น";
 
 "rate_alert_five_star_message" = "ฮูเร่! เราก็รักคุณเช่นกัน!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "สถานที่ซ้ำ";
 
-"first_launch_congrats_title" = "MAPS.ME พร้อมใช้งานแล้ว";
+"first_launch_congrats_title" = "OMaps พร้อมใช้งานแล้ว";
 
 "first_launch_congrats_text" = "ค้นหาและนำทางไปทุกที่ในโลกแบบออฟไลน์ ไม่มีค่าใช้จ่าย";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "เพิ่มสถานที่ใหม่ ๆ ไปยังแผนที่ และแก้ไขสถานที่ที่มีอยู่เดิมจากแอปโดยตรง";
 
-"whatsnew_editor_message_2" = "* MAPS.ME ใช้ข้อมูลจากชุมชน OpenStreetMap";
+"whatsnew_editor_message_2" = "* OMaps ใช้ข้อมูลจากชุมชน OpenStreetMap";
 
 "onboarding_offline_navigation_title" = "คุณจะไม่หลงทางอีกต่อไป";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "วางแผนเส้นทางรถยนต์และเส้นทางเดินที่เหมาะสมที่สุด";
 
-"onboarding_offline_maps_title" = "MAPS.ME — เข้าถึงแผนที่ทั่วโลกโดยไม่ใช้อินเทอร์เน็ต";
+"onboarding_offline_maps_title" = "OMaps — เข้าถึงแผนที่ทั่วโลกโดยไม่ใช้อินเทอร์เน็ต";
 
 "onboarding_offline_maps_message" = "ดาวน์โหลดแผนที่สำหรับพื้นที่ที่ต้องการเพียงหนึ่งครั้ง แล้วใช้การฟังก์ชันการนำทางและการค้นหาโดยไม่ต้องเชื่อมต่ออินเทอร์เน็ต";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "เพื่อใช้การนำทางและฟีเจอร์อื่น ๆ เราต้องการเข้าถึงตำแหน่งทางภูมิศาสตร์ของคุณ";
 
-"onboarding_permissions_title" = "อนุญาตให้ MAPS.ME เข้าถึงที่เก็บข้อมูลและตำแหน่งที่ตั้ง";
+"onboarding_permissions_title" = "อนุญาตให้ OMaps เข้าถึงที่เก็บข้อมูลและตำแหน่งที่ตั้ง";
 
 "onboarding_permissions_message" = "เพื่อที่คุณจะได้สามารถดาวน์โหลดแผนที่ ดูสถานที่ต่าง ๆ และการจราจรที่อยู่ใกล้ ๆ คุณแล้วใช้งานการนำทางได้";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "ในการดาวน์โหลด คุณต้องมีพื้นที่มากขึ้น กรุณาลบเนื้อหาที่ไม่จำเป็นออกไป";
 
-"editor_sharing_title" = "ฉันได้ปรับปรุงแผนที่ MAPS.ME";
+"editor_sharing_title" = "ฉันได้ปรับปรุงแผนที่ OMaps";
 
 "editor_comment_will_be_sent" = "เราจะส่งความคิดเห็นของคุณไปให้กับนักเขียนแผนที่";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "ข้อคิดเห็นอย่างละเอียด";
 
-"editor_detailed_description" = "คำแนะนำการเปลี่ยนแปลงของคุณจะถูกส่งไปยังกลุ่ม OpenStreetMap โปรดอธิบายรายละเอียดที่ MAPS.ME ไม่สามารถแก้ไขได้";
+"editor_detailed_description" = "คำแนะนำการเปลี่ยนแปลงของคุณจะถูกส่งไปยังกลุ่ม OpenStreetMap โปรดอธิบายรายละเอียดที่ OMaps ไม่สามารถแก้ไขได้";
 
 "editor_more_about_osm" = "ข้อมูลเพิ่มเติมเกี่ยวกับ OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "เราได้ทำการอัพเดตตัวแก้ไขแผนที่แล้ว";
 
-"whatsnew_update_editor_message" = "ผู้ใช้ MAPS.ME ได้ทำการเปลี่ยนแปลงแผนที่เป็นจำนวนมากกว่า 200 000 ครั้งแล้ว เรากำลังทำให้แผนที่นี้มีรายละเอียดมากที่สุดในโลก มาร่วมมือกัน!";
+"whatsnew_update_editor_message" = "ผู้ใช้ OMaps ได้ทำการเปลี่ยนแปลงแผนที่เป็นจำนวนมากกว่า 200 000 ครั้งแล้ว เรากำลังทำให้แผนที่นี้มีรายละเอียดมากที่สุดในโลก มาร่วมมือกัน!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "ในการใช้เครื่องมือการแก้ไขแผนที่ โปรดอัปเดตแผนที่ทั้งหมด";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "ดำเนินการต่อ";
 
-"recent_track_background_dialog_message" = "MAPS.ME ใช้ตำแหน่งทางภูมิศาสตร์ของคุณในพื้นหลังเพื่อบันทึกเส้นทางที่คุณเดินทางเมื่อเร็ว ๆ นี้";
+"recent_track_background_dialog_message" = "OMaps ใช้ตำแหน่งทางภูมิศาสตร์ของคุณในพื้นหลังเพื่อบันทึกเส้นทางที่คุณเดินทางเมื่อเร็ว ๆ นี้";
 
 "whatsnew_car_navigation_header" = "การนำทางยานพาหนะอย่างเป็นมิตรต่อผู้ใช้";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "การนำทางจักรยาน (beta-version)";
 
-"whatsnew_cycle_navigation_message" = "เรากำลังทดสอบการนำทางจักรยานในฤดูกาลใหม่ ลองเส้นทางการขี่จักรยานด้วย MAPS.ME และแชร์ความคิดเห็นของคุณมาให้เรา";
+"whatsnew_cycle_navigation_message" = "เรากำลังทดสอบการนำทางจักรยานในฤดูกาลใหม่ ลองเส้นทางการขี่จักรยานด้วย OMaps และแชร์ความคิดเห็นของคุณมาให้เรา";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "ให้คะแนนบน Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "บอกเพื่อน";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "สวัสดี! ติดตั้ง MAPS.ME กันเถอะ!";
+"tell_friends_text" = "สวัสดี! ติดตั้ง OMaps กันเถอะ!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME เป็นแอปพลิเคชั่นออฟไลน์ที่จำเป็นสำหรับการท่องเที่ยว MAPS.ME นั้นใช้งานบนพื้นฐานของข้อมูล OpenStreetMap และใช้แก้ไขได้ด้วย";
+"about_description" = "OMaps เป็นแอปพลิเคชั่นออฟไลน์ที่จำเป็นสำหรับการท่องเที่ยว OMaps นั้นใช้งานบนพื้นฐานของข้อมูล OpenStreetMap และใช้แก้ไขได้ด้วย";
 
 /* Text in menu */
 "blog" = "บล็อก";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "เปิด";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "เรียกแท็กซี่ Uber โดยตรงจากแอป!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "เพิ่มขนาดฟอนต์บนแผนที่";
 
-"traffic_update_app" = "กรุณาอัปเดต MAPS.ME";
+"traffic_update_app" = "กรุณาอัปเดต OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "ในการแสดงข้อมูลการจราจร แอปพลิเคชั่นจะต้องอัปเดตก่อน";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "ให้สิทธิ์เข้าถึง";
 
-"onboarding_storage_permissions_message" = "เปลี่ยนการตั้งค่าการให้สิทธิ์ในเครื่องของคุณ จำเป็นต้องได้สิทธิ์การเข้าถึงที่เก็บข้อมูลเพื่อใช้งาน MAPS.ME";
+"onboarding_storage_permissions_message" = "เปลี่ยนการตั้งค่าการให้สิทธิ์ในเครื่องของคุณ จำเป็นต้องได้สิทธิ์การเข้าถึงที่เก็บข้อมูลเพื่อใช้งาน OMaps";
 
 "button_exit" = "ออก";
 
-"onboarding_detail_permissions_title" = "MAPS.ME จำเป็นต้องได้สิทธิ์การเข้าถึง";
+"onboarding_detail_permissions_title" = "OMaps จำเป็นต้องได้สิทธิ์การเข้าถึง";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "ที่เก็บข้อมูล";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "ปัญหาการเข้าถึงที่เก็บข้อมูล";
 
-"dialog_error_storage_message" = "ที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน อาจเป็นเพราะการ์ด SD ถูกถอดออกไป ได้รับความเสียหาย หรือระบบไฟล์ให้เขียนได้อย่างเดียว กรุณาตรวจสอบและติดต่อเราได้ที่ support@maps.me";
+"dialog_error_storage_message" = "ที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน อาจเป็นเพราะการ์ด SD ถูกถอดออกไป ได้รับความเสียหาย หรือระบบไฟล์ให้เขียนได้อย่างเดียว กรุณาตรวจสอบและติดต่อเราได้ที่ support@omaps.app";
 
 "setting_emulate_bad_storage" = "จำลองแบบที่เก็บข้อมูลที่ไม่ดี";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "ฉันยอมรับ <a href=\"%s\">ข้อกำหนดในการให้บริการ</a>";
 
-"sign_agree_news_gdpr" = "ฉันยอมรับที่จะรับข่าวสารล่าสุดเกี่ยวกับผลิตภัณฑ์ MAPS.ME";
+"sign_agree_news_gdpr" = "ฉันยอมรับที่จะรับข่าวสารล่าสุดเกี่ยวกับผลิตภัณฑ์ OMaps";
 
 "whats_new_localbiz_title" = "ธุรกิจขนาดเล็กควรจะได้รับความเอาใจใส่";
 
-"whats_new_localbiz_message" = "มันเป็นร้านกาแฟในท้องถิ่น หอพักอันอบอุ่น และร้านค้าที่ทำให้การเดินทางของเราเป็นที่น่าจดจำ เราจะเพิ่มประสิทธิภาพหน้าเว็บไซต์ของคุณใน MAPS.ME เพื่อทำให้เว็บไซต์ของคุณโดดเด่น";
+"whats_new_localbiz_message" = "มันเป็นร้านกาแฟในท้องถิ่น หอพักอันอบอุ่น และร้านค้าที่ทำให้การเดินทางของเราเป็นที่น่าจดจำ เราจะเพิ่มประสิทธิภาพหน้าเว็บไซต์ของคุณใน OMaps เพื่อทำให้เว็บไซต์ของคุณโดดเด่น";
 
 "whats_new_order_button" = "ฝากคำร้อง";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "ดาวน์โหลดสถานที่ใหม่";
 
-"cached_bookmarks_placeholder_subtitle" = "กดปุ่มเพื่อดาวน์โหลดหลายพันสถานที่ และเส้นทางที่น่าสนใจต่าง ๆ ซึ่งสร้างขึ้นโดยผู้ใช้งานของ MAPS.ME คุณจำเป็นต้องเชื่อมต่อกับอินเตอร์เน็ต";
+"cached_bookmarks_placeholder_subtitle" = "กดปุ่มเพื่อดาวน์โหลดหลายพันสถานที่ และเส้นทางที่น่าสนใจต่าง ๆ ซึ่งสร้างขึ้นโดยผู้ใช้งานของ OMaps คุณจำเป็นต้องเชื่อมต่อกับอินเตอร์เน็ต";
 
 "downloader_download_routers" = "ดาวน์โหลดบุ๊กมาร์ก";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "รายงานข้อขัดข้อง";
 
-"opt_out_fabric_description" = "เราอาจใช้ข้อมูลของคุณเพื่อพัฒนาประสบการณ์ของ MAPS.ME การเปลี่ยนแปลงจะมีผลหลังจากที่คุณเปิดแอพฯ ขึ้นใหม่";
+"opt_out_fabric_description" = "เราอาจใช้ข้อมูลของคุณเพื่อพัฒนาประสบการณ์ของ OMaps การเปลี่ยนแปลงจะมีผลหลังจากที่คุณเปิดแอพฯ ขึ้นใหม่";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "ไม่ได้ดาวน์โหลดบุ๊กมาร์ก";
 
-"whats_new_bookmarks_catalog_title" = "ขณะนี้ MAPS.ME มีแคตาล็อกเส้นทางแล้ว";
+"whats_new_bookmarks_catalog_title" = "ขณะนี้ OMaps มีแคตาล็อกเส้นทางแล้ว";
 
 "whats_new_bookmarks_catalog_message" = "หลายร้อยเส้นทางโดยรายละเอียดทั่วโลก: ที่ไหนควรจะไป ควรจะไปดูอะไร ควรจะกินที่ไหน";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "ซ่อนโฆษณา";
 
-"remove_ads_title" = "ซ่อนโฆษณาทั้งหมดที่แสดงในแอพพลิเคชันด้วยการสนับสนุน MAPS.ME";
+"remove_ads_title" = "ซ่อนโฆษณาทั้งหมดที่แสดงในแอพพลิเคชันด้วยการสนับสนุน OMaps";
 
 "paybtn_title" = "ในราคา %s/ปี";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "ทางเลือกอื่นๆ";
 
-"why_support" = "ทำไมถึงควรใช้บริการ MAPS.ME?";
+"why_support" = "ทำไมถึงควรใช้บริการ OMaps?";
 
 "options_dropdown_item1" = "%s/เดือน (ประหยัดได้ %s/ปี)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "เราจะซ่อนโฆษณาทั้งหมดบนแอพเพื่อคุณ";
 
-"why_support_item2" = "คุณช่วยเราพัฒนา MAPS.ME";
+"why_support_item2" = "คุณช่วยเราพัฒนา OMaps";
 
 "why_support_item3" = "คุณช่วยเราพัฒนาแผนที่ที่เปิดให้คนทั่วไปเข้าใช้งานของ OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "ไม่สามารถเข้าถึงเซิร์ฟเวอร์";
 
-"server_unavailable_message" = "การชำระเงินจะเสร็จสมบูรณ์ในภายหลัง หากข้อผิดพลาดยังคงเกิดขึ้นต่อเนื่อง โปรดติดต่อเราที่ support@maps.me";
+"server_unavailable_message" = "การชำระเงินจะเสร็จสมบูรณ์ในภายหลัง หากข้อผิดพลาดยังคงเกิดขึ้นต่อเนื่อง โปรดติดต่อเราที่ support@omaps.app";
 
 "offline_fiters_check_in" = "เชื่อมต่ออินเทอร์เน็ตเพื่อคัดกรองโรงแรมตามลำดับวันที่";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "ไกด์นี้จะถูกอัพโหลดไปยังแคตตาล็อกสาธารณะของ MAPS.ME และเปิดให้ผู้ใช้งานคนอื่นเข้าถึงได้";
+"upload_and_publish_desc" = "ไกด์นี้จะถูกอัพโหลดไปยังแคตตาล็อกสาธารณะของ OMaps และเปิดให้ผู้ใช้งานคนอื่นเข้าถึงได้";
 
 "upload_and_publish" = "อัพโหลดและเผยแพร่";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "ช่วยนักเดินทางโดยการทิ้งรีวิว!";
 
-"share_bookmarks_email_body_link" = "สวัสดี!\n\nนี่คือลิงค์ที่คุณสามารถดาวน์โหลดบุ๊คมาร์คของคุณ: %s เปิดรายการผ่าน MAPS.ME และเพลิดเพลินไปกับการเดินทางของคุณ!\n\nรับแอพพลิเคชัน: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "สวัสดี!\n\nนี่คือลิงค์ที่คุณสามารถดาวน์โหลดบุ๊คมาร์คของคุณ: %s เปิดรายการผ่าน OMaps และเพลิดเพลินไปกับการเดินทางของคุณ!\n\nรับแอพพลิเคชัน: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "เนวิเกเตอร์จะเตือนคุณเกี่ยวกับกล้องถ่ายรูปเมื่อคุณขับเร็วเกินกำหนดโดยอยู่ที่ %d กม./ชม";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "แบ่งปันความประทับใจของคุณได้ง่าย ๆ";
 
-"whats_new_ugc_routes_subtitle" = "บันทึกสถานที่ที่น่าจดจำ สร้างสรรค์การเดินทางต่าง ๆโดยใช้บุ๊กมาร์ก และแบ่งปันกับทุกคนในแคตตาล็อก MAPS.ME";
+"whats_new_ugc_routes_subtitle" = "บันทึกสถานที่ที่น่าจดจำ สร้างสรรค์การเดินทางต่าง ๆโดยใช้บุ๊กมาร์ก และแบ่งปันกับทุกคนในแคตตาล็อก OMaps";
 
 "whats_new_webeditor_title" = "เปลี่ยนการเดินทางต่าง ๆ ของคุณให้กลายเป็นเรื่องราว";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "คุณจำเป็นต้องมีอย่างน้อย 3 บุ๊กมาร์กเพื่ออัพโหลดไกด์ของคุณไปยังแคตตาล็อกสาธารณะ";
 
-"bookmark_public_upload_alert_title" = "เหลืออีกเพียงไม่กี่ขั้นตอนในการแชร์บุ๊กมาร์กแก่นักท่องเที่ยวใน MAPS.ME ทุกคน!";
+"bookmark_public_upload_alert_title" = "เหลืออีกเพียงไม่กี่ขั้นตอนในการแชร์บุ๊กมาร์กแก่นักท่องเที่ยวใน OMaps ทุกคน!";
 
 "bookmark_public_upload_alert_subtitle" = "โปรดแน่ใจว่าคุณได้ระบุชื่อที่ชัดเจนและคำบรรยายในรายการของคุณ และบุ๊กมาร์กทั้งหมดนั้นมีข้อมูลเกี่ยวกับสถานที่ วิธีนี้จะทำให้คนอื่นๆ นั้นพบและใช้รายการของคุณได้";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "ประหยัดพลังงานสูงสุด";
 
-"enable_logging_warning_message" = "ออปชันเพื่อเปิดการบันทึกประวัติการทำงานเพื่อการวินิจฉัย ประวัติดังกล่าวอาจเป็นประโยชน์กับทีมงานช่วยเหลือของเราที่คอยจัดการกับปัญหาที่เจอระหว่างแอปทำงาน โปรดเปิดออปชันดังกล่าวจากการร้องข้อการสนับสนุนจาก MAPS.ME เท่านั้น";
+"enable_logging_warning_message" = "ออปชันเพื่อเปิดการบันทึกประวัติการทำงานเพื่อการวินิจฉัย ประวัติดังกล่าวอาจเป็นประโยชน์กับทีมงานช่วยเหลือของเราที่คอยจัดการกับปัญหาที่เจอระหว่างแอปทำงาน โปรดเปิดออปชันดังกล่าวจากการร้องข้อการสนับสนุนจาก OMaps เท่านั้น";
 
 "html_error_upload_message_try_again" = "โปรดเช็คการตั้งค่าเครือข่ายและลองใหม่อีกครั้ง";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "ชื่อบัญชีของคุณ: %s";
 
-"gdpr_request_window_message" = "โปรดคัดลอกชื่อบัญชีและส่งมาทางคำร้องที่ support@maps.me";
+"gdpr_request_window_message" = "โปรดคัดลอกชื่อบัญชีและส่งมาทางคำร้องที่ support@omaps.app";
 
 "gdpr_request_window_copy" = "คัดลอกชื่อบัญชี";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "เลี่ยงการข้ามฟากด้วยเรือ";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME เสนอไกด์ที่สมบูรณ์แบบสำหรับการเลือกสถานที่พร้อมภาพ และคำบรรยายที่ปรากฏในแผนที่ และทำงานโดยไม่มีสัญญาณอินเทอร์เน็ตได้";
+"cached_guides_placeholder_subtitle" = "OMaps เสนอไกด์ที่สมบูรณ์แบบสำหรับการเลือกสถานที่พร้อมภาพ และคำบรรยายที่ปรากฏในแผนที่ และทำงานโดยไม่มีสัญญาณอินเทอร์เน็ตได้";
 
 "guides_catalogue_title" = "ไกด์แคตตาล็อก";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "อาหารแนวอุซเบค";
 
-"onboarding_welcome_title" = "วางแผนและท่องเที่ยวด้วย MAPS.ME";
+"onboarding_welcome_title" = "วางแผนและท่องเที่ยวด้วย OMaps";
 
 "onboarding_welcome_first_subtitle" = "บุ๊ตมาร์คสถานที่ที่น่าสนใจ จองโรงแรม และคำนวณเส้นทางแบบไม่ต้องใช้สัญญาณอินเทอร์เน็ต";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "ดาวน์โหลด";
 
-"onboarding_bydeeplink_guide_title" = "ไกด์ใน MAPS.ME พร้อมใช้งานแล้ว";
+"onboarding_bydeeplink_guide_title" = "ไกด์ใน OMaps พร้อมใช้งานแล้ว";
 
 "onboarding_bydeeplink_guide_subtitle" = "สถานที่ที่เหมาะกับการเยี่ยมชมนั้นปรากฎบนแผนที่พร้อมกับรูปและคำบรรยาย ทำงานโดยไม่ต้องใช้สัญญาณอินเทอร์เน็ต";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "จองโรงแรมหรือไม่";
 
-"popup_booking_download_guides_message" = "วางแผนเส้นทางของคุณด้วยไกด์ที่จัดการเรียบร้อยด้วย MAPS.ME";
+"popup_booking_download_guides_message" = "วางแผนเส้นทางของคุณด้วยไกด์ที่จัดการเรียบร้อยด้วย OMaps";
 
 "popup_mwm_download_guides_title" = "คู่มือเที่ยวเมืองออฟไลน์";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "ลองดู";
 
-"gallery_pp_download_guides_offline_title" = "วางแผนวันหยุดด้วย MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "วางแผนวันหยุดด้วย OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "อย่าพลาดโอกาสที่จะใช้ไกด์ที่เขียนโดยนักท่องเที่ยวผู้ช่ำชอง";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "จะเรียกเก็บการชำระเงินไปยังบัญชี iTunes ของคุณเมื่อทำการยืนยันการซื้อ การสมัครสมาชิกจะได้รับการต่ออายุโดยอัตโนมัติ เว้นเสียแต่จะมีการปิดการต่ออายุอัตโนมัติอย่างน้อย 24 ชั่วโมงก่อนสิ้นสุดรอบปัจจุบัน บัญชีของของคุณจะได้รับการเรียกเก็บค่าบริการตามแผนสำหรับการต่ออายุของคุณภายใน 24 ชั่วโมงก่อนสิ้นสุดรอบปัจจุบัน คุณสามารถจัดการหรือปิดการต่ออายุอัตโนมัติได้ในการตั้งค่าบัญชี ID Apple ได้ทุกเมื่อเมื่อทำการซื้อของคุณ";
 
-"whatsnew_carplay_title" = "นำทางรถใน CarPlay ของ MAPS.ME!";
+"whatsnew_carplay_title" = "นำทางรถใน CarPlay ของ OMaps!";
 
 "whatsnew_carplay_message" = "บุ๊คมาร์ก การค้นหา ความเร็วของกล้อง และตัวเลือกของเส้นทางพร้อมให้ใช้งานในแบบออฟไลน์";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "เตือนความเร็ว";
 
-"download_map_carplay" = "โปรดดาวน์โหลดแผนที่ในแอพฯ MAPS.ME บนอุปกรณ์ของคุณ";
+"download_map_carplay" = "โปรดดาวน์โหลดแผนที่ในแอพฯ OMaps บนอุปกรณ์ของคุณ";
 
 "carplay_roundabout_exit" = "ทางออกที่ %s";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "วู้ว ฮู้วว คุณได้สมัครสมาชิกแล้ว!";
 
-"popup_subscription_success_map_message" = "ค้นพบการท่องเที่ยวโดดเด่นที่ดีที่สุดในแคตตาล็อก MAPS.ME";
+"popup_subscription_success_map_message" = "ค้นพบการท่องเที่ยวโดดเด่นที่ดีที่สุดในแคตตาล็อก OMaps";
 
 "popup_subscription_success_map_start_button" = "เริ่มค้นหา";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "เริ่มเลย";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "เพื่อนคู่การท่องเที่ยวแบบเบ็ดเสร็จ";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "เปิดแคตตาล็อก";
 
-"new_onboarding_step5.2_message" = "การสมัครสมาชิกไกด์แคตตาล็อกของ MAPS.ME นั้นคุ้มค่า เขาถึงคู่มือใช้งานของเมืองและกิจกรรมการแจ้งทั่วโลกได้แบบครบถ้วน!";
+"new_onboarding_step5.2_message" = "การสมัครสมาชิกไกด์แคตตาล็อกของ OMaps นั้นคุ้มค่า เขาถึงคู่มือใช้งานของเมืองและกิจกรรมการแจ้งทั่วโลกได้แบบครบถ้วน!";
 
 "new_onboarding_step5.2_button" = "เช็คเงื่อนไขการใช้งาน";
 
-"new_onboarding_step5.3_message" = "เช็คตัวอย่างของเส้นทางที่ถูกวางไว้แล้วของเมืองใหญ่ๆ และพื้นที่กลางแจ้ง ด้วยการเลือกสรรให้ฟรีๆ ของ MAPS.ME!";
+"new_onboarding_step5.3_message" = "เช็คตัวอย่างของเส้นทางที่ถูกวางไว้แล้วของเมืองใหญ่ๆ และพื้นที่กลางแจ้ง ด้วยการเลือกสรรให้ฟรีๆ ของ OMaps!";
 
 "new_onboarding_step5.3_button" = "ดาวน์โหลดฟรี";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "เส้นทางจากOutdooractiveสำหรับการเดินทางในฤดูหนาวและฤดูร้อนนั้นรอยู่ในแคตตาล็อก!";
 
-"whatsnew_guides_galleries_title" = "วางแผนทริปที่คุณกำลังไปด้วย MAPS.ME";
+"whatsnew_guides_galleries_title" = "วางแผนทริปที่คุณกำลังไปด้วย OMaps";
 
 "whatsnew_guides_galleries_message" = "ตอนนี้คุณสามารถค้นหาคู่มือใช้งานที่เราแนะนำในเว็บเพจเกี่ยวกับสถานที่ของเมืองและสถานที่ที่เป็นสถานที่ท่องเที่ยวยอดนิยม";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "ความสูง";
 
-"tips_map_layers_title_countour" = "เลเยอร์แผนที่ภูมิประเทศแบบออฟไลน์ ใหม่ในแอป MAPS.ME!";
+"tips_map_layers_title_countour" = "เลเยอร์แผนที่ภูมิประเทศแบบออฟไลน์ ใหม่ในแอป OMaps!";
 
 "tips_map_layers_message_countour" = "วางแผนและสนุกไปกับทริปท่องธรรมชาติโดยมั่นใจว่าคุณรู้ทุกอย่างเกี่ยวกับพื้นที่นั้น";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict
index 01db4cdcb0..a182a8e531 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.stringsdict
@@ -135,4 +135,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 007e7ba3e1..17431de899 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Hemen al";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "MAPS.ME’yi kullandığınız için teşekkür ederiz! Uygulamayı beğendiniz mi? Bundan arkadaşlarınıza bahsedin! Bundan büyük memnuniyet duyarız.";
+"share_on_facebook_text" = "OMaps’yi kullandığınız için teşekkür ederiz! Uygulamayı beğendiniz mi? Bundan arkadaşlarınıza bahsedin! Bundan büyük memnuniyet duyarız.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Tekrar Deneyin";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "MAPS.ME Hakkında";
+"about_menu_title" = "OMaps Hakkında";
 
 "downloading_touch_to_cancel" = "%d%% indiriliyor, iptal etmek için dokunun";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "İndirilen haritalarla SD kart/USB depolama aygıtı kullanılamıyor";
 
-"disconnect_usb_cable" = "MAPS.ME’yi kullanabilmeniz için lütfen USB kablosunun bağlantısını kesin veya hafıza kartı takın";
+"disconnect_usb_cable" = "OMaps’yi kullanabilmeniz için lütfen USB kablosunun bağlantısını kesin veya hafıza kartı takın";
 
 "not_enough_free_space_on_sdcard" = "Uygulamayı kullanabilmeniz için lütfen SD kart/USB depolama aygıtında biraz alan boşaltın";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Bu haritalar için güncelleme kullanılabilir:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "MAPS.ME Lite’e artık ihtiyacınız yok; bu nedenle uygulamayı kaldırabilirsiniz.";
+"suggest_uninstall_lite" = "OMaps Lite’e artık ihtiyacınız yok; bu nedenle uygulamayı kaldırabilirsiniz.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ başarılı bir şekilde indirildi";
@@ -249,10 +249,10 @@
 "set" = "Ayarla";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Henüz hiç yer iminiz yok.\nYer imi eklemek için haritada bir yere dokunun.\nBaşka kaynaklardan da yer imleri alınıp MAPS.ME’de gösterilebilir KML/KMZ dosyasını posta, Dropbox veya web bağlantısından kaydedilen pinlerle aç.";
+"bookmarks_usage_hint" = "Henüz hiç yer iminiz yok.\nYer imi eklemek için haritada bir yere dokunun.\nBaşka kaynaklardan da yer imleri alınıp OMaps’de gösterilebilir KML/KMZ dosyasını posta, Dropbox veya web bağlantısından kaydedilen pinlerle aç.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Başka kaynaklardan yer imleri alınıp MAPS.ME’de gösterilebilir. KML/KMZ dosyasını posta, Dropbox veya web bağlantısından kaydedilen yer imleriyle aç.";
+"bookmarks_usage_hint_import_only" = "Başka kaynaklardan yer imleri alınıp OMaps’de gösterilebilir. KML/KMZ dosyasını posta, Dropbox veya web bağlantısından kaydedilen yer imleriyle aç.";
 
 /* Settings button in system menu */
 "settings" = "Ayarlar";
@@ -354,9 +354,9 @@
 "share_by_email" = "E-postayla paylaş";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Paylaşılan MAPS.ME yer imleri";
+"share_bookmarks_email_subject" = "Paylaşılan OMaps yer imleri";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Yer İmleri Yükleniyor";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Ülke indirme işlemi şu anda sürüyor.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "MAPS.ME kullanmaktan keyif aldığınızı umuyoruz! Öyleyse, lütfen App Store’da uygulamaya puan verin veya uygulama hakkında yorum yapın. Bir dakikadan daha kısa sürer ama bize gerçekten yardımcı olabilir. Desteğiniz için teşekkürler!";
+"appStore_message" = "OMaps kullanmaktan keyif aldığınızı umuyoruz! Öyleyse, lütfen App Store’da uygulamaya puan verin veya uygulama hakkında yorum yapın. Bir dakikadan daha kısa sürer ama bize gerçekten yardımcı olabilir. Desteğiniz için teşekkürler!";
 
 /* No, thanks */
 "no_thanks" = "Hayır, teşekkürler";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Hey, MAPS.ME’de pinimi incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yüklü değil mi? Buradan indir: http://maps.me/get";
+"bookmark_share_sms" = "Hey, OMaps’de pinimi incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yüklü değil mi? Buradan indir: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Hey, MAPS.ME’de geçerli konumumu incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yok mu? Buradan indir: http://maps.me/get";
+"my_position_share_sms" = "Hey, OMaps’de geçerli konumumu incele! %1$@ veya %2$@ Çevrimiçi haritalar sende yok mu? Buradan indir: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hey, MAPS.ME haritasında pinimi incele!";
+"bookmark_share_email_subject" = "Hey, OMaps haritasında pinimi incele!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Hey, MAPS.ME’de geçerli konumumu incele!";
+"my_position_share_email_subject" = "Hey, OMaps’de geçerli konumumu incele!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Merhaba,\n\nŞu anda bulunduğum yer: %1$@. Yeri haritada görmek için bu bağlantıya %2$@ veya şuna %3$@ tıkla.\n\nTeşekkürler.";
@@ -549,7 +549,7 @@
 "search_show_on_map" = "Haritada görüntüle";
 
 /* Used to warn user when fixing KitKat issue */
-"kitkat_migrate_ok" = "Harita veri depolama optimize edildi. Lütfen uygulamayı yeniden başlatın.\n\nSD kart kaynağındaki MAPS.ME klasörüne artık ihtiyaç yok; silebilirsiniz.";
+"kitkat_migrate_ok" = "Harita veri depolama optimize edildi. Lütfen uygulamayı yeniden başlatın.\n\nSD kart kaynağındaki OMaps klasörüne artık ihtiyaç yok; silebilirsiniz.";
 
 /* Used to warn user when fixing KitKat issue */
 "kitkat_migrate_failed" = "Android 4.4’de yapılan değişikliklerden dolayı harita veri depolamasını optimize etmemiz gerekiyor ancak harita verilerini kopyalayacak yeterli alan yok.\n\nLütfen hafızayı boşaltın, aksi takdirde haritalar salt okunur modda kullanılabilir olacaktır.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Bulunduğun yerin haritasını indir";
 
 /* text of notification */
-"pro_version_is_free_today" = "MAPS.ME tam sürümü bugün ücretsiz! İndir ve arkadaşlarına haber ver.";
+"pro_version_is_free_today" = "OMaps tam sürümü bugün ücretsiz! İndir ve arkadaşlarına haber ver.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "MAPS.ME Lite'den indirmiş olduğunuz haritaları MAPS.ME'ye aktarıyoruz. Bu bir kaç dakika sürebilir.";
+"move_lite_maps_to_pro" = "OMaps Lite'den indirmiş olduğunuz haritaları OMaps'ye aktarıyoruz. Bu bir kaç dakika sürebilir.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "İndirmiş olduğunuz haritalar başarılı bir şekilde MAPS.ME'ye aktarıldı.";
+"move_lite_maps_to_pro_ok" = "İndirmiş olduğunuz haritalar başarılı bir şekilde OMaps'ye aktarıldı.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Haritanızın aktarımı başarısız oldu. Lütfen MAPS.ME Lite'yi silin ve haritaları tekrar indirin.";
+"move_lite_maps_to_pro_failed" = "Haritanızın aktarımı başarısız oldu. Lütfen OMaps Lite'yi silin ve haritaları tekrar indirin.";
 
 /* Text in menu */
 "settings_and_more" = "Ayarlar & Fazlası";
@@ -600,7 +600,7 @@
 "website" = "Web Sitesi";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME Topluluğu";
+"maps_me_community" = "OMaps Topluluğu";
 
 /* Text in menu */
 "like_on_facebook" = "Facebook'da beğen";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Hata bildir";
 
 /* Email subject */
-"subscribe_me_subject" = "Lütfen MAPS.ME haber bültenine beni abone yap";
+"subscribe_me_subject" = "Lütfen OMaps haber bültenine beni abone yap";
 
 /* Email body */
 "subscribe_me_body" = "En son haberlerden güncellemelerden ve tanıtımlardan ilk önce haberdar olmak istiyorum. Aboneliğimi herhangi bir zaman iptal edebilirim.";
 
 /* About text */
-"about_text" = "MAPS.ME dünyadaki tüm ülkelerdeki şehirlerin en hızlı çevrimdışı haritalarını sunuyor. Tam güven ile seyahat edin: nerede olursanız olun, MAPS.ME harita üzerinde nerede olduğunuzu belirlemeye, en yakın restoranı, oteli, bankayı, benzin istasyonunu v.b. bulmaya yardımcı olur. İnternet bağlantısı gerektirmez.\n\nHer zaman yeni özellikler üzerinde çalışıyoruz ve sizlerin MAPS.ME'yi nasıl geliştirebileceğimize dair görüşlerinizi almaktan mutluluk duyuyoruz. Eğer uygulama ile ilgili herhangi bir probleminiz varsa, bizimle support@maps.me adresinden temasa geçmekten çekinmeyin. Her talebe cevap veriyoruz!\n\nMAPS.ME'yi beğendiniz ve bize destek olmak ister misiniz? Bunun bazı basit ve tamamıyla ücretsiz yolları var:\n\n- Uygulama Marketinizde bir yorum yazın\n- Facebook sayfamızı beğenin http://www.facebook.com/mapswithme\n- veya sadece annenize, arkadaşlarınıza ve iş arkadaşlarınıza MAPS.ME'den bahsedin :)\n\nBizi tercih ettiğiniz için teşekkür ederiz. Desteğinizden dolayı çok memnuniyet duyarız!\n\nNot: Verileri haritaları kullanıcıların yaratmasına ve düzenlemesine olanak veren Wikipedia benzeri bir proje olan OpenStreetMap'dan almaktayız. Eğer haritada eksik ya da hatalı bir şeyler görürseniz doğrudan haritaları\n\nhttps://www.openstreetmap.org, adresinden düzeltebilirsiniz ve yaptığınız değişiklikler MAPS.ME'de bir sonraki sürüm yayınlandığında görülebilir olacaktır.";
+"about_text" = "OMaps dünyadaki tüm ülkelerdeki şehirlerin en hızlı çevrimdışı haritalarını sunuyor. Tam güven ile seyahat edin: nerede olursanız olun, OMaps harita üzerinde nerede olduğunuzu belirlemeye, en yakın restoranı, oteli, bankayı, benzin istasyonunu v.b. bulmaya yardımcı olur. İnternet bağlantısı gerektirmez.\n\nHer zaman yeni özellikler üzerinde çalışıyoruz ve sizlerin OMaps'yi nasıl geliştirebileceğimize dair görüşlerinizi almaktan mutluluk duyuyoruz. Eğer uygulama ile ilgili herhangi bir probleminiz varsa, bizimle support@omaps.app adresinden temasa geçmekten çekinmeyin. Her talebe cevap veriyoruz!\n\nOMaps'yi beğendiniz ve bize destek olmak ister misiniz? Bunun bazı basit ve tamamıyla ücretsiz yolları var:\n\n- Uygulama Marketinizde bir yorum yazın\n- Facebook sayfamızı beğenin http://www.facebook.com/mapswithme\n- veya sadece annenize, arkadaşlarınıza ve iş arkadaşlarınıza OMaps'den bahsedin :)\n\nBizi tercih ettiğiniz için teşekkür ederiz. Desteğinizden dolayı çok memnuniyet duyarız!\n\nNot: Verileri haritaları kullanıcıların yaratmasına ve düzenlemesine olanak veren Wikipedia benzeri bir proje olan OpenStreetMap'dan almaktayız. Eğer haritada eksik ya da hatalı bir şeyler görürseniz doğrudan haritaları\n\nhttps://www.openstreetmap.org, adresinden düzeltebilirsiniz ve yaptığınız değişiklikler OMaps'de bir sonraki sürüm yayınlandığında görülebilir olacaktır.";
 
 /* Alert text */
 "email_error_body" = "E-posta istemcisi henüz kurulmamış. Lütfen e-posta istemcisini yapılandırın ya da bize %@ adresinden ulaşmak için başka bir yöntem deneyin";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Yeni bir rota oluşturmak için lütfen haritayı güncelleyin.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "MAPS.ME'nin yeni sürümü mevcut pozisyonunuzdan varış noktasına rotalar oluşturmanıza imkan verir. Lütfen bu özelliği kullanmak için haritaları güncelleyin.";
+"routing_update_maps" = "OMaps'nin yeni sürümü mevcut pozisyonunuzdan varış noktasına rotalar oluşturmanıza imkan verir. Lütfen bu özelliği kullanmak için haritaları güncelleyin.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Hepsini güncelle";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Bulundu";
 
 /* Disclaimer message */
-"routing_disclaimer" = "MAPS.ME uygulamasında rota yaratırken lütfen aşağıdakileri dikkate alın:\n\n  - Önerilen rotalar sadece tavsiyeler olarak düşünülmelidir.\n - Yol koşulları, trafik kuralları ve işaretleri navigasyon tavsiyelerden daha önceliklidir.\n - Harita doğru olmayabilir ya da eskimiş olabilir ve rotalar en iyi mümkün yola göre oluşturulmamış olabilir.\n\n  Yollarda güvende olun ve kendinize dikkat edin!";
+"routing_disclaimer" = "OMaps uygulamasında rota yaratırken lütfen aşağıdakileri dikkate alın:\n\n  - Önerilen rotalar sadece tavsiyeler olarak düşünülmelidir.\n - Yol koşulları, trafik kuralları ve işaretleri navigasyon tavsiyelerden daha önceliklidir.\n - Harita doğru olmayabilir ya da eskimiş olabilir ve rotalar en iyi mümkün yola göre oluşturulmamış olabilir.\n\n  Yollarda güvende olun ve kendinize dikkat edin!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Güncel değil";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Seçilen kalkış yeriyle varış yeri arasında hiçbir rota bulunamadı. Lütfen farklı bir başlangıç veya bitiş noktası seçin.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Sistem içi hata oluştu. Lütfen haritayı silin ve tekrar yüklemeyi deneyin. Sorun devam ettiği takdirde lütfen support@maps.me adresinden bize ulaşın.";
+"routing_failed_internal_error" = "Sistem içi hata oluştu. Lütfen haritayı silin ve tekrar yüklemeyi deneyin. Sorun devam ettiği takdirde lütfen support@omaps.app adresinden bize ulaşın.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Harita + Rota İndir";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Uygulamanıza az önce puan verdim";
 
 /* Text for rating dialog */
-"rating_user_since" = "%@ yılından beri MAPS.ME kullanıcısıyım";
+"rating_user_since" = "%@ yılından beri OMaps kullanıcısıyım";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "MAPS.ME'yi beğeniyor musunuz?";
+"rating_do_like_maps" = "OMaps'yi beğeniyor musunuz?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Uygulamamıza puan vermek için bir yıldıza dokunun.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Harita alın";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Tüm MAPS.ME özelliklerini edinmek için güncellenmiş harita ve rota verilerini indirin.";
+"routing_download_map_and_routing" = "Tüm OMaps özelliklerini edinmek için güncellenmiş harita ve rota verilerini indirin.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Rota verileri edin";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Uygulamayı beğendiniz mi?";
 
-"rate_alert_default_message" = "MAPS.ME’yi kullandığınız için teşekkür ederiz. Lütfen uygulamaya puan verin. Geri bildiriminiz daha iyi hale gelebilmemize yardımcı olur.";
+"rate_alert_default_message" = "OMaps’yi kullandığınız için teşekkür ederiz. Lütfen uygulamaya puan verin. Geri bildiriminiz daha iyi hale gelebilmemize yardımcı olur.";
 
 "rate_alert_five_star_message" = "Yaşasın! Biz de sizi seviyoruz!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Kopyalanmış yer";
 
-"first_launch_congrats_title" = "MAPS.ME kullanıma hazır";
+"first_launch_congrats_title" = "OMaps kullanıma hazır";
 
 "first_launch_congrats_text" = "Dünyanın her yerinde çevrimdışı olarak ücretsiz arama yapın ve gezinin.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Doğrudan uygulamadan haritaya yeni yerler ekle ve mevcut yerleri düzenleyin.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME, OpenStreetMap topluluğu verilerini kullanmaktadır.";
+"whatsnew_editor_message_2" = "* OMaps, OpenStreetMap topluluğu verilerini kullanmaktadır.";
 
 "onboarding_offline_navigation_title" = "Bir daha asla kaybolmayacaksınız";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "En iyi araba ve yaya rotalarını planlayın.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — dünya genelinde haritaya internetsiz erişim";
+"onboarding_offline_maps_title" = "OMaps — dünya genelinde haritaya internetsiz erişim";
 
 "onboarding_offline_maps_message" = "İlk önce istenilen alanın haritasını indirin ve internet bağlantısı olmadan navigasyonu ve arama fonksiyonlarını kullanın.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Navigasyon ve diğer özellikleri kullanmak için konum belirlemenize erişmeye ihtiyacımız var.";
 
-"onboarding_permissions_title" = "MAPS.ME'nin depolama alanına ve konum bilgilerine erişmesine izin verin";
+"onboarding_permissions_title" = "OMaps'nin depolama alanına ve konum bilgilerine erişmesine izin verin";
 
 "onboarding_permissions_message" = "Böylece haritaları indirebilir, size yakın olan yerleri ve trafik bilgilerini görebilir ve navigasyonu kullanabilirsiniz.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "İndirmek için daha fazla alana ihtiyacınız var. Lütfen gereksiz verileri silin.";
 
-"editor_sharing_title" = "MAPS.ME haritalarını iyileştirdim";
+"editor_sharing_title" = "OMaps haritalarını iyileştirdim";
 
 "editor_comment_will_be_sent" = "Yorumunuzu haritacılara göndereceğiz.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Ayrıntılı yorum";
 
-"editor_detailed_description" = "Önerdiğiniz değişiklikler OpenStreetMap topluluğuna gönderilecek. MAPS.ME’de düzenlenemeyen ayrıntıları açıklayın.";
+"editor_detailed_description" = "Önerdiğiniz değişiklikler OpenStreetMap topluluğuna gönderilecek. OMaps’de düzenlenemeyen ayrıntıları açıklayın.";
 
 "editor_more_about_osm" = "OpenStreetMap hakkında ek bilgi";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Harita düzenleyicisini güncelledik";
 
-"whatsnew_update_editor_message" = "MAPS.ME kullanıcıları, haritalar üzerinde 200.000 değişiklik yaptı. Birlikte, dünyanın en detaylı haritalarını yaratıyoruz. Bize katılın!";
+"whatsnew_update_editor_message" = "OMaps kullanıcıları, haritalar üzerinde 200.000 değişiklik yaptı. Birlikte, dünyanın en detaylı haritalarını yaratıyoruz. Bize katılın!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Harita Editörü'nü kullanmak için lütfen tüm haritaları güncelleyin.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Devam Et";
 
-"recent_track_background_dialog_message" = "MAPS.ME, en son seyahat ettiğiniz rotayı kaydetmek için arka planda coğrafi konumunuzu kullanır.";
+"recent_track_background_dialog_message" = "OMaps, en son seyahat ettiğiniz rotayı kaydetmek için arka planda coğrafi konumunuzu kullanır.";
 
 "whatsnew_car_navigation_header" = "Kullanıcı dostu araç navigasyonu";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Bisiklet navigasyonu (beta sürüm)";
 
-"whatsnew_cycle_navigation_message" = "Yeni sezon için bisiklet navigasyonu özelliğini test ediyoruz. En sık kullandığınız bisiklet rotasını MAPS.ME ile deneyin ve görüşlerinizi bizimle paylaşın.";
+"whatsnew_cycle_navigation_message" = "Yeni sezon için bisiklet navigasyonu özelliğini test ediyoruz. En sık kullandığınız bisiklet rotasını OMaps ile deneyin ve görüşlerinizi bizimle paylaşın.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Google Play'de Oy Ver";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Arkadaşınıza söyleyin";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Merhaba! MAPS.ME'yi hemen yükle!";
+"tell_friends_text" = "Merhaba! OMaps'yi hemen yükle!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME, seyahatler için vazgeçilmez bir çevrimdışı uygulamadır. MAPS.ME, OpenStreetMap verilerine dayanmakta ve bu verilerin düzenlenmesini sağlamaktadır.";
+"about_description" = "OMaps, seyahatler için vazgeçilmez bir çevrimdışı uygulamadır. OMaps, OpenStreetMap verilerine dayanmakta ve bu verilerin düzenlenmesini sağlamaktadır.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Aç";
 
-"whatsnew_uber_header" = "MAPS.ME ve Uber";
+"whatsnew_uber_header" = "OMaps ve Uber";
 
 "whatsnew_uber_message" = "Doğrudan uygulamadan Uber taksi isteyin!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Harita üzerindeki yazı tipi boyutunu artır";
 
-"traffic_update_app" = "Lütfen MAPS.ME uygulamasını güncelleyin";
+"traffic_update_app" = "Lütfen OMaps uygulamasını güncelleyin";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Trafik verilerini görüntülemek için uygulamanın güncellenmesi gerekiyor.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Erişime izin ver";
 
-"onboarding_storage_permissions_message" = "Cihazınızdaki izin ayarlarını değiştirin. MAPS.ME'yi kullanmak için depolama alanına erişim izni gerekiyor.";
+"onboarding_storage_permissions_message" = "Cihazınızdaki izin ayarlarını değiştirin. OMaps'yi kullanmak için depolama alanına erişim izni gerekiyor.";
 
 "button_exit" = "Çık";
 
-"onboarding_detail_permissions_title" = "MAPS.ME'nin şuraya erişmesi gerekiyor:";
+"onboarding_detail_permissions_title" = "OMaps'nin şuraya erişmesi gerekiyor:";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Depolama Alanı";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Depolama alanı erişim sorunu";
 
-"dialog_error_storage_message" = "Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin ve support@maps.me adresinden bizimle iletişime geçin";
+"dialog_error_storage_message" = "Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin ve support@omaps.app adresinden bizimle iletişime geçin";
 
 "setting_emulate_bad_storage" = "Bozuk depolama alanını taklit et";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "<a href=\"%s\">Kullanım Şartları</a> bölümünü kabul ediyorum";
 
-"sign_agree_news_gdpr" = "MAPS.ME ürünleri hakkında en yeni haberleri almayı kabul ediyorum";
+"sign_agree_news_gdpr" = "OMaps ürünleri hakkında en yeni haberleri almayı kabul ediyorum";
 
 "whats_new_localbiz_title" = "Küçük işletmeler de ilgi hak ediyor";
 
-"whats_new_localbiz_message" = "Seyahatlerinizi unutulmaz kılan bölgedeki kafeler, konforlu oteller ve alışveriş yapabileceğiniz mağazalardır. Tüm bunların ön plana çıkabilmesi için MAPS.ME sayfanızı optimize edeceğiz.";
+"whats_new_localbiz_message" = "Seyahatlerinizi unutulmaz kılan bölgedeki kafeler, konforlu oteller ve alışveriş yapabileceğiniz mağazalardır. Tüm bunların ön plana çıkabilmesi için OMaps sayfanızı optimize edeceğiz.";
 
 "whats_new_order_button" = "İsteğinizi iletin";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Yeni yerler indirin";
 
-"cached_bookmarks_placeholder_subtitle" = "MAPS.ME kullanıcılarının oluşturduğu binlerce ilgi çekici yeri ve rotayı indirmek için düğmeye basın. İnternet bağlantınızın olması gerekir.";
+"cached_bookmarks_placeholder_subtitle" = "OMaps kullanıcılarının oluşturduğu binlerce ilgi çekici yeri ve rotayı indirmek için düğmeye basın. İnternet bağlantınızın olması gerekir.";
 
 "downloader_download_routers" = "İndirilen yer imleri";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Kilitlenme raporu";
 
-"opt_out_fabric_description" = "MAPS.ME deneyimini geliştirmek için verilerinizi kullanabiliriz. Değişiklikler, uygulama yeniden başlatıldıktan sonra geçerli olur.";
+"opt_out_fabric_description" = "OMaps deneyimini geliştirmek için verilerinizi kullanabiliriz. Değişiklikler, uygulama yeniden başlatıldıktan sonra geçerli olur.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Yer imleri indirilmedi";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME'de artık yeni bir rota kategorisi var";
+"whats_new_bookmarks_catalog_title" = "OMaps'de artık yeni bir rota kategorisi var";
 
 "whats_new_bookmarks_catalog_message" = "Dünyanın dört bir yanından yüzlerce ayrıntılı rota: Nereye gidilir? Nereleri ziyaret edilir? Ne yenir?";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Reklamları kaldır";
 
-"remove_ads_title" = "Tüm reklamları kaldırın ve MAPS.ME'ye destek olun";
+"remove_ads_title" = "Tüm reklamları kaldırın ve OMaps'ye destek olun";
 
 "paybtn_title" = "Yıllık %s/ödeyin";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Diğer seçenekler";
 
-"why_support" = "MAPS.ME'yi neden desteklemeliyim?";
+"why_support" = "OMaps'yi neden desteklemeliyim?";
 
 "options_dropdown_item1" = "%s/ay (yıllık %s tasarruf)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Sizin için tüm reklamları kaldıracağız";
 
-"why_support_item2" = "MAPS.ME'yi geliştirmemize yardımcı oldunuz";
+"why_support_item2" = "OMaps'yi geliştirmemize yardımcı oldunuz";
 
 "why_support_item3" = "OpenStreetMap.org'daki açık haritaları geliştirmemize yardımcı oldunuz";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Hizmet kullanılamıyor";
 
-"server_unavailable_message" = "Satın alma işlemi daha sonra tamamlanacak. Sorun devam ederse lütfen support@maps.me adresine ulaşın.";
+"server_unavailable_message" = "Satın alma işlemi daha sonra tamamlanacak. Sorun devam ederse lütfen support@omaps.app adresine ulaşın.";
 
 "offline_fiters_check_in" = "Otelleri tarihe göre filtrelemek için internete bağlanın.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Bu kılavuz, herkese açık MAPS.ME kataloğuna yüklenecek ve diğer kullanıcılara sunulacaktır";
+"upload_and_publish_desc" = "Bu kılavuz, herkese açık OMaps kataloğuna yüklenecek ve diğer kullanıcılara sunulacaktır";
 
 "upload_and_publish" = "Yükle ve yayınla";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Yorum bırakarak gezginlere yardım edin!";
 
-"share_bookmarks_email_body_link" = "Merhaba!\n\nİşte yer işaretlerinizi indirebileceğiniz bağlantı: %s. MAPS.ME ile listeyi açın ve yolculuğunuzun tadını çıkarın!\n\nUygulamayı indir: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Merhaba!\n\nİşte yer işaretlerinizi indirebileceğiniz bağlantı: %s. OMaps ile listeyi açın ve yolculuğunuzun tadını çıkarın!\n\nUygulamayı indir: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "%d km/sa hız limitini aştığınızda navigasyon, kameralar hakkında sizi uyaracak";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "İzlenimlerinizi paylaşmak çok kolay";
 
-"whats_new_ugc_routes_subtitle" = "nutulmaz mekanları kaydedin, sayfa işaretleri kullanarak rotalar oluşturun ve bunları MAPS.ME kataloğundaki herkesle paylaşın.";
+"whats_new_ugc_routes_subtitle" = "nutulmaz mekanları kaydedin, sayfa işaretleri kullanarak rotalar oluşturun ve bunları OMaps kataloğundaki herkesle paylaşın.";
 
 "whats_new_webeditor_title" = "Rotalarınızı hikayelere dönüştürün";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Kılavuzunuzu genel kataloğa yükleyebilmek için en az 3 yer iminiz olmalı";
 
-"bookmark_public_upload_alert_title" = "Yer imlerinizi tüm MAPS.ME gezginleriyle paylaşmanıza az kaldı!";
+"bookmark_public_upload_alert_title" = "Yer imlerinizi tüm OMaps gezginleriyle paylaşmanıza az kaldı!";
 
 "bookmark_public_upload_alert_subtitle" = "Lütfen listeniz için belirli bir ad ve açıklamanız olduğundan ve tüm yer imlerinde yerler hakkında biraz bilgi bulunduğundan emin olun. Bu şekilde listeniz başkaları tarafından bulunabilir ve kullanılabilir.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Maksimum güç tasarrufu";
 
-"enable_logging_warning_message" = "Seçenek tanı amaçlı, günlüğe kaydetmeyi açar. Uygulamayla ilgili sorunları gideren destek ekibimiz için yardımcı olabilir. Bu seçeneği yalnızca MAPS.ME desteğinin isteği üzerine etkinleştirin.";
+"enable_logging_warning_message" = "Seçenek tanı amaçlı, günlüğe kaydetmeyi açar. Uygulamayla ilgili sorunları gideren destek ekibimiz için yardımcı olabilir. Bu seçeneği yalnızca OMaps desteğinin isteği üzerine etkinleştirin.";
 
 "html_error_upload_message_try_again" = "Lütfen ağ ayarlarınızı kontrol edip tekrar deneyin";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Kimliğiniz: %s.";
 
-"gdpr_request_window_message" = "Lütfen kopyalayın ve talebi support@maps.me adresine gönderin";
+"gdpr_request_window_message" = "Lütfen kopyalayın ve talebi support@omaps.app adresine gönderin";
 
 "gdpr_request_window_copy" = "Kimliği kopyala";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Feribot geçişlerinden kaçın";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME, harita üzerinde görüntülenen ve çevrimdışı kullanılabilen, fotoğraf ve açıklamaların bulunduğu seçili yerler için hazır rehberler sunar.";
+"cached_guides_placeholder_subtitle" = "OMaps, harita üzerinde görüntülenen ve çevrimdışı kullanılabilen, fotoğraf ve açıklamaların bulunduğu seçili yerler için hazır rehberler sunar.";
 
 "guides_catalogue_title" = "Rehber kataloğu";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Özbek mutfağı";
 
-"onboarding_welcome_title" = "MAPS.ME ile planlayın ve seyahat edin";
+"onboarding_welcome_title" = "OMaps ile planlayın ve seyahat edin";
 
 "onboarding_welcome_first_subtitle" = "İlginç yerleri işaretleyin, otel rezervasyonu yapın, çevrimdışıyken rota hesaplayın";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "İndir";
 
-"onboarding_bydeeplink_guide_title" = "MAPS.ME’de kullanıma hazır rehberler";
+"onboarding_bydeeplink_guide_title" = "OMaps’de kullanıma hazır rehberler";
 
 "onboarding_bydeeplink_guide_subtitle" = "Ziyaret edilecek en iyi yerler fotoğraf ve açıklamalarla birlikte haritada görüntülenir. Çevrimdışı kullanın.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Otel rezervasyonu yaptırdınız mı?";
 
-"popup_booking_download_guides_message" = "MAPS.ME adresinden, hazır rehberler ile rotanızı planlayın";
+"popup_booking_download_guides_message" = "OMaps adresinden, hazır rehberler ile rotanızı planlayın";
 
 "popup_mwm_download_guides_title" = "Çevrimdışı şehir rehberleri";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Bir göz atın";
 
-"gallery_pp_download_guides_offline_title" = "Tatilinizi MAPS.ME ile planlayın!";
+"gallery_pp_download_guides_offline_title" = "Tatilinizi OMaps ile planlayın!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Deneyimli gezginler tarafından yapılan rehberlerle, hiçbir şeyi kaçırmayın";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Ödeme, satın alma onayında iTunes hesabınızdan alınacaktır. Otomatik yenileme geçerli dönemin sona ermesinden en az 24 saat önce kapatılmadıkça abonelik otomatik olarak yenilenecektir. Hesabınızdan, geçerli dönemin sona ermesinden önce 24 saat içinde planınıza göre yenileme için ücret alınacaktır. Otomatik yenilemeyi satın alma işleminizde dilediğiniz zaman Apple ID hesap ayarlarınızda yönetebilir veya kapatabilirsiniz.";
 
-"whatsnew_carplay_title" = "CarPlay'de MAPS.ME araç navigasyonu!";
+"whatsnew_carplay_title" = "CarPlay'de OMaps araç navigasyonu!";
 
 "whatsnew_carplay_message" = "Yer imleri, arama, hız kameraları ve sürüş seçenekleri çevrimdışı da mevcut";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Hız uyarıları";
 
-"download_map_carplay" = "Lütfen haritaları cihazınıza MAPS.ME uygulamasından indirin";
+"download_map_carplay" = "Lütfen haritaları cihazınıza OMaps uygulamasından indirin";
 
 "carplay_roundabout_exit" = "%s çıkış";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Yaşasın, abone oldun!";
 
-"popup_subscription_success_map_message" = "Şimdi MAPS.ME kataloğunda en iyi turistik yerleri keşfedin";
+"popup_subscription_success_map_message" = "Şimdi OMaps kataloğunda en iyi turistik yerleri keşfedin";
 
 "popup_subscription_success_map_start_button" = "Göz atmaya başla";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Başla";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Her şey dahil seyahat arkadaşı";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Kataloğu aç";
 
-"new_onboarding_step5.2_message" = "MAPS.ME rehber kataloğu aboneliğiniz çok değerlidir. Tüm dünyadan hem şehir içi hem de doğa rehberlerine tam erişim elde edin!";
+"new_onboarding_step5.2_message" = "OMaps rehber kataloğu aboneliğiniz çok değerlidir. Tüm dünyadan hem şehir içi hem de doğa rehberlerine tam erişim elde edin!";
 
 "new_onboarding_step5.2_button" = "Şartlara göz at";
 
-"new_onboarding_step5.3_message" = "Ücretsiz MAPS.ME seçeneği ile hazır şehir ve açık hava güzergahlarından ücretsiz örnekleri inceleyin!";
+"new_onboarding_step5.3_message" = "Ücretsiz OMaps seçeneği ile hazır şehir ve açık hava güzergahlarından ücretsiz örnekleri inceleyin!";
 
 "new_onboarding_step5.3_button" = "Ücretsiz indir";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Outdooractive'in kış ve yaz seyahatleri için güzergahlar katalogda bekliyor!";
 
-"whatsnew_guides_galleries_title" = "Yaklaşan seyahatinizi MAPS.ME ile planlayın";
+"whatsnew_guides_galleries_title" = "Yaklaşan seyahatinizi OMaps ile planlayın";
 
 "whatsnew_guides_galleries_message" = "Artık popüler turistik şehirlerin ve turistik mekanların yer sayfalarında önerilen rehberleri bulabilirsiniz";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Yükseklikler";
 
-"tips_map_layers_title_countour" = "MAPS.ME'de yükseklik çizgileri çevrimdışı!";
+"tips_map_layers_title_countour" = "OMaps'de yükseklik çizgileri çevrimdışı!";
 
 "tips_map_layers_message_countour" = "Yükseklik çizgileri, doğaya bir gezi planlamanıza ve arazide kaybolmamanıza yardımcı olacaktır";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
index 23bc31c707..48f81c7ee1 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.stringsdict
@@ -135,4 +135,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index d7a636022a..3d6ff8bbb5 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Встановити";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Дякуємо за використання MAPS.ME! Чи подобається вам ця програма? Розкажіть своїм друзям про неї! Це буде найкраща подяка для нас.";
+"share_on_facebook_text" = "Дякуємо за використання OMaps! Чи подобається вам ця програма? Розкажіть своїм друзям про неї! Це буде найкраща подяка для нас.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "кБ";
@@ -138,7 +138,7 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Спробуйте ще раз";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
 "about_menu_title" = "Про програму";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Доступні оновлення для наступних карт:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "MAPS.ME Lite більше не потрібна. Рекомендуємо її видалити.";
+"suggest_uninstall_lite" = "OMaps Lite більше не потрібна. Рекомендуємо її видалити.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ успішно завантажена";
@@ -249,10 +249,10 @@
 "set" = "Група";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "У вас ще немає мiток.\nНатисніть на будь-яке місце на карті, щоб зберегти мiтку.\nМiтки з інших ресурсів також можна імпортувати для застосунка MAPS.ME. Відкрийте файл KML/KMZ із збереженими пінами з почти, Dropbox або інтернет посилання.";
+"bookmarks_usage_hint" = "У вас ще немає мiток.\nНатисніть на будь-яке місце на карті, щоб зберегти мiтку.\nМiтки з інших ресурсів також можна імпортувати для застосунка OMaps. Відкрийте файл KML/KMZ із збереженими пінами з почти, Dropbox або інтернет посилання.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Мітки з інших ресурсів можна імпортувати для застосунка MAPS.ME. Відкрийте файл KML/KMZ із збереженими мітками з почти, Dropbox або інтернет посилання.";
+"bookmarks_usage_hint_import_only" = "Мітки з інших ресурсів можна імпортувати для застосунка OMaps. Відкрийте файл KML/KMZ із збереженими мітками з почти, Dropbox або інтернет посилання.";
 
 /* Settings button in system menu */
 "settings" = "Налаштування";
@@ -354,9 +354,9 @@
 "share_by_email" = "Подiлитися по електронній пошті";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "З вами поділилися мiтками MAPS.ME";
+"share_bookmarks_email_subject" = "З вами поділилися мiтками OMaps";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Завантаження мiток";
@@ -386,7 +386,7 @@
 "downloading_is_active" = "Зараз відбувається завантаження країни.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Сподіваємося, що вам сподобалося користуватися MAPS.ME! Якщо так, будь ласка, надайте оцінку програмі або залиште свій відгук на app store. Витративши менше хвилини, ви дійсно нам допоможете. Дякуємо за вашу підтримку!";
+"appStore_message" = "Сподіваємося, що вам сподобалося користуватися OMaps! Якщо так, будь ласка, надайте оцінку програмі або залиште свій відгук на app store. Витративши менше хвилини, ви дійсно нам допоможете. Дякуємо за вашу підтримку!";
 
 /* No, thanks */
 "no_thanks" = "Ні, дякую";
@@ -398,10 +398,10 @@
 "my_position_share_sms" = "Глянь де я зараз. Іди %1$@ або %2$@";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Поглянь на мою мiтку на карті MAPS.ME";
+"bookmark_share_email_subject" = "Поглянь на мою мiтку на карті OMaps";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Поглянь на моє поточне місцезнаходження на карті MAPS.ME";
+"my_position_share_email_subject" = "Поглянь на моє поточне місцезнаходження на карті OMaps";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Привіт,\n\nЯ зараз тут: %1$@. Натисни на це посилання %2$@ або на це посилання %3$@ щоб побачити місце на карті.\n\nДякую.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Завантажуйте карту тієї місцевості, де ви знаходитесь";
 
 /* text of notification */
-"pro_version_is_free_today" = "Повна версія MAPS.ME сьогодні безкоштовна! Завантажуй та розкажи друзям.";
+"pro_version_is_free_today" = "Повна версія OMaps сьогодні безкоштовна! Завантажуй та розкажи друзям.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Ми переносимо завантажені карти з MAPS.ME Lite в MAPS.ME. Це може зайняти декілька хвилин.";
+"move_lite_maps_to_pro" = "Ми переносимо завантажені карти з OMaps Lite в OMaps. Це може зайняти декілька хвилин.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Ваші карти успішно перенесено в MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Ваші карти успішно перенесено в OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "При переносі карт виникла помилка. Будь ласка, видаліть MAPS.ME Lite і завантажте карти знову.";
+"move_lite_maps_to_pro_failed" = "При переносі карт виникла помилка. Будь ласка, видаліть OMaps Lite і завантажте карти знову.";
 
 /* Text in menu */
 "settings_and_more" = "Налаштування";
@@ -600,13 +600,13 @@
 "website" = "Вебсайт";
 
 /* Text in menu */
-"maps_me_community" = "Спільнота MAPS.ME";
+"maps_me_community" = "Спільнота OMaps";
 
 /* Text in menu */
-"like_on_facebook" = "MAPS.ME у Facebook";
+"like_on_facebook" = "OMaps у Facebook";
 
 /* Text in menu */
-"follow_on_twitter" = "MAPS.ME у Twitter";
+"follow_on_twitter" = "OMaps у Twitter";
 
 /* Text in menu */
 "contact_us" = "Контакти";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Сповістити про помилку";
 
 /* Email subject */
-"subscribe_me_subject" = "Підпишіть мене на email-розсилку MAPS.ME";
+"subscribe_me_subject" = "Підпишіть мене на email-розсилку OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Я хочу першим дізнаватися про всі новини оновлення програм і акції. Я можу відписатися від розсилки в будь-який момент.";
 
 /* About text */
-"about_text" = "MAPS.ME пропонує карти всіх міст, всіх країн світу, які працюють без підключення до інтернету. Подорожуйте з впевненістю: де б ви не були, MAPS.ME допоможуть вирішити будь-яку вашу проблему - допоможуть визначити ваше місцезнаходження, знайти ресторан, готель, заправку, банк, туалет і т.д.\n\nМи постійно працюємо над додаванням нових функцій, тому, якщо у вас є ідеї або пропозиції з покращення MAPS.ME, пишіть нам. Якщо у вам виникла проблема з програмою, сповістіть нас, будь ласка, про неї. Наш емейл support@maps.me. Ми відповідаємо на всі листи!\n\nЯкщо вам подобається програма і ви хочете підтримати нас, є декілька простих і абсолютно безкоштовних способів:\n\n- залиште відгук у вашому магазині програм\n- підпишіться на наші новини на сторінці у Facebook http://www.facebook.com/mapswithme\n- або просто розкажіть про MAPS.ME своїй мамі, друзям і колегам :)\n\nДякуємо за вашу підтримку!\n\nP.S. У програмі ми використовуємо картографічні дані проекту OpenStreetMap, який працює за принципом Вікіпедії, надаючи можливість користувачам зі всього світу створювати і редагувати карти. Якщо ви помітили, що на карті щось не відповідає дійсності або відсутнє, ви можете виправити це прямо на сайті https://www.openstreetmap.org, і ці виправлення з'являться під час наступного оновлення MAPS.ME.";
+"about_text" = "OMaps пропонує карти всіх міст, всіх країн світу, які працюють без підключення до інтернету. Подорожуйте з впевненістю: де б ви не були, OMaps допоможуть вирішити будь-яку вашу проблему - допоможуть визначити ваше місцезнаходження, знайти ресторан, готель, заправку, банк, туалет і т.д.\n\nМи постійно працюємо над додаванням нових функцій, тому, якщо у вас є ідеї або пропозиції з покращення OMaps, пишіть нам. Якщо у вам виникла проблема з програмою, сповістіть нас, будь ласка, про неї. Наш емейл support@omaps.app. Ми відповідаємо на всі листи!\n\nЯкщо вам подобається програма і ви хочете підтримати нас, є декілька простих і абсолютно безкоштовних способів:\n\n- залиште відгук у вашому магазині програм\n- підпишіться на наші новини на сторінці у Facebook http://www.facebook.com/mapswithme\n- або просто розкажіть про OMaps своїй мамі, друзям і колегам :)\n\nДякуємо за вашу підтримку!\n\nP.S. У програмі ми використовуємо картографічні дані проекту OpenStreetMap, який працює за принципом Вікіпедії, надаючи можливість користувачам зі всього світу створювати і редагувати карти. Якщо ви помітили, що на карті щось не відповідає дійсності або відсутнє, ви можете виправити це прямо на сайті https://www.openstreetmap.org, і ці виправлення з'являться під час наступного оновлення OMaps.";
 
 /* Alert text */
 "email_error_body" = "Поштовий клієнт не налаштований. Налаштуйте його або скористайтеся іншими способами зв'язку. Наша адреса – %@.";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Будь ласка, оновіть карту, щоб прокласти маршрут.";
 
 /* Update maps suggestion */
-"routing_update_maps" = "В новій версії MAPS.ME ви зможете прокладати маршрут від поточного місця перебування до точки призначення. Щоб скористатися цією функцією, будь ласка, оновіть карти.";
+"routing_update_maps" = "В новій версії OMaps ви зможете прокладати маршрут від поточного місця перебування до точки призначення. Щоб скористатися цією функцією, будь ласка, оновіть карти.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Оновити всі";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Знайдено";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Використовуючи маршрути в програмі MAPS.ME, будь ласка, враховуйте наступне:\n\n  - Пропоновані маршрути можуть розглядатися тільки в якості рекомендації.\n - Дорожні умови, правила дорожнього руху, знаки являються більш пріоритетними в порівнянні з порадами навігаційної програми.\n - Карта може бути неточною або неактуальною, а запропонований маршрут не найоптимальнішим.\n\n  Будьте уважні на дорозі та бережіть себе!";
+"routing_disclaimer" = "Використовуючи маршрути в програмі OMaps, будь ласка, враховуйте наступне:\n\n  - Пропоновані маршрути можуть розглядатися тільки в якості рекомендації.\n - Дорожні умови, правила дорожнього руху, знаки являються більш пріоритетними в порівнянні з порадами навігаційної програми.\n - Карта може бути неточною або неактуальною, а запропонований маршрут не найоптимальнішим.\n\n  Будьте уважні на дорозі та бережіть себе!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Неактуальні";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Неможливо прокласти маршрут між вибраними точками. Будь ласка, змініть початок і кінець маршруту.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Внутрішня помилка. Будь ласка, видаліть мапу і завантажте її ще раз. Якщо це не допомогло, напишіть нам на support@maps.me";
+"routing_failed_internal_error" = "Внутрішня помилка. Будь ласка, видаліть мапу і завантажте її ще раз. Якщо це не допомогло, напишіть нам на support@omaps.app";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Завантажити карту + маршрути";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Я щойно оцінив вашу програму";
 
 /* Text for rating dialog */
-"rating_user_since" = "Я користувач MAPS.ME з %@ року";
+"rating_user_since" = "Я користувач OMaps з %@ року";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Вам подобається MAPS.ME?";
+"rating_do_like_maps" = "Вам подобається OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Торкніться зірочки, щоб оцінити нашу програму.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Отримати карту";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Завантажте оновлену карту та дані про маршрут, щоб отримати всі можливості MAPS.ME.";
+"routing_download_map_and_routing" = "Завантажте оновлену карту та дані про маршрут, щоб отримати всі можливості OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Отримати дані про маршрут";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Подобається програма?";
 
-"rate_alert_default_message" = "Дякуємо за використання MAPS.ME. Будь ласка, дайте їй оцінку. Ваш відгук допоможе нам стати краще.";
+"rate_alert_default_message" = "Дякуємо за використання OMaps. Будь ласка, дайте їй оцінку. Ваш відгук допоможе нам стати краще.";
 
 "rate_alert_five_star_message" = "Ура! Ми теж вас любимо!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Дубльовані місця";
 
-"first_launch_congrats_title" = "MAPS.ME готовий до роботи";
+"first_launch_congrats_title" = "OMaps готовий до роботи";
 
 "first_launch_congrats_text" = "Користуйтесь пошуком і навігацією по всьому світу без інтернету і безкоштовно.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Додати нові місця до карти і редагувати існуючі місця прямо з програми.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME використовує дані спільноти OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps використовує дані спільноти OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Ви ніколи не загубитеся знову";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Плануйте оптимальні маршрути для поїздок і піших походів.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — використовуй карти всього світу без інтернету";
+"onboarding_offline_maps_title" = "OMaps — використовуй карти всього світу без інтернету";
 
 "onboarding_offline_maps_message" = "Завантажте мапи необхідного регіону один раз та користуйтесь навігацією та пошуком без підключення до інтернету.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Щоб користуватися навігацією та іншими функціями додатку, нам необхідний доступ до вашого місцезнаходження.";
 
-"onboarding_permissions_title" = "Дозволити MAPS.ME доступ до сховища та функції визначення геолокації";
+"onboarding_permissions_title" = "Дозволити OMaps доступ до сховища та функції визначення геолокації";
 
 "onboarding_permissions_message" = "Таким чином ви зможете завантажувати карти, переглядати місцевість і трафік, а також використовувати навігацію.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Для завантаження потрібно більше вільного місця. Будь ласка, видаліть непотрібні дані.";
 
-"editor_sharing_title" = "Я покращив мапи MAPS.ME";
+"editor_sharing_title" = "Я покращив мапи OMaps";
 
 "editor_comment_will_be_sent" = "Ми обов'язково відправимо ваш коментар картографам.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Докладний коментар";
 
-"editor_detailed_description" = "Зміни, що ви запропонували, буде відправлено до OpenStreetMap. Опишіть подробиці про об'єкт, які не можна редагувати у MAPS.ME.";
+"editor_detailed_description" = "Зміни, що ви запропонували, буде відправлено до OpenStreetMap. Опишіть подробиці про об'єкт, які не можна редагувати у OMaps.";
 
 "editor_more_about_osm" = "Більше про OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Ми обновили редактор";
 
-"whatsnew_update_editor_message" = "Користувачі MAPS.ME вже внесли 200 000 виправлень на мапі. Разом ми зробимо мапи найбільш докладними у світі. Приєднуйся!";
+"whatsnew_update_editor_message" = "Користувачі OMaps вже внесли 200 000 виправлень на мапі. Разом ми зробимо мапи найбільш докладними у світі. Приєднуйся!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Для використання редактору карт, будь ласка, оновіть всі карти.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Продовжити";
 
-"recent_track_background_dialog_message" = "MAPS.ME використовує вашу геопозицію у фоновому режимі для запису нещодавно пройденого шляху.";
+"recent_track_background_dialog_message" = "OMaps використовує вашу геопозицію у фоновому режимі для запису нещодавно пройденого шляху.";
 
 "whatsnew_car_navigation_header" = "Режим автонавігації став зручнішим";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Велонавігація (бета-версія)";
 
-"whatsnew_cycle_navigation_message" = "До відкриття сезону ми тестуємо велонавігацію. Проїдьтесь за своїм улюбленим маршрутом з MAPS.ME та поділіться враженнями з нами.";
+"whatsnew_cycle_navigation_message" = "До відкриття сезону ми тестуємо велонавігацію. Проїдьтесь за своїм улюбленим маршрутом з OMaps та поділіться враженнями з нами.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Рейтинг на Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Розповісти другу";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Привіт! Встанови MAPS.ME!";
+"tell_friends_text" = "Привіт! Встанови OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME — це додаток must-have для мандрівників. У MAPS.ME використовуються офлайн-дані OpenStreetMap, які можна редагувати.";
+"about_description" = "OMaps — це додаток must-have для мандрівників. У OMaps використовуються офлайн-дані OpenStreetMap, які можна редагувати.";
 
 /* Text in menu */
 "blog" = "Блог";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Відкрити";
 
-"whatsnew_uber_header" = "MAPS.ME і Uber";
+"whatsnew_uber_header" = "OMaps і Uber";
 
 "whatsnew_uber_message" = "Замовляйте таксі прямо з додатку!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Збільшити розмір шрифту на карті";
 
-"traffic_update_app" = "Будь ласка, встановіть оновлення MAPS.ME";
+"traffic_update_app" = "Будь ласка, встановіть оновлення OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Для відображення даних про трафік оновіть додаток.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Надати доступ";
 
-"onboarding_storage_permissions_message" = "Внесіть зміни до прав доступу на вашому пристрої. Для використання MAPS.ME необхідно надати додатку права доступу до сховища.";
+"onboarding_storage_permissions_message" = "Внесіть зміни до прав доступу на вашому пристрої. Для використання OMaps необхідно надати додатку права доступу до сховища.";
 
 "button_exit" = "Вихід";
 
-"onboarding_detail_permissions_title" = "MAPS.ME необхідно надати доступ до";
+"onboarding_detail_permissions_title" = "OMaps необхідно надати доступ до";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Сховище";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Не вдалося отримати доступ до сховища";
 
-"dialog_error_storage_message" = "Зовнішнє сховище не доступно. Ймовірно, SD-картку пам'яті було вилучено, пошкоджено, або система файлів доступна тільки для читання. Будь ласка, перевірте та зв'яжіться з нами, написавши на адресу електронну пошту support@maps.me";
+"dialog_error_storage_message" = "Зовнішнє сховище не доступно. Ймовірно, SD-картку пам'яті було вилучено, пошкоджено, або система файлів доступна тільки для читання. Будь ласка, перевірте та зв'яжіться з нами, написавши на адресу електронну пошту support@omaps.app";
 
 "setting_emulate_bad_storage" = "Емулювати проблемне сховище";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Я згоден з <a href=\"%s\">Умовами використання</a>";
 
-"sign_agree_news_gdpr" = "Я згоден отримувати останні новини про MAPS.ME";
+"sign_agree_news_gdpr" = "Я згоден отримувати останні новини про OMaps";
 
 "whats_new_localbiz_title" = "Малий бізнес заслуговує на увагу";
 
-"whats_new_localbiz_message" = "Саме локальні кав’ярні, хостели та магазинчики роблять мандрівки незабутніми. Ми безкоштовно оптимізуємо вашу бізнес-сторінку в MAPS.ME, для того, щоб його помітили.";
+"whats_new_localbiz_message" = "Саме локальні кав’ярні, хостели та магазинчики роблять мандрівки незабутніми. Ми безкоштовно оптимізуємо вашу бізнес-сторінку в OMaps, для того, щоб його помітили.";
 
 "whats_new_order_button" = "Залишити заявку";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Завантажте нові місця";
 
-"cached_bookmarks_placeholder_subtitle" = "Натисніть кнопку, щоб завантажити тисячі цікавих місць і маршрутів, створених користувачами MAPS.ME. Вам знадобиться підключення до Інтернету.";
+"cached_bookmarks_placeholder_subtitle" = "Натисніть кнопку, щоб завантажити тисячі цікавих місць і маршрутів, створених користувачами OMaps. Вам знадобиться підключення до Інтернету.";
 
 "downloader_download_routers" = "Завантажити позначки";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Звіти про помилки";
 
-"opt_out_fabric_description" = "Ми можемо використовувати ваші дані, щоб розвивати та покращувати MAPS.ME. Зміни вступлять у силу після перезапуску програми";
+"opt_out_fabric_description" = "Ми можемо використовувати ваші дані, щоб розвивати та покращувати OMaps. Зміни вступлять у силу після перезапуску програми";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Позначки не були завантажені";
 
-"whats_new_bookmarks_catalog_title" = "У MAPS.ME з’явився каталог маршрутів";
+"whats_new_bookmarks_catalog_title" = "У OMaps з’явився каталог маршрутів";
 
 "whats_new_bookmarks_catalog_message" = "Десятки докладних маршрутів по всьому світу: куди сходити, що подивитися, де поїсти.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Відключити рекламу";
 
-"remove_ads_title" = "Відключіть всю рекламу та підтримайте MAPS.ME";
+"remove_ads_title" = "Відключіть всю рекламу та підтримайте OMaps";
 
 "paybtn_title" = "Заплатити %s/рік";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Інші варіанти";
 
-"why_support" = "Навіщо підтримувати MAPS.ME?";
+"why_support" = "Навіщо підтримувати OMaps?";
 
 "options_dropdown_item1" = "%s/місяць (економія %s/рік)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Ми відключимо для вас всю рекламу";
 
-"why_support_item2" = "Ви допомагаєте нам покращувати MAPS.ME";
+"why_support_item2" = "Ви допомагаєте нам покращувати OMaps";
 
 "why_support_item3" = "Ви допомагаєте нам покращувати карти OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Сервер недоступний";
 
-"server_unavailable_message" = "Купівля буде завершена пізніше. Якщо помилка повториться, зв’яжіться з support@maps.me.";
+"server_unavailable_message" = "Купівля буде завершена пізніше. Якщо помилка повториться, зв’яжіться з support@omaps.app.";
 
 "offline_fiters_check_in" = "Підключіться до інтернету, щоб вибрати дату заїзду та виїзду.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Цей путівник буде завантажено у публічний каталог MAPS.ME та буде доступний іншим користувачам";
+"upload_and_publish_desc" = "Цей путівник буде завантажено у публічний каталог OMaps та буде доступний іншим користувачам";
 
 "upload_and_publish" = "Завантажити та опублікувати";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Залиште відгук та допоможіть мандрівникам!";
 
-"share_bookmarks_email_body_link" = "Вітаємо!\n\nВаші мітки можна завантажити за посиланням: %s. Відкривайте список за допомогою MAPS.ME та насолоджуйтесь подорожжю!\n\nЗавантажити додаток: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Вітаємо!\n\nВаші мітки можна завантажити за посиланням: %s. Відкривайте список за допомогою OMaps та насолоджуйтесь подорожжю!\n\nЗавантажити додаток: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Навігатор вас попередить про камери при перевищенні швидкісного режиму на %d км/г";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Ділитись враженнями легко";
 
-"whats_new_ugc_routes_subtitle" = "Зберігай пам'ятні місця, створюй маршрути, використовуючи закладки, та ділись ними з усіма в каталозі MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Зберігай пам'ятні місця, створюй маршрути, використовуючи закладки, та ділись ними з усіма в каталозі OMaps.";
 
 "whats_new_webeditor_title" = "Перетворюй свої маршрути у історії";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "У вашому маршруті має бути мінімум 3 мітки, щоб його можна було завантажити до публічного каталогу";
 
-"bookmark_public_upload_alert_title" = "Ви всього в парі кроків від завантаження вашого маршруту до каталогу MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Ви всього в парі кроків від завантаження вашого маршруту до каталогу OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Переконайтеся, що маршрут має назву й опис, а всі мітки містять інформацію про місця. Завдяки цьому користувачі знайдуть маршрут і зможуть скористатися ним у мандрівці.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Максимальне енергозбереження";
 
-"enable_logging_warning_message" = "Дана опція вмикається для логування дій з метою діагностики. Це допомагає команді виявити проблеми з додатком. Вмикайте цю опцію тільки на прохання служби підтримки MAPS.ME.";
+"enable_logging_warning_message" = "Дана опція вмикається для логування дій з метою діагностики. Це допомагає команді виявити проблеми з додатком. Вмикайте цю опцію тільки на прохання служби підтримки OMaps.";
 
 "html_error_upload_message_try_again" = "Перевірте доступ до мережі та спробуйте ще раз";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "Ваш ID: %s.";
 
-"gdpr_request_window_message" = "Будь ласка, скопіюйте його й надішліть запит на support@maps.me";
+"gdpr_request_window_message" = "Будь ласка, скопіюйте його й надішліть запит на support@omaps.app";
 
 "gdpr_request_window_copy" = "Скопіювати ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Уникати поромних переправ";
 
-"cached_guides_placeholder_subtitle" = "Готові путівники в MAPS.ME – це вибрані місця з фотографіями та описами, що відображаються на карті та доступні офлайн.";
+"cached_guides_placeholder_subtitle" = "Готові путівники в OMaps – це вибрані місця з фотографіями та описами, що відображаються на карті та доступні офлайн.";
 
 "guides_catalogue_title" = "Каталог путівників";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Узбецька кухня";
 
-"onboarding_welcome_title" = "Плануйте та подорожуйте з MAPS.ME";
+"onboarding_welcome_title" = "Плануйте та подорожуйте з OMaps";
 
 "onboarding_welcome_first_subtitle" = "Зберігайте цікаві місця, бронюйте готелі, будуйте маршрути офлайн";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Завантажити";
 
-"onboarding_bydeeplink_guide_title" = "Готові путівники в MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Готові путівники в OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Вибрані місця з фотографіями та описами відображаються на карті та доступні офлайн.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Готель заброньовано?";
 
-"popup_booking_download_guides_message" = "Заплануйте маршрут із готовими путівниками MAPS.ME";
+"popup_booking_download_guides_message" = "Заплануйте маршрут із готовими путівниками OMaps";
 
 "popup_mwm_download_guides_title" = "Офлайн-путівники";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Переглянути";
 
-"gallery_pp_download_guides_offline_title" = "Плануйте свій відпочинок із MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Плануйте свій відпочинок із OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Не проґавте найважливіше з маршрутами від досвідчених мандрівників";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Оплату буде стягнуто з вашого облікового запису iTunes при підтвердженні покупки. Передплату буде автоматично поновлено, якщо автоматичне оновлення не буде вимкнено принаймні за 24 години до кінця поточного періоду. З вашого обліквого запису буде стягнуто плату відповідно до вашого плану про поновлення протягом 24 годин до кінця поточного періоду. Ви можете керувати або вимкнути автоматичне оновлення у налаштуваннях облікового запису Apple ID у будь-який час вашої покупки.";
 
-"whatsnew_carplay_title" = "Автонавигація MAPS.ME в CarPlay!";
+"whatsnew_carplay_title" = "Автонавигація OMaps в CarPlay!";
 
 "whatsnew_carplay_message" = "Мітки, пошук, камери швидкості та налаштування об’їзду — все працює без Інтернету";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Інфо о камерах";
 
-"download_map_carplay" = "Завантажте карти в додатку MAPS.ME на своєму пристрої";
+"download_map_carplay" = "Завантажте карти в додатку OMaps на своєму пристрої";
 
 "carplay_roundabout_exit" = "%s з’їзд";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Ура! Ви оформили підписку!";
 
-"popup_subscription_success_map_message" = "Тепер досліджуйте найкращі туристичні пам’ятки в каталозі MAPS.ME";
+"popup_subscription_success_map_message" = "Тепер досліджуйте найкращі туристичні пам’ятки в каталозі OMaps";
 
 "popup_subscription_success_map_start_button" = "Переглянути";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Почати";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Універсальний помічник у подорожах";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Відкрити каталог";
 
-"new_onboarding_step5.2_message" = "Передплата каталогу путівників у MAPS.ME – це вигідно. Отримай повний доступ до маршрутів для міських прогулянок і активного відпочинку!";
+"new_onboarding_step5.2_message" = "Передплата каталогу путівників у OMaps – це вигідно. Отримай повний доступ до маршрутів для міських прогулянок і активного відпочинку!";
 
 "new_onboarding_step5.2_button" = "Переглянути умови";
 
-"new_onboarding_step5.3_message" = "Завантажте й оцініть маршрути для прогулянок містом і активного відпочинку з безкоштовною підбіркою MAPS.ME!";
+"new_onboarding_step5.3_message" = "Завантажте й оцініть маршрути для прогулянок містом і активного відпочинку з безкоштовною підбіркою OMaps!";
 
 "new_onboarding_step5.3_button" = "Завантажити безкоштовно";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Маршрути від Outdooractive для зимових і літніх відпусток уже у каталозі!";
 
-"whatsnew_guides_galleries_title" = "Плануйте найближчу поїздку з MAPS.ME";
+"whatsnew_guides_galleries_title" = "Плануйте найближчу поїздку з OMaps";
 
 "whatsnew_guides_galleries_message" = "Тепер ви можете знайти рекомендовані путівники в картках популярних міст і пам’яток";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Висоти";
 
-"tips_map_layers_title_countour" = "Лінії висот офлайн у MAPS.ME!";
+"tips_map_layers_title_countour" = "Лінії висот офлайн у OMaps!";
 
 "tips_map_layers_message_countour" = "Лінії висот допоможуть спланувати подорож на природу та не загубитися на місцевості";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
index a4cc00c18b..32f6935241 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.stringsdict
@@ -139,4 +139,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index afdeb3fd5b..4645adc672 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "Tải xuống ngay";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "Cám ơn bạn đã sử dụng MAPS.ME! Bạn thích ứng dụng chứ? Kể cho bạn bè về ứng dụng này! Đây sẽ là sự biết ơn tuyệt vời nhất đối với chúng tôi.";
+"share_on_facebook_text" = "Cám ơn bạn đã sử dụng OMaps! Bạn thích ứng dụng chứ? Kể cho bạn bè về ứng dụng này! Đây sẽ là sự biết ơn tuyệt vời nhất đối với chúng tôi.";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "Thử lại";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "Giới thiệu về MAPS.ME";
+"about_menu_title" = "Giới thiệu về OMaps";
 
 "downloading_touch_to_cancel" = "Đang tải xuống %d%%, chạm để hủy bỏ";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "Không hỗ trợ lưu trữ trên thẻ SD/USB với các bản đồ được tải xuống";
 
-"disconnect_usb_cable" = "Bạn vui lòng tháo cáp USB hoặc lắp thẻ nhớ vào để sử dụng MAPS.ME";
+"disconnect_usb_cable" = "Bạn vui lòng tháo cáp USB hoặc lắp thẻ nhớ vào để sử dụng OMaps";
 
 "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";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "Bạn cần bản đồ được cập nhật cho chức năng tìm kiếm:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "Bạn không cần MAPS.ME Lite nữa, vì vậy bạn có thể gỡ cài đặt nó.";
+"suggest_uninstall_lite" = "Bạn không cần OMaps Lite nữa, vì vậy bạn có thể gỡ cài đặt nó.";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@, descărcată cu succes";
@@ -249,10 +249,10 @@
 "set" = "Đặt";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "Bạn chưa có điểm đánh dấu.\nChạm vào bất kỳ địa điểm nào trên bản đồ để thêm một điểm đánh dấu.\nĐiểm đánh dấu từ các nguồn khác cũng có thể được nhập và hiển thị trong MAPS.ME. Mở tập tin KML/KMZ với các điểm đánh dấu được lưu từ email, Dropbox hoặc liên kết web.";
+"bookmarks_usage_hint" = "Bạn chưa có điểm đánh dấu.\nChạm vào bất kỳ địa điểm nào trên bản đồ để thêm một điểm đánh dấu.\nĐiểm đánh dấu từ các nguồn khác cũng có thể được nhập và hiển thị trong OMaps. Mở tập tin KML/KMZ với các điểm đánh dấu được lưu từ email, Dropbox hoặc liên kết web.";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "Điểm đánh dấu từ các nguồn khác có thể được nhập và hiển thị trong MAPS.ME. Mở tập tin KML/KMZ với các điểm đánh dấu được lưu từ thư, Dropbox hoặc liên kết web.";
+"bookmarks_usage_hint_import_only" = "Điểm đánh dấu từ các nguồn khác có thể được nhập và hiển thị trong OMaps. Mở tập tin KML/KMZ với các điểm đánh dấu được lưu từ thư, Dropbox hoặc liên kết web.";
 
 /* Settings button in system menu */
 "settings" = "Thiết lập";
@@ -354,9 +354,9 @@
 "share_by_email" = "Chia sẻ bằng email";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "Điểm đánh dấu MAPS.ME được chia sẻ";
+"share_bookmarks_email_subject" = "Điểm đánh dấu OMaps được chia sẻ";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Tải Điểm đánh dấu";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "Hiện đang tải xuống quốc gia.";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "Hi vọng bạn thích sử dụng MAPS.ME! Nếu vậy, bạn vui lòng cho điểm hoặc đánh giá ứng dụng trên App Store. Việc này chỉ tốn dưới một phút và sẽ giúp chúng tôi rất nhiều. Cảm ơn bạn đã ủng hộ!";
+"appStore_message" = "Hi vọng bạn thích sử dụng OMaps! Nếu vậy, bạn vui lòng cho điểm hoặc đánh giá ứng dụng trên App Store. Việc này chỉ tốn dưới một phút và sẽ giúp chúng tôi rất nhiều. Cảm ơn bạn đã ủng hộ!";
 
 /* No, thanks */
 "no_thanks" = "Không, cảm ơn";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "Này, hãy xem ghim của tôi tại MAPS.ME! %1$@ hoặc %2$@ Bạn chưa cài đặt bản đồ ngoại tuyến? Tải xuống tại đây: http://maps.me/get";
+"bookmark_share_sms" = "Này, hãy xem ghim của tôi tại OMaps! %1$@ hoặc %2$@ Bạn chưa cài đặt bản đồ ngoại tuyến? Tải xuống tại đây: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "Này, hãy xem vị trí hiện tại của tôi tại MAPS.ME! %1$@ hoặc %2$@ Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: http://maps.me/get";
+"my_position_share_sms" = "Này, hãy xem vị trí hiện tại của tôi tại OMaps! %1$@ hoặc %2$@ Bạn không có bản đồ ngoại tuyến? Tải xuống tại đây: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Này, hãy xem ghim của tôi tại MAPS.ME map";
+"bookmark_share_email_subject" = "Này, hãy xem ghim của tôi tại OMaps map";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "Này, hãy xem vị trí hiện tại của tôi tại MAPS.ME map!";
+"my_position_share_email_subject" = "Này, hãy xem vị trí hiện tại của tôi tại OMaps map!";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "Chào,\n\nTôi hiện đang ở đây: %1$@. Hãy nhấn vào liên kết này %2$@ hoặc liên kết này %3$@ để xem địa điểm trên bản đồ.\n\nCám ơn.";
@@ -582,16 +582,16 @@
 "download_map_notification" = "Tải xuống bản đồ của vị trí của bạn";
 
 /* text of notification */
-"pro_version_is_free_today" = "Full version of MAPS.ME is free today! Download now and tell your friends.";
+"pro_version_is_free_today" = "Full version of OMaps is free today! Download now and tell your friends.";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "Chúng tôi đang chuyển bản đồ đã tải xuống của bạn từ MAPS.ME Lite sang MAPS.ME. Việc này có thể mất vài phút.";
+"move_lite_maps_to_pro" = "Chúng tôi đang chuyển bản đồ đã tải xuống của bạn từ OMaps Lite sang OMaps. Việc này có thể mất vài phút.";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "Bản đồ đã tải xuống của bạn đã được chuyển thành công sang MAPS.ME.";
+"move_lite_maps_to_pro_ok" = "Bản đồ đã tải xuống của bạn đã được chuyển thành công sang OMaps.";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "Bản đồ của bạn không chuyển được. Vui lòng xóa MAPS.ME Lite và tải xuống lại bản đồ.";
+"move_lite_maps_to_pro_failed" = "Bản đồ của bạn không chuyển được. Vui lòng xóa OMaps Lite và tải xuống lại bản đồ.";
 
 /* Text in menu */
 "settings_and_more" = "Thiết lập &amp; Khác";
@@ -600,7 +600,7 @@
 "website" = "Trang web";
 
 /* Text in menu */
-"maps_me_community" = "Cộng đồng MAPS.ME";
+"maps_me_community" = "Cộng đồng OMaps";
 
 /* Text in menu */
 "like_on_facebook" = "Thích trên Facebook";
@@ -630,13 +630,13 @@
 "report_a_bug" = "Báo cáo lỗi";
 
 /* Email subject */
-"subscribe_me_subject" = "Vui lòng đăng ký tôi vào danh sách nhận thư định kỳ MAPS.ME";
+"subscribe_me_subject" = "Vui lòng đăng ký tôi vào danh sách nhận thư định kỳ OMaps";
 
 /* Email body */
 "subscribe_me_body" = "Tôi muốn là người đầu tiên được biết về các thông tin cập nhật và quảng bá mới nhất. Tôi có thể hủy bỏ đăng ký nhận tin của mình bất cứ lúc nào.";
 
 /* About text */
-"about_text" = "MAPS.ME cung cấp bản đồ ngoại tuyến của tất cả các thành phố và quốc gia trên thế giới một cách nhanh nhất. Hoàn toàn tự tin đi du lịch: dù bạn ở đâu, MAPS.ME vẫn sẽ giúp bạn định vị bản thân trên bản đồ, tìm các nhà hàng, khách sạn, ngân hàng, trạm xăng, v.v… gần nhất. Ứng dụng này không yêu cầu kết nối Internet.\n\nChúng tôi luôn phát triển các tính năng mới và rất chào đón ý kiến của bạn về cách mà chúng tôi có thể cải thiện MAPS.ME. Nếu bạn có bất cứ vấn đề nào với ứng dụng, hãy liên hệ với chúng tôi qua địa chỉ support@maps.me. Chúng tôi sẽ trả lời mọi yêu cầu!\n\nBạn có thích MAPS.ME và muốn hỗ trợ chúng tôi hay không? Sau đây là một số cách đơn giản và hoàn toàn miễn phí:\n\n- viết đánh giá trên Chợ Ứng dụng mà bạn sử dụng\n- thích trang Facebook của chúng tôi http://www.facebook.com/mapswithme\n- hoặc chỉ đơn giản là kể về MAPS.ME với mẹ, bạn bè và đồng nghiệp của bạn :)\n\nCảm ơn bạn đã ủng hộ chúng tôi. Chúng tôi rất cảm ơn sự giúp đỡ của bạn!\n\nT.B. Chúng tôi lấy dữ liệu bản đồ từ OpenStreetMap, một dự án bản đồ tương đương với Wikipedia, cho phép người dùng có thể tạo và sửa bản đồ. Nếu bạn thấy có thông tin bị thiếu hoặc sai trên bản đồ, bạn có thể sửa trực tiếp tại https://www.openstreetmap.org, và các thay đổi của bạn sẽ xuất hiện trong ứng dụng MAPS.ME ở phiên bản kế tiếp.";
+"about_text" = "OMaps cung cấp bản đồ ngoại tuyến của tất cả các thành phố và quốc gia trên thế giới một cách nhanh nhất. Hoàn toàn tự tin đi du lịch: dù bạn ở đâu, OMaps vẫn sẽ giúp bạn định vị bản thân trên bản đồ, tìm các nhà hàng, khách sạn, ngân hàng, trạm xăng, v.v… gần nhất. Ứng dụng này không yêu cầu kết nối Internet.\n\nChúng tôi luôn phát triển các tính năng mới và rất chào đón ý kiến của bạn về cách mà chúng tôi có thể cải thiện OMaps. Nếu bạn có bất cứ vấn đề nào với ứng dụng, hãy liên hệ với chúng tôi qua địa chỉ support@omaps.app. Chúng tôi sẽ trả lời mọi yêu cầu!\n\nBạn có thích OMaps và muốn hỗ trợ chúng tôi hay không? Sau đây là một số cách đơn giản và hoàn toàn miễn phí:\n\n- viết đánh giá trên Chợ Ứng dụng mà bạn sử dụng\n- thích trang Facebook của chúng tôi http://www.facebook.com/mapswithme\n- hoặc chỉ đơn giản là kể về OMaps với mẹ, bạn bè và đồng nghiệp của bạn :)\n\nCảm ơn bạn đã ủng hộ chúng tôi. Chúng tôi rất cảm ơn sự giúp đỡ của bạn!\n\nT.B. Chúng tôi lấy dữ liệu bản đồ từ OpenStreetMap, một dự án bản đồ tương đương với Wikipedia, cho phép người dùng có thể tạo và sửa bản đồ. Nếu bạn thấy có thông tin bị thiếu hoặc sai trên bản đồ, bạn có thể sửa trực tiếp tại https://www.openstreetmap.org, và các thay đổi của bạn sẽ xuất hiện trong ứng dụng OMaps ở phiên bản kế tiếp.";
 
 /* Alert text */
 "email_error_body" = "Trình khách email này chưa được thiết lập. Bạn vui lòng cấu hình nó hoặc sử dụng một cách khác để liên hệ với chúng tôi tại %@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "Vui lòng cập nhật bản đồ để tạo tuyến đường";
 
 /* Update maps suggestion */
-"routing_update_maps" = "Phiên bản MAPS.ME mới cho phép tạo các tuyến đường từ vị trí hiện tại của bạn đến điểm đến. Vui lòng cập nhật bản đồ để sử dụng tính năng này.";
+"routing_update_maps" = "Phiên bản OMaps mới cho phép tạo các tuyến đường từ vị trí hiện tại của bạn đến điểm đến. Vui lòng cập nhật bản đồ để sử dụng tính năng này.";
 
 /* Update all button text */
 "downloader_update_all_button" = "Cập nhật tất cả";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "Đã tìm thấy";
 
 /* Disclaimer message */
-"routing_disclaimer" = "Tạo các tuyến đường trong ứng dụng MAPS.ME, xin lưu ý điều sau:\n\n – Các tuyến đường được gợi ý chỉ có thể được xem là đề xuất.\n – Điều kiện con đường, luật giao thông và biển báo có mức ưu tiên cao hơn lời khuyên dẫn hướng.\n – Bản đồ có thể không chính xác hoặc lỗi thời, tuyến đường có thể không được tạo theo cách tốt nhất có thể.\n\n Hãy lái xe an toàn trên đường và bảo trọng!";
+"routing_disclaimer" = "Tạo các tuyến đường trong ứng dụng OMaps, xin lưu ý điều sau:\n\n – Các tuyến đường được gợi ý chỉ có thể được xem là đề xuất.\n – Điều kiện con đường, luật giao thông và biển báo có mức ưu tiên cao hơn lời khuyên dẫn hướng.\n – Bản đồ có thể không chính xác hoặc lỗi thời, tuyến đường có thể không được tạo theo cách tốt nhất có thể.\n\n Hãy lái xe an toàn trên đường và bảo trọng!";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "Lỗi thời";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "Không tìm thấy tuyến đường nào giữa điểm gốc và điểm đến được chọn. Vui lòng chọn điểm bắt đầu hoặc điểm cuối khác.";
 
 /* InternalError */
-"routing_failed_internal_error" = "Đã xảy ra lỗi nội bộ. Vui lòng thử xóa và tải lại xuống bản đồ. Nếu vấn đề vẫn còn tồn tại, vui lòng liên hệ với chúng tôi tại support@maps.me.";
+"routing_failed_internal_error" = "Đã xảy ra lỗi nội bộ. Vui lòng thử xóa và tải lại xuống bản đồ. Nếu vấn đề vẫn còn tồn tại, vui lòng liên hệ với chúng tôi tại support@omaps.app.";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "Tải xuống Bản đồ + Định tuyến";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "Tôi vừa đánh giá ứng dụng của bạn";
 
 /* Text for rating dialog */
-"rating_user_since" = "Tôi là người dùng MAPS.ME từ năm %@";
+"rating_user_since" = "Tôi là người dùng OMaps từ năm %@";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "Bạn có thích MAPS.ME?";
+"rating_do_like_maps" = "Bạn có thích OMaps?";
 
 /* Text for rating dialog */
 "rating_tap_star" = "Chạm vào một ngôi sao để đánh giá ứng dụng của chúng tôi.";
@@ -792,7 +792,7 @@
 "routing_download_map" = "Nhận bản đồ";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "Tải bản đồ và dữ liệu đường đi cập nhật để nhận được tất cả các tính năng của MAPS.ME.";
+"routing_download_map_and_routing" = "Tải bản đồ và dữ liệu đường đi cập nhật để nhận được tất cả các tính năng của OMaps.";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "Nhận dữ liệu đường đi";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "Bạn thích ứng dụng chứ?";
 
-"rate_alert_default_message" = "Cám ơn bạn đã sử dụng MAPS.ME. Vui lòng đánh giá ứng dụng. Phản hồi của bạn giúp chúng tôi trở nên tốt hơn.";
+"rate_alert_default_message" = "Cám ơn bạn đã sử dụng OMaps. Vui lòng đánh giá ứng dụng. Phản hồi của bạn giúp chúng tôi trở nên tốt hơn.";
 
 "rate_alert_five_star_message" = "Hoan hô! Chúng tôi cũng yêu bạn!";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "Địa điểm trùng lặp";
 
-"first_launch_congrats_title" = "MAPS.ME đã sẵn sàng để sử dụng";
+"first_launch_congrats_title" = "OMaps đã sẵn sàng để sử dụng";
 
 "first_launch_congrats_text" = "Tìm kiếm và điều hướng ngoại tuyến, miễn phí khắp mọi nơi trên thế giới.";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "Nhập các địa điểm mới vào bản đồ, và trực tiếp chỉnh sửa những địa điểm hiện có trên ứng dụng.";
 
-"whatsnew_editor_message_2" = "* MAPS.ME sử dụng dữ liệu của cộng đồng OpenStreetMap.";
+"whatsnew_editor_message_2" = "* OMaps sử dụng dữ liệu của cộng đồng OpenStreetMap.";
 
 "onboarding_offline_navigation_title" = "Bạn sẽ không bao giờ bị lạc nữa";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "Lập tuyến đường xe hơi và đi bộ tối ưu.";
 
-"onboarding_offline_maps_title" = "MAPS.ME — truy cập bản đồ trên toàn thế giới không cần Internet";
+"onboarding_offline_maps_title" = "OMaps — truy cập bản đồ trên toàn thế giới không cần Internet";
 
 "onboarding_offline_maps_message" = "Chỉ tải xuống các bản đồ của khu vực bạn muốn một lần, và sử dụng các chức năng dẫn đường và tìm kiếm mà không cần kết nối Internet.";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "Để sử dụng tính năng dẫn đường và các tính năng khác, chúng tôi cần truy cập vị trí địa lý của bạn.";
 
-"onboarding_permissions_title" = "Cho phép MAPS.ME truy cập ổ lưu trữ và vị trí";
+"onboarding_permissions_title" = "Cho phép OMaps truy cập ổ lưu trữ và vị trí";
 
 "onboarding_permissions_message" = "Để bạn có thể tải về các bản đồ, xem các địa điểm và lưu lượng giao thông gần bạn và sử dụng điều hướng.";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "Để tải xuống, bạn cần thêm dung lượng. Xin xóa mọi dữ liệu không cần thiết.";
 
-"editor_sharing_title" = "Tôi đã cải thiện các bản đồ MAPS.ME";
+"editor_sharing_title" = "Tôi đã cải thiện các bản đồ OMaps";
 
 "editor_comment_will_be_sent" = "Chúng tôi sẽ gửi bình luận của bạn đến những người lập bản đồ.";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "Nhận xét chi tiết";
 
-"editor_detailed_description" = "Những thay đổi đề nghị của bạn sẽ được gửi đến cộng đồng OpenStreetMap. Mô tả các chi tiết không thể sửa trong MAPS.ME.";
+"editor_detailed_description" = "Những thay đổi đề nghị của bạn sẽ được gửi đến cộng đồng OpenStreetMap. Mô tả các chi tiết không thể sửa trong OMaps.";
 
 "editor_more_about_osm" = "Thông tin bổ sung về OpenStreetMap";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "Chúng tôi đã cập nhật trình biên tập bản đồ";
 
-"whatsnew_update_editor_message" = "Người dùng MAPS.ME đã thực hiện 200 000 thay đổi cho bản đồ. Cùng nhau chúng ta đang tạo ra những bản đồ chi tiết nhất trên thế giới. Hãy tham gia cùng chúng tôi!";
+"whatsnew_update_editor_message" = "Người dùng OMaps đã thực hiện 200 000 thay đổi cho bản đồ. Cùng nhau chúng ta đang tạo ra những bản đồ chi tiết nhất trên thế giới. Hãy tham gia cùng chúng tôi!";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "Để sử dụng Ứng dụng Điều chỉnh Bản đồ, xin vui lòng cập nhật tất cả các bản đồ.";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "Tiếp tục";
 
-"recent_track_background_dialog_message" = "MAPS.ME sử dụng định vị của bạn trong ứng dụng chạy nền để ghi lại tuyến đường đã đi gần đây của bạn.";
+"recent_track_background_dialog_message" = "OMaps sử dụng định vị của bạn trong ứng dụng chạy nền để ghi lại tuyến đường đã đi gần đây của bạn.";
 
 "whatsnew_car_navigation_header" = "Phần mềm dẫn đường dành cho xe cộ thân thiện với người dùng";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "Định vị xe đạp (phiên bản beta)";
 
-"whatsnew_cycle_navigation_message" = "Chúng tôi đang thử nghiệm định vị xe đạp cho mùa mới. Hãy thử tuyến đường xe đạp ưa thích của bạn với MAPS.ME, và chia sẻ ý kiến của bạn với chúng tôi.";
+"whatsnew_cycle_navigation_message" = "Chúng tôi đang thử nghiệm định vị xe đạp cho mùa mới. Hãy thử tuyến đường xe đạp ưa thích của bạn với OMaps, và chia sẻ ý kiến của bạn với chúng tôi.";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "Cho điểm trên Google Play";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "Giới thiệu với Bạn bè";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "Xin chào! Hãy cài đặt MAPS.ME!";
+"tell_friends_text" = "Xin chào! Hãy cài đặt OMaps!";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME là một ứng dụng ngoại tuyến thiết yếu khi đi du lịch. MAPS.ME được dựa trên dữ liệu của OpenStreetMap và cho phép bạn hiệu chỉnh nó.";
+"about_description" = "OMaps là một ứng dụng ngoại tuyến thiết yếu khi đi du lịch. OMaps được dựa trên dữ liệu của OpenStreetMap và cho phép bạn hiệu chỉnh nó.";
 
 /* Text in menu */
 "blog" = "Blog";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "Mở";
 
-"whatsnew_uber_header" = "MAPS.ME & Uber";
+"whatsnew_uber_header" = "OMaps & Uber";
 
 "whatsnew_uber_message" = "Đặt taxi Uber trực tiếp từ ứng dụng!";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "Tăng kích cỡ phông chữ trên bản đồ";
 
-"traffic_update_app" = "Vui lòng cập nhật MAPS.ME";
+"traffic_update_app" = "Vui lòng cập nhật OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "Để hiển thị dữ liệu giao thông, ứng dụng cần phải được cập nhật.";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "Cho phép truy cập";
 
-"onboarding_storage_permissions_message" = "Thay đổi các cài đặt cho phép trong thiết bị của bạn. Cần quyền truy cập ổ lưu trữ để sử dụng MAPS.ME.";
+"onboarding_storage_permissions_message" = "Thay đổi các cài đặt cho phép trong thiết bị của bạn. Cần quyền truy cập ổ lưu trữ để sử dụng OMaps.";
 
 "button_exit" = "Thoát";
 
-"onboarding_detail_permissions_title" = "MAPS.ME cần quyền truy cập đến";
+"onboarding_detail_permissions_title" = "OMaps cần quyền truy cập đến";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "Ổ lưu trữ";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "Vấn đề truy cập ổ lưu trữ";
 
-"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@maps.me";
+"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@omaps.app";
 
 "setting_emulate_bad_storage" = "Giả lập ổ lưu trữ hỏng";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "Tôi đồng ý với <a href=\"%s\">Điều khoản sử dụng</a>";
 
-"sign_agree_news_gdpr" = "Tôi đồng ý nhận tin tức mới nhất về các sản phẩm MAPS.ME";
+"sign_agree_news_gdpr" = "Tôi đồng ý nhận tin tức mới nhất về các sản phẩm OMaps";
 
 "whats_new_localbiz_title" = "Doanh nghiệp nhỏ xứng đáng để được chú ý";
 
-"whats_new_localbiz_message" = "Chính các quán cà phê địa phương, nhà khách nhỏ và các cửa hàng ấm cúng mới làm cho hành trình của chúng ta thật khó quên. Chúng tôi sẽ tối ưu hóa trang của bạn trong MAPS.ME để làm nổi bật nó lên.";
+"whats_new_localbiz_message" = "Chính các quán cà phê địa phương, nhà khách nhỏ và các cửa hàng ấm cúng mới làm cho hành trình của chúng ta thật khó quên. Chúng tôi sẽ tối ưu hóa trang của bạn trong OMaps để làm nổi bật nó lên.";
 
 "whats_new_order_button" = "Để lại yêu cầu";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "Tải xuống các địa điểm mới";
 
-"cached_bookmarks_placeholder_subtitle" = "Nhấn nút để tải xuống hàng ngàn địa điểm và tuyến đường thú vị được tạo bởi người dùng MAPS.ME. Bạn sẽ cần kết nối internet.";
+"cached_bookmarks_placeholder_subtitle" = "Nhấn nút để tải xuống hàng ngàn địa điểm và tuyến đường thú vị được tạo bởi người dùng OMaps. Bạn sẽ cần kết nối internet.";
 
 "downloader_download_routers" = "Tải dấu trang xuống";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "Báo cáo sự cố";
 
-"opt_out_fabric_description" = "Chúng tôi có thể sử dụng dữ liệu của bạn để cải thiện trải nghiệm trên MAPS.ME. Thay đổi sẽ có hiệu lực sau khi bạn khởi động lại ứng dụng.";
+"opt_out_fabric_description" = "Chúng tôi có thể sử dụng dữ liệu của bạn để cải thiện trải nghiệm trên OMaps. Thay đổi sẽ có hiệu lực sau khi bạn khởi động lại ứng dụng.";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "Dấu trang chưa được tải xuống";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME hiện đã có danh mục tuyến đường";
+"whats_new_bookmarks_catalog_title" = "OMaps hiện đã có danh mục tuyến đường";
 
 "whats_new_bookmarks_catalog_message" = "Hàng trăm tuyến đường chi tiết trên toàn thế giới: đi đâu, xem gì, ăn ở đâu.";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "Xóa quảng cáo";
 
-"remove_ads_title" = "Xóa tất cả quảng cáo và hỗ trợ MAPS.ME";
+"remove_ads_title" = "Xóa tất cả quảng cáo và hỗ trợ OMaps";
 
 "paybtn_title" = "Thanh toán %s/năm";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "Nhiều lựa chọn hơn";
 
-"why_support" = "Tại sao hỗ trợ MAPS.ME?";
+"why_support" = "Tại sao hỗ trợ OMaps?";
 
 "options_dropdown_item1" = "%s/tháng (tiết kiệm %s/năm)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "Chúng tôi sẽ xóa tất cả quảng cáo cho bạn";
 
-"why_support_item2" = "You help us to improve MAPS.ME";
+"why_support_item2" = "You help us to improve OMaps";
 
 "why_support_item3" = "Bạn giúp chúng tôi cải thiện bản đồ mở OpenStreetMap.org";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "Máy chủ không khả dụng";
 
-"server_unavailable_message" = "Giao dịch mua sẽ được hoàn thành sau. Nếu vẫn còn lỗi, vui lòng liên hệ với support@maps.me.";
+"server_unavailable_message" = "Giao dịch mua sẽ được hoàn thành sau. Nếu vẫn còn lỗi, vui lòng liên hệ với support@omaps.app.";
 
 "offline_fiters_check_in" = "Kết nối với internet để lọc khách sạn theo ngày tháng.";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "Hướng dẫn này sẽ được tải lên danh mục MAPS.ME công khai và sẽ có sẵn cho những người dùng khác";
+"upload_and_publish_desc" = "Hướng dẫn này sẽ được tải lên danh mục OMaps công khai và sẽ có sẵn cho những người dùng khác";
 
 "upload_and_publish" = "Tải lên và phát hành";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "Giúp khách du lịch bằng cách để lại đánh giá!";
 
-"share_bookmarks_email_body_link" = "Xin chào!\n\nĐây là liên kết nơi bạn có thể tải xuống dấu trang của mình: %s. Mở danh sách qua MAPS.ME và tận hưởng chuyến đi của bạn!\n\nNhận đơn đăng ký: http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "Xin chào!\n\nĐây là liên kết nơi bạn có thể tải xuống dấu trang của mình: %s. Mở danh sách qua OMaps và tận hưởng chuyến đi của bạn!\n\nNhận đơn đăng ký: http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "Thanh điều hướng sẽ cảnh báo bạn về máy ảnh khi bạn vượt quá giới hạn tốc độ %d km/h";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "Rất dễ để chia sẻ những sự ấn tượng của bạn";
 
-"whats_new_ugc_routes_subtitle" = "Lưu các địa điểm đáng nhớ, tạo tuyến đường bằng cách sử dụng chỉ mục và chia sẻ chúng với mọi người trong danh mục MAPS.ME.";
+"whats_new_ugc_routes_subtitle" = "Lưu các địa điểm đáng nhớ, tạo tuyến đường bằng cách sử dụng chỉ mục và chia sẻ chúng với mọi người trong danh mục OMaps.";
 
 "whats_new_webeditor_title" = "Biến tuyến đường của bạn thành câu chuyện";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "Trong hướng dẫn tuyến du lịch của bạn phải có ít nhất 3 thẻ đánh dấu để có thể tải lên công khai";
 
-"bookmark_public_upload_alert_title" = "Bạn chỉ cần thêm vài bước nữa là có thể chia sẻ hướng dẫn của mình với tất cả khách du lịch của MAPS.ME!";
+"bookmark_public_upload_alert_title" = "Bạn chỉ cần thêm vài bước nữa là có thể chia sẻ hướng dẫn của mình với tất cả khách du lịch của OMaps!";
 
 "bookmark_public_upload_alert_subtitle" = "Hãy chắc chắn rằng tuyến hướng dẫn của bạn có đầy đủ tên gọi, mô tả, và tất nhiên tất cả thẻ đánh dấu đều có thông tin về các địa điểm. Chính nhờ điều này, người dùng sẽ tìm được tuyến hướng dẫn và có thể áp dụng vào chuyến đi của mình.";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "Tiết kiệm năng lượng tối đa";
 
-"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ừ MAPS.ME.";
+"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ừ OMaps.";
 
 "html_error_upload_message_try_again" = "Vui lòng kiểm tra kết nối internet và thử lại";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "ID của bạn: %s.";
 
-"gdpr_request_window_message" = "Xin vui lòng sao chép nó và gửi yêu cầu tới địa chỉ support@maps.me";
+"gdpr_request_window_message" = "Xin vui lòng sao chép nó và gửi yêu cầu tới địa chỉ support@omaps.app";
 
 "gdpr_request_window_copy" = "Sao chép ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "Tránh bến phà";
 
-"cached_guides_placeholder_subtitle" = "Sách hướng dẫn sẵn có trong MAPS.ME – là những điểm được lựa chọn cùng với hình ảnh và mô tả, chúng được hiển thị trên bản đồ và cho phép truy cập ngoại tuyến.";
+"cached_guides_placeholder_subtitle" = "Sách hướng dẫn sẵn có trong OMaps – là những điểm được lựa chọn cùng với hình ảnh và mô tả, chúng được hiển thị trên bản đồ và cho phép truy cập ngoại tuyến.";
 
 "guides_catalogue_title" = "Danh mục sách hướng dẫn";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "Ẩm thực của Uzbekistan";
 
-"onboarding_welcome_title" = "Hãy lên kế hoạch và đi du lịch cùng với MAPS.ME";
+"onboarding_welcome_title" = "Hãy lên kế hoạch và đi du lịch cùng với OMaps";
 
 "onboarding_welcome_first_subtitle" = "Hãy lưu lại những địa chỉ hấp dẫn, đặt phòng khách sạn và xây dựng lộ trình đi ngoại tuyến";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "Tải về";
 
-"onboarding_bydeeplink_guide_title" = "Sác hướng dẫn sẵn có trong MAPS.ME";
+"onboarding_bydeeplink_guide_title" = "Sác hướng dẫn sẵn có trong OMaps";
 
 "onboarding_bydeeplink_guide_subtitle" = "Những địa điểm đã lựa chọn cùng hình ảnh và mô tả được hiển thị trên bản đồ và cho phép truy cập ngoại tuyến.";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "Đặt phòng khách sạn?";
 
-"popup_booking_download_guides_message" = "Lên kế hoạch chô lộ trình du lịch cùng với những sách hướng dẫn sẵn có từ MAPS.ME";
+"popup_booking_download_guides_message" = "Lên kế hoạch chô lộ trình du lịch cùng với những sách hướng dẫn sẵn có từ OMaps";
 
 "popup_mwm_download_guides_title" = "Hướng dẫn ngoại tuyến";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "Xem";
 
-"gallery_pp_download_guides_offline_title" = "Lên kết hoạch nghỉ ngơi cùng MAPS.ME!";
+"gallery_pp_download_guides_offline_title" = "Lên kết hoạch nghỉ ngơi cùng OMaps!";
 
 "gallery_pp_download_guides_offline_subtitle" = "Đừng bỏ lỡ những thứ quan trọng cùng với các tuyến được những du khách có kinh nghiệm đề xuất";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "Thanh toán sẽ được tính vào tài khoản iTunes của bạn khi xác nhận mua. Đăng ký sẽ tự động gia hạn trừ khi tính năng tự động gia hạn được tắt ít nhất 24 giờ trước khi kết thúc kỳ đăng ký hiện tại. Tài khoản của bạn sẽ được tính phí theo gói gia hạn trong vòng 24 giờ trước khi kết thúc kỳ đăng ký hiện tại. Bạn có thể quản lý hoặc tắt tính năng tự động gia hạn trong cài đặt tài khoản Apple ID của mình bất kỳ lúc nào sau khi mua.";
 
-"whatsnew_carplay_title" = "Điều hướng tự động MAPS.ME trong CarPlay!";
+"whatsnew_carplay_title" = "Điều hướng tự động OMaps trong CarPlay!";
 
 "whatsnew_carplay_message" = "Đánh dấu, tìm kiếm, camera tốc độ và thiết lập đi vòng, đường tránh – tất cả đều hoạt động mà không cần Internet";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "Cảnh báo tốc độ";
 
-"download_map_carplay" = "Vui lòng tải xuống bản đồ trong ứng dụng MAPS.ME trên thiết bị của bạn";
+"download_map_carplay" = "Vui lòng tải xuống bản đồ trong ứng dụng OMaps trên thiết bị của bạn";
 
 "carplay_roundabout_exit" = "Lối ra %s của vòng xuyến";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "Ura! Bạn đã đăng ký mua!";
 
-"popup_subscription_success_map_message" = "Bây giờ hãy khám phá những điểm du lịch tốt nhất trong danh mục của MAPS.ME";
+"popup_subscription_success_map_message" = "Bây giờ hãy khám phá những điểm du lịch tốt nhất trong danh mục của OMaps";
 
 "popup_subscription_success_map_start_button" = "Xem xét";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "Bắt đầu";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "Người trợ lý độc đáo cho các chuyến du lịch";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "Mở danh sách";
 
-"new_onboarding_step5.2_message" = "Đăng ký danh mục hướng dẫn trong MAPS.ME – đó là một điều hoàn toàn có lợi. Nhận được quyền truy cập toàn bộ vào các tuyến cho những chuyến dạo chơi quanh thành phố hay hoạt động ngoài trời!";
+"new_onboarding_step5.2_message" = "Đăng ký danh mục hướng dẫn trong OMaps – đó là một điều hoàn toàn có lợi. Nhận được quyền truy cập toàn bộ vào các tuyến cho những chuyến dạo chơi quanh thành phố hay hoạt động ngoài trời!";
 
 "new_onboarding_step5.2_button" = "Xem các điều khoản";
 
-"new_onboarding_step5.3_message" = "Tải xuống và đánh giá các tuyến đường cho các chuyến đi trong thành phố và các hoạt động ngoài trời với lựa chọn MAPS.ME miễn phí!";
+"new_onboarding_step5.3_message" = "Tải xuống và đánh giá các tuyến đường cho các chuyến đi trong thành phố và các hoạt động ngoài trời với lựa chọn OMaps miễn phí!";
 
 "new_onboarding_step5.3_button" = "Tải miễn phí";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "Các tuyến đường từ Outdooractive cho kỳ nghỉ mùa đông, mùa hè đang chờ đón bạn trong danh sách!";
 
-"whatsnew_guides_galleries_title" = "Hãy lên kế hoạch cho chuyến đi sắp tới cùng với MAPS.ME";
+"whatsnew_guides_galleries_title" = "Hãy lên kế hoạch cho chuyến đi sắp tới cùng với OMaps";
 
 "whatsnew_guides_galleries_message" = "Bây giờ bạn có thể tìm thấy hướng dẫn được đề xuất trong các thẻ của các thành phố và điểm tham quan nổi tiếng";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "Độ cao";
 
-"tips_map_layers_title_countour" = "Đường độ cao ngoại tuyến trong MAPS.ME!";
+"tips_map_layers_title_countour" = "Đường độ cao ngoại tuyến trong OMaps!";
 
 "tips_map_layers_message_countour" = "Đường độ cao giúp lên kế hoạch du lịch hòa mình với thiên nhiên và không bị lạc khi di chuyển";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict
index bd9fa7e32e..0aab55090c 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.stringsdict
@@ -137,4 +137,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index b6a2c8bd01..2f54308cd7 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "现在就获取它";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "感谢您使用 MAPS.ME！您喜欢此应用吗？告诉您的好友们吧！这会是对我们最好的感谢。";
+"share_on_facebook_text" = "感谢您使用 OMaps！您喜欢此应用吗？告诉您的好友们吧！这会是对我们最好的感谢。";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "重试";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "关于 MAPS.ME";
+"about_menu_title" = "关于 OMaps";
 
 "downloading_touch_to_cancel" = "正在下载 %d%%，触摸以取消";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "缺少包含已下载地图的 SD 卡/ USB 储存设备";
 
-"disconnect_usb_cable" = "请断开 USB 线或插入存储卡以使用 MAPS.ME";
+"disconnect_usb_cable" = "请断开 USB 线或插入存储卡以使用 OMaps";
 
 "not_enough_free_space_on_sdcard" = "请在 SD 卡/ USB 储存设备上释放一些空间以 使用此应用";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "这些地图有更新版本:";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "您不再需要MAPS.ME Lite ，所以，您可以卸载它。";
+"suggest_uninstall_lite" = "您不再需要OMaps Lite ，所以，您可以卸载它。";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@已成功下载";
@@ -249,10 +249,10 @@
 "set" = "集合";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "您还没有书签。\n在地图任何位置轻触以添 加一个书签。\n其他来源的书签也可载入并 显示在 MAPS.ME 中。从邮件、 Dropbox 或 weblink 中打开存储有图钉的 KML/KMZ 文 件。";
+"bookmarks_usage_hint" = "您还没有书签。\n在地图任何位置轻触以添 加一个书签。\n其他来源的书签也可载入并 显示在 OMaps 中。从邮件、 Dropbox 或 weblink 中打开存储有图钉的 KML/KMZ 文 件。";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "其他来源的书签也可载入并显示在 MAPS.ME中。从邮件、Dropbox 或 weblink 中打开存储有图钉的 KML/KMZ 文件。";
+"bookmarks_usage_hint_import_only" = "其他来源的书签也可载入并显示在 OMaps中。从邮件、Dropbox 或 weblink 中打开存储有图钉的 KML/KMZ 文件。";
 
 /* Settings button in system menu */
 "settings" = "设置";
@@ -354,9 +354,9 @@
 "share_by_email" = "邮件分享";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "MAPS.ME 书签已与您共享";
+"share_bookmarks_email_subject" = "OMaps 书签已与您共享";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "加载书签";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "国家下载进行中。";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "希望您喜欢使用 MAPS.ME! 若确实喜欢, 请在应用商店对此应用进行打分和点评。这 花不了一分钟但却可以实在地帮助我们。感 谢您的支持!";
+"appStore_message" = "希望您喜欢使用 OMaps! 若确实喜欢, 请在应用商店对此应用进行打分和点评。这 花不了一分钟但却可以实在地帮助我们。感 谢您的支持!";
 
 /* No, thanks */
 "no_thanks" = "不,谢谢";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "嘿,在 MAPS.ME 上查看我标注的图钉吧! %1$@ 或%2$@ 未安装离线地图?在此下 载: http://maps.me/get";
+"bookmark_share_sms" = "嘿,在 OMaps 上查看我标注的图钉吧! %1$@ 或%2$@ 未安装离线地图?在此下 载: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "嘿,在 MAPS.ME 上查看我目前的位置 吧!%1$@ 或%2$@ 未安装离线地图?在此 下载: http://maps.me/get";
+"my_position_share_sms" = "嘿,在 OMaps 上查看我目前的位置 吧!%1$@ 或%2$@ 未安装离线地图?在此 下载: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "嘿,在 MAPS.ME 上查看我标注的图钉吧!";
+"bookmark_share_email_subject" = "嘿,在 OMaps 上查看我标注的图钉吧!";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "嗨，到 MAPS.ME 查看我的当前位置！";
+"my_position_share_email_subject" = "嗨，到 OMaps 查看我的当前位置！";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "嗨,\n\n我现在在这:%1$@。点击此链 接%2$@或此链接 %3$@来查看在地图上的 位置。\n\n谢谢。";
@@ -549,7 +549,7 @@
 "search_show_on_map" = "在地图上查看";
 
 /* Used to warn user when fixing KitKat issue */
-"kitkat_migrate_ok" = "地图数据存储已优化。请重启应用。\n\nSD 卡根目录中的 MAPS.ME 文件夹已不再需要, 您可以删除它了。";
+"kitkat_migrate_ok" = "地图数据存储已优化。请重启应用。\n\nSD 卡根目录中的 OMaps 文件夹已不再需要, 您可以删除它了。";
 
 /* Used to warn user when fixing KitKat issue */
 "kitkat_migrate_failed" = "由于安卓 4.4 的更改,我们需要优化地图的数 据存储,但现在没有足够的空间用于拷贝地 图数据。\n\n请释放存储空间,否则地图将 在只读模式中提供。";
@@ -582,16 +582,16 @@
 "download_map_notification" = "下载您所在地方的地图";
 
 /* text of notification */
-"pro_version_is_free_today" = "完整版MAPS.ME是免费的今天! 立刻下载并告诉您的好友。";
+"pro_version_is_free_today" = "完整版OMaps是免费的今天! 立刻下载并告诉您的好友。";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "我们正在将您从MAPS.ME Lite 下载的地图传输至 MAPS.ME。这可能需要几分钟的时间。";
+"move_lite_maps_to_pro" = "我们正在将您从OMaps Lite 下载的地图传输至 OMaps。这可能需要几分钟的时间。";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "您下载的地图已成功传输至 MAPS.ME。";
+"move_lite_maps_to_pro_ok" = "您下载的地图已成功传输至 OMaps。";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "您的地图传输失败。请删除 MAPS.ME Lite，然后再次下载地图。";
+"move_lite_maps_to_pro_failed" = "您的地图传输失败。请删除 OMaps Lite，然后再次下载地图。";
 
 /* Text in menu */
 "settings_and_more" = "设置及更多";
@@ -600,7 +600,7 @@
 "website" = "网站";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME社区";
+"maps_me_community" = "OMaps社区";
 
 /* Text in menu */
 "like_on_facebook" = "在Facebook 上点赞";
@@ -630,13 +630,13 @@
 "report_a_bug" = "报告漏洞";
 
 /* Email subject */
-"subscribe_me_subject" = "请帮我订阅MAPS.ME简报";
+"subscribe_me_subject" = "请帮我订阅OMaps简报";
 
 /* Email body */
 "subscribe_me_body" = "我想率先了解最新新闻、更新及促销活动。订阅可随时取消。";
 
 /* About text */
-"about_text" = "MAPS.ME 提供全球所有国家和所有城市的最快速的离线地图。充满自信地出行：无论您在哪，MAPS.ME都能够帮助您在地图上找到您自己的位置，找到最近的餐馆、酒店、银行、加油站，等等。无需网络连接。\n\n我们始终在为添加新功能而努力，并希望能够听到您对我们应如何改进MAPS.ME的想法。若您在使用本应用时遇到任何问题，请随时联系我们：support@maps.me。我们会回复每一条请求！\n\n您喜欢MAPS.ME并希望支持我们吗？以下为一些简单且完全免费的方法：\n\n- 在您的App Market发表评论\n- 在我们的Facebook页面http://www.facebook.com/mapswithme赞我们\n- 或者向您的母亲、朋友，以及同事介绍MAPS.ME :)\n\n感谢您与我们在一起。非常感谢您的支持。\n\n附言：我们从OpenStreetMap获取地图信息，这是一个类似于Wikipedia的地图绘制项目，能够让用户创建并编辑地图。若您看到地图上缺少了什么或者有什么错误，可以直接在https://www.openstreetmap.org上进行纠正。在下一个版本发布时，您做出的更改便会出现在MAPS.ME应用中。";
+"about_text" = "OMaps 提供全球所有国家和所有城市的最快速的离线地图。充满自信地出行：无论您在哪，OMaps都能够帮助您在地图上找到您自己的位置，找到最近的餐馆、酒店、银行、加油站，等等。无需网络连接。\n\n我们始终在为添加新功能而努力，并希望能够听到您对我们应如何改进OMaps的想法。若您在使用本应用时遇到任何问题，请随时联系我们：support@omaps.app。我们会回复每一条请求！\n\n您喜欢OMaps并希望支持我们吗？以下为一些简单且完全免费的方法：\n\n- 在您的App Market发表评论\n- 在我们的Facebook页面http://www.facebook.com/mapswithme赞我们\n- 或者向您的母亲、朋友，以及同事介绍OMaps :)\n\n感谢您与我们在一起。非常感谢您的支持。\n\n附言：我们从OpenStreetMap获取地图信息，这是一个类似于Wikipedia的地图绘制项目，能够让用户创建并编辑地图。若您看到地图上缺少了什么或者有什么错误，可以直接在https://www.openstreetmap.org上进行纠正。在下一个版本发布时，您做出的更改便会出现在OMaps应用中。";
 
 /* Alert text */
 "email_error_body" = "电子邮件客户端尚未建立。请配置或使用任何其他方式与我们联系%@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "请更新地图以创建一条路线。";
 
 /* Update maps suggestion */
-"routing_update_maps" = "使用新版本的MAPS.ME可以创建从您的当前位置至一个目的地的路线。请更新地图以使用该功能。";
+"routing_update_maps" = "使用新版本的OMaps可以创建从您的当前位置至一个目的地的路线。请更新地图以使用该功能。";
 
 /* Update all button text */
 "downloader_update_all_button" = "更新全部";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "找到";
 
 /* Disclaimer message */
-"routing_disclaimer" = "在MAPS.ME应用中制定路线时请谨记以下 几点：\n\n  - 建议路线仅可当作推荐路线。\n - 路况、交通规则以及标志应优先于导航建议。\n - 地图可能会不正确或者过时，路线也可能不是以最佳可能方式制定的。\n\n  行车安全，请照顾好您自己！";
+"routing_disclaimer" = "在OMaps应用中制定路线时请谨记以下 几点：\n\n  - 建议路线仅可当作推荐路线。\n - 路况、交通规则以及标志应优先于导航建议。\n - 地图可能会不正确或者过时，路线也可能不是以最佳可能方式制定的。\n\n  行车安全，请照顾好您自己！";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "过时的";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "找不到所选起点和终点间的路程。请选择不同的起点或终点。";
 
 /* InternalError */
-"routing_failed_internal_error" = "出现内部错误。请尝试删除并再次下载地图。如果还有问题请联系我们：support@maps.me。";
+"routing_failed_internal_error" = "出现内部错误。请尝试删除并再次下载地图。如果还有问题请联系我们：support@omaps.app。";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "下载地图 + 路线";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "我刚刚评价了您的应用";
 
 /* Text for rating dialog */
-"rating_user_since" = "我是从%@年起的MAPS.ME用户";
+"rating_user_since" = "我是从%@年起的OMaps用户";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "您喜欢MAPS.ME吗？";
+"rating_do_like_maps" = "您喜欢OMaps吗？";
 
 /* Text for rating dialog */
 "rating_tap_star" = "点击星星给我们应用评分。";
@@ -792,7 +792,7 @@
 "routing_download_map" = "获取地图";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "下载更新的地图和路线数据，获取所有 MAPS.ME 的特色功能。";
+"routing_download_map_and_routing" = "下载更新的地图和路线数据，获取所有 OMaps 的特色功能。";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "获取所需的路线数据";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "喜欢这个应用吗？";
 
-"rate_alert_default_message" = "感谢您使用 MAPS.ME。请，评价该应用。您的反馈帮助我们变得更好。";
+"rate_alert_default_message" = "感谢您使用 OMaps。请，评价该应用。您的反馈帮助我们变得更好。";
 
 "rate_alert_five_star_message" = "太棒了！我们也爱您！";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "重复的地点";
 
-"first_launch_congrats_title" = "MAPS.ME已经可用";
+"first_launch_congrats_title" = "OMaps已经可用";
 
 "first_launch_congrats_text" = "在世界各地离线搜索和导航，免费。";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "添加新地点到该地图，并直接通过此应用编辑已存在的地点。";
 
-"whatsnew_editor_message_2" = "* MAPS.ME使用OpenStreetMap社区的数据。";
+"whatsnew_editor_message_2" = "* OMaps使用OpenStreetMap社区的数据。";
 
 "onboarding_offline_navigation_title" = "您将不再迷路";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "规划最佳的驾车和步行路线。";
 
-"onboarding_offline_maps_title" = "MAPS.ME — 无需互联网获取全球地图";
+"onboarding_offline_maps_title" = "OMaps — 无需互联网获取全球地图";
 
 "onboarding_offline_maps_message" = "下载一次所需区域的地图，您便可以在无网络连接的情况下使用导航和搜索功能。";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "为了使用导航和其他功能，我们需要访问您的地理位置信息.";
 
-"onboarding_permissions_title" = "允许 MAPS.ME 访问存储空间和地点";
+"onboarding_permissions_title" = "允许 OMaps 访问存储空间和地点";
 
 "onboarding_permissions_message" = "因此，您可以下载地图，查看您附近的地点和交通状况并使用导航。";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "为了下载，您需要更多的空间。请删除不必要的数据。";
 
-"editor_sharing_title" = "我改进了MAPS.ME地图";
+"editor_sharing_title" = "我改进了OMaps地图";
 
 "editor_comment_will_be_sent" = "我们将把您的评论发送给地图制作者。";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "详细备注";
 
-"editor_detailed_description" = "您建议的更改将发送至 OpenStreetMap 社区。说明无法在 MAPS.ME 编辑的详情。";
+"editor_detailed_description" = "您建议的更改将发送至 OpenStreetMap 社区。说明无法在 OMaps 编辑的详情。";
 
 "editor_more_about_osm" = "关于 OpenStreetMap 的更多信息";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "我们已经更新了地图编辑器";
 
-"whatsnew_update_editor_message" = "MAPS.ME 用户已经进行了 200 000 处地图修改。我们正在齐心协力打造世界上最详细的地图，加入我们吧！";
+"whatsnew_update_editor_message" = "OMaps 用户已经进行了 200 000 处地图修改。我们正在齐心协力打造世界上最详细的地图，加入我们吧！";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "如要使用地图编辑器，请更新所有地图";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "继续";
 
-"recent_track_background_dialog_message" = "MAPS.ME使用背景中的地理位置记录您最近去过的路径。";
+"recent_track_background_dialog_message" = "OMaps使用背景中的地理位置记录您最近去过的路径。";
 
 "whatsnew_car_navigation_header" = "方便用户使用的车辆导航";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "自行车导航 (beta 版)";
 
-"whatsnew_cycle_navigation_message" = "正在测试自行车导航。试一下使用 MAPS.ME 寻找您最喜爱的自行车路线并与我们分享您的意见。";
+"whatsnew_cycle_navigation_message" = "正在测试自行车导航。试一下使用 OMaps 寻找您最喜爱的自行车路线并与我们分享您的意见。";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "在 Google Play 上的评分";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "告诉朋友";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "您好！安装 MAPS.ME！";
+"tell_friends_text" = "您好！安装 OMaps！";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME 是一款基本的离线旅行应用。MAPS.ME 基于 OpenStreetMap 数据并且允许对其进行编辑。";
+"about_description" = "OMaps 是一款基本的离线旅行应用。OMaps 基于 OpenStreetMap 数据并且允许对其进行编辑。";
 
 /* Text in menu */
 "blog" = "博客";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "开放";
 
-"whatsnew_uber_header" = "优步和MAPS.ME";
+"whatsnew_uber_header" = "优步和OMaps";
 
 "whatsnew_uber_message" = "从应用直接叫优步出租车！";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "增大地图上的字体大小";
 
-"traffic_update_app" = "请更新 MAPS.ME";
+"traffic_update_app" = "请更新 OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "要显示交通数据，必须更新应用。";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "授予访问权限";
 
-"onboarding_storage_permissions_message" = "更改您的设备中的权限设置。需要存储空间访问权限才能使用 MAPS.ME。";
+"onboarding_storage_permissions_message" = "更改您的设备中的权限设置。需要存储空间访问权限才能使用 OMaps。";
 
 "button_exit" = "退出";
 
-"onboarding_detail_permissions_title" = "MAPS.ME 需要以下访问权限";
+"onboarding_detail_permissions_title" = "OMaps 需要以下访问权限";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "存储空间";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "存储空间访问问题";
 
-"dialog_error_storage_message" = "外部存储空间不可用，可能是 SD 卡已移除、损坏，或者文件系统为只读。请检查，然后通过以下方式联系我们：support@maps.me";
+"dialog_error_storage_message" = "外部存储空间不可用，可能是 SD 卡已移除、损坏，或者文件系统为只读。请检查，然后通过以下方式联系我们：support@omaps.app";
 
 "setting_emulate_bad_storage" = "模拟不良存储空间";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "我同意<a href=\"%s\">使用条款</a>";
 
-"sign_agree_news_gdpr" = "我同意接收有关MAPS.ME产品的最新消息";
+"sign_agree_news_gdpr" = "我同意接收有关OMaps产品的最新消息";
 
 "whats_new_localbiz_title" = "Small business deserves attention";
 
-"whats_new_localbiz_message" = "当地的咖啡馆、旅馆和小商店让旅行难以忘怀。我们在MAPS.ME中免费优化您的商家页面，让它能够被看见。";
+"whats_new_localbiz_message" = "当地的咖啡馆、旅馆和小商店让旅行难以忘怀。我们在OMaps中免费优化您的商家页面，让它能够被看见。";
 
 "whats_new_order_button" = "留下申请表";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "上传新地点";
 
-"cached_bookmarks_placeholder_subtitle" = "单击按钮下载MAPS.ME用户创建的数千个有趣的地点和路线。您需要连接网络。";
+"cached_bookmarks_placeholder_subtitle" = "单击按钮下载OMaps用户创建的数千个有趣的地点和路线。您需要连接网络。";
 
 "downloader_download_routers" = "下载标签";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "错误报告";
 
-"opt_out_fabric_description" = "我们可以使用您的数据来开发和改进MAPS.ME.更改将在重新启动应用程序后生效。";
+"opt_out_fabric_description" = "我们可以使用您的数据来开发和改进OMaps.更改将在重新启动应用程序后生效。";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "标签尚未上传";
 
-"whats_new_bookmarks_catalog_title" = "MAPS.ME有一个路线目录";
+"whats_new_bookmarks_catalog_title" = "OMaps有一个路线目录";
 
 "whats_new_bookmarks_catalog_message" = "世界各地数十条详细路线：去哪里、看什么、在哪里吃饭。";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "关闭广告";
 
-"remove_ads_title" = "关闭所有广告并支持MAPS.ME";
+"remove_ads_title" = "关闭所有广告并支持OMaps";
 
 "paybtn_title" = "支付%s/年";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "其他选择";
 
-"why_support" = "为什么支持MAPS.ME?";
+"why_support" = "为什么支持OMaps?";
 
 "options_dropdown_item1" = "%s/月 (节省%s/年)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "我们将为您关闭所有广告";
 
-"why_support_item2" = "您帮助我们改进MAPS.ME";
+"why_support_item2" = "您帮助我们改进OMaps";
 
 "why_support_item3" = "您帮助我们改进OpenStreetMap.org地图";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "服务不可用";
 
-"server_unavailable_message" = "购买将在稍后完成。如果错误仍然存在，请联系support@maps.me。";
+"server_unavailable_message" = "购买将在稍后完成。如果错误仍然存在，请联系support@omaps.app。";
 
 "offline_fiters_check_in" = "连接到网络来选择到达和离开的日期。";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "本指南将上传到MAPS.ME公共目录，并可供其他用户使用";
+"upload_and_publish_desc" = "本指南将上传到OMaps公共目录，并可供其他用户使用";
 
 "upload_and_publish" = "加载并发布";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "请发表评论并帮助游客！";
 
-"share_bookmarks_email_body_link" = "您好！\n\n您的标签可以从链接下载：%s.使用MAPS.ME打开列表并享受旅行!\n\n下载程序：http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "您好！\n\n您的标签可以从链接下载：%s.使用OMaps打开列表并享受旅行!\n\n下载程序：http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "当速度限制超过%d km / h时，导航会通知您的摄像机";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "分享您的印象很容易";
 
-"whats_new_ugc_routes_subtitle" = "保存有印象的地点、用书签创建路线，并在MAPS.ME目录中和大家分享。";
+"whats_new_ugc_routes_subtitle" = "保存有印象的地点、用书签创建路线，并在OMaps目录中和大家分享。";
 
 "whats_new_webeditor_title" = "把路线变成故事";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "您的路线至少应有3个标签才能上传到公共目录中";
 
-"bookmark_public_upload_alert_title" = "您只需几步即可将您的路径加载到MAPS.ME目录中！";
+"bookmark_public_upload_alert_title" = "您只需几步即可将您的路径加载到OMaps目录中！";
 
 "bookmark_public_upload_alert_subtitle" = "请确保路线具有名称和描述，并且所有标签都包含场地信息。这样用户就能找到路线并在旅途中使用它们。";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "最大程度省电";
 
-"enable_logging_warning_message" = "此选项启用以记录操作来进行诊断。这有助于团队识别应用程序的问题。请仅在MAPS.ME支持请求时开启该选项。";
+"enable_logging_warning_message" = "此选项启用以记录操作来进行诊断。这有助于团队识别应用程序的问题。请仅在OMaps支持请求时开启该选项。";
 
 "html_error_upload_message_try_again" = "请检查网络访问，然后再重试";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "您的ID：%s。";
 
-"gdpr_request_window_message" = "请复制并发送请求至support@maps.me";
+"gdpr_request_window_message" = "请复制并发送请求至support@omaps.app";
 
 "gdpr_request_window_copy" = "复制ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "规避轮渡";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME中的现有指南是精选出来的地点，其中包含在地图上显示并可离线使用的照片和说明。";
+"cached_guides_placeholder_subtitle" = "OMaps中的现有指南是精选出来的地点，其中包含在地图上显示并可离线使用的照片和说明。";
 
 "guides_catalogue_title" = "指南目录";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "乌兹别克美食";
 
-"onboarding_welcome_title" = "请使用MAPS.ME开始规划和旅行";
+"onboarding_welcome_title" = "请使用OMaps开始规划和旅行";
 
 "onboarding_welcome_first_subtitle" = "请保存有趣的地方，预订酒店，离线规划路线";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "下载";
 
-"onboarding_bydeeplink_guide_title" = "MAPS.ME上现成的指南";
+"onboarding_bydeeplink_guide_title" = "OMaps上现成的指南";
 
 "onboarding_bydeeplink_guide_subtitle" = "带有照片和说明的竞选地点会显示在地图中，并且可以离线使用。";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "已预订酒店？";
 
-"popup_booking_download_guides_message" = "和MAPS.ME一起规划行程吧";
+"popup_booking_download_guides_message" = "和OMaps一起规划行程吧";
 
 "popup_mwm_download_guides_title" = "在线指南";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "查看";
 
-"gallery_pp_download_guides_offline_title" = "和 MAPS.ME一起规划你的假期吧！";
+"gallery_pp_download_guides_offline_title" = "和 OMaps一起规划你的假期吧！";
 
 "gallery_pp_download_guides_offline_subtitle" = "不要错过资深驴友提供线路中最重要的内容";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "确认购买后将向您的iTunes账户收费。除非在当前周期结束前至少24小时关闭自动续订，订购会自动延续。在当前周期结束前24小时内，我们会根据您的方案向您的账户收费。您能在购买后在Apple ID账户设置中随时管理或关闭自动续订。";
 
-"whatsnew_carplay_title" = "MAPS.ME 自动导航已被纳入CarPlay系统中！";
+"whatsnew_carplay_title" = "OMaps 自动导航已被纳入CarPlay系统中！";
 
 "whatsnew_carplay_message" = "可在无网络的条件下使用标记、搜索、车速摄像头和绕道设置";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "摄像头信息";
 
-"download_map_carplay" = "将MAPS.ME软件中的地图下载至个人设备中";
+"download_map_carplay" = "将OMaps软件中的地图下载至个人设备中";
 
 "carplay_roundabout_exit" = "%s号坡道";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "耶！您已订阅！";
 
-"popup_subscription_success_map_message" = "现在在MAPS.ME画册中探索最佳的旅游景点";
+"popup_subscription_success_map_message" = "现在在OMaps画册中探索最佳的旅游景点";
 
 "popup_subscription_success_map_start_button" = "浏览";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "开始";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "旅行中的万能助手";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "打开目录";
 
-"new_onboarding_step5.2_message" = "訂閱MAPS.ME中的旅行指南會讓您受益匪淺。全面訪問城市散步路線和戶外活動路線！";
+"new_onboarding_step5.2_message" = "訂閱OMaps中的旅行指南會讓您受益匪淺。全面訪問城市散步路線和戶外活動路線！";
 
 "new_onboarding_step5.2_button" = "查看条件";
 
-"new_onboarding_step5.3_message" = "下载或评论带有 MAPS.ME免费编录的市内旅行和休闲运动的线路！";
+"new_onboarding_step5.3_message" = "下载或评论带有 OMaps免费编录的市内旅行和休闲运动的线路！";
 
 "new_onboarding_step5.3_button" = "免费下载";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "目录中添加了Outdooractive 的冬季和夏季旅行线路！";
 
-"whatsnew_guides_galleries_title" = "与MAPS.ME共同规划即将到来的旅行";
+"whatsnew_guides_galleries_title" = "与OMaps共同规划即将到来的旅行";
 
 "whatsnew_guides_galleries_message" = "现在你可在热门城市与名胜古迹地图上查找推荐的旅行指南";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "高度";
 
-"tips_map_layers_title_countour" = "离线高度线在MAPS.ME中！";
+"tips_map_layers_title_countour" = "离线高度线在OMaps中！";
 
 "tips_map_layers_message_countour" = "高度线可以帮您规划通往大自然地区的路线，不会迷路";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict
index e5211c5adc..ac49bce9b5 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.stringsdict
@@ -135,4 +135,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index c17bbf0415..9322d870ff 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -47,7 +47,7 @@
 "get_it_now" = "馬上取得";
 
 /* Text to show occasionaly with a proposal to Like our program on Facebook */
-"share_on_facebook_text" = "感謝您使用 MAPS.ME！您喜歡此應用程式嗎？告訴好友們吧！這會是對我們最好的感謝。";
+"share_on_facebook_text" = "感謝您使用 OMaps！您喜歡此應用程式嗎？告訴好友們吧！這會是對我們最好的感謝。";
 
 /* Settings/Downloader - size string, only strings different from English should be translated */
 "kb" = "kB";
@@ -138,9 +138,9 @@
 /* Button text for the button under the country_status_download_failed message */
 "try_again" = "再試一次";
 
-"app_name" = "MAPS.ME";
+"app_name" = "OMaps";
 
-"about_menu_title" = "關於 MAPS.ME";
+"about_menu_title" = "關於 OMaps";
 
 "downloading_touch_to_cancel" = "正在下載 %d%%, 輕觸以取消";
 
@@ -158,7 +158,7 @@
 
 "external_storage_is_not_available" = "SD 卡/USB 無法有效儲存下載的地圖";
 
-"disconnect_usb_cable" = "請拔除 USB 線或插入 SD 卡以使用 MAPS.ME";
+"disconnect_usb_cable" = "請拔除 USB 線或插入 SD 卡以使用 OMaps";
 
 "not_enough_free_space_on_sdcard" = "如要繼續使用，請先釋放一些 SD 卡/ USB 儲存空間";
 
@@ -204,7 +204,7 @@
 "advise_update_maps" = "以下為可更新的地圖：";
 
 /* Show popup notification in Pro version that Lite can be deleted */
-"suggest_uninstall_lite" = "你再也不需要 MAPS.ME Lite 了，所以您可以移除它！";
+"suggest_uninstall_lite" = "你再也不需要 OMaps Lite 了，所以您可以移除它！";
 
 /* Show popup notification on top of the map when country was downloaded. */
 "download_country_success" = "%@ 已成功下載";
@@ -249,10 +249,10 @@
 "set" = "收藏夾";
 
 /* Text hint in Bookmarks dialog when no any bookmarks are added */
-"bookmarks_usage_hint" = "您還沒有任何書籤。\n點擊地圖上的任何地方以新增書籤。\n其他來源的書籤也可導入在 MAPS.ME 中顯示。從電子郵件、Dropbox 或網站連結開啟有著已儲存書籤的 KML/KMZ 檔案。";
+"bookmarks_usage_hint" = "您還沒有任何書籤。\n點擊地圖上的任何地方以新增書籤。\n其他來源的書籤也可導入在 OMaps 中顯示。從電子郵件、Dropbox 或網站連結開啟有著已儲存書籤的 KML/KMZ 檔案。";
 
 /* Text hint in Bookmarks dialog when at least one bookmark is added */
-"bookmarks_usage_hint_import_only" = "其他來源的書籤也可導入在 MAPS.ME 中顯示。從電子郵件、Dropbox 或網站連結開啟有著已儲存書籤的 KML/KMZ 檔案。";
+"bookmarks_usage_hint_import_only" = "其他來源的書籤也可導入在 OMaps 中顯示。從電子郵件、Dropbox 或網站連結開啟有著已儲存書籤的 KML/KMZ 檔案。";
 
 /* Settings button in system menu */
 "settings" = "設定";
@@ -354,9 +354,9 @@
 "share_by_email" = "以電子郵件分享";
 
 /* Email Subject when sharing bookmarks category */
-"share_bookmarks_email_subject" = "已分享 MAPS.ME 書籤";
+"share_bookmarks_email_subject" = "已分享 OMaps 書籤";
 
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from MAPS.ME offline maps. Please open them if you have MAPS.ME installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://maps.me/get?kmz\n\nEnjoy traveling with MAPS.ME!";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks from OMaps offline maps. Please open them if you have OMaps installed. Or, if you don't, download the app for your iOS or Android device by following this link: http://omaps.app/get?kmz\n\nEnjoy traveling with OMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "正在載入書籤…";
@@ -386,22 +386,22 @@
 "downloading_is_active" = "國家地圖正在進行下載";
 
 /* Message that will be shown in alert view, when we ask user to leave review on App Store */
-"appStore_message" = "祝您使用 MAPS.ME 愉快！ 方便的話，請到 App Store 幫我們評分或寫寫評論。在這短短的時間當中卻能夠真正的協助我們改善，再次感謝您的支持！";
+"appStore_message" = "祝您使用 OMaps 愉快！ 方便的話，請到 App Store 幫我們評分或寫寫評論。在這短短的時間當中卻能夠真正的協助我們改善，再次感謝您的支持！";
 
 /* No, thanks */
 "no_thanks" = "不，謝了";
 
 /* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"bookmark_share_sms" = "嘿，看看我在 MAPS.ME 標記的圖釘吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: http://maps.me/get";
+"bookmark_share_sms" = "嘿，看看我在 OMaps 標記的圖釘吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: http://omaps.app/get";
 
 /* Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
-"my_position_share_sms" = "嘿，在 MAPS.ME 查看我的目前位置吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: http://maps.me/get";
+"my_position_share_sms" = "嘿，在 OMaps 查看我的目前位置吧！ %1$@ 或%2$@ 沒安裝離線地圖？在此下載: http://omaps.app/get";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "嘿，看看我在 MAPS.ME 地圖上的圖釘！";
+"bookmark_share_email_subject" = "嘿，看看我在 OMaps 地圖上的圖釘！";
 
 /* Subject for emailed position */
-"my_position_share_email_subject" = "嗨，到 MAPS.ME 地圖查看我的目前位置！";
+"my_position_share_email_subject" = "嗨，到 OMaps 地圖查看我的目前位置！";
 
 /* Share my position using EMail, %1$@ is ge0:// and %2$@ is http://ge0.me link WITHOUT NAME */
 "my_position_share_email" = "嗨，\n\n我現在在這：%1$@。點擊此連結 %2$@ 或此連結 %3$@ 來查看在地圖上的位置。\n\n謝謝。";
@@ -582,16 +582,16 @@
 "download_map_notification" = "下載您所在地方的地圖";
 
 /* text of notification */
-"pro_version_is_free_today" = "現在完整版 MAPS.ME 是免費的！馬上下載並告訴您的朋友。";
+"pro_version_is_free_today" = "現在完整版 OMaps 是免費的！馬上下載並告訴您的朋友。";
 
 /* Dialog for transferring maps from lite to pro. */
-"move_lite_maps_to_pro" = "我們正在將您從 MAPS.ME Lite 下載的地圖傳輸至 MAPS.ME。這可能需要幾分鐘的時間。";
+"move_lite_maps_to_pro" = "我們正在將您從 OMaps Lite 下載的地圖傳輸至 OMaps。這可能需要幾分鐘的時間。";
 
 /* Message to display when maps moved. */
-"move_lite_maps_to_pro_ok" = "您下載的地圖已成功傳輸至 MAPS.ME。";
+"move_lite_maps_to_pro_ok" = "您下載的地圖已成功傳輸至 OMaps。";
 
 /* Message to display when maps move failed. */
-"move_lite_maps_to_pro_failed" = "您的地圖傳輸失敗。請刪除 MAPS.ME Lite，然後再次下載地圖。";
+"move_lite_maps_to_pro_failed" = "您的地圖傳輸失敗。請刪除 OMaps Lite，然後再次下載地圖。";
 
 /* Text in menu */
 "settings_and_more" = "設定及更多";
@@ -600,7 +600,7 @@
 "website" = "網站";
 
 /* Text in menu */
-"maps_me_community" = "MAPS.ME 社群";
+"maps_me_community" = "OMaps 社群";
 
 /* Text in menu */
 "like_on_facebook" = "在 Facebook 上按讚";
@@ -630,13 +630,13 @@
 "report_a_bug" = "報告錯誤";
 
 /* Email subject */
-"subscribe_me_subject" = "請幫我訂閱 MAPS.ME 新聞郵件、";
+"subscribe_me_subject" = "請幫我訂閱 OMaps 新聞郵件、";
 
 /* Email body */
 "subscribe_me_body" = "我想搶先了解最新新聞、更新和促銷活動。我可以隨時取消我的訂閱。";
 
 /* About text */
-"about_text" = "MAPS.ME 提供全球所有國家和所有城市的最快速的離線地圖。充滿自信地出行：無論您在哪，MAPS.ME都能夠幫助您在地圖上找到您自己的位置，找到最近的餐館、酒店、銀行、加油站，等等。無需網路連接。 我們始終在為增加新功能而努力，並希望能夠聽到您對我們應如何改進 MAPS.ME 的想法。若您在使用本應用程式時遇到任何問題，請隨時聯繫我們：support@maps.me。我們會回覆每一條請求！\n\n您喜歡 MAPS.ME 並想支持我們嗎？以下為一些簡單且完全免費的方法：\n- 在您的應用程式商店上發表評論\n- 在我們的 Facebook 頁面 http://www.facebook.com/mapswithme 上按讚\n- 或者向您的母親、朋友，以及同事介紹 MAPS.ME :)\n\n感謝您與我們在一起。非常感謝您的支持。\n\nP.S.：我們從 OpenStreetMap 獲得地圖資訊，這是一個類似維基百科的地圖繪製專案，能夠讓使用者建立並編輯編輯地圖。若您看到地圖上缺少了什麽或者有什麽錯誤，可以直接在 https://www.openstreetmap.org 上進行糾正。在下一個版本發佈時，您做出的更改便會出現在 MAPS.ME 應用程式中。";
+"about_text" = "OMaps 提供全球所有國家和所有城市的最快速的離線地圖。充滿自信地出行：無論您在哪，OMaps都能夠幫助您在地圖上找到您自己的位置，找到最近的餐館、酒店、銀行、加油站，等等。無需網路連接。 我們始終在為增加新功能而努力，並希望能夠聽到您對我們應如何改進 OMaps 的想法。若您在使用本應用程式時遇到任何問題，請隨時聯繫我們：support@omaps.app。我們會回覆每一條請求！\n\n您喜歡 OMaps 並想支持我們嗎？以下為一些簡單且完全免費的方法：\n- 在您的應用程式商店上發表評論\n- 在我們的 Facebook 頁面 http://www.facebook.com/mapswithme 上按讚\n- 或者向您的母親、朋友，以及同事介紹 OMaps :)\n\n感謝您與我們在一起。非常感謝您的支持。\n\nP.S.：我們從 OpenStreetMap 獲得地圖資訊，這是一個類似維基百科的地圖繪製專案，能夠讓使用者建立並編輯編輯地圖。若您看到地圖上缺少了什麽或者有什麽錯誤，可以直接在 https://www.openstreetmap.org 上進行糾正。在下一個版本發佈時，您做出的更改便會出現在 OMaps 應用程式中。";
 
 /* Alert text */
 "email_error_body" = "電子郵件客戶端尚未建立。請設定或使用任何其他方式與我們聯絡%@";
@@ -654,7 +654,7 @@
 "routing_map_outdated" = "請更新地圖以建立一條路線。";
 
 /* Update maps suggestion */
-"routing_update_maps" = "使用新版本的 MAPS.ME 可以建立從您的目前位置至一個目的地的路線。請更新地圖以使用該功能。";
+"routing_update_maps" = "使用新版本的 OMaps 可以建立從您的目前位置至一個目的地的路線。請更新地圖以使用該功能。";
 
 /* Update all button text */
 "downloader_update_all_button" = "更新全部";
@@ -682,7 +682,7 @@
 "downloader_search_results" = "已找到";
 
 /* Disclaimer message */
-"routing_disclaimer" = "在 MAPS.ME 應用程式中建立路線時請謹記以下幾點：\n\n  - 建議路線僅可當作推薦路線。\n - 路況、交通規則以及標誌應優先於導航建議。\n - 地圖可能會不正確或者過時，路線也可能不是以最佳可能方式建立的。\n\n  行車安全，請照顧好您自己！";
+"routing_disclaimer" = "在 OMaps 應用程式中建立路線時請謹記以下幾點：\n\n  - 建議路線僅可當作推薦路線。\n - 路況、交通規則以及標誌應優先於導航建議。\n - 地圖可能會不正確或者過時，路線也可能不是以最佳可能方式建立的。\n\n  行車安全，請照顧好您自己！";
 
 /* Outdated maps category */
 "downloader_outdated_maps" = "過時的";
@@ -718,7 +718,7 @@
 "routing_failed_route_not_found" = "找不到所選起點和終點間的路程。請選擇不同的起點或終點。";
 
 /* InternalError */
-"routing_failed_internal_error" = "出現內部錯誤。請嘗試刪除並再次下載地圖。如果還有問題請聯絡我們：support@maps.me。";
+"routing_failed_internal_error" = "出現內部錯誤。請嘗試刪除並再次下載地圖。如果還有問題請聯絡我們：support@omaps.app。";
 
 /* Context menu item for downloader. */
 "downloader_download_map_and_routing" = "下載地圖 + 路線";
@@ -765,10 +765,10 @@
 "rating_just_rated" = "我剛剛評價了您的應用";
 
 /* Text for rating dialog */
-"rating_user_since" = "我是從 %@ 年起的 MAPS.ME 使用者";
+"rating_user_since" = "我是從 %@ 年起的 OMaps 使用者";
 
 /* Text for rating dialog */
-"rating_do_like_maps" = "您喜歡 MAPS.ME 嗎？";
+"rating_do_like_maps" = "您喜歡 OMaps 嗎？";
 
 /* Text for rating dialog */
 "rating_tap_star" = "點擊星星給我們應用程式評分。";
@@ -792,7 +792,7 @@
 "routing_download_map" = "獲取地圖";
 
 /* Text for routing error dialog */
-"routing_download_map_and_routing" = "下載更新的地圖和路線數據，獲取所有 MAPS.ME 的特色功能。";
+"routing_download_map_and_routing" = "下載更新的地圖和路線數據，獲取所有 OMaps 的特色功能。";
 
 /* Text for routing error dialog */
 "routing_get_routing_data" = "獲取所需的路線數據";
@@ -1013,7 +1013,7 @@
 
 "rate_alert_title" = "喜歡這個應用程式嗎？";
 
-"rate_alert_default_message" = "感謝您使用 MAPS.ME。請評價此應用程式。您的回饋幫助我們改善我們的產品。";
+"rate_alert_default_message" = "感謝您使用 OMaps。請評價此應用程式。您的回饋幫助我們改善我們的產品。";
 
 "rate_alert_five_star_message" = "太棒了！我們也愛您！";
 
@@ -1124,7 +1124,7 @@
 
 "editor_report_problem_duplicate_place_title" = "重複的地點";
 
-"first_launch_congrats_title" = "MAPS.ME 已做好使用準備";
+"first_launch_congrats_title" = "OMaps 已做好使用準備";
 
 "first_launch_congrats_text" = "在世界各地離線搜尋和導航，免費。";
 
@@ -1320,7 +1320,7 @@
 
 "whatsnew_editor_message_1" = "新增新地點到該地圖，並直接通過此應用程式編輯已存在的地點。";
 
-"whatsnew_editor_message_2" = "* MAPS.ME 使用 OpenStreetMap 社群的數據。";
+"whatsnew_editor_message_2" = "* OMaps 使用 OpenStreetMap 社群的數據。";
 
 "onboarding_offline_navigation_title" = "您將不再迷路";
 
@@ -1330,7 +1330,7 @@
 
 "onboarding_offline_navigation_message_2" = "規劃最佳的行車和步行路線。";
 
-"onboarding_offline_maps_title" = "MAPS.ME — 無需網際網路獲取全球地圖";
+"onboarding_offline_maps_title" = "OMaps — 無需網際網路獲取全球地圖";
 
 "onboarding_offline_maps_message" = "一次下載所需地區的地圖，無需網絡連接就能使用導航和搜索功能。";
 
@@ -1342,7 +1342,7 @@
 
 "onboarding_location_message" = "如要使用導航和其他功能，我們需要能獲取您的地理位置.";
 
-"onboarding_permissions_title" = "允許 MAPS.ME 存儲和定位的權限";
+"onboarding_permissions_title" = "允許 OMaps 存儲和定位的權限";
 
 "onboarding_permissions_message" = "所以，您可以下載地圖，查看您附近的地點和交通，以及使用導航服務。";
 
@@ -1359,7 +1359,7 @@
 /* Error dialog no space */
 "migration_no_space_message" = "為了下載，您需要更多的空間。請刪除不必要的數據。";
 
-"editor_sharing_title" = "我改進了 MAPS.ME 地圖";
+"editor_sharing_title" = "我改進了 OMaps 地圖";
 
 "editor_comment_will_be_sent" = "我們將把您的評論發送給地圖編輯者。";
 
@@ -1390,7 +1390,7 @@
 
 "editor_detailed_description_hint" = "詳細註釋";
 
-"editor_detailed_description" = "您建議的變更將傳送至 OpenStreetMap 社群。說明無法在 MAPS.ME 中編輯的詳細資料。";
+"editor_detailed_description" = "您建議的變更將傳送至 OpenStreetMap 社群。說明無法在 OMaps 中編輯的詳細資料。";
 
 "editor_more_about_osm" = "關於 OpenStreetMap 的更多資訊";
 
@@ -1430,7 +1430,7 @@
 
 "whatsnew_update_editor_title" = "我們已更新地圖編輯器";
 
-"whatsnew_update_editor_message" = "MAPS.ME 使用者已經進行了 200,000 處地圖變更。我們正在齊心協力打造世界上最詳細的地圖，加入我們吧！";
+"whatsnew_update_editor_message" = "OMaps 使用者已經進行了 200,000 處地圖變更。我們正在齊心協力打造世界上最詳細的地圖，加入我們吧！";
 
 /* Additional text in whats new */
 "whatsnew_update_editor_message_update" = "如要使用地圖編輯器，請更新所有地圖。";
@@ -1598,7 +1598,7 @@
 
 "continue_recent_track_background_button" = "繼續";
 
-"recent_track_background_dialog_message" = "MAPS.ME使用背景中的地理位置記錄您最近去過的路徑。";
+"recent_track_background_dialog_message" = "OMaps使用背景中的地理位置記錄您最近去過的路徑。";
 
 "whatsnew_car_navigation_header" = "方便用戶使用的車輛導航";
 
@@ -1614,7 +1614,7 @@
 
 "whatsnew_cycle_navigation_header" = "自行車導航（beta 版）";
 
-"whatsnew_cycle_navigation_message" = "我們正在為新的一季測試自行車導航功能。請使用 MAPS.ME 嘗試您最喜愛的自行車路徑，並將您的意見與我們分享。";
+"whatsnew_cycle_navigation_message" = "我們正在為新的一季測試自行車導航功能。請使用 OMaps 嘗試您最喜愛的自行車路徑，並將您的意見與我們分享。";
 
 /* Rate on Google Play (Android only) */
 "rate_gp" = "在 Google Play 評分";
@@ -1623,10 +1623,10 @@
 "tell_friends" = "告訴朋友";
 
 /* Share with friends: sharing text */
-"tell_friends_text" = "嗨！安裝 MAPS.ME！";
+"tell_friends_text" = "嗨！安裝 OMaps！";
 
 /* About short text (below logo) */
-"about_description" = "MAPS.ME 是一款基本離線旅遊應用程式。MAPS.ME 以 OpenStreetMap 數據為基礎，並允許對其進行編輯。";
+"about_description" = "OMaps 是一款基本離線旅遊應用程式。OMaps 以 OpenStreetMap 數據為基礎，並允許對其進行編輯。";
 
 /* Text in menu */
 "blog" = "部落格";
@@ -1721,7 +1721,7 @@
 /* Verb. Text on a button that opens the chat. */
 "chat_open" = "開放";
 
-"whatsnew_uber_header" = "優步 & MAPS.ME離綫地圖";
+"whatsnew_uber_header" = "優步 & OMaps離綫地圖";
 
 "whatsnew_uber_message" = "直接從應用程序預訂計程車！";
 
@@ -1754,7 +1754,7 @@
 
 "big_font" = "增加地圖上的字體大小";
 
-"traffic_update_app" = "請更新 MAPS.ME";
+"traffic_update_app" = "請更新 OMaps";
 
 /* "traffic" as in road congestion */
 "traffic_update_app_message" = "若要顯示交通資訊，必須更新應用程式。";
@@ -1943,11 +1943,11 @@
 
 "onboarding_storage_permissions_title" = "授與存取權";
 
-"onboarding_storage_permissions_message" = "變更您裝置中的權限設定。需要存儲權限才能使用 MAPS.ME。";
+"onboarding_storage_permissions_message" = "變更您裝置中的權限設定。需要存儲權限才能使用 OMaps。";
 
 "button_exit" = "退出";
 
-"onboarding_detail_permissions_title" = "MAPS.ME 需要下列存取權限：";
+"onboarding_detail_permissions_title" = "OMaps 需要下列存取權限：";
 
 /* Default permission's name from Android settings. */
 "onboarding_detail_permissions_storage_title" = "存儲空間";
@@ -2099,7 +2099,7 @@
 
 "dialog_error_storage_title" = "儲存空間存取問題";
 
-"dialog_error_storage_message" = "外部儲存空間不可用，很可能是因為 SD 卡已移除、毀損，或檔案系統處於唯讀狀態。請進行檢查，然後以 support@maps.me 方式聯繫我們";
+"dialog_error_storage_message" = "外部儲存空間不可用，很可能是因為 SD 卡已移除、毀損，或檔案系統處於唯讀狀態。請進行檢查，然後以 support@omaps.app 方式聯繫我們";
 
 "setting_emulate_bad_storage" = "模擬不良儲存空間";
 
@@ -2277,11 +2277,11 @@
 
 "sign_agree_tof_gdpr" = "我同意<a href=\"%s\">使用條款</a>";
 
-"sign_agree_news_gdpr" = "我同意接收有關MAPS.ME產品的最新消息";
+"sign_agree_news_gdpr" = "我同意接收有關OMaps產品的最新消息";
 
 "whats_new_localbiz_title" = "Small business deserves attention";
 
-"whats_new_localbiz_message" = "當地的咖啡館、旅館和小商店令旅行難以忘懷。我們在MAPS.ME中免費優化您的商家頁面，以便它可以被看見。";
+"whats_new_localbiz_message" = "當地的咖啡館、旅館和小商店令旅行難以忘懷。我們在OMaps中免費優化您的商家頁面，以便它可以被看見。";
 
 "whats_new_order_button" = "留下申請表";
 
@@ -2295,7 +2295,7 @@
 
 "cached_bookmarks_placeholder_title" = "上傳新地點";
 
-"cached_bookmarks_placeholder_subtitle" = "單擊按鈕下載MAPS.ME用戶創建的數千個有趣的地點和路線。您需要網絡連接。";
+"cached_bookmarks_placeholder_subtitle" = "單擊按鈕下載OMaps用戶創建的數千個有趣的地點和路線。您需要網絡連接。";
 
 "downloader_download_routers" = "加載標籤";
 
@@ -2311,7 +2311,7 @@
 
 "opt_out_fabric" = "錯誤報告";
 
-"opt_out_fabric_description" = "我們可以使用您的數據來開發和改進MAPS.ME。更改將再重新啟動應用程序后生效。";
+"opt_out_fabric_description" = "我們可以使用您的數據來開發和改進OMaps。更改將再重新啟動應用程序后生效。";
 
 "opt_out_pushwoosh" = "Pushwoosh";
 
@@ -2357,7 +2357,7 @@
 
 "subtitle_error_downloading_bookmarks" = "標籤未加載";
 
-"whats_new_bookmarks_catalog_title" = "在MAPS.ME中有路線目錄";
+"whats_new_bookmarks_catalog_title" = "在OMaps中有路線目錄";
 
 "whats_new_bookmarks_catalog_message" = "全球數十條詳細路線去哪裡、看什麼、在哪吃飯。";
 
@@ -2398,7 +2398,7 @@
 
 "remove_ads" = "關閉廣告";
 
-"remove_ads_title" = "關閉所有廣告并支持 MAPS.ME";
+"remove_ads_title" = "關閉所有廣告并支持 OMaps";
 
 "paybtn_title" = "支付%s/年";
 
@@ -2406,7 +2406,7 @@
 
 "options_dropdown_title" = "其他選擇";
 
-"why_support" = "為什麼支持MAPS.ME?";
+"why_support" = "為什麼支持OMaps?";
 
 "options_dropdown_item1" = "%s/月 (節省%s/年)";
 
@@ -2414,7 +2414,7 @@
 
 "why_support_item1" = "我們將為您關閉所有廣告";
 
-"why_support_item2" = "您幫助我們改進MAPS.ME";
+"why_support_item2" = "您幫助我們改進OMaps";
 
 "why_support_item3" = "您幫助我們改進OpenStreetMap.org地圖";
 
@@ -2450,7 +2450,7 @@
 
 "server_unavailable_title" = "服務不可用";
 
-"server_unavailable_message" = "購買將在稍後完成。如果錯誤仍然存在，請聯繫support@maps.me。";
+"server_unavailable_message" = "購買將在稍後完成。如果錯誤仍然存在，請聯繫support@omaps.app。";
 
 "offline_fiters_check_in" = "連接到網絡已選擇到達和離開的日期。";
 
@@ -2497,7 +2497,7 @@
 /* FIXME */
 "bookmarks_private_access" = "bookmarks_private_access";
 
-"upload_and_publish_desc" = "本指南將上傳到MAPS.ME公共目錄，並可供其他用戶使用";
+"upload_and_publish_desc" = "本指南將上傳到OMaps公共目錄，並可供其他用戶使用";
 
 "upload_and_publish" = "加載並發布";
 
@@ -2598,7 +2598,7 @@
 
 "notification_leave_review_content" = "請發表評論並幫助旅客！";
 
-"share_bookmarks_email_body_link" = "您好！\n\n您的標籤可以從鏈接下載：%s.使用MAPS.ME打開列表並享受旅行!\n\n下載應用程序：http://maps.me/get?kmz";
+"share_bookmarks_email_body_link" = "您好！\n\n您的標籤可以從鏈接下載：%s.使用OMaps打開列表並享受旅行!\n\n下載應用程序：http://omaps.app/get?kmz";
 
 "warning_speedcams_title" = "當速度限制超過%d km / h時，導航會通知您的攝像機";
 
@@ -2608,7 +2608,7 @@
 
 "whats_new_ugc_routes_title" = "分享您的印象很容易";
 
-"whats_new_ugc_routes_subtitle" = "保存有印象的地点、用书签创建路线，并在MAPS.ME目录中和大家分享。";
+"whats_new_ugc_routes_subtitle" = "保存有印象的地点、用书签创建路线，并在OMaps目录中和大家分享。";
 
 "whats_new_webeditor_title" = "把路线变成故事";
 
@@ -2642,7 +2642,7 @@
 
 "error_public_not_enought_subtitle" = "您的路線至少應有3個標籤才能上傳到公共目錄中";
 
-"bookmark_public_upload_alert_title" = "您只需幾步即可將您的路徑加載到MAPS.ME目錄中！";
+"bookmark_public_upload_alert_title" = "您只需幾步即可將您的路徑加載到OMaps目錄中！";
 
 "bookmark_public_upload_alert_subtitle" = "請確保路線具有名稱和描述，並且所有標籤都包含場地信息。這樣用戶就能找到路線並在旅途中使用它們。";
 
@@ -2702,7 +2702,7 @@
 
 "power_managment_setting_manual_max" = "最大程度省電";
 
-"enable_logging_warning_message" = "此選項啟用以記錄操作來進行診斷。這有助於團隊識別應用程序的問題。請僅在MAPS.ME支持請求時開啟該選項。";
+"enable_logging_warning_message" = "此選項啟用以記錄操作來進行診斷。這有助於團隊識別應用程序的問題。請僅在OMaps支持請求時開啟該選項。";
 
 "html_error_upload_message_try_again" = "請檢查網絡訪問，然後再重試";
 
@@ -2722,7 +2722,7 @@
 
 "gdpr_request_window_title" = "您的ID：%s。";
 
-"gdpr_request_window_message" = "請複制並發送請求至support@maps.me";
+"gdpr_request_window_message" = "請複制並發送請求至support@omaps.app";
 
 "gdpr_request_window_copy" = "複製ID";
 
@@ -2768,7 +2768,7 @@
 
 "avoid_ferry_crossing_placepage" = "規避輪渡";
 
-"cached_guides_placeholder_subtitle" = "MAPS.ME中的現有指南是精選出來的地點，其中包含在地圖上顯示並可離線使用的照片和說明。";
+"cached_guides_placeholder_subtitle" = "OMaps中的現有指南是精選出來的地點，其中包含在地圖上顯示並可離線使用的照片和說明。";
 
 "guides_catalogue_title" = "指南目錄";
 
@@ -2776,7 +2776,7 @@
 
 "type.cuisine.uzbek" = "烏茲別克美食";
 
-"onboarding_welcome_title" = "請使用MAPS.ME開始規劃和旅行";
+"onboarding_welcome_title" = "請使用OMaps開始規劃和旅行";
 
 "onboarding_welcome_first_subtitle" = "請保存有趣的地方，預訂酒店，離線規劃路線";
 
@@ -2786,7 +2786,7 @@
 
 "onboarding_guide_direct_download_button" = "下載";
 
-"onboarding_bydeeplink_guide_title" = "MAPS.ME上現成的指南";
+"onboarding_bydeeplink_guide_title" = "OMaps上現成的指南";
 
 "onboarding_bydeeplink_guide_subtitle" = "帶有照片和說明的競選地點會顯示在地圖中，並且可以離線使用。";
 
@@ -2850,7 +2850,7 @@
 
 "popup_booking_download_guides_title" = "已預訂酒店？";
 
-"popup_booking_download_guides_message" = "和MAPS.ME壹起規劃行程吧";
+"popup_booking_download_guides_message" = "和OMaps壹起規劃行程吧";
 
 "popup_mwm_download_guides_title" = "在線指南";
 
@@ -2858,7 +2858,7 @@
 
 "popup_mwm_download_guides_cta_1" = "查看";
 
-"gallery_pp_download_guides_offline_title" = "和 MAPS.ME壹起規劃妳的假期吧！";
+"gallery_pp_download_guides_offline_title" = "和 OMaps壹起規劃妳的假期吧！";
 
 "gallery_pp_download_guides_offline_subtitle" = "不要錯過資深驢友提供線路中最重要的內容";
 
@@ -2918,7 +2918,7 @@
 
 "subscription_terms" = "確認購買後將向您的iTunes賬戶收費。除非在當前周期結束前至少24小時關閉自動續訂，訂購會自動延續。在當前周期結束前24小時內，我們會根據您的方案向您的賬戶收費。您能在購買後在Apple ID賬戶設置中隨時管理或關閉自動續訂。";
 
-"whatsnew_carplay_title" = "MAPS.ME 自動導航已被納入CarPlay系統中！";
+"whatsnew_carplay_title" = "OMaps 自動導航已被納入CarPlay系統中！";
 
 "whatsnew_carplay_message" = "可在無網絡的條件下使用標記、搜索、車速攝像頭和繞道設置";
 
@@ -2946,7 +2946,7 @@
 
 "speedcams_alert_title_carplay_2" = "攝像頭信息";
 
-"download_map_carplay" = "將MAPS.ME軟件中的地圖下載至個人設備中";
+"download_map_carplay" = "將OMaps軟件中的地圖下載至個人設備中";
 
 "carplay_roundabout_exit" = "%s號坡道";
 
@@ -3039,7 +3039,7 @@
 
 "popup_subscription_success_map_title" = "耶！您已訂閱！";
 
-"popup_subscription_success_map_message" = "現在在MAPS.ME畫冊中探索最佳的旅遊景點";
+"popup_subscription_success_map_message" = "現在在OMaps畫冊中探索最佳的旅遊景點";
 
 "popup_subscription_success_map_start_button" = "瀏覽";
 
@@ -3085,7 +3085,7 @@
 
 "new_onboarding_button_2" = "開始";
 
-"new_onboarding_step1_header" = "MAPS.ME";
+"new_onboarding_step1_header" = "OMaps";
 
 "new_onboarding_step1_header_2" = "旅行中的萬能助手";
 
@@ -3105,11 +3105,11 @@
 
 "new_onboarding_step5.1_button" = "打開目錄";
 
-"new_onboarding_step5.2_message" = "订阅MAPS.ME中的旅行指南会让您受益匪浅。全面访问城市散步路线和户外活动路线！";
+"new_onboarding_step5.2_message" = "订阅OMaps中的旅行指南会让您受益匪浅。全面访问城市散步路线和户外活动路线！";
 
 "new_onboarding_step5.2_button" = "查看條件";
 
-"new_onboarding_step5.3_message" = "下載或評論帶有 MAPS.ME免費編錄的市內旅行和休閑運動的線路！";
+"new_onboarding_step5.3_message" = "下載或評論帶有 OMaps免費編錄的市內旅行和休閑運動的線路！";
 
 "new_onboarding_step5.3_button" = "免費下載";
 
@@ -3172,7 +3172,7 @@
 
 "whatsnew_outdoor_guides_message" = "目錄中添加了Outdooractive 的冬季和夏季旅行線路！";
 
-"whatsnew_guides_galleries_title" = "與MAPS.ME共同規劃即將到來的旅行";
+"whatsnew_guides_galleries_title" = "與OMaps共同規劃即將到來的旅行";
 
 "whatsnew_guides_galleries_message" = "現在你可在熱門城市與名勝古迹地圖上查找推薦的旅行指南";
 
@@ -3198,7 +3198,7 @@
 
 "button_layer_isolines" = "高度";
 
-"tips_map_layers_title_countour" = "離線高度線在MAPS.ME中！";
+"tips_map_layers_title_countour" = "離線高度線在OMaps中！";
 
 "tips_map_layers_message_countour" = "高度線可以幫您規劃通往大自然地區的路線，不會迷路";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
index d7857b6f3c..ceac91b8ae 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.stringsdict
@@ -135,4 +135,4 @@
     </dict>
   </dict>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index fa88d52927..60c91ff151 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -953,8 +953,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0B07BBB5C2EFC6F60EF51BC8 /* Pods-MAPS.ME.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MAPS.ME.debug.xcconfig"; path = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.debug.xcconfig"; sourceTree = "<group>"; };
-		166595280BE641CF8ADE2209 /* Pods-MAPS.ME.production full.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MAPS.ME.production full.xcconfig"; path = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.production full.xcconfig"; sourceTree = "<group>"; };
+		0B07BBB5C2EFC6F60EF51BC8 /* Pods-OMaps.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OMaps.debug.xcconfig"; path = "Target Support Files/Pods-OMaps/Pods-OMaps.debug.xcconfig"; sourceTree = "<group>"; };
+		166595280BE641CF8ADE2209 /* Pods-OMaps.production full.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OMaps.production full.xcconfig"; path = "Target Support Files/Pods-OMaps/Pods-OMaps.production full.xcconfig"; sourceTree = "<group>"; };
 		1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = "<group>"; };
 		1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		1DA7908720762B6F008BDD6B /* libopen_location_code.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libopen_location_code.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1329,7 +1329,7 @@
 		34D3B0151E389D05004100F9 /* MWMNoteCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMNoteCell.m; sourceTree = "<group>"; };
 		34D3B0161E389D05004100F9 /* MWMNoteCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNoteCell.xib; sourceTree = "<group>"; };
 		34D3B04D1E38A20C004100F9 /* Bundle+Init.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bundle+Init.swift"; sourceTree = "<group>"; };
-		34D7DB77204ED3DD0041D015 /* maps.me dbg.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "maps.me dbg.entitlements"; sourceTree = "<group>"; };
+		34D7DB77204ED3DD0041D015 /* omaps dbg.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "omaps dbg.entitlements"; sourceTree = "<group>"; };
 		34E6F2DA1F459C05008E14F9 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
 		34E7270820444A7A009E4CED /* MWMAlertViewController+CPP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMAlertViewController+CPP.h"; sourceTree = "<group>"; };
 		34E7270920444B95009E4CED /* MWMAlert+CPP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMAlert+CPP.h"; sourceTree = "<group>"; };
@@ -1640,7 +1640,7 @@
 		56EE14D21FE804550036F20C /* libtransit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtransit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		58E5736C23FC4E77509C9946 /* Pods_MAPS_ME.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MAPS_ME.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		671E78D21E6A423300B2859B /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/librouting_common.a"; sourceTree = "<group>"; };
-		6741AA5D1BF340DE002C974C /* maps.me dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "maps.me dbg.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6741AA5D1BF340DE002C974C /* omaps.app dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "omaps.app dbg.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6741AAA21BF356B9002C974C /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<group>"; };
 		6741AAA31BF356B9002C974C /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
 		6741AAA61BF356B9002C974C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<group>"; };
@@ -1671,8 +1671,8 @@
 		67B78B461E422E0A0018E590 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		67B78B541E42333C0018E590 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
 		6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = "<group>"; };
-		8022FD18AD3EEA9E8C75A7A7 /* Pods-MAPS.ME.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MAPS.ME.release.xcconfig"; path = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.release.xcconfig"; sourceTree = "<group>"; };
-		8D1107310486CEB800E47090 /* MAPSME.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = MAPSME.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
+		8022FD18AD3EEA9E8C75A7A7 /* Pods-OMaps.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OMaps.release.xcconfig"; path = "Target Support Files/Pods-OMaps/Pods-OMaps.release.xcconfig"; sourceTree = "<group>"; };
+		8D1107310486CEB800E47090 /* OMAPS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OMAPS.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = "<group>"; };
 		97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; };
 		99012846243F0D6900C72B10 /* UIViewController+alternative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+alternative.swift"; sourceTree = "<group>"; };
@@ -1918,8 +1918,8 @@
 		BB8123D52130427E00ADE512 /* MetalContextFactory.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalContextFactory.mm; sourceTree = "<group>"; };
 		CD08887222B7ABB400C1368D /* MWMDiscoveryCollectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryCollectionView.h; sourceTree = "<group>"; };
 		CD08887322B7ABB400C1368D /* MWMDiscoveryCollectionView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDiscoveryCollectionView.mm; sourceTree = "<group>"; };
-		CD08888322BCF1C800C1368D /* maps.me rel.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "maps.me rel.entitlements"; sourceTree = "<group>"; };
-		CD08888422BCF1C900C1368D /* maps.me full.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "maps.me full.entitlements"; sourceTree = "<group>"; };
+		CD08888322BCF1C800C1368D /* omaps rel.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "omaps rel.entitlements"; sourceTree = "<group>"; };
+		CD08888422BCF1C900C1368D /* omaps full.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "omaps full.entitlements"; sourceTree = "<group>"; };
 		CD4A1F122305872700F2A6B6 /* PromoBookingPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoBookingPresentationController.swift; sourceTree = "<group>"; };
 		CD4A1F19230EADC100F2A6B6 /* CatalogConnectionErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogConnectionErrorView.swift; sourceTree = "<group>"; };
 		CD4A1F1B230EB43B00F2A6B6 /* CatalogConnectionErrorView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CatalogConnectionErrorView.xib; sourceTree = "<group>"; };
@@ -2310,9 +2310,9 @@
 		044715AD432F538B6F731670 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				0B07BBB5C2EFC6F60EF51BC8 /* Pods-MAPS.ME.debug.xcconfig */,
-				8022FD18AD3EEA9E8C75A7A7 /* Pods-MAPS.ME.release.xcconfig */,
-				166595280BE641CF8ADE2209 /* Pods-MAPS.ME.production full.xcconfig */,
+				0B07BBB5C2EFC6F60EF51BC8 /* Pods-OMaps.debug.xcconfig */,
+				8022FD18AD3EEA9E8C75A7A7 /* Pods-OMaps.release.xcconfig */,
+				166595280BE641CF8ADE2209 /* Pods-OMaps.production full.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -2352,7 +2352,7 @@
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				6741AA5D1BF340DE002C974C /* maps.me dbg.app */,
+				6741AA5D1BF340DE002C974C /* omaps.app dbg.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -2373,7 +2373,7 @@
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				34F73FA11E08300E00AC1FD6 /* Images.xcassets */,
 				34F73F5E1E082FF700AC1FD6 /* LocalizedStrings */,
-				8D1107310486CEB800E47090 /* MAPSME.plist */,
+				8D1107310486CEB800E47090 /* OMAPS.plist */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
@@ -2399,9 +2399,9 @@
 			isa = PBXGroup;
 			children = (
 				F6C3A1B121AC22810060EEC8 /* Alert 5.m4a */,
-				34D7DB77204ED3DD0041D015 /* maps.me dbg.entitlements */,
-				CD08888422BCF1C900C1368D /* maps.me full.entitlements */,
-				CD08888322BCF1C800C1368D /* maps.me rel.entitlements */,
+				34D7DB77204ED3DD0041D015 /* omaps dbg.entitlements */,
+				CD08888422BCF1C900C1368D /* omaps full.entitlements */,
+				CD08888322BCF1C800C1368D /* omaps rel.entitlements */,
 				34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */,
 				4A300ED31C6DCFD400140018 /* countries-strings */,
 				5605022E1B6211E100169CAD /* sound-strings */,
@@ -5081,9 +5081,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		6741A93D1BF340DE002C974C /* MAPS.ME */ = {
+		6741A93D1BF340DE002C974C /* OMaps */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "MAPS.ME" */;
+			buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "OMaps" */;
 			buildPhases = (
 				DC18E8E671D9B333180B1B98 /* [CP] Check Pods Manifest.lock */,
 				47C7F96D2191A3B600C2760C /* ShellScript */,
@@ -5099,9 +5099,9 @@
 			);
 			dependencies = (
 			);
-			name = MAPS.ME;
+			name = OMaps;
 			productName = Maps;
-			productReference = 6741AA5D1BF340DE002C974C /* maps.me dbg.app */;
+			productReference = 6741AA5D1BF340DE002C974C /* omaps.app dbg.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -5111,7 +5111,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0820;
-				ORGANIZATIONNAME = MapsWithMe;
+				ORGANIZATIONNAME = OMaps;
 				TargetAttributes = {
 					6741A93D1BF340DE002C974C = {
 						DevelopmentTeam = N9X2A789QT;
@@ -5177,7 +5177,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				6741A93D1BF340DE002C974C /* MAPS.ME */,
+				6741A93D1BF340DE002C974C /* OMaps */,
 			);
 		};
 /* End PBXProject section */
@@ -5458,7 +5458,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-OMaps/Pods-OMaps-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework",
 				"${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework",
 				"${BUILT_PRODUCTS_DIR}/Flurry-iOS-SDK/Flurry_iOS_SDK.framework",
@@ -5479,7 +5479,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OMaps/Pods-OMaps-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DC18E8E671D9B333180B1B98 /* [CP] Check Pods Manifest.lock */ = {
@@ -5497,7 +5497,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-MAPS.ME-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-OMaps-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -6276,9 +6276,9 @@
 /* Begin XCBuildConfiguration section */
 		6741AA571BF340DE002C974C /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0B07BBB5C2EFC6F60EF51BC8 /* Pods-MAPS.ME.debug.xcconfig */;
+			baseConfigurationReference = 0B07BBB5C2EFC6F60EF51BC8 /* Pods-OMaps.debug.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_ENTITLEMENTS = "maps.me dbg.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "omaps.app dbg.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development: Aleksey Belousov (8P35JSY4C8)";
 				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -6291,17 +6291,18 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 0.0.1;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.full;
-				PROVISIONING_PROFILE_SPECIFIER = "Maps.me Carplay";
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.full;
+				PROVISIONING_PROFILE_SPECIFIER = "OMaps Carplay";
 			};
 			name = Debug;
 		};
 		6741AA5A1BF340DE002C974C /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8022FD18AD3EEA9E8C75A7A7 /* Pods-MAPS.ME.release.xcconfig */;
+			baseConfigurationReference = 8022FD18AD3EEA9E8C75A7A7 /* Pods-OMaps.release.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_ENTITLEMENTS = "maps.me rel.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "omaps.app rel.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development: Aleksey Belousov (8P35JSY4C8)";
 				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -6314,17 +6315,18 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 0.0.1;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.full;
-				PROVISIONING_PROFILE_SPECIFIER = "Maps.me Carplay";
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.full;
+				PROVISIONING_PROFILE_SPECIFIER = "OMaps Carplay";
 			};
 			name = Release;
 		};
 		6741AA5C1BF340DE002C974C /* Production Full */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 166595280BE641CF8ADE2209 /* Pods-MAPS.ME.production full.xcconfig */;
+			baseConfigurationReference = 166595280BE641CF8ADE2209 /* Pods-OMaps.production full.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_ENTITLEMENTS = "maps.me full.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "omaps.app full.entitlements";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm;
 				"EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm;
@@ -6335,8 +6337,9 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 0.0.1;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.full;
+				PRODUCT_BUNDLE_IDENTIFIER = app.omaps.full;
 			};
 			name = "Production Full";
 		};
@@ -6348,6 +6351,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				BUNDLE_IDENTIFIER = mapsme.debug;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+				CURRENT_PROJECT_VERSION = 0.0.1;
 				DEVELOPMENT_TEAM = N9X2A789QT;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6364,7 +6368,7 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/**",
 					"$(OMIM_ROOT)/3party/jansson/src",
 				);
-				INFOPLIST_FILE = MAPSME.plist;
+				INFOPLIST_FILE = OMAPS.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party/Flurry",
@@ -6382,7 +6386,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}";
-				PRODUCT_NAME = "maps.me dbg";
+				PRODUCT_NAME = "omaps.app dbg";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = NO;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -6402,6 +6406,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				BUNDLE_IDENTIFIER = com.mapswithme.full;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+				CURRENT_PROJECT_VERSION = 0.0.1;
 				DEVELOPMENT_TEAM = N9X2A789QT;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6418,7 +6423,7 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/**",
 					"$(OMIM_ROOT)/3party/jansson/src",
 				);
-				INFOPLIST_FILE = MAPSME.plist;
+				INFOPLIST_FILE = OMAPS.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party/Flurry",
@@ -6437,7 +6442,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}";
-				PRODUCT_NAME = maps.me;
+				PRODUCT_NAME = omaps.app;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = NO;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -6458,6 +6463,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				BUNDLE_IDENTIFIER = mapsme.release;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+				CURRENT_PROJECT_VERSION = 0.0.1;
 				DEVELOPMENT_TEAM = N9X2A789QT;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6477,7 +6483,7 @@
 					"$(PROJECT_DIR)/3party/MoPubSDK/**",
 					"$(OMIM_ROOT)/3party/jansson/src",
 				);
-				INFOPLIST_FILE = MAPSME.plist;
+				INFOPLIST_FILE = OMAPS.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/3party/Flurry",
@@ -6495,7 +6501,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}";
-				PRODUCT_NAME = "maps.me rel";
+				PRODUCT_NAME = "omaps.app rel";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = NO;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -6510,7 +6516,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "MAPS.ME" */ = {
+		6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "OMaps" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				6741AA571BF340DE002C974C /* Debug */,
diff --git a/iphone/Maps/MAPSME.plist b/iphone/Maps/OMAPS.plist
similarity index 97%
rename from iphone/Maps/MAPSME.plist
rename to iphone/Maps/OMAPS.plist
index c092ad0037..15739d5f9a 100644
--- a/iphone/Maps/MAPSME.plist
+++ b/iphone/Maps/OMAPS.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>omaps.app dbg</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -54,7 +54,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>${CURRENT_PROJECT_VERSION}</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -63,7 +63,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>CFBundleURLName</key>
-			<string>com.mapswithme.maps</string>
+			<string>app.omaps.maps</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>mapswithme</string>
@@ -102,7 +102,7 @@
 	<key>FacebookAppID</key>
 	<string>185237551520383</string>
 	<key>FacebookDisplayName</key>
-	<string>MapsWithMe, offline maps</string>
+	<string>OMaps, offline maps</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>fbapi</string>
@@ -151,7 +151,7 @@
 				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
 				<false/>
 			</dict>
-			<key>maps.me</key>
+			<key>omaps.app</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
diff --git a/iphone/Maps/Podfile b/iphone/Maps/Podfile
index 3cca2853d0..2a12078af1 100644
--- a/iphone/Maps/Podfile
+++ b/iphone/Maps/Podfile
@@ -3,10 +3,10 @@ platform :ios, '11.0'
 
 workspace './../../xcode/omim.xcworkspace'
 
-target 'MAPS.ME' do
+target 'OMaps' do
   use_frameworks!
 
-  # Pods for MAPS.ME
+  # Pods for OMaps
 
 pod 'AppsFlyerFramework', '4.9.0'
 pod 'Pushwoosh', '5.16.0'
diff --git a/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/AppsFlyerLib b/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/AppsFlyerLib
deleted file mode 120000
index fd96586f85..0000000000
--- a/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/AppsFlyerLib
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/AppsFlyerLib
\ No newline at end of file
diff --git a/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/AppsFlyerLib b/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/AppsFlyerLib
new file mode 100644
index 0000000000..1876a687c4
Binary files /dev/null and b/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/AppsFlyerLib differ
diff --git a/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/Headers b/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/Headers
deleted file mode 120000
index a177d2a6b9..0000000000
--- a/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/Headers
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Headers
\ No newline at end of file
diff --git a/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/Versions/Current b/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/Versions/Current
deleted file mode 120000
index 8c7e5a667f..0000000000
--- a/iphone/Maps/Pods/AppsFlyerFramework/AppsFlyerLib.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/Firebase/Firebase.h b/iphone/Maps/Pods/Headers/Private/Firebase/Firebase.h
deleted file mode 120000
index 07ac6eb193..0000000000
--- a/iphone/Maps/Pods/Headers/Private/Firebase/Firebase.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Firebase/CoreOnly/Sources/Firebase.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/Firebase/Firebase.h b/iphone/Maps/Pods/Headers/Private/Firebase/Firebase.h
new file mode 100755
index 0000000000..e5049ca432
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Private/Firebase/Firebase.h
@@ -0,0 +1,172 @@
+// Copyright 2019 Google
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import <FirebaseCore/FirebaseCore.h>
+
+#if !defined(__has_include)
+  #error "Firebase.h won't import anything if your compiler doesn't support __has_include. Please \
+          import the headers individually."
+#else
+  #if __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+    #import <FirebaseAnalytics/FirebaseAnalytics.h>
+  #endif
+
+  #if __has_include(<FirebaseAuth/FirebaseAuth.h>)
+    #import <FirebaseAuth/FirebaseAuth.h>
+  #endif
+
+  #if __has_include(<FirebaseCrashlytics/FirebaseCrashlytics.h>)
+    #import <FirebaseCrashlytics/FirebaseCrashlytics.h>
+  #endif
+
+  #if __has_include(<FirebaseDatabase/FirebaseDatabase.h>)
+    #import <FirebaseDatabase/FirebaseDatabase.h>
+  #endif
+
+  #if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>)
+    #import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Dynamic Links works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseFirestore/FirebaseFirestore.h>)
+    #import <FirebaseFirestore/FirebaseFirestore.h>
+  #endif
+
+  #if __has_include(<FirebaseFunctions/FirebaseFunctions.h>)
+    #import <FirebaseFunctions/FirebaseFunctions.h>
+  #endif
+
+  #if __has_include(<FirebaseInAppMessaging/FirebaseInAppMessaging.h>)
+    #import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase In App Messaging works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseInstanceID/FirebaseInstanceID.h>)
+    #import <FirebaseInstanceID/FirebaseInstanceID.h>
+  #endif
+
+  #if __has_include(<FirebaseMessaging/FirebaseMessaging.h>)
+    #import <FirebaseMessaging/FirebaseMessaging.h>
+      #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Messaging works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+#endif
+
+  #if __has_include(<FirebaseMLCommon/FirebaseMLCommon.h>)
+    #import <FirebaseMLCommon/FirebaseMLCommon.h>
+  #endif
+
+  #if __has_include(<FirebaseMLModelInterpreter/FirebaseMLModelInterpreter.h>)
+    #import <FirebaseMLModelInterpreter/FirebaseMLModelInterpreter.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNLLanguageID/FirebaseMLNLLanguageID.h>)
+    #import <FirebaseMLNLLanguageID/FirebaseMLNLLanguageID.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNLSmartReply/FirebaseMLNLSmartReply.h>)
+    #import <FirebaseMLNLSmartReply/FirebaseMLNLSmartReply.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNLTranslate/FirebaseMLNLTranslate.h>)
+    #import <FirebaseMLNLTranslate/FirebaseMLNLTranslate.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNaturalLanguage/FirebaseMLNaturalLanguage.h>)
+    #import <FirebaseMLNaturalLanguage/FirebaseMLNaturalLanguage.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVision/FirebaseMLVision.h>)
+    #import <FirebaseMLVision/FirebaseMLVision.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionAutoML/FirebaseMLVisionAutoML.h>)
+    #import <FirebaseMLVisionAutoML/FirebaseMLVisionAutoML.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionBarcodeModel/FirebaseMLVisionBarcodeModel.h>)
+    #import <FirebaseMLVisionBarcodeModel/FirebaseMLVisionBarcodeModel.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionFaceModel/FirebaseMLVisionFaceModel.h>)
+    #import <FirebaseMLVisionFaceModel/FirebaseMLVisionFaceModel.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionLabelModel/FirebaseMLVisionLabelModel.h>)
+    #import <FirebaseMLVisionLabelModel/FirebaseMLVisionLabelModel.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionObjectDetection/FirebaseMLVisionObjectDetection.h>)
+    #import <FirebaseMLVisionObjectDetection/FirebaseMLVisionObjectDetection.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionTextModel/FirebaseMLVisionTextModel.h>)
+    #import <FirebaseMLVisionTextModel/FirebaseMLVisionTextModel.h>
+  #endif
+
+  #if __has_include(<FirebasePerformance/FirebasePerformance.h>)
+    #import <FirebasePerformance/FirebasePerformance.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Performance works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>)
+    #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Remote Config works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseStorage/FirebaseStorage.h>)
+    #import <FirebaseStorage/FirebaseStorage.h>
+  #endif
+
+  #if __has_include(<GoogleMobileAds/GoogleMobileAds.h>)
+    #import <GoogleMobileAds/GoogleMobileAds.h>
+  #endif
+
+  #if __has_include(<Fabric/Fabric.h>)
+    #import <Fabric/Fabric.h>
+  #endif
+
+  #if __has_include(<Crashlytics/Crashlytics.h>)
+    #import <Crashlytics/Crashlytics.h>
+  #endif
+
+#endif  // defined(__has_include)
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
deleted file mode 120000
index e01a43ad4e..0000000000
--- a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRAnalyticsInterop.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
new file mode 100644
index 0000000000..6581b5368d
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol FIRAnalyticsInteropListener;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Block typedef callback parameter to getUserPropertiesWithCallback:.
+typedef void (^FIRAInteropUserPropertiesCallback)(NSDictionary<NSString *, id> *userProperties);
+
+/// Connector for bridging communication between Firebase SDKs and FirebaseAnalytics API.
+@protocol FIRAnalyticsInterop
+
+/// Sets user property when trigger event is logged. This API is only available in the SDK.
+- (void)setConditionalUserProperty:(NSDictionary<NSString *, id> *)conditionalUserProperty;
+
+/// Clears user property if set.
+- (void)clearConditionalUserProperty:(NSString *)userPropertyName
+                           forOrigin:(NSString *)origin
+                      clearEventName:(NSString *)clearEventName
+                clearEventParameters:(NSDictionary<NSString *, NSString *> *)clearEventParameters;
+
+/// Returns currently set user properties.
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)conditionalUserProperties:(NSString *)origin
+                                                            propertyNamePrefix:
+                                                                (NSString *)propertyNamePrefix;
+
+/// Returns the maximum number of user properties.
+- (NSInteger)maxUserProperties:(NSString *)origin;
+
+/// Returns the user properties to a callback function.
+- (void)getUserPropertiesWithCallback:(FIRAInteropUserPropertiesCallback)callback;
+
+/// Logs events.
+- (void)logEventWithOrigin:(NSString *)origin
+                      name:(NSString *)name
+                parameters:(nullable NSDictionary<NSString *, id> *)parameters;
+
+/// Sets user property.
+- (void)setUserPropertyWithOrigin:(NSString *)origin name:(NSString *)name value:(id)value;
+
+/// Registers an Analytics listener for the given origin.
+- (void)registerAnalyticsListener:(id<FIRAnalyticsInteropListener>)listener
+                       withOrigin:(NSString *)origin;
+
+/// Unregisters an Analytics listener for the given origin.
+- (void)unregisterAnalyticsListenerWithOrigin:(NSString *)origin;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
deleted file mode 120000
index d3cd09763b..0000000000
--- a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRAnalyticsInteropListener.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
new file mode 100644
index 0000000000..45cde55061
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/// Handles events and messages from Analytics.
+@protocol FIRAnalyticsInteropListener <NSObject>
+
+/// Triggers when an Analytics event happens for the registered origin with
+/// `FIRAnalyticsInterop`s `registerAnalyticsListener:withOrigin:`.
+- (void)messageTriggered:(NSString *)name parameters:(NSDictionary *)parameters;
+
+@end
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropEventNames.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropEventNames.h
deleted file mode 120000
index dbda3ecc96..0000000000
--- a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropEventNames.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRInteropEventNames.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropEventNames.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropEventNames.h
new file mode 100644
index 0000000000..efc54ab221
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropEventNames.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/// @file FIRInteropEventNames.h
+
+#import <Foundation/Foundation.h>
+
+/// Notification open event name.
+static NSString *const kFIRIEventNotificationOpen = @"_no";
+
+/// Notification foreground event name.
+static NSString *const kFIRIEventNotificationForeground = @"_nf";
+
+/// Campaign event name.
+static NSString *const kFIRIEventFirebaseCampaign = @"_cmp";
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropParameterNames.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
deleted file mode 120000
index 51458430df..0000000000
--- a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRInteropParameterNames.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropParameterNames.h b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
new file mode 100644
index 0000000000..ae440becf8
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Private/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+/// @file FIRInteropParameterNames.h
+///
+/// Predefined event parameter names used by Firebase. This file is a subset of the
+/// FirebaseAnalytics FIRParameterNames.h public header.
+///
+/// The origin of your traffic, such as an Ad network (for example, google) or partner (urban
+/// airship). Identify the advertiser, site, publication, etc. that is sending traffic to your
+/// property. Highly recommended (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterSource : @"InMobi",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRIParameterSource NS_SWIFT_NAME(AnalyticsParameterSource) = @"source";
+
+/// The advertising or marketing medium, for example: cpc, banner, email, push. Highly recommended
+/// (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterMedium : @"email",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRIParameterMedium NS_SWIFT_NAME(AnalyticsParameterMedium) = @"medium";
+
+/// The individual campaign name, slogan, promo code, etc. Some networks have pre-defined macro to
+/// capture campaign information, otherwise can be populated by developer. Highly Recommended
+/// (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterCampaign : @"winter_promotion",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRIParameterCampaign NS_SWIFT_NAME(AnalyticsParameterCampaign) =
+    @"campaign";
+
+/// Message identifier.
+static NSString *const kFIRIParameterMessageIdentifier = @"_nmid";
+
+/// Message name.
+static NSString *const kFIRIParameterMessageName = @"_nmn";
+
+/// Message send time.
+static NSString *const kFIRIParameterMessageTime = @"_nmt";
+
+/// Message device time.
+static NSString *const kFIRIParameterMessageDeviceTime = @"_ndt";
+
+/// Topic message.
+static NSString *const kFIRIParameterTopic = @"_nt";
+
+/// Stores the message_id of the last notification opened by the app.
+static NSString *const kFIRIUserPropertyLastNotification = @"_ln";
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h b/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
deleted file mode 120000
index ce646ecf1d..0000000000
--- a/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseCoreDiagnosticsInterop/Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h b/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
new file mode 100644
index 0000000000..69c40721a2
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/** If present, is a BOOL wrapped in an NSNumber. */
+#define kFIRCDIsDataCollectionDefaultEnabledKey @"FIRCDIsDataCollectionDefaultEnabledKey"
+
+/** If present, is an int32_t wrapped in an NSNumber. */
+#define kFIRCDConfigurationTypeKey @"FIRCDConfigurationTypeKey"
+
+/** If present, is an NSString. */
+#define kFIRCDSdkNameKey @"FIRCDSdkNameKey"
+
+/** If present, is an NSString. */
+#define kFIRCDSdkVersionKey @"FIRCDSdkVersionKey"
+
+/** If present, is an int32_t wrapped in an NSNumber. */
+#define kFIRCDllAppsCountKey @"FIRCDllAppsCountKey"
+
+/** If present, is an NSString. */
+#define kFIRCDGoogleAppIDKey @"FIRCDGoogleAppIDKey"
+
+/** If present, is an NSString. */
+#define kFIRCDBundleIDKey @"FIRCDBundleID"
+
+/** If present, is a BOOL wrapped in an NSNumber. */
+#define kFIRCDUsingOptionsFromDefaultPlistKey @"FIRCDUsingOptionsFromDefaultPlistKey"
+
+/** If present, is an NSString. */
+#define kFIRCDLibraryVersionIDKey @"FIRCDLibraryVersionIDKey"
+
+/** If present, is an NSString. */
+#define kFIRCDFirebaseUserAgentKey @"FIRCDFirebaseUserAgentKey"
+
+/** Defines the interface of a data object needed to log diagnostics data. */
+@protocol FIRCoreDiagnosticsData <NSObject>
+
+@required
+
+/** A dictionary containing data (non-exhaustive) to be logged in diagnostics. */
+@property(nonatomic) NSDictionary<NSString *, id> *diagnosticObjects;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h b/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
deleted file mode 120000
index 07d83d70f4..0000000000
--- a/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseCoreDiagnosticsInterop/Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h b/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
new file mode 100644
index 0000000000..2b0eb710cd
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Private/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "FIRCoreDiagnosticsData.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/** Allows the interoperation of FirebaseCore and FirebaseCoreDiagnostics. */
+@protocol FIRCoreDiagnosticsInterop <NSObject>
+
+/** Sends the given diagnostics data.
+ *
+ * @param diagnosticsData The diagnostics data object to send.
+ */
++ (void)sendDiagnosticsData:(id<FIRCoreDiagnosticsData>)diagnosticsData;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Pods/Headers/Public/Firebase/Firebase.h b/iphone/Maps/Pods/Headers/Public/Firebase/Firebase.h
deleted file mode 120000
index 07ac6eb193..0000000000
--- a/iphone/Maps/Pods/Headers/Public/Firebase/Firebase.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Firebase/CoreOnly/Sources/Firebase.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/Firebase/Firebase.h b/iphone/Maps/Pods/Headers/Public/Firebase/Firebase.h
new file mode 100755
index 0000000000..e5049ca432
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Public/Firebase/Firebase.h
@@ -0,0 +1,172 @@
+// Copyright 2019 Google
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import <FirebaseCore/FirebaseCore.h>
+
+#if !defined(__has_include)
+  #error "Firebase.h won't import anything if your compiler doesn't support __has_include. Please \
+          import the headers individually."
+#else
+  #if __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+    #import <FirebaseAnalytics/FirebaseAnalytics.h>
+  #endif
+
+  #if __has_include(<FirebaseAuth/FirebaseAuth.h>)
+    #import <FirebaseAuth/FirebaseAuth.h>
+  #endif
+
+  #if __has_include(<FirebaseCrashlytics/FirebaseCrashlytics.h>)
+    #import <FirebaseCrashlytics/FirebaseCrashlytics.h>
+  #endif
+
+  #if __has_include(<FirebaseDatabase/FirebaseDatabase.h>)
+    #import <FirebaseDatabase/FirebaseDatabase.h>
+  #endif
+
+  #if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>)
+    #import <FirebaseDynamicLinks/FirebaseDynamicLinks.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Dynamic Links works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseFirestore/FirebaseFirestore.h>)
+    #import <FirebaseFirestore/FirebaseFirestore.h>
+  #endif
+
+  #if __has_include(<FirebaseFunctions/FirebaseFunctions.h>)
+    #import <FirebaseFunctions/FirebaseFunctions.h>
+  #endif
+
+  #if __has_include(<FirebaseInAppMessaging/FirebaseInAppMessaging.h>)
+    #import <FirebaseInAppMessaging/FirebaseInAppMessaging.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase In App Messaging works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseInstanceID/FirebaseInstanceID.h>)
+    #import <FirebaseInstanceID/FirebaseInstanceID.h>
+  #endif
+
+  #if __has_include(<FirebaseMessaging/FirebaseMessaging.h>)
+    #import <FirebaseMessaging/FirebaseMessaging.h>
+      #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Messaging works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+#endif
+
+  #if __has_include(<FirebaseMLCommon/FirebaseMLCommon.h>)
+    #import <FirebaseMLCommon/FirebaseMLCommon.h>
+  #endif
+
+  #if __has_include(<FirebaseMLModelInterpreter/FirebaseMLModelInterpreter.h>)
+    #import <FirebaseMLModelInterpreter/FirebaseMLModelInterpreter.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNLLanguageID/FirebaseMLNLLanguageID.h>)
+    #import <FirebaseMLNLLanguageID/FirebaseMLNLLanguageID.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNLSmartReply/FirebaseMLNLSmartReply.h>)
+    #import <FirebaseMLNLSmartReply/FirebaseMLNLSmartReply.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNLTranslate/FirebaseMLNLTranslate.h>)
+    #import <FirebaseMLNLTranslate/FirebaseMLNLTranslate.h>
+  #endif
+
+  #if __has_include(<FirebaseMLNaturalLanguage/FirebaseMLNaturalLanguage.h>)
+    #import <FirebaseMLNaturalLanguage/FirebaseMLNaturalLanguage.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVision/FirebaseMLVision.h>)
+    #import <FirebaseMLVision/FirebaseMLVision.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionAutoML/FirebaseMLVisionAutoML.h>)
+    #import <FirebaseMLVisionAutoML/FirebaseMLVisionAutoML.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionBarcodeModel/FirebaseMLVisionBarcodeModel.h>)
+    #import <FirebaseMLVisionBarcodeModel/FirebaseMLVisionBarcodeModel.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionFaceModel/FirebaseMLVisionFaceModel.h>)
+    #import <FirebaseMLVisionFaceModel/FirebaseMLVisionFaceModel.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionLabelModel/FirebaseMLVisionLabelModel.h>)
+    #import <FirebaseMLVisionLabelModel/FirebaseMLVisionLabelModel.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionObjectDetection/FirebaseMLVisionObjectDetection.h>)
+    #import <FirebaseMLVisionObjectDetection/FirebaseMLVisionObjectDetection.h>
+  #endif
+
+  #if __has_include(<FirebaseMLVisionTextModel/FirebaseMLVisionTextModel.h>)
+    #import <FirebaseMLVisionTextModel/FirebaseMLVisionTextModel.h>
+  #endif
+
+  #if __has_include(<FirebasePerformance/FirebasePerformance.h>)
+    #import <FirebasePerformance/FirebasePerformance.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Performance works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>)
+    #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
+    #if !__has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
+      #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+        #warning "FirebaseAnalytics.framework is not included in your target. Please add \
+`Firebase/Analytics` to your Podfile or add FirebaseAnalytics.framework to your project to ensure \
+Firebase Remote Config works as intended."
+      #endif // #ifndef FIREBASE_ANALYTICS_SUPPRESS_WARNING
+    #endif
+  #endif
+
+  #if __has_include(<FirebaseStorage/FirebaseStorage.h>)
+    #import <FirebaseStorage/FirebaseStorage.h>
+  #endif
+
+  #if __has_include(<GoogleMobileAds/GoogleMobileAds.h>)
+    #import <GoogleMobileAds/GoogleMobileAds.h>
+  #endif
+
+  #if __has_include(<Fabric/Fabric.h>)
+    #import <Fabric/Fabric.h>
+  #endif
+
+  #if __has_include(<Crashlytics/Crashlytics.h>)
+    #import <Crashlytics/Crashlytics.h>
+  #endif
+
+#endif  // defined(__has_include)
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
deleted file mode 120000
index e01a43ad4e..0000000000
--- a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRAnalyticsInterop.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
new file mode 100644
index 0000000000..6581b5368d
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInterop.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol FIRAnalyticsInteropListener;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Block typedef callback parameter to getUserPropertiesWithCallback:.
+typedef void (^FIRAInteropUserPropertiesCallback)(NSDictionary<NSString *, id> *userProperties);
+
+/// Connector for bridging communication between Firebase SDKs and FirebaseAnalytics API.
+@protocol FIRAnalyticsInterop
+
+/// Sets user property when trigger event is logged. This API is only available in the SDK.
+- (void)setConditionalUserProperty:(NSDictionary<NSString *, id> *)conditionalUserProperty;
+
+/// Clears user property if set.
+- (void)clearConditionalUserProperty:(NSString *)userPropertyName
+                           forOrigin:(NSString *)origin
+                      clearEventName:(NSString *)clearEventName
+                clearEventParameters:(NSDictionary<NSString *, NSString *> *)clearEventParameters;
+
+/// Returns currently set user properties.
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)conditionalUserProperties:(NSString *)origin
+                                                            propertyNamePrefix:
+                                                                (NSString *)propertyNamePrefix;
+
+/// Returns the maximum number of user properties.
+- (NSInteger)maxUserProperties:(NSString *)origin;
+
+/// Returns the user properties to a callback function.
+- (void)getUserPropertiesWithCallback:(FIRAInteropUserPropertiesCallback)callback;
+
+/// Logs events.
+- (void)logEventWithOrigin:(NSString *)origin
+                      name:(NSString *)name
+                parameters:(nullable NSDictionary<NSString *, id> *)parameters;
+
+/// Sets user property.
+- (void)setUserPropertyWithOrigin:(NSString *)origin name:(NSString *)name value:(id)value;
+
+/// Registers an Analytics listener for the given origin.
+- (void)registerAnalyticsListener:(id<FIRAnalyticsInteropListener>)listener
+                       withOrigin:(NSString *)origin;
+
+/// Unregisters an Analytics listener for the given origin.
+- (void)unregisterAnalyticsListenerWithOrigin:(NSString *)origin;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
deleted file mode 120000
index d3cd09763b..0000000000
--- a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRAnalyticsInteropListener.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
new file mode 100644
index 0000000000..45cde55061
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/// Handles events and messages from Analytics.
+@protocol FIRAnalyticsInteropListener <NSObject>
+
+/// Triggers when an Analytics event happens for the registered origin with
+/// `FIRAnalyticsInterop`s `registerAnalyticsListener:withOrigin:`.
+- (void)messageTriggered:(NSString *)name parameters:(NSDictionary *)parameters;
+
+@end
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropEventNames.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropEventNames.h
deleted file mode 120000
index dbda3ecc96..0000000000
--- a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropEventNames.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRInteropEventNames.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropEventNames.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropEventNames.h
new file mode 100644
index 0000000000..efc54ab221
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropEventNames.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/// @file FIRInteropEventNames.h
+
+#import <Foundation/Foundation.h>
+
+/// Notification open event name.
+static NSString *const kFIRIEventNotificationOpen = @"_no";
+
+/// Notification foreground event name.
+static NSString *const kFIRIEventNotificationForeground = @"_nf";
+
+/// Campaign event name.
+static NSString *const kFIRIEventFirebaseCampaign = @"_cmp";
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropParameterNames.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
deleted file mode 120000
index 51458430df..0000000000
--- a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseAnalyticsInterop/Interop/Analytics/Public/FIRInteropParameterNames.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropParameterNames.h b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
new file mode 100644
index 0000000000..ae440becf8
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Public/FirebaseAnalyticsInterop/FIRInteropParameterNames.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+/// @file FIRInteropParameterNames.h
+///
+/// Predefined event parameter names used by Firebase. This file is a subset of the
+/// FirebaseAnalytics FIRParameterNames.h public header.
+///
+/// The origin of your traffic, such as an Ad network (for example, google) or partner (urban
+/// airship). Identify the advertiser, site, publication, etc. that is sending traffic to your
+/// property. Highly recommended (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterSource : @"InMobi",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRIParameterSource NS_SWIFT_NAME(AnalyticsParameterSource) = @"source";
+
+/// The advertising or marketing medium, for example: cpc, banner, email, push. Highly recommended
+/// (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterMedium : @"email",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRIParameterMedium NS_SWIFT_NAME(AnalyticsParameterMedium) = @"medium";
+
+/// The individual campaign name, slogan, promo code, etc. Some networks have pre-defined macro to
+/// capture campaign information, otherwise can be populated by developer. Highly Recommended
+/// (NSString).
+/// <pre>
+///     NSDictionary *params = @{
+///       kFIRParameterCampaign : @"winter_promotion",
+///       // ...
+///     };
+/// </pre>
+static NSString *const kFIRIParameterCampaign NS_SWIFT_NAME(AnalyticsParameterCampaign) =
+    @"campaign";
+
+/// Message identifier.
+static NSString *const kFIRIParameterMessageIdentifier = @"_nmid";
+
+/// Message name.
+static NSString *const kFIRIParameterMessageName = @"_nmn";
+
+/// Message send time.
+static NSString *const kFIRIParameterMessageTime = @"_nmt";
+
+/// Message device time.
+static NSString *const kFIRIParameterMessageDeviceTime = @"_ndt";
+
+/// Topic message.
+static NSString *const kFIRIParameterTopic = @"_nt";
+
+/// Stores the message_id of the last notification opened by the app.
+static NSString *const kFIRIUserPropertyLastNotification = @"_ln";
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h b/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
deleted file mode 120000
index ce646ecf1d..0000000000
--- a/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseCoreDiagnosticsInterop/Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h b/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
new file mode 100644
index 0000000000..69c40721a2
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/** If present, is a BOOL wrapped in an NSNumber. */
+#define kFIRCDIsDataCollectionDefaultEnabledKey @"FIRCDIsDataCollectionDefaultEnabledKey"
+
+/** If present, is an int32_t wrapped in an NSNumber. */
+#define kFIRCDConfigurationTypeKey @"FIRCDConfigurationTypeKey"
+
+/** If present, is an NSString. */
+#define kFIRCDSdkNameKey @"FIRCDSdkNameKey"
+
+/** If present, is an NSString. */
+#define kFIRCDSdkVersionKey @"FIRCDSdkVersionKey"
+
+/** If present, is an int32_t wrapped in an NSNumber. */
+#define kFIRCDllAppsCountKey @"FIRCDllAppsCountKey"
+
+/** If present, is an NSString. */
+#define kFIRCDGoogleAppIDKey @"FIRCDGoogleAppIDKey"
+
+/** If present, is an NSString. */
+#define kFIRCDBundleIDKey @"FIRCDBundleID"
+
+/** If present, is a BOOL wrapped in an NSNumber. */
+#define kFIRCDUsingOptionsFromDefaultPlistKey @"FIRCDUsingOptionsFromDefaultPlistKey"
+
+/** If present, is an NSString. */
+#define kFIRCDLibraryVersionIDKey @"FIRCDLibraryVersionIDKey"
+
+/** If present, is an NSString. */
+#define kFIRCDFirebaseUserAgentKey @"FIRCDFirebaseUserAgentKey"
+
+/** Defines the interface of a data object needed to log diagnostics data. */
+@protocol FIRCoreDiagnosticsData <NSObject>
+
+@required
+
+/** A dictionary containing data (non-exhaustive) to be logged in diagnostics. */
+@property(nonatomic) NSDictionary<NSString *, id> *diagnosticObjects;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h b/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
deleted file mode 120000
index 07d83d70f4..0000000000
--- a/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../FirebaseCoreDiagnosticsInterop/Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h b/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
new file mode 100644
index 0000000000..2b0eb710cd
--- /dev/null
+++ b/iphone/Maps/Pods/Headers/Public/FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "FIRCoreDiagnosticsData.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/** Allows the interoperation of FirebaseCore and FirebaseCoreDiagnostics. */
+@protocol FIRCoreDiagnosticsInterop <NSObject>
+
+/** Sends the given diagnostics data.
+ *
+ * @param diagnosticsData The diagnostics data object to send.
+ */
++ (void)sendDiagnosticsData:(id<FIRCoreDiagnosticsData>)diagnosticsData;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/iphone/Maps/Pods/Pods.xcodeproj/project.pbxproj b/iphone/Maps/Pods/Pods.xcodeproj/project.pbxproj
index 90d3b93460..ec6c7cc530 100644
--- a/iphone/Maps/Pods/Pods.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Pods/Pods.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
 				00CD3353F1CCC85F6440EB3CCACE84A6 /* PBXTargetDependency */,
 			);
 			name = Firebase;
+			productName = Firebase;
 		};
 		5EB4B0B6DA6D5C0C3365733BEAA1C485 /* FirebaseCoreDiagnosticsInterop */ = {
 			isa = PBXAggregateTarget;
@@ -27,6 +28,7 @@
 			dependencies = (
 			);
 			name = FirebaseCoreDiagnosticsInterop;
+			productName = FirebaseCoreDiagnosticsInterop;
 		};
 		803EF1AFD27445A470912B1033353BFC /* Pushwoosh */ = {
 			isa = PBXAggregateTarget;
@@ -36,6 +38,7 @@
 			dependencies = (
 			);
 			name = Pushwoosh;
+			productName = Pushwoosh;
 		};
 		B0B23938B1EBCBAD2419AB6E9D222A0B /* AppsFlyerFramework */ = {
 			isa = PBXAggregateTarget;
@@ -45,6 +48,7 @@
 			dependencies = (
 			);
 			name = AppsFlyerFramework;
+			productName = AppsFlyerFramework;
 		};
 		B53D977A951AFC38B21751B706C1DF83 /* GoogleAppMeasurement */ = {
 			isa = PBXAggregateTarget;
@@ -56,6 +60,7 @@
 				9AE698479AC7EB0324A264ED96C6CD58 /* PBXTargetDependency */,
 			);
 			name = GoogleAppMeasurement;
+			productName = GoogleAppMeasurement;
 		};
 		C49E7A4D59E5C8BE8DE9FB1EFB150185 /* FirebaseAnalytics */ = {
 			isa = PBXAggregateTarget;
@@ -70,6 +75,7 @@
 				3BC8FD2068D59EEF0A6026C4C145811B /* PBXTargetDependency */,
 			);
 			name = FirebaseAnalytics;
+			productName = FirebaseAnalytics;
 		};
 		D372E53E2E8FEAA06A0439FB85E65767 /* FirebaseAnalyticsInterop */ = {
 			isa = PBXAggregateTarget;
@@ -79,6 +85,7 @@
 			dependencies = (
 			);
 			name = FirebaseAnalyticsInterop;
+			productName = FirebaseAnalyticsInterop;
 		};
 		D53454FBB630479B01CA0A777383E94F /* FBAudienceNetwork */ = {
 			isa = PBXAggregateTarget;
@@ -89,6 +96,7 @@
 				432222FC3724482DA420A70080E77416 /* PBXTargetDependency */,
 			);
 			name = FBAudienceNetwork;
+			productName = FBAudienceNetwork;
 		};
 /* End PBXAggregateTarget section */
 
@@ -689,7 +697,7 @@
 		782F26A35281BD2B4BE360EBB2B4BC83 /* MPMediationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D395969B2EBB5BCA02301809DF7E06 /* MPMediationManager.m */; };
 		7858439C2AAD2B96795D64B5D4232C46 /* FIRHeartbeatInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ACBC2914F93D985326031BE043212AF /* FIRHeartbeatInfo.m */; };
 		785BC8D74AA8D6A5E51608A7A28CB3D5 /* MPMoPubNativeCustomEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D197AA74E37E0B5774E58C0B5A0A0EC /* MPMoPubNativeCustomEvent.m */; };
-		78A928121EAF60C2561F74610A97D7A8 /* Pods-MAPS.ME-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AAD6432F9CBA054F5118361E3C552BC /* Pods-MAPS.ME-dummy.m */; };
+		78A928121EAF60C2561F74610A97D7A8 /* Pods-OMaps-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AAD6432F9CBA054F5118361E3C552BC /* Pods-OMaps-dummy.m */; };
 		78B467E73E736C2F4CF467B6906266F6 /* MPMoPubAdPlacer.h in Headers */ = {isa = PBXBuildFile; fileRef = B1FB82AE1C58472D03C1026460955A64 /* MPMoPubAdPlacer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		78E21609CFE99F2CC126C47E4D6D411A /* GDTCORLifecycle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9817D2EB3DE93156C745A7972CE7F294 /* GDTCORLifecycle.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		795C791BD387D6E5AAE481C01CC376B6 /* MPRateLimitManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 53990A469C3230E8AEB44751E77A30BB /* MPRateLimitManager.m */; };
@@ -1099,7 +1107,7 @@
 		C950851E3F33634EF798AC563B445BB8 /* FIRCLSDataCollectionArbiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 92ECF2597AD03253C6B2BA7DB605A4F3 /* FIRCLSDataCollectionArbiter.m */; };
 		C96572D70A9385094FDE1DDC74272E4F /* FIRCLSUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 669AD6FA3A83718653790465EDDA3027 /* FIRCLSUtility.m */; };
 		C9A74F8683FDE7056600B9EC17EDBE07 /* NSBundle+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B4870C332847015867E0F5AA508FC12 /* NSBundle+MPAdditions.m */; };
-		CA48F24590F676CD28AF58F068002E5A /* Pods-MAPS.ME-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 943F5E0AB0E3CD68128746521DD14872 /* Pods-MAPS.ME-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		CA48F24590F676CD28AF58F068002E5A /* Pods-OMaps-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 943F5E0AB0E3CD68128746521DD14872 /* Pods-OMaps-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CA65A645CE1590FBF6F956A4CB0D4A65 /* FBSDKTestUsersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B2B2FEED99DEC50D3CADC5BEC00D23C /* FBSDKTestUsersManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CA6E16013BE31ABC208DB12C0A16F63D /* FIRCLSURLSession.h in Headers */ = {isa = PBXBuildFile; fileRef = A85B4EF03377E5041F6806362957EE8D /* FIRCLSURLSession.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		CA7D8516D787FACA64D31A6A104C453A /* MPAdTargeting.m in Sources */ = {isa = PBXBuildFile; fileRef = 592F0B11524968DE9F802AF5B916322C /* MPAdTargeting.m */; };
@@ -1841,7 +1849,7 @@
 		06A02E80D1C5D4C73742A796CAAAA880 /* MPClientAdPositioning.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPClientAdPositioning.h; path = MoPubSDK/NativeAds/MPClientAdPositioning.h; sourceTree = "<group>"; };
 		06C2D80F1174A8BD4EF3423D5064D41E /* MPMoPubNativeCustomEvent.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPMoPubNativeCustomEvent.h; path = MoPubSDK/NativeAds/Internal/MPMoPubNativeCustomEvent.h; sourceTree = "<group>"; };
 		06D395969B2EBB5BCA02301809DF7E06 /* MPMediationManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPMediationManager.m; path = MoPubSDK/Internal/MPMediationManager.m; sourceTree = "<group>"; };
-		06FC5C9CF96D60C50FCD47D339C91951 /* nanopb.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = nanopb.framework; path = nanopb.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		06FC5C9CF96D60C50FCD47D339C91951 /* nanopb.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = nanopb.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		075C4DF70B858A5DBD768F5B0923C013 /* FBSDKSuggestedEventsIndexer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKSuggestedEventsIndexer.m; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/SuggestedEvents/FBSDKSuggestedEventsIndexer.m; sourceTree = "<group>"; };
 		0760BDE73BD4B2996E034191239627CD /* mopub-ios-sdk-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "mopub-ios-sdk-umbrella.h"; sourceTree = "<group>"; };
 		0765CB37FBB795F392FE143A06B334AA /* MPDeviceInformation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPDeviceInformation.m; path = MoPubSDK/Internal/MPDeviceInformation.m; sourceTree = "<group>"; };
@@ -1864,7 +1872,7 @@
 		09D25BB92FE35DE365583A0E4F0F33F8 /* FBSDKGateKeeperManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKGateKeeperManager.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/ServerConfiguration/FBSDKGateKeeperManager.m; sourceTree = "<group>"; };
 		09FF2C02EC266B00E1319521BF961022 /* MPNativeAdRendererConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPNativeAdRendererConfiguration.m; path = MoPubSDK/NativeAds/MPNativeAdRendererConfiguration.m; sourceTree = "<group>"; };
 		0A3E9520A2E59D655D6BC500A9C6E772 /* FBSDKMeasurementEvent_Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKMeasurementEvent_Internal.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKMeasurementEvent_Internal.h; sourceTree = "<group>"; };
-		0A8924B6305C5116EA8035AE891818F6 /* MoPub.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MoPub.framework; path = "mopub-ios-sdk.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		0A8924B6305C5116EA8035AE891818F6 /* MoPub.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MoPub.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0A91470A56EC81F0DFB8596B4AF9E7F1 /* MPConsentError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPConsentError.h; path = MoPubSDK/MPConsentError.h; sourceTree = "<group>"; };
 		0A9A74A3715738F017D71D5DB5E217B1 /* FBAudienceNetwork.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBAudienceNetwork.h; path = Static/FBAudienceNetwork.framework/Headers/FBAudienceNetwork.h; sourceTree = "<group>"; };
 		0ADCE169C2DFDCDA84BAF06B7A69AF17 /* GULNSData+zlib.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "GULNSData+zlib.m"; path = "GoogleUtilities/NSData+zlib/GULNSData+zlib.m"; sourceTree = "<group>"; };
@@ -1906,7 +1914,7 @@
 		12B3ACF35A72BD37FA4087EA336D4FC4 /* MPCoreInstanceProvider+MRAID.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "MPCoreInstanceProvider+MRAID.m"; path = "MoPubSDK/Internal/MPCoreInstanceProvider+MRAID.m"; sourceTree = "<group>"; };
 		1320DC94A7C81519A9ED20DDDC21D335 /* FIRAnalyticsConnector.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FIRAnalyticsConnector.framework; path = Frameworks/FIRAnalyticsConnector.framework; sourceTree = "<group>"; };
 		13A3DFF61BC403AAA3457FFF182AD5AC /* GULMutableDictionary.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GULMutableDictionary.h; path = GoogleUtilities/Network/Private/GULMutableDictionary.h; sourceTree = "<group>"; };
-		13C8C8B254851998F9289F71229B28A2 /* FirebaseInstallations.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FirebaseInstallations.framework; path = FirebaseInstallations.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		13C8C8B254851998F9289F71229B28A2 /* FirebaseInstallations.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseInstallations.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		14B33C6D455B374BFF40F79724EF1BC7 /* FBSDKKeychainStore.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKKeychainStore.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/TokenCaching/FBSDKKeychainStore.m; sourceTree = "<group>"; };
 		14E1D9B307BB8EF1F04A6423DA930C64 /* FBSDKError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKError.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKError.m; sourceTree = "<group>"; };
 		150923DBB7459F1982ECE83658A4FAC2 /* MPTableViewAdPlacer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPTableViewAdPlacer.m; path = MoPubSDK/NativeAds/MPTableViewAdPlacer.m; sourceTree = "<group>"; };
@@ -1978,7 +1986,7 @@
 		2073E072928D199F39A9FACF21274996 /* MPViewabilityOption.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPViewabilityOption.h; path = MoPubSDK/Viewability/MPViewabilityOption.h; sourceTree = "<group>"; };
 		209C35E1539CC5A6EBA80687B13EA2B3 /* FBSDKGraphRequest+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBSDKGraphRequest+Internal.h"; path = "FBSDKCoreKit/FBSDKCoreKit/Internal/Network/FBSDKGraphRequest+Internal.h"; sourceTree = "<group>"; };
 		20AFCAFAC86972789130D5D28C54E8F0 /* MPViewabilityAdapterAvid.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPViewabilityAdapterAvid.h; path = MoPubSDK/Viewability/Avid/MPViewabilityAdapterAvid.h; sourceTree = "<group>"; };
-		20C31D59DA82361E25F193FABD96B204 /* Pods-MAPS.ME-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MAPS.ME-acknowledgements.plist"; sourceTree = "<group>"; };
+		20C31D59DA82361E25F193FABD96B204 /* Pods-OMaps-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-OMaps-acknowledgements.plist"; sourceTree = "<group>"; };
 		20CDED04B8DBFC354C29EB239CA8F428 /* MRNativeCommandHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MRNativeCommandHandler.m; path = MoPubSDK/Internal/MRAID/MRNativeCommandHandler.m; sourceTree = "<group>"; };
 		211919002F2CA7D396CAD0FF8546330F /* FBLPromise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBLPromise.m; path = Sources/FBLPromises/FBLPromise.m; sourceTree = "<group>"; };
 		21BBC982F0017CA55E853ADE08BA2075 /* MOPUBExperimentProvider.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MOPUBExperimentProvider.h; path = MoPubSDK/Internal/Utility/MOPUBExperimentProvider.h; sourceTree = "<group>"; };
@@ -2004,7 +2012,7 @@
 		255544BB8527817AE5EBE5D395FA2277 /* FBSDKTypeUtility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKTypeUtility.h; path = FBSDKCoreKit/FBSDKCoreKit/Basics/Internal/FBSDKTypeUtility.h; sourceTree = "<group>"; };
 		257B2EA361B5A5232CF9ADF913D995BE /* MPVASTInterstitialCustomEvent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPVASTInterstitialCustomEvent.m; path = MoPubSDK/Internal/MPVASTInterstitialCustomEvent.m; sourceTree = "<group>"; };
 		25872DB607DB8C1D6F26B4E9B348EE02 /* MPVideoPlayerView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPVideoPlayerView.h; path = MoPubSDK/Internal/VideoPlayer/MPVideoPlayerView.h; sourceTree = "<group>"; };
-		25B285412D70A03CD380C90DC1635FCD /* FIRCLSProfiling.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSProfiling.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.c; sourceTree = "<group>"; };
+		25B285412D70A03CD380C90DC1635FCD /* FIRCLSProfiling.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSProfiling.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.c; sourceTree = "<group>"; };
 		25B6D7F61EA5FA07F49D1E699DFC441F /* FBAdExtraHint.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBAdExtraHint.h; path = Static/FBAudienceNetwork.framework/Headers/FBAdExtraHint.h; sourceTree = "<group>"; };
 		25F820A8C7B3348E9C6A787AAEA9A069 /* FBNativeBannerAd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBNativeBannerAd.h; path = Static/FBAudienceNetwork.framework/Headers/FBNativeBannerAd.h; sourceTree = "<group>"; };
 		2613A58B6E7EDEF087018D8366169C3D /* FIRInstallationsAuthTokenResult.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRInstallationsAuthTokenResult.m; path = FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResult.m; sourceTree = "<group>"; };
@@ -2025,7 +2033,7 @@
 		284F3FFEDAD59D2F26C9A2AFA013AFA8 /* FBSDKAppLinkReturnToRefererController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKAppLinkReturnToRefererController.h; path = FBSDKCoreKit/FBSDKCoreKit/AppLink/FBSDKAppLinkReturnToRefererController.h; sourceTree = "<group>"; };
 		288EDF2F9D05AB94498FFAC8FE4F6DA3 /* FBSDKSmartDeviceDialogView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKSmartDeviceDialogView.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/Device/FBSDKSmartDeviceDialogView.m; sourceTree = "<group>"; };
 		289B33331AB4638DFCA3183C947B8B5C /* FIRAValue.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRAValue.h; path = Crashlytics/Crashlytics/Helpers/FIRAValue.h; sourceTree = "<group>"; };
-		28DD99903B12F6E2D89F23CFC532D07C /* FBSDKEventInferencer.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = FBSDKEventInferencer.mm; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/SuggestedEvents/FBSDKEventInferencer.mm; sourceTree = "<group>"; };
+		28DD99903B12F6E2D89F23CFC532D07C /* FBSDKEventInferencer.mm */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.objcpp; name = FBSDKEventInferencer.mm; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/SuggestedEvents/FBSDKEventInferencer.mm; sourceTree = "<group>"; };
 		28FA8E076B3803FC0698F0981339450F /* MPNativeAdRendering.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativeAdRendering.h; path = MoPubSDK/NativeAds/MPNativeAdRendering.h; sourceTree = "<group>"; };
 		291F3C6744C3D0D00FFCDB17202EFA35 /* MPStreamAdPlacerDelegate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPStreamAdPlacerDelegate.h; path = MoPubSDK/NativeAds/Internal/MPStreamAdPlacerDelegate.h; sourceTree = "<group>"; };
 		291F84318AAFF66696583D3C33938B0C /* GoogleDataTransport-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "GoogleDataTransport-umbrella.h"; sourceTree = "<group>"; };
@@ -2092,12 +2100,12 @@
 		314EA77948709322D61FDC3575D424E6 /* FIRInstallationsErrorUtil.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRInstallationsErrorUtil.m; path = FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.m; sourceTree = "<group>"; };
 		318FA1796E5735FD567BDA02BEBC70CF /* GDTCORTransformer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GDTCORTransformer.h; path = GoogleDataTransport/GDTCORLibrary/Private/GDTCORTransformer.h; sourceTree = "<group>"; };
 		31B8E32F09C1F35A17ECED05EA3E86A4 /* FBSDKLoginManagerLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKLoginManagerLogger.m; path = FBSDKLoginKit/FBSDKLoginKit/Internal/FBSDKLoginManagerLogger.m; sourceTree = "<group>"; };
-		31C596999512C76A20CD0BAD735E6110 /* MoPub_FacebookAudienceNetwork_Adapters.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MoPub_FacebookAudienceNetwork_Adapters.framework; path = "MoPub-FacebookAudienceNetwork-Adapters.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		31C596999512C76A20CD0BAD735E6110 /* MoPub_FacebookAudienceNetwork_Adapters.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MoPub_FacebookAudienceNetwork_Adapters.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		322BE1BD10E9877A5A6E2D3B39EA1C9A /* GULReachabilityChecker+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "GULReachabilityChecker+Internal.h"; path = "GoogleUtilities/Reachability/GULReachabilityChecker+Internal.h"; sourceTree = "<group>"; };
 		326871F700D630BC7DADFB958059DE48 /* FirebaseAnalyticsInterop.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = FirebaseAnalyticsInterop.debug.xcconfig; sourceTree = "<group>"; };
 		32ADF318F72F7017909E357D87E107FB /* MPPlayBtn@2x.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = "MPPlayBtn@2x.png"; path = "MoPubSDK/Resources/MPPlayBtn@2x.png"; sourceTree = "<group>"; };
 		32F90A5B39692428C34E3AF072FD8EA2 /* FIRCLSProfiling.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSProfiling.h; path = Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.h; sourceTree = "<group>"; };
-		3347A1AB6546F0A3977529B8F199DC41 /* FBLPromises.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FBLPromises.framework; path = PromisesObjC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		3347A1AB6546F0A3977529B8F199DC41 /* FBLPromises.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBLPromises.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3355824F72E69EE67BE5F63F7E87F659 /* FIRCLSURLSessionDataTask.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSURLSessionDataTask.h; path = Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.h; sourceTree = "<group>"; };
 		33616668082F3F26DE0CE5DF7426B9BF /* FIRComponentType.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRComponentType.m; path = FirebaseCore/Sources/FIRComponentType.m; sourceTree = "<group>"; };
 		3371B68B59A8A529EA0CAC88634B8CE3 /* FIRCLSdSYM.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSdSYM.m; path = Crashlytics/Shared/FIRCLSMachO/FIRCLSdSYM.m; sourceTree = "<group>"; };
@@ -2156,7 +2164,7 @@
 		3B0B28689101CE72329205323E16E5A7 /* FBSDKServerConfigurationManager+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBSDKServerConfigurationManager+Internal.h"; path = "FBSDKCoreKit/FBSDKCoreKit/Internal/ServerConfiguration/FBSDKServerConfigurationManager+Internal.h"; sourceTree = "<group>"; };
 		3B153F58CB062A9E3D9A640C518D4F9C /* FIROptions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIROptions.m; path = FirebaseCore/Sources/FIROptions.m; sourceTree = "<group>"; };
 		3B1F9758C6825FC17878A284A83F9DC6 /* MPNativeAds.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativeAds.h; path = MoPubSDK/NativeAds/MPNativeAds.h; sourceTree = "<group>"; };
-		3B31EE81E09044637137D15261EB3E0C /* FIRCLSMachException.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSMachException.c; path = Crashlytics/Crashlytics/Handlers/FIRCLSMachException.c; sourceTree = "<group>"; };
+		3B31EE81E09044637137D15261EB3E0C /* FIRCLSMachException.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSMachException.c; path = Crashlytics/Crashlytics/Handlers/FIRCLSMachException.c; sourceTree = "<group>"; };
 		3B3965F2BF5CFBC6A077C1220BA1E7AB /* FBSDKLoginConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKLoginConstants.h; path = FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginConstants.h; sourceTree = "<group>"; };
 		3B792C7CD1317917125C2EB53EC15E4C /* MPNativeAdConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativeAdConstants.h; path = MoPubSDK/NativeAds/MPNativeAdConstants.h; sourceTree = "<group>"; };
 		3B87B8633CBD396D005FFB65A57525C7 /* MPIdentityProvider.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPIdentityProvider.m; path = MoPubSDK/Internal/Utility/MPIdentityProvider.m; sourceTree = "<group>"; };
@@ -2185,7 +2193,7 @@
 		402AC9B1720B22AEE526DCE4416CD7F8 /* FBSDKErrorConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKErrorConfiguration.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/ServerConfiguration/FBSDKErrorConfiguration.m; sourceTree = "<group>"; };
 		405EB80FC7B0EFEED5832D9846EB2134 /* FBNativeAdTableViewAdProvider.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBNativeAdTableViewAdProvider.h; path = Static/FBAudienceNetwork.framework/Headers/FBNativeAdTableViewAdProvider.h; sourceTree = "<group>"; };
 		407C425811C1E07AC1387FF972170846 /* MPConsentManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPConsentManager.h; path = MoPubSDK/Internal/MPConsentManager.h; sourceTree = "<group>"; };
-		40F694279899D5DE08A1D633DAFE496B /* Flurry_iOS_SDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Flurry_iOS_SDK.framework; path = "Flurry-iOS-SDK.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		40F694279899D5DE08A1D633DAFE496B /* Flurry_iOS_SDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Flurry_iOS_SDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		40FD2249472D8F7C8C8A6ACE137A1537 /* GDTCOREvent+GDTCCTSupport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "GDTCOREvent+GDTCCTSupport.h"; path = "GoogleDataTransportCCTSupport/GDTCCTLibrary/Public/GDTCOREvent+GDTCCTSupport.h"; sourceTree = "<group>"; };
 		41428B555BFE4B749A371517A2A41FE3 /* FBSDKCoreKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "FBSDKCoreKit-prefix.pch"; sourceTree = "<group>"; };
 		4143B3D7FE43215066031B5F2FFA889E /* FIRInstallationsAuthTokenResultInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRInstallationsAuthTokenResultInternal.h; path = FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResultInternal.h; sourceTree = "<group>"; };
@@ -2234,7 +2242,7 @@
 		491287D06568031D2A46A13935EEB89E /* MoPub_AvidVideoPlaybackListener.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MoPub_AvidVideoPlaybackListener.h; path = MoPubSDK/Viewability/Avid/MoPub_AvidVideoPlaybackListener.h; sourceTree = "<group>"; };
 		4920541557733F272A7C6FEACBA3CF69 /* MPHTTPNetworkTaskData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPHTTPNetworkTaskData.h; path = MoPubSDK/Internal/MPHTTPNetworkTaskData.h; sourceTree = "<group>"; };
 		494668B5491A9BAA3C74B35D973D9CA7 /* MPActivityViewControllerHelper+TweetShare.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "MPActivityViewControllerHelper+TweetShare.h"; path = "MoPubSDK/Internal/Common/MPActivityViewControllerHelper+TweetShare.h"; sourceTree = "<group>"; };
-		498A16D85D9C972689BF42A44AABE26F /* Pods-MAPS.ME.production full.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MAPS.ME.production full.xcconfig"; sourceTree = "<group>"; };
+		498A16D85D9C972689BF42A44AABE26F /* Pods-OMaps.production full.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OMaps.production full.xcconfig"; sourceTree = "<group>"; };
 		49C70AA3C1EB95B8108211A9474D4663 /* FIRCLSURLSessionDataTask.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSURLSessionDataTask.m; path = Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.m; sourceTree = "<group>"; };
 		4A3633CD85491A5F14C3E1F3813FE6A1 /* FBSDKBridgeAPIProtocolWebV1.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKBridgeAPIProtocolWebV1.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/BridgeAPI/ProtocolVersions/FBSDKBridgeAPIProtocolWebV1.h; sourceTree = "<group>"; };
 		4A95F89D46A4178EE091F54A96F44043 /* FIRInstallationsLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRInstallationsLogger.m; path = FirebaseInstallations/Source/Library/FIRInstallationsLogger.m; sourceTree = "<group>"; };
@@ -2316,7 +2324,7 @@
 		587FFBBCD6BB553F69A0F31CB108E118 /* FIRAppInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRAppInternal.h; path = FirebaseCore/Sources/Private/FIRAppInternal.h; sourceTree = "<group>"; };
 		58BD567248F13BB3EB88E1498E94CC54 /* Firebase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Firebase.h; path = CoreOnly/Sources/Firebase.h; sourceTree = "<group>"; };
 		592F0B11524968DE9F802AF5B916322C /* MPAdTargeting.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPAdTargeting.m; path = MoPubSDK/MPAdTargeting.m; sourceTree = "<group>"; };
-		59337EB6923721D465B4B5D0661F7FC5 /* FIRCLSException.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSException.mm; path = Crashlytics/Crashlytics/Handlers/FIRCLSException.mm; sourceTree = "<group>"; };
+		59337EB6923721D465B4B5D0661F7FC5 /* FIRCLSException.mm */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.objcpp; name = FIRCLSException.mm; path = Crashlytics/Crashlytics/Handlers/FIRCLSException.mm; sourceTree = "<group>"; };
 		59348EE35CEBB5A1D8B458C9D66037B5 /* MPAdapters.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = MPAdapters.plist; path = MoPubSDK/Resources/MPAdapters.plist; sourceTree = "<group>"; };
 		5955C4A26A288B10A125F3C4AB75B270 /* MPVASTLinearAd.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPVASTLinearAd.m; path = MoPubSDK/Internal/VAST/MPVASTLinearAd.m; sourceTree = "<group>"; };
 		5961AFE7F12DFDE4DCF45FBD00A23ED0 /* GDTCORConsoleLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GDTCORConsoleLogger.h; path = GoogleDataTransport/GDTCORLibrary/Public/GDTCORConsoleLogger.h; sourceTree = "<group>"; };
@@ -2341,7 +2349,7 @@
 		5D42B77EE4F038D68606FA53FEFB9FED /* MRBridge.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MRBridge.h; path = MoPubSDK/Internal/MRAID/MRBridge.h; sourceTree = "<group>"; };
 		5D56CC1FFF1A7F8222942B0A4FDF686C /* FIRInstallationsErrorUtil.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRInstallationsErrorUtil.h; path = FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.h; sourceTree = "<group>"; };
 		5DB346B4071FC4461222A71CCA838C98 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/SafariServices.framework; sourceTree = DEVELOPER_DIR; };
-		5DE0FEFC3995E740EC1AE2611D0AEFB0 /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FBSDKLoginKit.framework; path = FBSDKLoginKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		5DE0FEFC3995E740EC1AE2611D0AEFB0 /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBSDKLoginKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5DEA59C4C687E3786486C449221FC752 /* FBSDKLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKLogger.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKLogger.m; sourceTree = "<group>"; };
 		5E382684BEE5094909BC60FB7F604CB0 /* MOPUBPlayerViewController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MOPUBPlayerViewController.m; path = MoPubSDK/NativeVideo/Internal/MOPUBPlayerViewController.m; sourceTree = "<group>"; };
 		5E45B05D98A6DB306C0F1D991C952478 /* MPStreamAdPlacer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPStreamAdPlacer.m; path = MoPubSDK/NativeAds/MPStreamAdPlacer.m; sourceTree = "<group>"; };
@@ -2394,7 +2402,7 @@
 		68692631D9BCCC58D8F4E29423BE3DAA /* MOPUBNativeVideoCustomEvent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MOPUBNativeVideoCustomEvent.m; path = MoPubSDK/NativeVideo/Internal/MOPUBNativeVideoCustomEvent.m; sourceTree = "<group>"; };
 		689B71909B44C6D315ED26255530370F /* MPCoreInstanceProvider.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPCoreInstanceProvider.h; path = MoPubSDK/Internal/MPCoreInstanceProvider.h; sourceTree = "<group>"; };
 		69347F26F6C2E168061FAB817E6FC305 /* GDTCORUploadCoordinator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GDTCORUploadCoordinator.h; path = GoogleDataTransport/GDTCORLibrary/Private/GDTCORUploadCoordinator.h; sourceTree = "<group>"; };
-		6942351307BC1F54575D9853307EAE0E /* GoogleDataTransportCCTSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = GoogleDataTransportCCTSupport.framework; path = GoogleDataTransportCCTSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		6942351307BC1F54575D9853307EAE0E /* GoogleDataTransportCCTSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GoogleDataTransportCCTSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6945279D2D882103A3A94BD9DF69667F /* FBSDKDeviceLoginManagerResult.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKDeviceLoginManagerResult.m; path = FBSDKLoginKit/FBSDKLoginKit/FBSDKDeviceLoginManagerResult.m; sourceTree = "<group>"; };
 		69B5B729970BF657D0395816C451C10E /* MPHTMLBannerCustomEvent.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPHTMLBannerCustomEvent.h; path = MoPubSDK/Internal/HTML/MPHTMLBannerCustomEvent.h; sourceTree = "<group>"; };
 		6A20379BC83A1E59449FC898243F5839 /* pb.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = pb.h; sourceTree = "<group>"; };
@@ -2408,7 +2416,7 @@
 		6ACBC2914F93D985326031BE043212AF /* FIRHeartbeatInfo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRHeartbeatInfo.m; path = FirebaseCore/Sources/FIRHeartbeatInfo.m; sourceTree = "<group>"; };
 		6ADDB4B80415BC5DEB5B94D09C91A74E /* FBSDKCoreKit+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBSDKCoreKit+Internal.h"; path = "FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKCoreKit+Internal.h"; sourceTree = "<group>"; };
 		6AED6248B672A00E0A269F9229742629 /* FBSDKSettings.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKSettings.m; path = FBSDKCoreKit/FBSDKCoreKit/FBSDKSettings.m; sourceTree = "<group>"; };
-		6AF16A2ABB4371388376FD7A7A89A628 /* pb_encode.c */ = {isa = PBXFileReference; includeInIndex = 1; path = pb_encode.c; sourceTree = "<group>"; };
+		6AF16A2ABB4371388376FD7A7A89A628 /* pb_encode.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; path = pb_encode.c; sourceTree = "<group>"; };
 		6B09EC9CBB78F317C0E7C884C6159B17 /* MPAdPositioning.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPAdPositioning.m; path = MoPubSDK/NativeAds/MPAdPositioning.m; sourceTree = "<group>"; };
 		6B1B828DE96AA5636DB040F928FCF93F /* MPBannerAdManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPBannerAdManager.h; path = MoPubSDK/Internal/Banners/MPBannerAdManager.h; sourceTree = "<group>"; };
 		6B9D33C5E8A0E9DA583CB234D92CC884 /* MPConsoleLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPConsoleLogger.h; path = MoPubSDK/Logging/Internal/MPConsoleLogger.h; sourceTree = "<group>"; };
@@ -2444,7 +2452,7 @@
 		709EFBD2F6AE1737C22A904822B4426B /* MPNativeAdError+VAST.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "MPNativeAdError+VAST.m"; path = "MoPubSDK/NativeAds/Internal/Categories/MPNativeAdError+VAST.m"; sourceTree = "<group>"; };
 		70EE066314FB3E6E83F20C89E6142B1A /* FBSDKViewHierarchyMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKViewHierarchyMacros.h; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/ViewHierarchy/FBSDKViewHierarchyMacros.h; sourceTree = "<group>"; };
 		7130D7140C6FE9C846F6C6FAA911B28B /* GULOriginalIMPConvenienceMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GULOriginalIMPConvenienceMacros.h; path = GoogleUtilities/MethodSwizzler/Private/GULOriginalIMPConvenienceMacros.h; sourceTree = "<group>"; };
-		7143E7FF82AB93597DAF450A09C3B3B6 /* FIRCLSUnwind.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSUnwind.c; path = Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.c; sourceTree = "<group>"; };
+		7143E7FF82AB93597DAF450A09C3B3B6 /* FIRCLSUnwind.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSUnwind.c; path = Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.c; sourceTree = "<group>"; };
 		71616735BFAD1A7AE7425B7AE9F8E829 /* FBSDKRestrictiveDataFilterManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKRestrictiveDataFilterManager.m; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/RestrictiveDataFilter/FBSDKRestrictiveDataFilterManager.m; sourceTree = "<group>"; };
 		716BAF382C88FD1CF7FB0F74354FA0FA /* MPNativeAdRendererSettings.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativeAdRendererSettings.h; path = MoPubSDK/NativeAds/MPNativeAdRendererSettings.h; sourceTree = "<group>"; };
 		71F6DE3BF109FD746859A8C9A008D5C1 /* MPBannerCustomEvent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPBannerCustomEvent.m; path = MoPubSDK/MPBannerCustomEvent.m; sourceTree = "<group>"; };
@@ -2472,7 +2480,7 @@
 		768F2B19754A0B02399D291945BDC419 /* FBSDKDeviceRequestsHelper.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKDeviceRequestsHelper.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKDeviceRequestsHelper.m; sourceTree = "<group>"; };
 		76AB238FB89EFE9FDF32EA3ECF97DD1D /* MPProgressOverlayView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPProgressOverlayView.m; path = MoPubSDK/Internal/Common/MPProgressOverlayView.m; sourceTree = "<group>"; };
 		76F3716DBD1D1B498123462FC4113A9A /* GoogleDataTransportCCTSupport-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "GoogleDataTransportCCTSupport-dummy.m"; sourceTree = "<group>"; };
-		7727D060E029691BBC6B6FAD2C9823F2 /* FIRCLSUnwind_x86.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSUnwind_x86.c; path = Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_x86.c; sourceTree = "<group>"; };
+		7727D060E029691BBC6B6FAD2C9823F2 /* FIRCLSUnwind_x86.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSUnwind_x86.c; path = Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_x86.c; sourceTree = "<group>"; };
 		7760A0AF86664FC43E6E281136FC37A0 /* FBSDKDeviceLoginCodeInfo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKDeviceLoginCodeInfo.h; path = FBSDKLoginKit/FBSDKLoginKit/FBSDKDeviceLoginCodeInfo.h; sourceTree = "<group>"; };
 		7772258312F8FFBC37B1701CF91A67C4 /* MRAID.bundle */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "wrapper.plug-in"; name = MRAID.bundle; path = MoPubSDK/Resources/MRAID.bundle; sourceTree = "<group>"; };
 		779B708F23B2347E6B64C56B472C4A68 /* FBSDKAppLinkTarget.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKAppLinkTarget.m; path = FBSDKCoreKit/FBSDKCoreKit/AppLink/FBSDKAppLinkTarget.m; sourceTree = "<group>"; };
@@ -2528,12 +2536,12 @@
 		8421B78D82345C3C2218415460154209 /* MRVideoPlayerManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MRVideoPlayerManager.h; path = MoPubSDK/Internal/MRAID/MRVideoPlayerManager.h; sourceTree = "<group>"; };
 		847E2A1299B889745B7CDA61402E6461 /* NSJSONSerialization+MPAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSJSONSerialization+MPAdditions.h"; path = "MoPubSDK/Internal/Utility/Categories/NSJSONSerialization+MPAdditions.h"; sourceTree = "<group>"; };
 		854DA4404AE05EA8E1C798964EABE112 /* FBNativeAdCollectionViewAdProvider.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBNativeAdCollectionViewAdProvider.h; path = Static/FBAudienceNetwork.framework/Headers/FBNativeAdCollectionViewAdProvider.h; sourceTree = "<group>"; };
-		856B5CD56F194FAD26EA91620B66D614 /* GoogleDataTransport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = GoogleDataTransport.framework; path = GoogleDataTransport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		856B5CD56F194FAD26EA91620B66D614 /* GoogleDataTransport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GoogleDataTransport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		85788E3AF5206F9CDD220BE81B99858C /* GoogleUtilities.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = GoogleUtilities.release.xcconfig; sourceTree = "<group>"; };
 		85F31C39518A8353AF0A3D64ED99CA1F /* FIRCLSCodeMapping.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSCodeMapping.h; path = Crashlytics/Shared/FIRCLSMachO/FIRCLSCodeMapping.h; sourceTree = "<group>"; };
 		85F3D4B1175DCF84CDF42C580CB4751F /* MPUBMoatMobileAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MPUBMoatMobileAppKit.framework; path = MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework; sourceTree = "<group>"; };
 		862AFAFFF836A0DB4276C126500CD3DE /* FIRErrors.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRErrors.m; path = FirebaseCore/Sources/FIRErrors.m; sourceTree = "<group>"; };
-		86375444C196BA272DDBB8165BF64A15 /* FirebaseCrashlytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FirebaseCrashlytics.framework; path = FirebaseCrashlytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		86375444C196BA272DDBB8165BF64A15 /* FirebaseCrashlytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseCrashlytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		867272EE107E76CFD51171F4E3EA86D5 /* FlurryCCPA.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FlurryCCPA.h; path = Flurry/FlurryCCPA.h; sourceTree = "<group>"; };
 		868363752B05CDFC7CB160C8F72458F5 /* MPClosableView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPClosableView.h; path = MoPubSDK/Internal/Common/MPClosableView.h; sourceTree = "<group>"; };
 		868BDF2301867D3D7F4568E953FE247A /* FBInstreamAdView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBInstreamAdView.h; path = Static/FBAudienceNetwork.framework/Headers/FBInstreamAdView.h; sourceTree = "<group>"; };
@@ -2564,7 +2572,7 @@
 		8BAD6768EC338FEE7F2E5FE8D78BEBE6 /* FIRCLSFeatures.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSFeatures.h; path = Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h; sourceTree = "<group>"; };
 		8BF86487A25C13CE6346CEC05715438E /* FBSDKSuggestedEventsIndexer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKSuggestedEventsIndexer.h; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/SuggestedEvents/FBSDKSuggestedEventsIndexer.h; sourceTree = "<group>"; };
 		8C9122611C5B3FE38B61F8E45EF2796E /* FBSDKModelUtility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKModelUtility.h; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/ML/FBSDKModelUtility.h; sourceTree = "<group>"; };
-		8CC9178C366942FD6FF6A115604EAD58 /* FirebaseCoreDiagnostics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FirebaseCoreDiagnostics.framework; path = FirebaseCoreDiagnostics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		8CC9178C366942FD6FF6A115604EAD58 /* FirebaseCoreDiagnostics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseCoreDiagnostics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D01C3C7238B2B2AD7B2A2AB9A7959E2 /* FIRCLSByteUtility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSByteUtility.h; path = Crashlytics/Shared/FIRCLSByteUtility.h; sourceTree = "<group>"; };
 		8D88B2688188E9D2DCFEB9F0DC0479CA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		8DCFFA7C353E76CC942338CCB28CCBD4 /* GULMutableDictionary.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GULMutableDictionary.m; path = GoogleUtilities/Network/GULMutableDictionary.m; sourceTree = "<group>"; };
@@ -2580,7 +2588,7 @@
 		8EADE5B5D8A27D9F974F8D699786A2A3 /* FIRCLSUserLogging.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSUserLogging.m; path = Crashlytics/Crashlytics/Components/FIRCLSUserLogging.m; sourceTree = "<group>"; };
 		8EC73343422232DBD4799D037B603602 /* FBSDKBridgeAPIProtocolWebV2.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKBridgeAPIProtocolWebV2.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/BridgeAPI/ProtocolVersions/FBSDKBridgeAPIProtocolWebV2.h; sourceTree = "<group>"; };
 		8EEA667CCD226FB95A7F36320AD4B4F4 /* MPCountdownTimerView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPCountdownTimerView.h; path = MoPubSDK/Internal/Common/MPCountdownTimerView.h; sourceTree = "<group>"; };
-		8EEA761BA7B8496BB63A2A3F938E7559 /* FIRCLSDemangleOperation.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSDemangleOperation.mm; path = Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSDemangleOperation.mm; sourceTree = "<group>"; };
+		8EEA761BA7B8496BB63A2A3F938E7559 /* FIRCLSDemangleOperation.mm */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.objcpp; name = FIRCLSDemangleOperation.mm; path = Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSDemangleOperation.mm; sourceTree = "<group>"; };
 		8EED7D2A5C8ACBB64FE0F34920A94153 /* FBSDKCodelessParameterComponent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKCodelessParameterComponent.m; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/Codeless/FBSDKCodelessParameterComponent.m; sourceTree = "<group>"; };
 		8F37D0042C941293047BDBFD25E23093 /* FBSDKBase64.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKBase64.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/Base64/FBSDKBase64.m; sourceTree = "<group>"; };
 		8F4C6B7F9F945BCDC1D2570556941C73 /* MPInterstitialAdManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPInterstitialAdManager.h; path = MoPubSDK/Internal/Interstitials/MPInterstitialAdManager.h; sourceTree = "<group>"; };
@@ -2590,9 +2598,9 @@
 		8F8470B349C63A52E3D8CF767119A42F /* FBSDKCloseIcon.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKCloseIcon.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/UI/FBSDKCloseIcon.h; sourceTree = "<group>"; };
 		8FDCD270C1EDEAC680200680C4488FCB /* FBSDKGraphRequestPiggybackManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKGraphRequestPiggybackManager.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/Network/FBSDKGraphRequestPiggybackManager.h; sourceTree = "<group>"; };
 		8FEBC6B2AD39E86085910EAB5418385F /* FIRCLSMachOBinary.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSMachOBinary.m; path = Crashlytics/Shared/FIRCLSMachO/FIRCLSMachOBinary.m; sourceTree = "<group>"; };
-		90429778259497EBA2033D42CA835743 /* Pods-MAPS.ME-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MAPS.ME-frameworks.sh"; sourceTree = "<group>"; };
+		90429778259497EBA2033D42CA835743 /* Pods-OMaps-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-OMaps-frameworks.sh"; sourceTree = "<group>"; };
 		9044B3A077CAC1211E46CA82B02DC0E5 /* MPVASTCompanionAd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPVASTCompanionAd.h; path = MoPubSDK/Internal/VAST/MPVASTCompanionAd.h; sourceTree = "<group>"; };
-		9085B8A32AFF10675A22486994BEAC12 /* Pods-MAPS.ME.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MAPS.ME.release.xcconfig"; sourceTree = "<group>"; };
+		9085B8A32AFF10675A22486994BEAC12 /* Pods-OMaps.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OMaps.release.xcconfig"; sourceTree = "<group>"; };
 		90EC9A4F17BBFBBDEF89853FD9138867 /* GULNetworkURLSession.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GULNetworkURLSession.m; path = GoogleUtilities/Network/GULNetworkURLSession.m; sourceTree = "<group>"; };
 		91459713F98CBE00E4F4A06EAD82FCAB /* MPRealTimeTimer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPRealTimeTimer.h; path = MoPubSDK/Internal/Common/MPRealTimeTimer.h; sourceTree = "<group>"; };
 		918CD1D8B2B01E16F21B8DCA07123528 /* GULNetworkMessageCode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GULNetworkMessageCode.h; path = GoogleUtilities/Network/Private/GULNetworkMessageCode.h; sourceTree = "<group>"; };
@@ -2616,13 +2624,13 @@
 		93789485924BEE4E63DE79D583C39B1F /* MPTableViewAdPlacerCell.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPTableViewAdPlacerCell.h; path = MoPubSDK/NativeAds/Internal/MPTableViewAdPlacerCell.h; sourceTree = "<group>"; };
 		9396B8263A1F8670989ED2DAEF4ECFA8 /* MPNativeAdAdapter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativeAdAdapter.h; path = MoPubSDK/NativeAds/MPNativeAdAdapter.h; sourceTree = "<group>"; };
 		93A82CC75292560D9B3BC49CCA5EB6AC /* FIRInteropEventNames.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRInteropEventNames.h; path = Interop/Analytics/Public/FIRInteropEventNames.h; sourceTree = "<group>"; };
-		93B3198F5C2C4103AB18153B0A491FA8 /* FBSDKAddressInferencer.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = FBSDKAddressInferencer.mm; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/RestrictiveDataFilter/FBSDKAddressInferencer.mm; sourceTree = "<group>"; };
+		93B3198F5C2C4103AB18153B0A491FA8 /* FBSDKAddressInferencer.mm */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.objcpp; name = FBSDKAddressInferencer.mm; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/RestrictiveDataFilter/FBSDKAddressInferencer.mm; sourceTree = "<group>"; };
 		93DE406DD843F31B8DA8190102E786BC /* FIRCLSSymbolResolver.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSSymbolResolver.m; path = Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.m; sourceTree = "<group>"; };
 		93ECBD3546A54D7CEBC0DDCFFE3F9757 /* FBSDKAppEventsUtility.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKAppEventsUtility.m; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/FBSDKAppEventsUtility.m; sourceTree = "<group>"; };
 		941962D43D8ED080A252FC2C1F4DCB16 /* FIRCLSDefines.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSDefines.h; path = Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h; sourceTree = "<group>"; };
 		94198D47DB7153AAB614D2BD0AD361A2 /* MoPub+Utility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "MoPub+Utility.h"; path = "MoPubSDK/Internal/Utility/Categories/MoPub+Utility.h"; sourceTree = "<group>"; };
 		9439C1DD7ADF946FA0D821414DDE15C6 /* UIView+FBNativeAdViewTag.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIView+FBNativeAdViewTag.h"; path = "Static/FBAudienceNetwork.framework/Headers/UIView+FBNativeAdViewTag.h"; sourceTree = "<group>"; };
-		943F5E0AB0E3CD68128746521DD14872 /* Pods-MAPS.ME-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-MAPS.ME-umbrella.h"; sourceTree = "<group>"; };
+		943F5E0AB0E3CD68128746521DD14872 /* Pods-OMaps-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-OMaps-umbrella.h"; sourceTree = "<group>"; };
 		945AA54D70279B1EC6C9244FF91F432D /* GoogleDataTransport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GoogleDataTransport.h; path = GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport.h; sourceTree = "<group>"; };
 		9495C0D407A5084BFB7866043ED2E21F /* MPAdConversionTracker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPAdConversionTracker.h; path = MoPubSDK/MPAdConversionTracker.h; sourceTree = "<group>"; };
 		9510A54071DF69DE5B3A8D4740C5F81B /* MPNativePositionSource.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativePositionSource.h; path = MoPubSDK/NativeAds/Internal/MPNativePositionSource.h; sourceTree = "<group>"; };
@@ -2659,18 +2667,18 @@
 		99FA0C33F8FD705C8505C27693C46AE1 /* MPReachabilityManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPReachabilityManager.h; path = MoPubSDK/Internal/MPReachabilityManager.h; sourceTree = "<group>"; };
 		9A0EE4D0B856820E1C49CF676DAEFCE0 /* FBSDKAppEvents.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKAppEvents.m; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/FBSDKAppEvents.m; sourceTree = "<group>"; };
 		9A2445CDEEDB3F456CF8A86C16411788 /* AppsFlyerFramework.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = AppsFlyerFramework.debug.xcconfig; sourceTree = "<group>"; };
-		9AAD6432F9CBA054F5118361E3C552BC /* Pods-MAPS.ME-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-MAPS.ME-dummy.m"; sourceTree = "<group>"; };
+		9AAD6432F9CBA054F5118361E3C552BC /* Pods-OMaps-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-OMaps-dummy.m"; sourceTree = "<group>"; };
 		9ACF948463B44B9CBCD15839A9C71A7B /* GULReachabilityMessageCode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GULReachabilityMessageCode.h; path = GoogleUtilities/Reachability/Private/GULReachabilityMessageCode.h; sourceTree = "<group>"; };
 		9AD06EB7CED79269EC3F40892B1D7811 /* FIRCLSApplication.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSApplication.h; path = Crashlytics/Crashlytics/Components/FIRCLSApplication.h; sourceTree = "<group>"; };
 		9B90734FD1FC7BA8DABFE1C2150BBB17 /* MPImpressionTrackedNotification.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPImpressionTrackedNotification.h; path = MoPubSDK/MPImpressionTrackedNotification.h; sourceTree = "<group>"; };
 		9B9E924D1C60C384D9FA932B85AEA5BC /* GULKeychainUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = GULKeychainUtils.m; path = GoogleUtilities/Environment/SecureStorage/GULKeychainUtils.m; sourceTree = "<group>"; };
 		9BB2BE9926BB510B58ED86AC35DA702A /* MPInterstitialCustomEventDelegate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPInterstitialCustomEventDelegate.h; path = MoPubSDK/MPInterstitialCustomEventDelegate.h; sourceTree = "<group>"; };
 		9C284741E25807C99F2D65D97A6C0086 /* GULLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GULLogger.h; path = GoogleUtilities/Logger/Private/GULLogger.h; sourceTree = "<group>"; };
-		9C34A935350EEF589E0CB5317D5E8D7A /* FIRCLSSignal.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSSignal.c; path = Crashlytics/Crashlytics/Handlers/FIRCLSSignal.c; sourceTree = "<group>"; };
+		9C34A935350EEF589E0CB5317D5E8D7A /* FIRCLSSignal.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSSignal.c; path = Crashlytics/Crashlytics/Handlers/FIRCLSSignal.c; sourceTree = "<group>"; };
 		9C84C2B5A4FDC3023F6F0D5ED07FAD44 /* MPMediationSettingsProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPMediationSettingsProtocol.h; path = MoPubSDK/MPMediationSettingsProtocol.h; sourceTree = "<group>"; };
 		9D4325D5B5B5EE56512FA79B4BED8DE5 /* FBLPromise+Testing.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBLPromise+Testing.h"; path = "Sources/FBLPromises/include/FBLPromise+Testing.h"; sourceTree = "<group>"; };
 		9D66005EED1D3EE319D3BCA7B2FB3F84 /* NSMutableArray+MPAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSMutableArray+MPAdditions.h"; path = "MoPubSDK/Internal/Utility/Categories/NSMutableArray+MPAdditions.h"; sourceTree = "<group>"; };
-		9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
+		9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		9DA04880496478F371945535BC7E4748 /* FBSDKEventBindingManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKEventBindingManager.m; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/Codeless/FBSDKEventBindingManager.m; sourceTree = "<group>"; };
 		9DD0DE202DCBBCA9F0AAAEE9712F3C89 /* FIRLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRLogger.h; path = FirebaseCore/Sources/Private/FIRLogger.h; sourceTree = "<group>"; };
 		9DEE24157113083579B5D107C4C095E9 /* MoPub_ExternalAvidAdSessionContext.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MoPub_ExternalAvidAdSessionContext.h; path = MoPubSDK/Viewability/Avid/MoPub_ExternalAvidAdSessionContext.h; sourceTree = "<group>"; };
@@ -2680,7 +2688,7 @@
 		9E6C3B7537E5214A269D7C64A399804F /* MPSessionTracker.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPSessionTracker.m; path = MoPubSDK/Internal/Utility/MPSessionTracker.m; sourceTree = "<group>"; };
 		9E9BC0324B44256F9848043373DA73BD /* GDTCCTNanopbHelpers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GDTCCTNanopbHelpers.h; path = GoogleDataTransportCCTSupport/GDTCCTLibrary/Private/GDTCCTNanopbHelpers.h; sourceTree = "<group>"; };
 		9EA27C27E8BE6A319F46EEFDC78434B0 /* FBSDKAppLinkResolving.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKAppLinkResolving.h; path = FBSDKCoreKit/FBSDKCoreKit/AppLink/FBSDKAppLinkResolving.h; sourceTree = "<group>"; };
-		9EBA8DA24D4260839318D78EC9359684 /* FIRCLSDwarfExpressionMachine.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSDwarfExpressionMachine.c; path = Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfExpressionMachine.c; sourceTree = "<group>"; };
+		9EBA8DA24D4260839318D78EC9359684 /* FIRCLSDwarfExpressionMachine.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSDwarfExpressionMachine.c; path = Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfExpressionMachine.c; sourceTree = "<group>"; };
 		9EF90B0EE47DA618D7587ABDBEEE4CF2 /* MPMoPubAd.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPMoPubAd.h; path = MoPubSDK/MPMoPubAd.h; sourceTree = "<group>"; };
 		9F6213C0BF36AF447DD774B75A86951E /* MPRewardedVideoAdapter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPRewardedVideoAdapter.h; path = MoPubSDK/RewardedVideo/Internal/MPRewardedVideoAdapter.h; sourceTree = "<group>"; };
 		9F8C134209ECFEE44DD30B54FA918FB1 /* FirebaseCrashlytics.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = FirebaseCrashlytics.debug.xcconfig; sourceTree = "<group>"; };
@@ -2707,13 +2715,13 @@
 		A3DEE8684E54692925CFF9649B4B9AA7 /* FBSDKInternalUtility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKInternalUtility.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKInternalUtility.h; sourceTree = "<group>"; };
 		A4359A28D50110A439610CD7606A5A1D /* MPAdServerCommunicator.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPAdServerCommunicator.m; path = MoPubSDK/Internal/Common/MPAdServerCommunicator.m; sourceTree = "<group>"; };
 		A45D5D9150FF9C5C0B4A63B72CA51415 /* FBSDKLoginButton.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKLoginButton.m; path = FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginButton.m; sourceTree = "<group>"; };
-		A50D488397CF80FE035346303494968D /* Pods_MAPS_ME.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_MAPS_ME.framework; path = "Pods-MAPS.ME.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A50D488397CF80FE035346303494968D /* Pods_OMaps.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OMaps.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A514772615FC436FC350277555010B19 /* FBSDKProfile.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKProfile.m; path = FBSDKCoreKit/FBSDKCoreKit/FBSDKProfile.m; sourceTree = "<group>"; };
 		A52F4F9D59A0C7A0ED4F5AFFECB2C689 /* MPVASTStringUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPVASTStringUtilities.m; path = MoPubSDK/Internal/VAST/MPVASTStringUtilities.m; sourceTree = "<group>"; };
 		A55461F3AB13BD236ABDC799453514B9 /* pb_encode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = pb_encode.h; sourceTree = "<group>"; };
 		A57812B00DC25CFF7E42EDC259870378 /* FIRCLSReportManager_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSReportManager_Private.h; path = Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h; sourceTree = "<group>"; };
 		A5A1E1AF6AC62B515EF26D84B9EFDE88 /* FBSDKGraphRequestDataAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKGraphRequestDataAttachment.m; path = FBSDKCoreKit/FBSDKCoreKit/GraphAPI/FBSDKGraphRequestDataAttachment.m; sourceTree = "<group>"; };
-		A5D57790DDAB444182A769246E82F50A /* pb_common.c */ = {isa = PBXFileReference; includeInIndex = 1; path = pb_common.c; sourceTree = "<group>"; };
+		A5D57790DDAB444182A769246E82F50A /* pb_common.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; path = pb_common.c; sourceTree = "<group>"; };
 		A60E9CEBF4FBB5B9DC8BCA2F72ABA9CE /* FBLPromiseError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBLPromiseError.h; path = Sources/FBLPromises/include/FBLPromiseError.h; sourceTree = "<group>"; };
 		A6AA483A3155F0243E97660634B8D8D2 /* FIRCLSUnwind_x86.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSUnwind_x86.h; path = Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_x86.h; sourceTree = "<group>"; };
 		A6E962762F6A88B83E5679C3AC3ABA38 /* FIRCLSFileManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSFileManager.h; path = Crashlytics/Crashlytics/Models/FIRCLSFileManager.h; sourceTree = "<group>"; };
@@ -2745,7 +2753,7 @@
 		AC65290E890725D78B78F6FC0CCD2871 /* MPHTMLInterstitialCustomEvent.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPHTMLInterstitialCustomEvent.h; path = MoPubSDK/Internal/HTML/MPHTMLInterstitialCustomEvent.h; sourceTree = "<group>"; };
 		AC8AA52C4A392EF0B8462CB0C7712E8A /* FBSDKSwizzler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKSwizzler.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKSwizzler.m; sourceTree = "<group>"; };
 		ACDADF91BDB29FA2C5AAF1B6A8DF653A /* MPBannerCustomEvent+Internal.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "MPBannerCustomEvent+Internal.m"; path = "MoPubSDK/Internal/Banners/MPBannerCustomEvent+Internal.m"; sourceTree = "<group>"; };
-		AD2254ED5E1056D4AC2BF9A9F57A51B6 /* Pods-MAPS.ME-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-MAPS.ME-acknowledgements.markdown"; sourceTree = "<group>"; };
+		AD2254ED5E1056D4AC2BF9A9F57A51B6 /* Pods-OMaps-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = "Pods-OMaps-acknowledgements.markdown"; sourceTree = "<group>"; };
 		AD36D3549F56921BAB6906898EE9EC02 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; };
 		AD3D91845CFBF7641C53E876757A2A18 /* FIRInstallationsStatus.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRInstallationsStatus.h; path = FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsStatus.h; sourceTree = "<group>"; };
 		AD4E5601CB7CBE9FE1E793A00E842797 /* FBLPromise+Any.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBLPromise+Any.h"; path = "Sources/FBLPromises/include/FBLPromise+Any.h"; sourceTree = "<group>"; };
@@ -2782,9 +2790,9 @@
 		B2ECC7E20300D7768709576B691E72EE /* GDTCORAssert.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GDTCORAssert.h; path = GoogleDataTransport/GDTCORLibrary/Public/GDTCORAssert.h; sourceTree = "<group>"; };
 		B2F2952698D05D04A1ED7D7AE022971C /* Flurry-iOS-SDK.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Flurry-iOS-SDK.modulemap"; sourceTree = "<group>"; };
 		B31D84E24524DF5682A267BFE7DA628D /* FIRCLSDownloadAndSaveSettingsOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSDownloadAndSaveSettingsOperation.m; path = Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.m; sourceTree = "<group>"; };
-		B3928D8C6DA55C8D5C580ACE10C351BA /* cct.nanopb.c */ = {isa = PBXFileReference; includeInIndex = 1; name = cct.nanopb.c; path = GoogleDataTransportCCTSupport/GDTCCTLibrary/Protogen/nanopb/cct.nanopb.c; sourceTree = "<group>"; };
+		B3928D8C6DA55C8D5C580ACE10C351BA /* cct.nanopb.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = cct.nanopb.c; path = GoogleDataTransportCCTSupport/GDTCCTLibrary/Protogen/nanopb/cct.nanopb.c; sourceTree = "<group>"; };
 		B3DFC0FDC86EF24DB6AC069D767F1DC3 /* GoogleUtilities.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = GoogleUtilities.modulemap; sourceTree = "<group>"; };
-		B43874C6CBB50E7134FBEC24BABFE14F /* GoogleUtilities.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = GoogleUtilities.framework; path = GoogleUtilities.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B43874C6CBB50E7134FBEC24BABFE14F /* GoogleUtilities.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GoogleUtilities.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B4547C009592E5CCBBF54E6B4EF89A61 /* FBSDKCrashObserver.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKCrashObserver.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/Instrument/CrashReport/FBSDKCrashObserver.h; sourceTree = "<group>"; };
 		B45A4460D252BA2CC8BE0592A309E75E /* MPBaseInterstitialAdapter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPBaseInterstitialAdapter.h; path = MoPubSDK/Internal/Interstitials/MPBaseInterstitialAdapter.h; sourceTree = "<group>"; };
 		B4AF9B5571F3247AB21D62F4859CB9CA /* FIRInstallationsVersion.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRInstallationsVersion.m; path = FirebaseInstallations/Source/Library/FIRInstallationsVersion.m; sourceTree = "<group>"; };
@@ -2806,7 +2814,7 @@
 		B63B211CE89CAA85880C54C23FBA980A /* MPNativeAdError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativeAdError.h; path = MoPubSDK/Internal/MPNativeAdError.h; sourceTree = "<group>"; };
 		B660581BA47FF0267E1C3FD26DB8B666 /* FIRCLSUtility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSUtility.h; path = Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h; sourceTree = "<group>"; };
 		B6BFE2BEEAB345CC2A86394E363C10F3 /* FBSDKAudioResourceLoader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKAudioResourceLoader.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKAudioResourceLoader.h; sourceTree = "<group>"; };
-		B6EEA83F1BE9333EC15AFF3BA55BDD4B /* Pods-MAPS.ME-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-MAPS.ME-Info.plist"; sourceTree = "<group>"; };
+		B6EEA83F1BE9333EC15AFF3BA55BDD4B /* Pods-OMaps-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-OMaps-Info.plist"; sourceTree = "<group>"; };
 		B6FF811D56B4E006CA31BA3A0AEFEA54 /* FIRCLSExecutionIdentifierModel.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSExecutionIdentifierModel.m; path = Crashlytics/Crashlytics/Models/FIRCLSExecutionIdentifierModel.m; sourceTree = "<group>"; };
 		B736FD012871F2E9C92ADA68598F421D /* FBSDKLoginTooltipView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKLoginTooltipView.h; path = FBSDKLoginKit/FBSDKLoginKit/FBSDKLoginTooltipView.h; sourceTree = "<group>"; };
 		B747649FBE325722E133571D1C955ED7 /* FBSDKRestrictiveDataFilterManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKRestrictiveDataFilterManager.h; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/RestrictiveDataFilter/FBSDKRestrictiveDataFilterManager.h; sourceTree = "<group>"; };
@@ -2815,7 +2823,7 @@
 		B85423919F546189D5E6A7AB2542C4CE /* FBSDKURL.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKURL.h; path = FBSDKCoreKit/FBSDKCoreKit/FBSDKURL.h; sourceTree = "<group>"; };
 		B8C1C01874F15B848BBD56EDEB351255 /* MOPUBReplayView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MOPUBReplayView.h; path = MoPubSDK/NativeVideo/Internal/MOPUBReplayView.h; sourceTree = "<group>"; };
 		B8EF546E8BCE2DC36157D7E93DE991A8 /* FIRComponentContainer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRComponentContainer.h; path = FirebaseCore/Sources/Private/FIRComponentContainer.h; sourceTree = "<group>"; };
-		B8F7CE1222CBE0D8992328283E5D8D09 /* FIRCLSAllocate.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSAllocate.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSAllocate.c; sourceTree = "<group>"; };
+		B8F7CE1222CBE0D8992328283E5D8D09 /* FIRCLSAllocate.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSAllocate.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSAllocate.c; sourceTree = "<group>"; };
 		B951042AE2AEB24F45AAC599C82AE7E4 /* MPMemoryCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPMemoryCache.m; path = MoPubSDK/Internal/MPMemoryCache.m; sourceTree = "<group>"; };
 		B95E13859FA5C7BE5F2116C31054BC09 /* GoogleAppMeasurement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleAppMeasurement.framework; path = Frameworks/GoogleAppMeasurement.framework; sourceTree = "<group>"; };
 		B9A478D858F62F9F068DE83A8CBA7E8A /* MPVASTMacroProcessor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPVASTMacroProcessor.h; path = MoPubSDK/Internal/VAST/MPVASTMacroProcessor.h; sourceTree = "<group>"; };
@@ -2838,7 +2846,7 @@
 		BCC81D90AA4D9847887DF63CE8BCBE10 /* FIRCLSURLSessionDataTask_PrivateMethods.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSURLSessionDataTask_PrivateMethods.h; path = Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask_PrivateMethods.h; sourceTree = "<group>"; };
 		BD256BA47553A5AACF835AC696D625E3 /* FIRCLSFABAsyncOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSFABAsyncOperation.h; path = Crashlytics/Shared/FIRCLSOperation/FIRCLSFABAsyncOperation.h; sourceTree = "<group>"; };
 		BDA097AE57FC5E4252FA9E163E6EACB7 /* FIRCLSFABNetworkClient.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSFABNetworkClient.h; path = Crashlytics/Shared/FIRCLSNetworking/FIRCLSFABNetworkClient.h; sourceTree = "<group>"; };
-		BDD051FCAACA7AC31BD04039027B77BC /* pb_decode.c */ = {isa = PBXFileReference; includeInIndex = 1; path = pb_decode.c; sourceTree = "<group>"; };
+		BDD051FCAACA7AC31BD04039027B77BC /* pb_decode.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; path = pb_decode.c; sourceTree = "<group>"; };
 		BE188B8A16FC9322DCB2ECEDAF33705A /* GDTCORFlatFileStorage.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GDTCORFlatFileStorage.h; path = GoogleDataTransport/GDTCORLibrary/Private/GDTCORFlatFileStorage.h; sourceTree = "<group>"; };
 		BE6706C0E91060814B4019DC196EA848 /* MPHTMLInterstitialCustomEvent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPHTMLInterstitialCustomEvent.m; path = MoPubSDK/Internal/HTML/MPHTMLInterstitialCustomEvent.m; sourceTree = "<group>"; };
 		BE8609CE945C9F8818FB940B4101B7C4 /* nanopb.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = nanopb.debug.xcconfig; sourceTree = "<group>"; };
@@ -2934,7 +2942,7 @@
 		CF6876AC311C8307CCF05E1196BCCF8F /* FIRCLSThreadArrayOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSThreadArrayOperation.h; path = Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSThreadArrayOperation.h; sourceTree = "<group>"; };
 		CF6A63C4B55F5F7C3CECC0DCCEE4A69F /* NSError+MPAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSError+MPAdditions.h"; path = "MoPubSDK/Internal/Utility/Categories/NSError+MPAdditions.h"; sourceTree = "<group>"; };
 		CF6CCFBF6868B0A060B6CACC63AD9715 /* FBSDKGraphRequestPiggybackManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKGraphRequestPiggybackManager.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/Network/FBSDKGraphRequestPiggybackManager.m; sourceTree = "<group>"; };
-		CFE2F92DC947D242323E352533FC125E /* FIRCLSInternalLogging.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSInternalLogging.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSInternalLogging.c; sourceTree = "<group>"; };
+		CFE2F92DC947D242323E352533FC125E /* FIRCLSInternalLogging.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSInternalLogging.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSInternalLogging.c; sourceTree = "<group>"; };
 		D03B5828EB71E48F7801EC9B3A1867EE /* MPNativePositionResponseDeserializer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPNativePositionResponseDeserializer.h; path = MoPubSDK/NativeAds/Internal/MPNativePositionResponseDeserializer.h; sourceTree = "<group>"; };
 		D0B4B7A3C6107F9F40BDEC5A513061CE /* FBSDKLoginKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "FBSDKLoginKit-dummy.m"; sourceTree = "<group>"; };
 		D0E7C1714D93675593DECCBB370D5FC8 /* FacebookNativeAdRenderer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FacebookNativeAdRenderer.h; path = FacebookAudienceNetwork/FacebookNativeAdRenderer.h; sourceTree = "<group>"; };
@@ -2946,7 +2954,7 @@
 		D236BDDF35357D256F15EE061D8DF285 /* FBAudienceNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBAudienceNetwork.framework; path = Static/FBAudienceNetwork.framework; sourceTree = "<group>"; };
 		D24ADC2C26AC17986E84E6AD71B4497D /* MPRealTimeTimer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPRealTimeTimer.m; path = MoPubSDK/Internal/Common/MPRealTimeTimer.m; sourceTree = "<group>"; };
 		D2656512704728DB2DBB34BBE2165797 /* MPLastResortDelegate.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPLastResortDelegate.m; path = MoPubSDK/Internal/Common/MPLastResortDelegate.m; sourceTree = "<group>"; };
-		D2A00557E86AB985431B6EBE76C05CE9 /* firebasecore.nanopb.c */ = {isa = PBXFileReference; includeInIndex = 1; name = firebasecore.nanopb.c; path = Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.c; sourceTree = "<group>"; };
+		D2A00557E86AB985431B6EBE76C05CE9 /* firebasecore.nanopb.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = firebasecore.nanopb.c; path = Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.c; sourceTree = "<group>"; };
 		D2E718FEBBC0B21B328F0AD4C483B85D /* FBSDKGraphRequestConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKGraphRequestConnection.h; path = FBSDKCoreKit/FBSDKCoreKit/GraphAPI/FBSDKGraphRequestConnection.h; sourceTree = "<group>"; };
 		D30C1A5C52F035ADBD3EEA0824B1DD27 /* FacebookInterstitialCustomEvent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FacebookInterstitialCustomEvent.m; path = FacebookAudienceNetwork/FacebookInterstitialCustomEvent.m; sourceTree = "<group>"; };
 		D32E916E946062051632D0E5DBE612CD /* FBSDKApplicationDelegate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKApplicationDelegate.h; path = FBSDKCoreKit/FBSDKCoreKit/FBSDKApplicationDelegate.h; sourceTree = "<group>"; };
@@ -2956,7 +2964,7 @@
 		D40F3EB80A82CF1EA834836E17B6AA55 /* FIRInstallationsStoredItem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRInstallationsStoredItem.h; path = FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredItem.h; sourceTree = "<group>"; };
 		D415223653ABC354C49E541E09592A9D /* FBSDKCodelessIndexer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKCodelessIndexer.h; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/Codeless/FBSDKCodelessIndexer.h; sourceTree = "<group>"; };
 		D41740737D7D65FD1EDAD94E25926D12 /* FBSDKDialogConfiguration.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKDialogConfiguration.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/ServerConfiguration/FBSDKDialogConfiguration.h; sourceTree = "<group>"; };
-		D454164375BCE20FEAA887F05C82CA54 /* FIRCLSThreadState.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSThreadState.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSThreadState.c; sourceTree = "<group>"; };
+		D454164375BCE20FEAA887F05C82CA54 /* FIRCLSThreadState.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSThreadState.c; path = Crashlytics/Crashlytics/Helpers/FIRCLSThreadState.c; sourceTree = "<group>"; };
 		D48FBD5E31629FFF372284263088E2D5 /* FBSDKFeatureManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKFeatureManager.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKFeatureManager.h; sourceTree = "<group>"; };
 		D48FDFD09A08E4A5AA0B90AC469DFA8E /* FIRCLSURLSessionDownloadTask_PrivateMethods.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSURLSessionDownloadTask_PrivateMethods.h; path = Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask_PrivateMethods.h; sourceTree = "<group>"; };
 		D4F67A3E65CC0FC59D9E2CEDECC946BB /* FIRCLSURLSessionDownloadTask.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSURLSessionDownloadTask.h; path = Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask.h; sourceTree = "<group>"; };
@@ -2971,7 +2979,7 @@
 		D76A6B3C4CBF23CB99E36B34D94F1033 /* FBSDKAddressFilterManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKAddressFilterManager.h; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/RestrictiveDataFilter/FBSDKAddressFilterManager.h; sourceTree = "<group>"; };
 		D79F393250BF3A0CB9F297EAD8E1356B /* MOPUBActivityIndicatorView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MOPUBActivityIndicatorView.m; path = MoPubSDK/NativeVideo/Internal/MOPUBActivityIndicatorView.m; sourceTree = "<group>"; };
 		D7B25E151F6CEE3FCCCFFA5E45CE1958 /* MPNativePositionResponseDeserializer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPNativePositionResponseDeserializer.m; path = MoPubSDK/NativeAds/Internal/MPNativePositionResponseDeserializer.m; sourceTree = "<group>"; };
-		D7C4B4719E036C1B09595417C7D8ACA6 /* Pods-MAPS.ME.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-MAPS.ME.debug.xcconfig"; sourceTree = "<group>"; };
+		D7C4B4719E036C1B09595417C7D8ACA6 /* Pods-OMaps.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-OMaps.debug.xcconfig"; sourceTree = "<group>"; };
 		D868942174467A00280EE2A3CB5E0116 /* GoogleDataTransport.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = GoogleDataTransport.modulemap; sourceTree = "<group>"; };
 		D87FE1C8DD5694CB3CD67B810B5F3E29 /* MPInterstitialAdManagerDelegate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPInterstitialAdManagerDelegate.h; path = MoPubSDK/Internal/Interstitials/MPInterstitialAdManagerDelegate.h; sourceTree = "<group>"; };
 		D9166C142B944D31D700CCF555CF75A2 /* FIRAnalyticsInterop.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRAnalyticsInterop.h; path = Interop/Analytics/Public/FIRAnalyticsInterop.h; sourceTree = "<group>"; };
@@ -2979,7 +2987,7 @@
 		D9388511DD9CA3E718B2E63D6A212C1C /* MPBaseAdapterConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPBaseAdapterConfiguration.m; path = MoPubSDK/MPBaseAdapterConfiguration.m; sourceTree = "<group>"; };
 		D94E1893022A390515E0D40305BAB20D /* MPAnalyticsTracker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPAnalyticsTracker.h; path = MoPubSDK/Internal/Utility/MPAnalyticsTracker.h; sourceTree = "<group>"; };
 		D96EB47E02BE9CC7D59F370B6B6F5102 /* FBSDKTooltipView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKTooltipView.m; path = FBSDKLoginKit/FBSDKLoginKit/FBSDKTooltipView.m; sourceTree = "<group>"; };
-		D98750936C51805AF7CAA9DF93448CB8 /* crashlytics.nanopb.c */ = {isa = PBXFileReference; includeInIndex = 1; name = crashlytics.nanopb.c; path = Crashlytics/Protogen/nanopb/crashlytics.nanopb.c; sourceTree = "<group>"; };
+		D98750936C51805AF7CAA9DF93448CB8 /* crashlytics.nanopb.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = crashlytics.nanopb.c; path = Crashlytics/Protogen/nanopb/crashlytics.nanopb.c; sourceTree = "<group>"; };
 		D9AC0AB30DA90EB31444CDDA222D3616 /* FBSDKAccessTokenCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKAccessTokenCache.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/TokenCaching/FBSDKAccessTokenCache.h; sourceTree = "<group>"; };
 		D9CFBF50DC6E1AE24CE04C9B70365C3D /* FBSDKWebViewAppLinkResolver.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKWebViewAppLinkResolver.m; path = FBSDKCoreKit/FBSDKCoreKit/AppLink/FBSDKWebViewAppLinkResolver.m; sourceTree = "<group>"; };
 		D9D2AB59193C5DC54FA5A2775836D3F3 /* MoPub-FacebookAudienceNetwork-Adapters-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MoPub-FacebookAudienceNetwork-Adapters-umbrella.h"; sourceTree = "<group>"; };
@@ -2988,7 +2996,7 @@
 		DA83000C88D37B03721453E6334C899E /* FBSDKPaymentObserver.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKPaymentObserver.h; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/FBSDKPaymentObserver.h; sourceTree = "<group>"; };
 		DA945CFEB939D760822C233216963059 /* FBSDKAccessTokenExpirer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKAccessTokenExpirer.m; path = FBSDKCoreKit/FBSDKCoreKit/Internal/TokenCaching/FBSDKAccessTokenExpirer.m; sourceTree = "<group>"; };
 		DAA6A2DEF645DC36C5564D6FE230A762 /* MPStopwatch.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPStopwatch.h; path = MoPubSDK/Internal/Utility/MPStopwatch.h; sourceTree = "<group>"; };
-		DAFE246CB253B48EDFAAD0B3458D7243 /* FBSDKModelRuntime.hpp */ = {isa = PBXFileReference; includeInIndex = 1; name = FBSDKModelRuntime.hpp; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/ML/FBSDKModelRuntime.hpp; sourceTree = "<group>"; };
+		DAFE246CB253B48EDFAAD0B3458D7243 /* FBSDKModelRuntime.hpp */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.h; name = FBSDKModelRuntime.hpp; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/ML/FBSDKModelRuntime.hpp; sourceTree = "<group>"; };
 		DB2CEB0165E20DBD8F873EA9AA03E794 /* FIRCLSReportUploader.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSReportUploader.m; path = Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m; sourceTree = "<group>"; };
 		DB3BC2BA5F41EF53779436068A55C31B /* MPGlobal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPGlobal.h; path = MoPubSDK/Internal/Utility/MPGlobal.h; sourceTree = "<group>"; };
 		DB4CFDE48D385561DA2EA77DA34F2BDB /* Firebase.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Firebase.release.xcconfig; sourceTree = "<group>"; };
@@ -3037,8 +3045,8 @@
 		E2434CB138B23681AD420AD601C0B50C /* FIRCLSReportAdapter_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSReportAdapter_Private.h; path = Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter_Private.h; sourceTree = "<group>"; };
 		E2850A9DC951025A2D99B4A8D9767A80 /* FIRCLSRecordApplication.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSRecordApplication.m; path = Crashlytics/Crashlytics/Models/Record/FIRCLSRecordApplication.m; sourceTree = "<group>"; };
 		E2A214B17544E79689BA872946E3B1B5 /* FIRCLSDwarfExpressionMachine.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSDwarfExpressionMachine.h; path = Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfExpressionMachine.h; sourceTree = "<group>"; };
-		E2A49853ADD371D4D590021CD3590E3B /* FIRCLSCompactUnwind.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSCompactUnwind.c; path = Crashlytics/Crashlytics/Unwind/Compact/FIRCLSCompactUnwind.c; sourceTree = "<group>"; };
-		E2B63D462DB7F827C4B11FD51E4F8E2D /* FirebaseCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FirebaseCore.framework; path = FirebaseCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E2A49853ADD371D4D590021CD3590E3B /* FIRCLSCompactUnwind.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSCompactUnwind.c; path = Crashlytics/Crashlytics/Unwind/Compact/FIRCLSCompactUnwind.c; sourceTree = "<group>"; };
+		E2B63D462DB7F827C4B11FD51E4F8E2D /* FirebaseCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E37656F237661D9E974F4D92B3037597 /* FirebaseCrashlytics-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "FirebaseCrashlytics-dummy.m"; sourceTree = "<group>"; };
 		E39716E612F58E64CA25C63391653747 /* FIRCLSFABHost.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSFABHost.m; path = Crashlytics/Shared/FIRCLSFABHost.m; sourceTree = "<group>"; };
 		E3C569EF859C4D9FE4623F2C5C81A6AF /* FBLPromise+Wrap.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBLPromise+Wrap.h"; path = "Sources/FBLPromises/include/FBLPromise+Wrap.h"; sourceTree = "<group>"; };
@@ -3086,10 +3094,10 @@
 		EC11E09F642F377CF91A38FC771C670B /* MPLastResortDelegate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPLastResortDelegate.h; path = MoPubSDK/Internal/Common/MPLastResortDelegate.h; sourceTree = "<group>"; };
 		EC55BD6F39BFBB8D16D185B7831D7450 /* MPStopwatch.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPStopwatch.m; path = MoPubSDK/Internal/Utility/MPStopwatch.m; sourceTree = "<group>"; };
 		EC840FB3A9B5FD39E877E39F9341CD4F /* MPVideoPlayer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPVideoPlayer.h; path = MoPubSDK/Internal/VideoPlayer/MPVideoPlayer.h; sourceTree = "<group>"; };
-		EC8F4D0BE3B0C192EBA4A93F8887D89F /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = FBSDKCoreKit.framework; path = FBSDKCoreKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EC8F4D0BE3B0C192EBA4A93F8887D89F /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FBSDKCoreKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		ED151E2F63278D70A065FE1B011F4ED3 /* FBSDKDeviceViewControllerBase.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKDeviceViewControllerBase.h; path = FBSDKCoreKit/FBSDKCoreKit/FBSDKDeviceViewControllerBase.h; sourceTree = "<group>"; };
 		EDAB3590DA5F32B3E4CEED29ED17BBA3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
-		EE25C353A9ECDB4F2E95942A94D58AC1 /* FIRCLSProcess.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSProcess.c; path = Crashlytics/Crashlytics/Components/FIRCLSProcess.c; sourceTree = "<group>"; };
+		EE25C353A9ECDB4F2E95942A94D58AC1 /* FIRCLSProcess.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSProcess.c; path = Crashlytics/Crashlytics/Components/FIRCLSProcess.c; sourceTree = "<group>"; };
 		EE420C9E6A86C5FBDF665940971F34FC /* MPBaseNativeAdRenderer+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "MPBaseNativeAdRenderer+Internal.h"; path = "MoPubSDK/NativeAds/Internal/MPBaseNativeAdRenderer+Internal.h"; sourceTree = "<group>"; };
 		EE6A99FEAD1985536C3FA5E943E2B5BC /* FBLPromise+Always.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "FBLPromise+Always.m"; path = "Sources/FBLPromises/FBLPromise+Always.m"; sourceTree = "<group>"; };
 		EE7455FF496929B6E6E48108C8093444 /* FIRAnalyticsInteropListener.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRAnalyticsInteropListener.h; path = Interop/Analytics/Public/FIRAnalyticsInteropListener.h; sourceTree = "<group>"; };
@@ -3110,7 +3118,7 @@
 		F09341822A2A373E7AE823104DE76BAC /* MPGeolocationProvider.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPGeolocationProvider.m; path = MoPubSDK/Internal/Utility/MPGeolocationProvider.m; sourceTree = "<group>"; };
 		F0A1F26D38C86D0DE8A04DD8906C8327 /* FirebaseCoreDiagnostics.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = FirebaseCoreDiagnostics.modulemap; sourceTree = "<group>"; };
 		F0FD980AEFBB5FCA43E9B93DC31B6417 /* MPHTMLInterstitialViewController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPHTMLInterstitialViewController.h; path = MoPubSDK/Internal/HTML/MPHTMLInterstitialViewController.h; sourceTree = "<group>"; };
-		F10E1CB55F68E7A3E8CF444567FC86BF /* FIRCLSUnwind_arm.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSUnwind_arm.c; path = Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_arm.c; sourceTree = "<group>"; };
+		F10E1CB55F68E7A3E8CF444567FC86BF /* FIRCLSUnwind_arm.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSUnwind_arm.c; path = Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_arm.c; sourceTree = "<group>"; };
 		F125AD9DE4885AF2EC70BD8CFAD862E5 /* FIRInstallationsHTTPError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRInstallationsHTTPError.m; path = FirebaseInstallations/Source/Library/Errors/FIRInstallationsHTTPError.m; sourceTree = "<group>"; };
 		F146C0F3C905A86A8C627E45FA51B555 /* FBSDKPaymentObserver.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FBSDKPaymentObserver.m; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/FBSDKPaymentObserver.m; sourceTree = "<group>"; };
 		F161CBD33AC7BA5D9969DDA2175F8522 /* MPInterstitialAdController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPInterstitialAdController.m; path = MoPubSDK/MPInterstitialAdController.m; sourceTree = "<group>"; };
@@ -3121,7 +3129,7 @@
 		F25A88845B1CCF98DAC77C9E9EB2FCB3 /* GDTCORRegistrar_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = GDTCORRegistrar_Private.h; path = GoogleDataTransport/GDTCORLibrary/Private/GDTCORRegistrar_Private.h; sourceTree = "<group>"; };
 		F2A77723C64C4401E3DDFADE708D5301 /* FIRCLSSymbolicationOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSSymbolicationOperation.h; path = Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSymbolicationOperation.h; sourceTree = "<group>"; };
 		F2DE8DACF699E98BA9B8103D69297896 /* FBSDKCoreKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = FBSDKCoreKit.release.xcconfig; sourceTree = "<group>"; };
-		F2EA102AC389AEB691486FEE64D1401F /* FIRCLSDataParsing.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSDataParsing.c; path = Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDataParsing.c; sourceTree = "<group>"; };
+		F2EA102AC389AEB691486FEE64D1401F /* FIRCLSDataParsing.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSDataParsing.c; path = Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDataParsing.c; sourceTree = "<group>"; };
 		F2EA64EFD0B3671042D6540CE86F7B17 /* MPContentBlocker.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPContentBlocker.h; path = MoPubSDK/Internal/HTML/MPContentBlocker.h; sourceTree = "<group>"; };
 		F2ED25B46717EE76477932E591AF483B /* FBLPromise+Recover.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBLPromise+Recover.h"; path = "Sources/FBLPromises/include/FBLPromise+Recover.h"; sourceTree = "<group>"; };
 		F3066CF07AADE233E03777E43150C416 /* FIROptionsInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIROptionsInternal.h; path = FirebaseCore/Sources/Private/FIROptionsInternal.h; sourceTree = "<group>"; };
@@ -3144,7 +3152,7 @@
 		F5875671B8493083F1CEF086C2DDFC65 /* MPVASTInline.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPVASTInline.h; path = MoPubSDK/Internal/VAST/MPVASTInline.h; sourceTree = "<group>"; };
 		F5CEF86EE487DF24CB3CAA8E122CB110 /* MPAdConfiguration.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPAdConfiguration.m; path = MoPubSDK/Internal/Common/MPAdConfiguration.m; sourceTree = "<group>"; };
 		F5FF22883B8A0858CB0F22F845D01F06 /* FBSDKDeviceRequestsHelper.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKDeviceRequestsHelper.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKDeviceRequestsHelper.h; sourceTree = "<group>"; };
-		F62857D1469FF9547E7F14F980C10127 /* FBSDKStandaloneModel.hpp */ = {isa = PBXFileReference; includeInIndex = 1; name = FBSDKStandaloneModel.hpp; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/ML/FBSDKStandaloneModel.hpp; sourceTree = "<group>"; };
+		F62857D1469FF9547E7F14F980C10127 /* FBSDKStandaloneModel.hpp */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.h; name = FBSDKStandaloneModel.hpp; path = FBSDKCoreKit/FBSDKCoreKit/AppEvents/Internal/ML/FBSDKStandaloneModel.hpp; sourceTree = "<group>"; };
 		F640DC969DFCC5E65015B54EFCE0D2C7 /* FIRAEvent+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FIRAEvent+Internal.h"; path = "Crashlytics/Crashlytics/Helpers/FIRAEvent+Internal.h"; sourceTree = "<group>"; };
 		F64CBDEFB07B9B6EC584F4DABA5DA43D /* FIRInstallationsStoredAuthToken.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRInstallationsStoredAuthToken.m; path = FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.m; sourceTree = "<group>"; };
 		F6C66B2DC50346BD83F7B30AD6857ADE /* FIRCoreDiagnosticsData.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCoreDiagnosticsData.h; path = Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h; sourceTree = "<group>"; };
@@ -3167,7 +3175,7 @@
 		F83F6485920D620BF528120D2F66BBD4 /* FirebaseCrashlytics-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "FirebaseCrashlytics-Info.plist"; sourceTree = "<group>"; };
 		F85C177F3787114EA6BA11CB3BEAC2D0 /* FBSDKServerConfiguration+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "FBSDKServerConfiguration+Internal.h"; path = "FBSDKCoreKit/FBSDKCoreKit/Internal/ServerConfiguration/FBSDKServerConfiguration+Internal.h"; sourceTree = "<group>"; };
 		F89E5E9C4209BF914E87A8D594320251 /* MPNativeView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPNativeView.m; path = MoPubSDK/NativeAds/Internal/MPNativeView.m; sourceTree = "<group>"; };
-		F8D29732A73F9BC51636E7AB7784CF5F /* FIRCLSCrashedMarkerFile.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSCrashedMarkerFile.c; path = Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.c; sourceTree = "<group>"; };
+		F8D29732A73F9BC51636E7AB7784CF5F /* FIRCLSCrashedMarkerFile.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSCrashedMarkerFile.c; path = Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.c; sourceTree = "<group>"; };
 		F9240820F4BBDCCE5249EE20F406898E /* MPBannerAdManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPBannerAdManager.m; path = MoPubSDK/Internal/Banners/MPBannerAdManager.m; sourceTree = "<group>"; };
 		F92BE1CBFCF07492C50DFF3A72DBB794 /* FBSDKCoreKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "FBSDKCoreKit-umbrella.h"; sourceTree = "<group>"; };
 		F92E93154C08880AB99F41FD106DCF0C /* MPVASTConstant.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MPVASTConstant.h; path = MoPubSDK/Internal/VAST/MPVASTConstant.h; sourceTree = "<group>"; };
@@ -3178,13 +3186,13 @@
 		F99D9AB50EAAF16149813029F81B0429 /* FBSDKImageDownloader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBSDKImageDownloader.h; path = FBSDKCoreKit/FBSDKCoreKit/Internal/FBSDKImageDownloader.h; sourceTree = "<group>"; };
 		F9B488FFB174D39D23CFF939CF53957B /* MPVASTConstant.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPVASTConstant.m; path = MoPubSDK/Internal/VAST/MPVASTConstant.m; sourceTree = "<group>"; };
 		F9C6AF6FE84006B95A8E671446098ABF /* FirebaseCoreDiagnostics-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "FirebaseCoreDiagnostics-Info.plist"; sourceTree = "<group>"; };
-		F9CC2E64A156A09363C34CD82E9994FD /* Pods-MAPS.ME.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-MAPS.ME.modulemap"; sourceTree = "<group>"; };
+		F9CC2E64A156A09363C34CD82E9994FD /* Pods-OMaps.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-OMaps.modulemap"; sourceTree = "<group>"; };
 		FA9F4355D52C34E7D21046BFFC2C3CD6 /* FIRCrashlytics.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCrashlytics.h; path = Crashlytics/Crashlytics/Public/FIRCrashlytics.h; sourceTree = "<group>"; };
 		FADE735BAE6A83A7260221701A0BB022 /* MPConsentChangedNotification.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPConsentChangedNotification.m; path = MoPubSDK/MPConsentChangedNotification.m; sourceTree = "<group>"; };
 		FB20CA01A9BECB10E7E15F3E90D5C2B2 /* FIRCLSReportUploader_Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FIRCLSReportUploader_Private.h; path = Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader_Private.h; sourceTree = "<group>"; };
 		FB3C6A112211CDA7085A37214E8C6C47 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
 		FB54EFA643EFE65F8B93F4ABD776A9DA /* MPRewardedVideoReward.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MPRewardedVideoReward.m; path = MoPubSDK/RewardedVideo/MPRewardedVideoReward.m; sourceTree = "<group>"; };
-		FC1D22ECA07EE837606E81D89589039D /* FIRCLSDwarfUnwind.c */ = {isa = PBXFileReference; includeInIndex = 1; name = FIRCLSDwarfUnwind.c; path = Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfUnwind.c; sourceTree = "<group>"; };
+		FC1D22ECA07EE837606E81D89589039D /* FIRCLSDwarfUnwind.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = FIRCLSDwarfUnwind.c; path = Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfUnwind.c; sourceTree = "<group>"; };
 		FC1FB84E26BD003635B679C7860135AF /* FIRCLSSymbolicationOperation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = FIRCLSSymbolicationOperation.m; path = Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSymbolicationOperation.m; sourceTree = "<group>"; };
 		FC57614E3243EC7C555920CC8C93AEA4 /* PromisesObjC-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PromisesObjC-umbrella.h"; sourceTree = "<group>"; };
 		FC6155FF94FD0991843109C2BAD27684 /* MOPUBNativeVideoAdAdapter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MOPUBNativeVideoAdAdapter.h; path = MoPubSDK/NativeVideo/Internal/MOPUBNativeVideoAdAdapter.h; sourceTree = "<group>"; };
@@ -3348,26 +3356,25 @@
 				E757740E1432653B0E1307DE6CEDEA63 /* FlurrySDK */,
 				8D03BDE90A76CFCD6FDE7AD7FED744F3 /* Support Files */,
 			);
-			name = "Flurry-iOS-SDK";
 			path = "Flurry-iOS-SDK";
 			sourceTree = "<group>";
 		};
-		08D2D768F4AB8FBA4BF7CDEDC9D03588 /* Pods-MAPS.ME */ = {
+		08D2D768F4AB8FBA4BF7CDEDC9D03588 /* Pods-OMaps */ = {
 			isa = PBXGroup;
 			children = (
-				F9CC2E64A156A09363C34CD82E9994FD /* Pods-MAPS.ME.modulemap */,
-				AD2254ED5E1056D4AC2BF9A9F57A51B6 /* Pods-MAPS.ME-acknowledgements.markdown */,
-				20C31D59DA82361E25F193FABD96B204 /* Pods-MAPS.ME-acknowledgements.plist */,
-				9AAD6432F9CBA054F5118361E3C552BC /* Pods-MAPS.ME-dummy.m */,
-				90429778259497EBA2033D42CA835743 /* Pods-MAPS.ME-frameworks.sh */,
-				B6EEA83F1BE9333EC15AFF3BA55BDD4B /* Pods-MAPS.ME-Info.plist */,
-				943F5E0AB0E3CD68128746521DD14872 /* Pods-MAPS.ME-umbrella.h */,
-				D7C4B4719E036C1B09595417C7D8ACA6 /* Pods-MAPS.ME.debug.xcconfig */,
-				498A16D85D9C972689BF42A44AABE26F /* Pods-MAPS.ME.production full.xcconfig */,
-				9085B8A32AFF10675A22486994BEAC12 /* Pods-MAPS.ME.release.xcconfig */,
+				F9CC2E64A156A09363C34CD82E9994FD /* Pods-OMaps.modulemap */,
+				AD2254ED5E1056D4AC2BF9A9F57A51B6 /* Pods-OMaps-acknowledgements.markdown */,
+				20C31D59DA82361E25F193FABD96B204 /* Pods-OMaps-acknowledgements.plist */,
+				9AAD6432F9CBA054F5118361E3C552BC /* Pods-OMaps-dummy.m */,
+				90429778259497EBA2033D42CA835743 /* Pods-OMaps-frameworks.sh */,
+				B6EEA83F1BE9333EC15AFF3BA55BDD4B /* Pods-OMaps-Info.plist */,
+				943F5E0AB0E3CD68128746521DD14872 /* Pods-OMaps-umbrella.h */,
+				D7C4B4719E036C1B09595417C7D8ACA6 /* Pods-OMaps.debug.xcconfig */,
+				498A16D85D9C972689BF42A44AABE26F /* Pods-OMaps.production full.xcconfig */,
+				9085B8A32AFF10675A22486994BEAC12 /* Pods-OMaps.release.xcconfig */,
 			);
-			name = "Pods-MAPS.ME";
-			path = "Target Support Files/Pods-MAPS.ME";
+			name = "Pods-OMaps";
+			path = "Target Support Files/Pods-OMaps";
 			sourceTree = "<group>";
 		};
 		09B4074386911B9369B8592F1647B2A2 /* MethodSwizzler */ = {
@@ -3386,7 +3393,6 @@
 				C818CC2E4650B58970671A9DD1A2E037 /* Frameworks */,
 				BE1B51DAC7B9284C5883D4E4D6E315B5 /* Support Files */,
 			);
-			name = GoogleAppMeasurement;
 			path = GoogleAppMeasurement;
 			sourceTree = "<group>";
 		};
@@ -3410,7 +3416,6 @@
 				4778B23B1DEF6428078620DC0585878F /* firebasecore.nanopb.h */,
 				EC79073C077DD69464BF1EA67DE04F1D /* Support Files */,
 			);
-			name = FirebaseCoreDiagnostics;
 			path = FirebaseCoreDiagnostics;
 			sourceTree = "<group>";
 		};
@@ -3615,7 +3620,6 @@
 				363CFFF506950B66C298C2CA540247A7 /* FIRStackFrame_Private.h */,
 				3EFBC0B98A3906D3EC00B4DFB926AA56 /* Support Files */,
 			);
-			name = FirebaseCrashlytics;
 			path = FirebaseCrashlytics;
 			sourceTree = "<group>";
 		};
@@ -3625,7 +3629,6 @@
 				D48C095B1AAFC731B090D9900E233AB4 /* Core */,
 				F1D847A49496D69B7E53008DD11E97FC /* Support Files */,
 			);
-			name = Pushwoosh;
 			path = Pushwoosh;
 			sourceTree = "<group>";
 		};
@@ -3695,7 +3698,6 @@
 				23F8A68C42FFC290D22B5C4019EEA2D5 /* Frameworks */,
 				FBA7B65DB2754C32E5B754829E6DAA68 /* Support Files */,
 			);
-			name = FBAudienceNetwork;
 			path = FBAudienceNetwork;
 			sourceTree = "<group>";
 		};
@@ -3780,7 +3782,6 @@
 				945AA54D70279B1EC6C9244FF91F432D /* GoogleDataTransport.h */,
 				ED9DC4DE59E75481F7028BC9072ABC3D /* Support Files */,
 			);
-			name = GoogleDataTransport;
 			path = GoogleDataTransport;
 			sourceTree = "<group>";
 		};
@@ -3804,7 +3805,6 @@
 				E7F85AAA1ADC373F06170A0B703238F7 /* Login */,
 				E479EA7EF2DA594C76D8A8E55BF6A6C6 /* Support Files */,
 			);
-			name = FBSDKLoginKit;
 			path = FBSDKLoginKit;
 			sourceTree = "<group>";
 		};
@@ -3832,7 +3832,6 @@
 				C6172E61DEA1B67966F863AE8D5C38AD /* encode */,
 				C7FA7C32EDFC3C940E87CF7A567540B4 /* Support Files */,
 			);
-			name = nanopb;
 			path = nanopb;
 			sourceTree = "<group>";
 		};
@@ -4203,7 +4202,6 @@
 				CB6C2C6F374D1D9F71C9E0B6025DB299 /* Frameworks */,
 				459289723974B2E946504BDECE6941C0 /* Support Files */,
 			);
-			name = AppsFlyerFramework;
 			path = AppsFlyerFramework;
 			sourceTree = "<group>";
 		};
@@ -4244,7 +4242,7 @@
 				0A8924B6305C5116EA8035AE891818F6 /* MoPub.framework */,
 				31C596999512C76A20CD0BAD735E6110 /* MoPub_FacebookAudienceNetwork_Adapters.framework */,
 				06FC5C9CF96D60C50FCD47D339C91951 /* nanopb.framework */,
-				A50D488397CF80FE035346303494968D /* Pods_MAPS_ME.framework */,
+				A50D488397CF80FE035346303494968D /* Pods_OMaps.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -4322,7 +4320,6 @@
 				7D17C78ADCC152D5E6E1B713B98248B5 /* GDTCOREvent+GDTCCTSupport.m */,
 				9D736B70E7B1E9737F3131FB00DFD729 /* Support Files */,
 			);
-			name = GoogleDataTransportCCTSupport;
 			path = GoogleDataTransportCCTSupport;
 			sourceTree = "<group>";
 		};
@@ -4354,7 +4351,6 @@
 				C1EA12F24D2CB9207AAB90231C12FBF7 /* Core */,
 				A3404E4DFB85B96522E65A91862CC6F2 /* Support Files */,
 			);
-			name = FBSDKCoreKit;
 			path = FBSDKCoreKit;
 			sourceTree = "<group>";
 		};
@@ -4424,7 +4420,6 @@
 				B4DFD201F459DF4CAFEFCA0E68626FC6 /* FIRVersion.m */,
 				C73D715BC7721D18A625E1448244415E /* Support Files */,
 			);
-			name = FirebaseCore;
 			path = FirebaseCore;
 			sourceTree = "<group>";
 		};
@@ -4435,7 +4430,6 @@
 				30D76939E75E4FBD646C16543F4DF669 /* FIRCoreDiagnosticsInterop.h */,
 				C7A7BB9C5EC9A52B3F5CBD1E8A1D05D5 /* Support Files */,
 			);
-			name = FirebaseCoreDiagnosticsInterop;
 			path = FirebaseCoreDiagnosticsInterop;
 			sourceTree = "<group>";
 		};
@@ -4579,7 +4573,6 @@
 				5608D402612BADF9402F627D5A1E5E2E /* FBLPromises.h */,
 				A8F02C1EA4BBD13C5883DD00823DC925 /* Support Files */,
 			);
-			name = PromisesObjC;
 			path = PromisesObjC;
 			sourceTree = "<group>";
 		};
@@ -4589,7 +4582,6 @@
 				FDC3183EDD7AA86A762291114329174E /* Frameworks */,
 				7C610A1EC4CC0E4FEFF851D152CBC251 /* Support Files */,
 			);
-			name = FirebaseAnalytics;
 			path = FirebaseAnalytics;
 			sourceTree = "<group>";
 		};
@@ -4599,7 +4591,6 @@
 				E9F235DB6B5926ADB53A700A00189E28 /* Network */,
 				687D6E507C84C764E520B845799323B1 /* Support Files */,
 			);
-			name = "MoPub-FacebookAudienceNetwork-Adapters";
 			path = "MoPub-FacebookAudienceNetwork-Adapters";
 			sourceTree = "<group>";
 		};
@@ -4616,7 +4607,6 @@
 				6C5199B1893D0EEFB743D24979A41DC5 /* Support Files */,
 				D8104636AB956D21A63439A2D9B03A2D /* UserDefaults */,
 			);
-			name = GoogleUtilities;
 			path = GoogleUtilities;
 			sourceTree = "<group>";
 		};
@@ -4822,14 +4812,13 @@
 				A0293EC14F82F44615B8FB84859CF9F0 /* NativeAds */,
 				4A8AB5680D2F28934E664B6707232091 /* Support Files */,
 			);
-			name = "mopub-ios-sdk";
 			path = "mopub-ios-sdk";
 			sourceTree = "<group>";
 		};
 		BDE0D5FDCD80D5FC2D88642960D810F9 /* Targets Support Files */ = {
 			isa = PBXGroup;
 			children = (
-				08D2D768F4AB8FBA4BF7CDEDC9D03588 /* Pods-MAPS.ME */,
+				08D2D768F4AB8FBA4BF7CDEDC9D03588 /* Pods-OMaps */,
 			);
 			name = "Targets Support Files";
 			sourceTree = "<group>";
@@ -5177,7 +5166,6 @@
 				3002158C7B158862270FD996FB121BE2 /* CoreOnly */,
 				958170D657A14244217700620AE49314 /* Support Files */,
 			);
-			name = Firebase;
 			path = Firebase;
 			sourceTree = "<group>";
 		};
@@ -5268,7 +5256,6 @@
 				B4AF9B5571F3247AB21D62F4859CB9CA /* FIRInstallationsVersion.m */,
 				2E31191ECCE10ACE11E67BBF3E85A04C /* Support Files */,
 			);
-			name = FirebaseInstallations;
 			path = FirebaseInstallations;
 			sourceTree = "<group>";
 		};
@@ -5412,7 +5399,6 @@
 				E0AFF93F9DDD07DDE37B699A952E48C7 /* FIRInteropParameterNames.h */,
 				D6C82ADDD501DAB4A017FD133999973D /* Support Files */,
 			);
-			name = FirebaseAnalyticsInterop;
 			path = FirebaseAnalyticsInterop;
 			sourceTree = "<group>";
 		};
@@ -5579,7 +5565,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CA48F24590F676CD28AF58F068002E5A /* Pods-MAPS.ME-umbrella.h in Headers */,
+				CA48F24590F676CD28AF58F068002E5A /* Pods-OMaps-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6446,9 +6432,9 @@
 			productReference = B43874C6CBB50E7134FBEC24BABFE14F /* GoogleUtilities.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		A05F1244859CDEEE96C5DBB250BB0266 /* Pods-MAPS.ME */ = {
+		A05F1244859CDEEE96C5DBB250BB0266 /* Pods-OMaps */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 8EF55EC51F3CC9B2741B66428B85C34E /* Build configuration list for PBXNativeTarget "Pods-MAPS.ME" */;
+			buildConfigurationList = 8EF55EC51F3CC9B2741B66428B85C34E /* Build configuration list for PBXNativeTarget "Pods-OMaps" */;
 			buildPhases = (
 				9395F0C1FE38C34E86588E144CED6687 /* Headers */,
 				98CB9DDC1782D7D36AB2113B5F2484EA /* Sources */,
@@ -6481,9 +6467,9 @@
 				0CD942F9F089C5621A5110F8605D28FF /* PBXTargetDependency */,
 				FCFC8A20880EE7408BEDE03683A5523E /* PBXTargetDependency */,
 			);
-			name = "Pods-MAPS.ME";
-			productName = "Pods-MAPS.ME";
-			productReference = A50D488397CF80FE035346303494968D /* Pods_MAPS_ME.framework */;
+			name = "Pods-OMaps";
+			productName = "Pods-OMaps";
+			productReference = A50D488397CF80FE035346303494968D /* Pods_OMaps.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		BE4A4ECC8A801924F03DA6FFE943E04C /* mopub-ios-sdk */ = {
@@ -6584,7 +6570,7 @@
 				8D115411ACEA387C9D854E11FDDD914F /* MoPub-FacebookAudienceNetwork-Adapters */,
 				BE4A4ECC8A801924F03DA6FFE943E04C /* mopub-ios-sdk */,
 				D2B5E7DCCBBFB32341D857D01211A1A3 /* nanopb */,
-				A05F1244859CDEEE96C5DBB250BB0266 /* Pods-MAPS.ME */,
+				A05F1244859CDEEE96C5DBB250BB0266 /* Pods-OMaps */,
 				2BBF7206D7FAC92C82A042A99C4A98F8 /* PromisesObjC */,
 				803EF1AFD27445A470912B1033353BFC /* Pushwoosh */,
 			);
@@ -7230,7 +7216,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				78A928121EAF60C2561F74610A97D7A8 /* Pods-MAPS.ME-dummy.m in Sources */,
+				78A928121EAF60C2561F74610A97D7A8 /* Pods-OMaps-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7831,7 +7817,7 @@
 		};
 		0FF3A071C7D78D7EED388AA458FAD39A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9085B8A32AFF10675A22486994BEAC12 /* Pods-MAPS.ME.release.xcconfig */;
+			baseConfigurationReference = 9085B8A32AFF10675A22486994BEAC12 /* Pods-OMaps.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
@@ -7845,12 +7831,12 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-Info.plist";
+				INFOPLIST_FILE = "Target Support Files/Pods-OMaps/Pods-OMaps-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.modulemap";
+				MODULEMAP_FILE = "Target Support Files/Pods-OMaps/Pods-OMaps.modulemap";
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
@@ -7867,7 +7853,7 @@
 		};
 		12F99B1499F3E2B056C7CF01CFD36B3C /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D7C4B4719E036C1B09595417C7D8ACA6 /* Pods-MAPS.ME.debug.xcconfig */;
+			baseConfigurationReference = D7C4B4719E036C1B09595417C7D8ACA6 /* Pods-OMaps.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
@@ -7881,12 +7867,12 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-Info.plist";
+				INFOPLIST_FILE = "Target Support Files/Pods-OMaps/Pods-OMaps-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.modulemap";
+				MODULEMAP_FILE = "Target Support Files/Pods-OMaps/Pods-OMaps.modulemap";
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
@@ -7947,7 +7933,7 @@
 		};
 		223D0B54CB0A3AD25FCAF7C6F529B21B /* Production Full */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 498A16D85D9C972689BF42A44AABE26F /* Pods-MAPS.ME.production full.xcconfig */;
+			baseConfigurationReference = 498A16D85D9C972689BF42A44AABE26F /* Pods-OMaps.production full.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
@@ -7961,12 +7947,12 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-Info.plist";
+				INFOPLIST_FILE = "Target Support Files/Pods-OMaps/Pods-OMaps-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.modulemap";
+				MODULEMAP_FILE = "Target Support Files/Pods-OMaps/Pods-OMaps.modulemap";
 				OTHER_LDFLAGS = "";
 				OTHER_LIBTOOLFLAGS = "";
 				PODS_ROOT = "$(SRCROOT)";
@@ -8034,8 +8020,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				SYMROOT = "${SRCROOT}/../build";
 			};
@@ -9324,8 +9309,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				SYMROOT = "${SRCROOT}/../build";
 			};
@@ -9881,7 +9865,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		8EF55EC51F3CC9B2741B66428B85C34E /* Build configuration list for PBXNativeTarget "Pods-MAPS.ME" */ = {
+		8EF55EC51F3CC9B2741B66428B85C34E /* Build configuration list for PBXNativeTarget "Pods-OMaps" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				12F99B1499F3E2B056C7CF01CFD36B3C /* Debug */,
diff --git a/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Headers b/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Headers
deleted file mode 120000
index a177d2a6b9..0000000000
--- a/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Headers
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Headers
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Pushwoosh b/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Pushwoosh
deleted file mode 120000
index b002d72473..0000000000
--- a/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Pushwoosh
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Pushwoosh
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Pushwoosh b/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Pushwoosh
new file mode 100644
index 0000000000..e8c1776444
Binary files /dev/null and b/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Pushwoosh differ
diff --git a/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Versions/Current b/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Versions/Current
deleted file mode 120000
index 8c7e5a667f..0000000000
--- a/iphone/Maps/Pods/Pushwoosh/Framework/Pushwoosh.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-dummy.m b/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-dummy.m
deleted file mode 100644
index 3dfc603616..0000000000
--- a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-dummy.m	
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_MAPS_ME : NSObject
-@end
-@implementation PodsDummy_Pods_MAPS_ME
-@end
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.modulemap b/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.modulemap
deleted file mode 100644
index d1a7456f84..0000000000
--- a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.modulemap	
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module Pods_MAPS_ME {
-  umbrella header "Pods-MAPS.ME-umbrella.h"
-
-  export *
-  module * { export * }
-}
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-Info.plist b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-Info.plist
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-Info.plist
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-Info.plist
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-acknowledgements.markdown b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-acknowledgements.markdown
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-acknowledgements.markdown
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-acknowledgements.markdown
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-acknowledgements.plist b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-acknowledgements.plist
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-acknowledgements.plist
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-acknowledgements.plist
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-dummy.m b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-dummy.m
new file mode 100644
index 0000000000..d0752e26c0
--- /dev/null
+++ b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-dummy.m	
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+@interface PodsDummy_Pods_OMaps : NSObject
+@end
+@implementation PodsDummy_Pods_OMaps
+@end
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-frameworks.sh b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-frameworks.sh
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-frameworks.sh
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-frameworks.sh
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-umbrella.h b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-umbrella.h
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME-umbrella.h
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps-umbrella.h
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.debug.xcconfig b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.debug.xcconfig
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.debug.xcconfig
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.debug.xcconfig
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.modulemap b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.modulemap
new file mode 100644
index 0000000000..fc3fbed9fd
--- /dev/null
+++ b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.modulemap	
@@ -0,0 +1,6 @@
+framework module Pods_OMaps {
+  umbrella header "Pods-OMaps-umbrella.h"
+
+  export *
+  module * { export * }
+}
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.production full.xcconfig b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.production full.xcconfig
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.production full.xcconfig
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.production full.xcconfig
diff --git a/iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.release.xcconfig b/iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.release.xcconfig
similarity index 100%
rename from iphone/Maps/Pods/Target Support Files/Pods-MAPS.ME/Pods-MAPS.ME.release.xcconfig
rename to iphone/Maps/Pods/Target Support Files/Pods-OMaps/Pods-OMaps.release.xcconfig
diff --git a/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/Headers b/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/Headers
deleted file mode 120000
index a177d2a6b9..0000000000
--- a/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/Headers
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Headers
\ No newline at end of file
diff --git a/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/MPUBMoatMobileAppKit b/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/MPUBMoatMobileAppKit
deleted file mode 120000
index 43a761f94f..0000000000
--- a/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/MPUBMoatMobileAppKit
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/MPUBMoatMobileAppKit
\ No newline at end of file
diff --git a/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/MPUBMoatMobileAppKit b/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/MPUBMoatMobileAppKit
new file mode 100644
index 0000000000..132ab8ee56
Binary files /dev/null and b/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/MPUBMoatMobileAppKit differ
diff --git a/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/Versions/Current b/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/Versions/Current
deleted file mode 120000
index 8c7e5a667f..0000000000
--- a/iphone/Maps/Pods/mopub-ios-sdk/MoPubSDK/Viewability/MOAT/MPUBMoatMobileAppKit.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/iphone/Maps/TipsAndTricks/IsolinesTutorialBlur.xib b/iphone/Maps/TipsAndTricks/IsolinesTutorialBlur.xib
index 89eb0884c5..614e6ff288 100644
--- a/iphone/Maps/TipsAndTricks/IsolinesTutorialBlur.xib
+++ b/iphone/Maps/TipsAndTricks/IsolinesTutorialBlur.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -44,7 +44,7 @@
                             <action selector="onCancel:" destination="-1" eventType="touchUpInside" id="71M-01-Usd"/>
                         </connections>
                     </button>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Линии высот офлайн в MAPS.ME!" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ouh-SJ-3gL">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Линии высот офлайн в OMaps!" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ouh-SJ-3gL">
                         <rect key="frame" x="40" y="130" width="295" height="48"/>
                         <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/iphone/Maps/UI/Ads/RemoveAdsViewController.xib b/iphone/Maps/UI/Ads/RemoveAdsViewController.xib
index 47a04b513d..83bbb1b859 100644
--- a/iphone/Maps/UI/Ads/RemoveAdsViewController.xib
+++ b/iphone/Maps/UI/Ads/RemoveAdsViewController.xib
@@ -51,7 +51,7 @@
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i5M-Pr-FkT">
                                     <rect key="frame" x="0.0" y="0.0" width="366" height="706"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" text="Remove all Ads and support MAPS.ME" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vCa-Yl-SkC">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" text="Remove all Ads and support OMaps" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vCa-Yl-SkC">
                                             <rect key="frame" x="24" y="24" width="318" height="21.5"/>
                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                             <nil key="textColor"/>
@@ -66,7 +66,7 @@
                                                 <constraint firstAttribute="height" constant="44" id="OmH-zS-Isw"/>
                                             </constraints>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                            <state key="normal" title="Why support MAPS.ME?">
+                                            <state key="normal" title="Why support OMaps?">
                                                 <color key="titleColor" white="0.0" alpha="0.53486194349315064" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </state>
                                             <userDefinedRuntimeAttributes>
@@ -101,7 +101,7 @@
                                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pAe-qE-h95">
                                             <rect key="frame" x="0.0" y="24" width="366" height="142.5"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" text="Why support MAPS.ME?" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YQ4-oq-7XN">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" text="Why support OMaps?" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YQ4-oq-7XN">
                                                     <rect key="frame" x="24" y="0.0" width="318" height="21.5"/>
                                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                                     <nil key="textColor"/>
@@ -154,7 +154,7 @@
                                                                 <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular15:linkBlueText"/>
                                                             </userDefinedRuntimeAttributes>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You help us improve MAPS.ME" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WMR-ho-FUS">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You help us improve OMaps" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WMR-ho-FUS">
                                                             <rect key="frame" x="15" y="0.0" width="276" height="18"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                             <nil key="textColor"/>
diff --git a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib
index a273dfa90a..48612d0b28 100644
--- a/iphone/Maps/UI/Authorization/AuthorizationViewController.xib
+++ b/iphone/Maps/UI/Authorization/AuthorizationViewController.xib
@@ -187,7 +187,7 @@
                                                                 <userDefinedRuntimeAttribute type="image" keyPath="onImage" value="radioBtnOn"/>
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
-                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="I agree to recieve the latest news about MAPS.ME products" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p04-D7-97V">
+                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="I agree to recieve the latest news about OMaps products" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p04-D7-97V">
                                                             <rect key="frame" x="40" y="0.0" width="298.5" height="54.5"/>
                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="16"/>
diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib
index 4ea2ffbf01..c6bd556eee 100644
--- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib
+++ b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BottomTabBarViewController" customModule="maps_me" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BottomTabBarViewController" customModule="omaps_app" customModuleProvider="target">
             <connections>
                 <outlet property="bookmarksButton" destination="dgG-ki-3tB" id="md5-3T-9tb"/>
                 <outlet property="discoveryButton" destination="lHY-LD-odP" id="6LF-po-mDd"/>
@@ -20,7 +20,7 @@
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="zuH-WU-hiP" customClass="BottomTabBarView" customModule="maps_me" customModuleProvider="target" propertyAccessControl="none">
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="zuH-WU-hiP" customClass="BottomTabBarView" customModule="omaps_app" customModuleProvider="target" propertyAccessControl="none">
             <rect key="frame" x="0.0" y="0.0" width="373" height="84"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
@@ -67,7 +67,7 @@
                                 <action selector="onDiscoveryButtonPressed:" destination="-1" eventType="touchUpInside" id="OII-P6-WT4"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dgG-ki-3tB" userLabel="Bookmarks" customClass="MWMButton">
+                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dgG-ki-3tB" userLabel="Bookmarks" customClass="MWMButton">
                             <rect key="frame" x="224" y="0.0" width="74.5" height="48"/>
                             <accessibility key="accessibilityConfiguration" identifier="bookmarksButton"/>
                             <state key="normal" image="ic_menu_bookmark_list"/>
@@ -130,6 +130,7 @@
                     </constraints>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="aaw-Hz-zma"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="aaw-Hz-zma" firstAttribute="trailing" secondItem="4Uc-SH-J1o" secondAttribute="trailing" id="04D-ND-rcR"/>
@@ -144,7 +145,6 @@
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="aaw-Hz-zma"/>
             <point key="canvasLocation" x="72" y="254"/>
         </view>
     </objects>
diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib
index aa13ab04c5..9b1c13750f 100644
--- a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib
+++ b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib
@@ -21,7 +21,7 @@
                             <constraints>
                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="q02-z4-K9S"/>
                             </constraints>
-                            <string key="text">Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Если у вас есть дополнительные сведения об объекте, которые MAPS.ME не может позволить отредактировать, напишите о них.</string>
+                            <string key="text">Предложенные вами изменения на карте будут отправлены в OpenStreetMap. Если у вас есть дополнительные сведения об объекте, которые OMaps не может позволить отредактировать, напишите о них.</string>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
diff --git a/iphone/Maps/UI/Settings/MWMAboutController.m b/iphone/Maps/UI/Settings/MWMAboutController.m
index cdaa98d6b5..2592fe478f 100644
--- a/iphone/Maps/UI/Settings/MWMAboutController.m
+++ b/iphone/Maps/UI/Settings/MWMAboutController.m
@@ -53,7 +53,7 @@
   if (cell == self.websiteCell)
   {
     [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"website"];
-    [self openUrl:[NSURL URLWithString:@"https://maps.me"]];
+    [self openUrl:[NSURL URLWithString:@"https://omaps.app"]];
   }
   else if (cell == self.facebookCell)
   {
@@ -63,7 +63,7 @@
   else if (cell == self.twitterCell)
   {
     [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"followOnTwitter"];
-    [self openUrl:[NSURL URLWithString:@"https://twitter.com/MAPS_ME"]];
+    [self openUrl:[NSURL URLWithString:@"https://twitter.com/OMaps"]];
   }
   else if (cell == self.osmCell)
   {
diff --git a/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib b/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib
index 9269a7f4df..cfe1f20119 100644
--- a/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib
+++ b/iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -26,8 +26,8 @@
                         <constraint firstAttribute="height" priority="750" constant="120" id="9ug-0X-yk5"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Версия 6.3.0.318" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eX4-Y6-p2e">
-                    <rect key="frame" x="119" y="156" width="137" height="21"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Версия 0.0.1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eX4-Y6-p2e">
+                    <rect key="frame" x="130.5" y="156" width="114.5" height="21"/>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -35,8 +35,8 @@
                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium17:blackPrimaryText"/>
                     </userDefinedRuntimeAttributes>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Дата 16.08.2016" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UY-CN-bbR">
-                    <rect key="frame" x="137" y="181" width="101" height="16"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Дата 31.12.2020" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UY-CN-bbR">
+                    <rect key="frame" x="137.5" y="181" width="100" height="16"/>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -44,7 +44,7 @@
                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular13:blackSecondaryText"/>
                     </userDefinedRuntimeAttributes>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Объединив усилия Mail.Ru Group и данные OpenStreetMap, мы создаем незаменимое приложение для путешествий." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GEL-Bz-rHg">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Объединив усилия OMap community и данные OpenStreetMap, мы создаем незаменимое приложение для путешествий." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GEL-Bz-rHg">
                     <rect key="frame" x="8" y="205" width="359" height="47"/>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/iphone/Maps/UI/Settings/MWMHelpController.m b/iphone/Maps/UI/Settings/MWMHelpController.m
index 2a29a3bc0e..398a58fea0 100644
--- a/iphone/Maps/UI/Settings/MWMHelpController.m
+++ b/iphone/Maps/UI/Settings/MWMHelpController.m
@@ -7,7 +7,7 @@
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
-static NSString * const kiOSEmail = @"ios@maps.me";
+static NSString * const kiOSEmail = @"ios@omaps.app";
 
 @interface MWMHelpController ()<MFMailComposeViewControllerDelegate>
 
@@ -27,7 +27,7 @@ static NSString * const kiOSEmail = @"ios@maps.me";
 
   NSString * html;
   if ([MWMFrameworkHelper isNetworkConnected]) {
-    NSURL *url = [NSURL URLWithString:@"https://support.maps.me"];
+    NSURL *url = [NSURL URLWithString:@"https://support.omaps.app"];
     self.aboutViewController = [[WebViewController alloc] initWithUrl:url title:nil];
   } else {
     NSString *path = [NSBundle.mainBundle pathForResource:@"faq" ofType:@"html"];
@@ -137,7 +137,7 @@ static NSString * const kiOSEmail = @"ios@maps.me";
                     value:locale];
     NSString * bundleVersion = [AppInfo sharedInfo].bundleVersion;
     NSString * buildNumber = [AppInfo sharedInfo].buildNumber;
-    NSString * text = [NSString stringWithFormat:@"\n\n\n\n- %@ (%@)\n- MAPS.ME %@ (%@)\n- %@/%@",
+    NSString * text = [NSString stringWithFormat:@"\n\n\n\n- %@ (%@)\n- OMaps %@ (%@)\n- %@/%@",
                                                  deviceModel, UIDevice.currentDevice.systemVersion,
                                                  bundleVersion, buildNumber, language, country];
     NSString * alohalyticsId = [Alohalytics installationId];
diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard
index 01cabad6d9..1607eb3406 100644
--- a/iphone/Maps/UI/Storyboard/Main.storyboard
+++ b/iphone/Maps/UI/Storyboard/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
     <device id="retina6_1" orientation="landscape" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -30,7 +30,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rL1-9E-4b7">
                                 <rect key="frame" x="0.0" y="0.0" width="896" height="414"/>
                                 <subviews>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65S-M4-TnM" customClass="NavigationInfoArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65S-M4-TnM" customClass="NavigationInfoArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="0.0" width="808" height="393"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
                                     </view>
@@ -51,7 +51,7 @@
                                             </mask>
                                         </variation>
                                     </view>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aVk-ab-LFJ" customClass="TabBarArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aVk-ab-LFJ" customClass="TabBarArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="345" width="350" height="69"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
                                         <constraints>
@@ -68,27 +68,27 @@
                                             </mask>
                                         </variation>
                                     </view>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QNg-zA-Jne" customClass="GuidesNavigationBarArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QNg-zA-Jne" customClass="GuidesNavigationBarArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="0.0" width="808" height="393"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </view>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="awj-9E-eBS" customClass="PlacePageArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="0.0" width="808" height="393"/>
                                         <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
                                     </view>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FFY-Dy-Wou" customClass="VisibleArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FFY-Dy-Wou" customClass="VisibleArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="0.0" width="808" height="393"/>
                                         <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
                                     </view>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NI8-tV-i2B" customClass="WidgetsArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NI8-tV-i2B" customClass="WidgetsArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="0.0" width="808" height="393"/>
                                         <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
                                     </view>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xJx-UU-IdV" customClass="SideButtonsArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xJx-UU-IdV" customClass="SideButtonsArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="0.0" width="808" height="393"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="1" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
                                     </view>
-                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QKu-4A-UgP" customClass="TrafficButtonArea" customModule="maps_me" customModuleProvider="target">
+                                    <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QKu-4A-UgP" customClass="TrafficButtonArea" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="44" y="0.0" width="808" height="393"/>
                                         <color key="backgroundColor" red="0.0" green="1" blue="0.0" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
                                     </view>
@@ -100,7 +100,7 @@
                                     <constraint firstItem="FFY-Dy-Wou" firstAttribute="top" secondItem="rL1-9E-4b7" secondAttribute="top" priority="100" id="svT-Vi-vvC"/>
                                 </constraints>
                             </view>
-                            <view contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="jio-3T-E6G" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
+                            <view contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="jio-3T-E6G" customClass="TouchTransparentView" customModule="omaps_app" customModuleProvider="target">
                                 <rect key="frame" x="44" y="0.0" width="350" height="414"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -127,7 +127,7 @@
                                     </mask>
                                 </variation>
                             </view>
-                            <view hidden="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-Oj-jeo" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
+                            <view hidden="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-Oj-jeo" customClass="TouchTransparentView" customModule="omaps_app" customModuleProvider="target">
                                 <rect key="frame" x="44" y="0.0" width="350" height="414"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
@@ -154,7 +154,7 @@
                                     </mask>
                                 </variation>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="at1-V1-pzl" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="at1-V1-pzl" customClass="TouchTransparentView" customModule="omaps_app" customModuleProvider="target">
                                 <rect key="frame" x="44" y="193" width="808" height="152"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <gestureRecognizers/>
@@ -1110,7 +1110,7 @@
         <!--Search No Results View Controller-->
         <scene sceneID="LUt-iU-iyq">
             <objects>
-                <viewController storyboardIdentifier="SearchNoResultsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0VQ-EO-9Sv" customClass="SearchNoResultsViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SearchNoResultsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0VQ-EO-9Sv" customClass="SearchNoResultsViewController" customModule="omaps_app" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="9jm-RW-DZK">
                         <rect key="frame" x="0.0" y="0.0" width="896" height="414"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1194,7 +1194,7 @@
         <segue reference="sMq-pa-AId"/>
         <segue reference="4Cc-99-mlN"/>
         <segue reference="OEF-kR-jKi"/>
-        <segue reference="0A8-4b-0A2"/>
+        <segue reference="4ye-8o-cjF"/>
     </inferredMetricsTieBreakers>
     <resources>
         <image name="ic_add_button" width="28" height="28"/>
diff --git a/iphone/Maps/UI/Storyboard/Settings.storyboard b/iphone/Maps/UI/Storyboard/Settings.storyboard
index 509fe0944e..0ea23a2cea 100644
--- a/iphone/Maps/UI/Storyboard/Settings.storyboard
+++ b/iphone/Maps/UI/Storyboard/Settings.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,7 +19,7 @@
                         <sections>
                             <tableViewSection id="eZf-AO-B39">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="yh8-cr-14c" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="yh8-cr-14c" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="10" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yh8-cr-14c" id="MYm-HI-oOR">
@@ -27,7 +27,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Профиль" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8jb-wX-P4h">
-                                                    <rect key="frame" x="16" y="12" width="73" height="20"/>
+                                                    <rect key="frame" x="16" y="12" width="72" height="20"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -58,7 +58,7 @@
                             </tableViewSection>
                             <tableViewSection headerTitle="ОБЩИЕ НАСТРОЙКИ" footerTitle="Сбор статистики помогает нам совершенствовать приложение." id="Swo-3Q-lWx">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Igk-BI-aHN" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Igk-BI-aHN" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="109.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Igk-BI-aHN" id="Qae-gb-v0B">
@@ -93,7 +93,7 @@
                                             <outlet property="title" destination="RB1-Nr-K3T" id="qLp-eT-hWj"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="LYi-oF-eGj" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="LYi-oF-eGj" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="153.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LYi-oF-eGj" id="6SA-kx-JeG">
@@ -127,7 +127,7 @@
                                             <outlet property="title" destination="OM9-RZ-sca" id="Zoz-kD-Jq9"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="0Lf-xU-P2U" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="0Lf-xU-P2U" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="197.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Lf-xU-P2U" id="3Q1-iE-5pP">
@@ -161,7 +161,7 @@
                                             <outlet property="title" destination="tU0-tQ-usy" id="DLR-0f-D2j"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="eE4-OC-9uX" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="eE4-OC-9uX" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="241.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eE4-OC-9uX" id="xJx-2K-AIP">
@@ -195,7 +195,7 @@
                                             <outlet property="title" destination="6ZU-5V-v0J" id="o2Z-fX-Ivz"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="hbG-yu-ut3" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="hbG-yu-ut3" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="285.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hbG-yu-ut3" id="5D0-ZK-p4X">
@@ -229,7 +229,7 @@
                                             <outlet property="title" destination="YUL-hz-V1C" id="VaO-EE-x5x"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="6NC-QX-WiF" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="6NC-QX-WiF" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="329.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6NC-QX-WiF" id="gGY-3t-Lik">
@@ -264,7 +264,7 @@
                                             <outlet property="title" destination="wjW-GA-wVI" id="9DP-zL-FLr"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="MN2-YK-AUo" userLabel="Power Managment Cell" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="MN2-YK-AUo" userLabel="Power Managment Cell" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="373.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MN2-YK-AUo" id="n6P-oZ-gz7">
@@ -299,7 +299,7 @@
                                             <outlet property="title" destination="ihs-G4-eJW" id="ppH-B2-8cU"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="VyW-Wh-2QX" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="VyW-Wh-2QX" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="417.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VyW-Wh-2QX" id="ihq-PO-ic8">
@@ -334,7 +334,7 @@
                                             <outlet property="title" destination="3ew-eh-kVT" id="69S-4H-yeg"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="pri-6G-9Zb" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="pri-6G-9Zb" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="461.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pri-6G-9Zb" id="Zp6-d6-V6o">
@@ -368,7 +368,7 @@
                                             <outlet property="title" destination="uNY-c3-bGX" id="4uS-f6-Gre"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="f8Z-Jk-JIR" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="f8Z-Jk-JIR" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="505.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f8Z-Jk-JIR" id="1QF-6L-hJp">
@@ -402,7 +402,7 @@
                                             <outlet property="title" destination="NQ0-0Q-Y8K" id="aCm-zk-ZTn"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="P5e-67-f4k" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="P5e-67-f4k" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="549.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P5e-67-f4k" id="RlB-hW-A2l">
@@ -436,7 +436,7 @@
                                             <outlet property="title" destination="Xqo-QZ-3fd" id="W1h-0a-CQ2"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="F1Y-qu-HAo" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="F1Y-qu-HAo" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="593.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="F1Y-qu-HAo" id="59j-Py-CGY">
@@ -470,7 +470,7 @@
                                             <outlet property="title" destination="g5e-wH-Cqs" id="p9Q-lw-L34"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="NOt-bc-7ls" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="NOt-bc-7ls" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="637.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NOt-bc-7ls" id="xdj-y5-zpk">
@@ -508,7 +508,7 @@
                             </tableViewSection>
                             <tableViewSection headerTitle="ПОДПИСКИ" id="hpa-fI-I3o">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="2pB-bw-TE4" customClass="SettingsTableViewSelectableProgressCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="2pB-bw-TE4" customClass="SettingsTableViewSelectableProgressCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="765.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2pB-bw-TE4" id="Mjg-FQ-BbL">
@@ -539,7 +539,7 @@
                                             <outlet property="title" destination="wLQ-ju-cRP" id="clm-e9-wMY"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Wqu-gu-kFj" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Wqu-gu-kFj" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="809.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Wqu-gu-kFj" id="aVC-Mw-Q04">
@@ -578,11 +578,11 @@
                             </tableViewSection>
                             <tableViewSection headerTitle="НАВИГАЦИЯ" id="E4E-hs-9xW">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="QNt-XC-xma" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="QNt-XC-xma" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="901.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QNt-XC-xma" id="fBV-aJ-Mo8">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="395" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ночной режим" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q7P-cj-3tZ">
@@ -613,7 +613,7 @@
                                             <outlet property="title" destination="q7P-cj-3tZ" id="3sG-Xy-G0r"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="X5R-fv-yd7" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="X5R-fv-yd7" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="945.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X5R-fv-yd7" id="s7y-Nu-Y01">
@@ -647,7 +647,7 @@
                                             <outlet property="title" destination="tmn-CU-6EB" id="OMB-Ug-n6a"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="veW-Fm-2Hl" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="veW-Fm-2Hl" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="989.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="veW-Fm-2Hl" id="AP7-jd-F4b">
@@ -681,11 +681,11 @@
                                             <outlet property="title" destination="qL3-bA-5tn" id="erU-oe-Lg5"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="nED-2n-gN6" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="nED-2n-gN6" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="1033.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nED-2n-gN6" id="2oQ-0g-poj">
-                                            <rect key="frame" x="0.0" y="0.0" width="383" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="395" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Голосовые инструкции" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2v2-mU-aWi">
@@ -716,7 +716,7 @@
                                             <outlet property="title" destination="2v2-mU-aWi" id="Zp1-zJ-xDM"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="KrE-Sc-fI1" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="KrE-Sc-fI1" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="1077.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KrE-Sc-fI1" id="AKJ-VB-Pzr">
@@ -758,7 +758,7 @@
                             </tableViewSection>
                             <tableViewSection headerTitle="ИНФОРМАЦИЯ" id="i4H-WV-BaS">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="JTZ-K9-RVv" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="JTZ-K9-RVv" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="1169.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JTZ-K9-RVv" id="mHA-wn-hse">
@@ -793,7 +793,7 @@
                                             <outlet property="title" destination="7ty-Jh-0Rp" id="5ls-qT-ZNd"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Kv3-pO-jV5" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="Kv3-pO-jV5" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="1213.5" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kv3-pO-jV5" id="8mJ-wm-9uJ">
@@ -893,7 +893,7 @@
                         <sections>
                             <tableViewSection id="XFW-hZ-fJo">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="Hgm-jL-Gnn" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="Hgm-jL-Gnn" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="18" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="Hgm-jL-Gnn" id="LeE-yP-Eoi">
@@ -924,7 +924,7 @@
                                             <outlet property="title" destination="sHx-XL-o9h" id="gfO-dz-iqf"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="WyO-qs-a7i" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="WyO-qs-a7i" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="62" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WyO-qs-a7i" id="q2k-AU-VdG">
@@ -952,7 +952,7 @@
                                             <outlet property="title" destination="um4-D2-sR5" id="ysd-Sz-e53"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HHw-BT-UeJ" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HHw-BT-UeJ" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="106" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HHw-BT-UeJ" id="WD5-kW-BlC">
@@ -1009,7 +1009,7 @@
                         <sections>
                             <tableViewSection id="0dw-og-Sit">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HL5-jQ-yNK" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="HL5-jQ-yNK" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="18" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HL5-jQ-yNK" id="DYw-KH-oDU">
@@ -1037,7 +1037,7 @@
                                             <outlet property="title" destination="2i3-c9-tdU" id="enq-hG-Uv3"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="8Cq-dm-roX" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="8Cq-dm-roX" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="62" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8Cq-dm-roX" id="62b-vT-xng">
@@ -1065,7 +1065,7 @@
                                             <outlet property="title" destination="J1O-iW-GF3" id="aMM-LR-032"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="DIL-q2-mUp" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="DIL-q2-mUp" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="106" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DIL-q2-mUp" id="IqW-Xu-xVP">
@@ -1093,7 +1093,7 @@
                                             <outlet property="title" destination="55i-C3-b9S" id="BqS-iD-fzu"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="1Mm-WA-eyt" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="1Mm-WA-eyt" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="150" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Mm-WA-eyt" id="lNb-wL-PFo">
@@ -1121,7 +1121,7 @@
                                             <outlet property="title" destination="QrP-xT-fcM" id="UYW-6c-FWG"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="JLY-Qt-y88" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="JLY-Qt-y88" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="194" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JLY-Qt-y88" id="jPr-Kt-mLi">
@@ -1149,7 +1149,7 @@
                                             <outlet property="title" destination="HyC-if-zpD" id="BMT-M4-hk7"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="mbv-1J-wSI" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="mbv-1J-wSI" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="238" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mbv-1J-wSI" id="oPS-HW-hfW">
@@ -1207,7 +1207,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="hb3-Fe-677" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="hb3-Fe-677" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="55.5" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hb3-Fe-677" id="gQB-q8-5c8">
@@ -1241,7 +1241,7 @@
                                     <outlet property="title" destination="1JE-c4-BGG" id="umA-FF-qdh"/>
                                 </connections>
                             </tableViewCell>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="79I-kz-hl4" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="79I-kz-hl4" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="99.5" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="79I-kz-hl4" id="gBB-ji-big">
@@ -1266,7 +1266,7 @@
                                     <outlet property="title" destination="FSn-fP-n3e" id="CKZ-Gb-7Wa"/>
                                 </connections>
                             </tableViewCell>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="lO6-zb-qb8" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewLinkCell" id="lO6-zb-qb8" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="143.5" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lO6-zb-qb8" id="35k-Nb-XSD">
@@ -1326,7 +1326,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="6Px-TO-sMc" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="6Px-TO-sMc" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="55.5" width="414" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Px-TO-sMc" id="aqp-aV-B3y">
@@ -1376,7 +1376,7 @@
                         <sections>
                             <tableViewSection id="YbY-TG-Fq9">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="233-Ku-OFh" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="233-Ku-OFh" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="18" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="233-Ku-OFh" id="Tig-SC-0oN">
@@ -1404,7 +1404,7 @@
                                             <outlet property="title" destination="m0T-TK-aex" id="TJz-l6-62M"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="XGu-p4-IVy" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="XGu-p4-IVy" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="62" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XGu-p4-IVy" id="c5A-yh-Pec">
@@ -1460,7 +1460,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Eg-lz-6TT">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Eg-lz-6TT">
                                 <rect key="frame" x="0.0" y="818" width="414" height="44"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
@@ -1485,6 +1485,7 @@
                                 </constraints>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="bw2-Gt-U9p"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="5Eg-lz-6TT" firstAttribute="top" secondItem="Kpm-mR-y8b" secondAttribute="bottom" id="ADY-Nc-qy2"/>
@@ -1494,7 +1495,6 @@
                             <constraint firstItem="bw2-Gt-U9p" firstAttribute="trailing" secondItem="5Eg-lz-6TT" secondAttribute="trailing" id="q4u-RQ-qZ0"/>
                             <constraint firstItem="5Eg-lz-6TT" firstAttribute="leading" secondItem="bw2-Gt-U9p" secondAttribute="leading" id="tsw-6B-trX"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="bw2-Gt-U9p"/>
                     </view>
                     <connections>
                         <outlet property="separatorView" destination="Kpm-mR-y8b" id="SSQ-e1-3xo"/>
@@ -1511,11 +1511,11 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="sUF-VC-Odx">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <sections>
                             <tableViewSection id="Fph-fY-iFA">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="WfS-iR-EYh" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="WfS-iR-EYh" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="18" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WfS-iR-EYh" id="pud-iP-cPv">
@@ -1543,7 +1543,7 @@
                                             <outlet property="title" destination="dRQ-jj-BMn" id="rXq-ie-1BA"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="AwY-rw-AMm" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="AwY-rw-AMm" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="62" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AwY-rw-AMm" id="AUp-Ql-usV">
@@ -1571,7 +1571,7 @@
                                             <outlet property="title" destination="VRr-XH-vvX" id="1RC-qM-3D2"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="PYl-5B-hBB" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell hidden="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="PYl-5B-hBB" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="106" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PYl-5B-hBB" id="99g-g6-dgY">
@@ -1599,7 +1599,7 @@
                                             <outlet property="title" destination="snB-CD-ffn" id="Gds-tD-RIY"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="8n2-Bc-3lW" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="8n2-Bc-3lW" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="150" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8n2-Bc-3lW" id="swd-n3-rgq">
@@ -1629,7 +1629,7 @@
                             </tableViewSection>
                             <tableViewSection id="wsr-ZV-X15">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jhU-Ha-kE2" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jhU-Ha-kE2" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="230" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jhU-Ha-kE2" id="BJb-8F-OEp">
@@ -1662,7 +1662,7 @@
                             </tableViewSection>
                             <tableViewSection id="riF-80-ZWx">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="DXH-GS-aHR" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="DXH-GS-aHR" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="310" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DXH-GS-aHR" id="hrz-tO-Flm">
@@ -1692,7 +1692,7 @@
                                             <segue destination="Vr8-QW-WhO" kind="show" id="U88-n3-d6K"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="6Fq-aj-irU" customClass="SettingsTableViewSwitchCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSwitchCell" id="6Fq-aj-irU" customClass="SettingsTableViewSwitchCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="354" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Fq-aj-irU" id="nFM-EC-CZC">
@@ -1730,7 +1730,7 @@
                             </tableViewSection>
                             <tableViewSection id="Vce-Ld-skc">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Phw-kU-YR4" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="Phw-kU-YR4" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="434" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Phw-kU-YR4" id="aSD-aJ-PPx">
@@ -1759,7 +1759,7 @@
                                             <outlet property="title" destination="Inh-j5-jJX" id="pfY-ci-ic6"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="HL5-l3-1jg" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="HL5-l3-1jg" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="478" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HL5-l3-1jg" id="8Wj-Aa-vPE">
@@ -1788,7 +1788,7 @@
                                             <outlet property="title" destination="VN8-6g-ffS" id="nkz-HK-pVs"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="VXa-CM-OXP" customClass="SettingsTableViewLinkCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="VXa-CM-OXP" customClass="SettingsTableViewLinkCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="522" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VXa-CM-OXP" id="Vot-vJ-3MU">
@@ -1881,6 +1881,7 @@
                                 </userDefinedRuntimeAttributes>
                             </label>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Olo-Bm-ZYz"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="OMh-3m-tmj" firstAttribute="leading" secondItem="YRz-ke-XdF" secondAttribute="leading" id="1uo-YJ-cfK"/>
@@ -1893,7 +1894,6 @@
                             <constraint firstItem="FTV-6u-1B0" firstAttribute="top" secondItem="Olo-Bm-ZYz" secondAttribute="top" constant="20" id="YHC-4q-RUb"/>
                             <constraint firstItem="Olo-Bm-ZYz" firstAttribute="trailing" secondItem="FTV-6u-1B0" secondAttribute="trailing" constant="20" id="bIm-Sb-N7W"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Olo-Bm-ZYz"/>
                     </view>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="localizedTitle" value="opt_out_mopub"/>
@@ -1933,7 +1933,7 @@
 
 Приложение не использует мобильный интернет в роуминге.</string>
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="gS7-2k-8yw" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="gS7-2k-8yw" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="18" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gS7-2k-8yw" id="1pg-RV-MG8">
@@ -1961,7 +1961,7 @@
                                             <outlet property="title" destination="vX5-wa-tBM" id="KIZ-8U-XsY"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="lTE-DT-aCE" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="lTE-DT-aCE" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="62" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lTE-DT-aCE" id="N6p-8U-90b">
@@ -1989,7 +1989,7 @@
                                             <outlet property="title" destination="cOW-yT-WYH" id="3si-Gj-sn7"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="9uV-jg-h2A" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="9uV-jg-h2A" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="106" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9uV-jg-h2A" id="z0N-m2-ums">
@@ -2046,7 +2046,7 @@
                         <sections>
                             <tableViewSection footerTitle="Когда автоматический режим выбран, приложение может отключать энергопотребляющую функциональность при снижении уровня заряда" id="JOr-Xh-pe0">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="E3v-HX-t4T" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="E3v-HX-t4T" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="18" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="E3v-HX-t4T" id="3Lz-ko-Zz4">
@@ -2075,7 +2075,7 @@
                                             <outlet property="title" destination="qmx-xQ-ZWp" id="hmJ-gO-2q6"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="ZIh-Ok-kbn" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="ZIh-Ok-kbn" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="62" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZIh-Ok-kbn" id="Ev7-bM-Auy">
@@ -2104,7 +2104,7 @@
                                             <outlet property="title" destination="kwv-qP-M40" id="IUE-JV-ghM"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="L0p-Ud-RNv" customClass="SettingsTableViewSelectableCell" customModule="maps_me" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SettingsTableViewSelectableCell" id="L0p-Ud-RNv" customClass="SettingsTableViewSelectableCell" customModule="omaps_app" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="106" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L0p-Ud-RNv" id="ZKy-q3-B0i">
@@ -2152,4 +2152,9 @@
             <point key="canvasLocation" x="1881" y="1173"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="groupTableViewBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/iphone/Maps/UI/Storyboard/Welcome.storyboard b/iphone/Maps/UI/Storyboard/Welcome.storyboard
index 101360c5da..290a96db17 100644
--- a/iphone/Maps/UI/Storyboard/Welcome.storyboard
+++ b/iphone/Maps/UI/Storyboard/Welcome.storyboard
@@ -25,7 +25,7 @@
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" ambiguous="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbi-ym-j4p">
                                         <rect key="frame" x="333" y="398" width="227" height="53"/>
-                                        <string key="text">MAPS.ME 
+                                        <string key="text">OMaps 
 All in one travel buddy</string>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                         <nil key="textColor"/>
@@ -278,7 +278,7 @@ All in one travel buddy</string>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" ambiguous="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TUB-Wi-cFX">
                                                 <rect key="frame" x="333" y="398" width="227" height="53"/>
-                                                <string key="text">MAPS.ME 
+                                                <string key="text">OMaps 
 All in one travel buddy</string>
                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
                                                 <nil key="textColor"/>
diff --git a/iphone/Maps/UI/Subscription/City/CitySubscriptionViewController.xib b/iphone/Maps/UI/Subscription/City/CitySubscriptionViewController.xib
index 0fdf974adb..101fecb572 100644
--- a/iphone/Maps/UI/Subscription/City/CitySubscriptionViewController.xib
+++ b/iphone/Maps/UI/Subscription/City/CitySubscriptionViewController.xib
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CitySubscriptionViewController" customModule="maps_me" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CitySubscriptionViewController" customModule="omaps_app" customModuleProvider="target">
             <connections>
                 <outlet property="annualDiscountLabel" destination="YH0-h4-ZEb" id="onk-lS-6im"/>
                 <outlet property="annualSubscriptionButton" destination="neX-0h-hs4" id="I6s-8S-Qks"/>
@@ -162,7 +163,7 @@
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="pHi-wc-Fah">
                                     <rect key="frame" x="20" y="564" width="374" height="144"/>
                                     <subviews>
-                                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="neX-0h-hs4" userLabel="Continue" customClass="BookmarksSubscriptionButton" customModule="maps_me" customModuleProvider="target">
+                                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="neX-0h-hs4" userLabel="Continue" customClass="BookmarksSubscriptionButton" customModule="omaps_app" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="64"/>
                                             <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_subscription_annual"/>
@@ -181,7 +182,7 @@
                                                 <action selector="onAnnualButtonTap:" destination="-1" eventType="touchUpInside" id="KEE-ZN-J9Y"/>
                                             </connections>
                                         </button>
-                                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sj5-ey-SEv" userLabel="Continue" customClass="BookmarksSubscriptionButton" customModule="maps_me" customModuleProvider="target">
+                                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sj5-ey-SEv" userLabel="Continue" customClass="BookmarksSubscriptionButton" customModule="omaps_app" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="80" width="374" height="64"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <accessibility key="accessibilityConfiguration" identifier="welcome_storyboard.button_subscription_monthly"/>
@@ -190,7 +191,7 @@
                                             </constraints>
                                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                                             <state key="normal" title="!! Monthly">
-                                                <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="titleColor" systemColor="darkTextColor"/>
                                                 <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             </state>
                                             <userDefinedRuntimeAttributes>
@@ -202,9 +203,9 @@
                                         </button>
                                     </subviews>
                                 </stackView>
-                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YH0-h4-ZEb" customClass="InsetsLabel" customModule="maps_me" customModuleProvider="target">
-                                    <rect key="frame" x="28" y="541" width="48.5" height="35"/>
-                                    <color key="backgroundColor" systemColor="systemPurpleColor" red="0.68627450980000004" green="0.32156862749999998" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- $38" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YH0-h4-ZEb" customClass="InsetsLabel" customModule="omaps_app" customModuleProvider="target">
+                                    <rect key="frame" x="28" y="541" width="48" height="35"/>
+                                    <color key="backgroundColor" systemColor="systemPurpleColor"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="35" id="ix5-N3-6ov"/>
                                     </constraints>
@@ -291,7 +292,7 @@
                                 </imageView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MPt-NS-DbA">
                                     <rect key="frame" x="0.0" y="1014.5" width="414" height="896"/>
-                                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <userDefinedRuntimeAttributes>
                                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="BookmarkSubscriptionFooterBackground"/>
                                     </userDefinedRuntimeAttributes>
@@ -385,6 +386,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="k4r-ns-RCJ"/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="0eE-hs-sId" secondAttribute="trailing" id="7gZ-TD-rRu"/>
@@ -396,7 +398,6 @@
                 <constraint firstItem="0eE-hs-sId" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="sv4-ek-sAP"/>
                 <constraint firstAttribute="top" secondItem="BHb-cU-Ze3" secondAttribute="top" id="vTu-oZ-veb"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="k4r-ns-RCJ"/>
             <userDefinedRuntimeAttributes>
                 <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
             </userDefinedRuntimeAttributes>
@@ -418,5 +419,14 @@
         <image name="bookmarksSubscriptionClose" width="24" height="24"/>
         <image name="bookmarksSubscriptionFooter" width="375" height="208"/>
         <image name="bookmarksSubscriptionHeader" width="375" height="212.5"/>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemPurpleColor">
+            <color red="0.68627450980392157" green="0.32156862745098042" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/iphone/Maps/main.mm b/iphone/Maps/main.mm
index 4135f36292..1dd91634d8 100644
--- a/iphone/Maps/main.mm
+++ b/iphone/Maps/main.mm
@@ -60,7 +60,7 @@ int main(int argc, char * argv[])
   base::SetAssertFunction(platform::IosAssertMessage);
 #endif
   auto & p = GetPlatform();
-  LOG(LINFO, ("maps.me started, detected CPU cores:", p.CpuCores()));
+  LOG(LINFO, ("omaps started, detected CPU cores:", p.CpuCores()));
 
   setPushWooshSender();
   setMarketingSender();
diff --git a/iphone/Maps/maps.me dbg.entitlements b/iphone/Maps/maps.me dbg.entitlements
index 10a4a32aee..279c3b3fd8 100644
--- a/iphone/Maps/maps.me dbg.entitlements	
+++ b/iphone/Maps/maps.me dbg.entitlements	
@@ -10,9 +10,7 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:dlink.maps.me</string>
-		<string>applinks:dlink.mapsme.devmail.ru</string>
-		<string>applinks:mapsme.onelink.me</string>
+		<string>applinks:dlink.omaps.app</string>
 	</array>
 	<key>com.apple.developer.carplay-maps</key>
 	<true/>
diff --git a/iphone/Maps/maps.me full.entitlements b/iphone/Maps/maps.me full.entitlements
index 10a4a32aee..279c3b3fd8 100644
--- a/iphone/Maps/maps.me full.entitlements	
+++ b/iphone/Maps/maps.me full.entitlements	
@@ -10,9 +10,7 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:dlink.maps.me</string>
-		<string>applinks:dlink.mapsme.devmail.ru</string>
-		<string>applinks:mapsme.onelink.me</string>
+		<string>applinks:dlink.omaps.app</string>
 	</array>
 	<key>com.apple.developer.carplay-maps</key>
 	<true/>
diff --git a/iphone/Maps/maps.me rel.entitlements b/iphone/Maps/maps.me rel.entitlements
index 9eb201708d..26c5dbd48b 100644
--- a/iphone/Maps/maps.me rel.entitlements	
+++ b/iphone/Maps/maps.me rel.entitlements	
@@ -10,9 +10,7 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:dlink.maps.me</string>
-		<string>applinks:dlink.mapsme.devmail.ru</string>
-		<string>applinks:mapsme.onelink.me</string>
+		<string>applinks:dlink.omaps.app</string>
 	</array>
 </dict>
 </plist>
diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj
index 90a13ee7b4..cf506cc15a 100644
--- a/xcode/coding/coding.xcodeproj/project.pbxproj
+++ b/xcode/coding/coding.xcodeproj/project.pbxproj
@@ -811,7 +811,7 @@
 		394916941BAC3A5F002A8C4F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMAPS.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.coding_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -821,7 +821,7 @@
 		394916951BAC3A5F002A8C4F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMAPS.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.coding_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -912,7 +912,7 @@
 		A8E541421F9FBD6B00A1B8FA /* Production Full */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMAPS.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.coding_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/xcode/ge0/ge0.xcodeproj/project.pbxproj b/xcode/ge0/ge0.xcodeproj/project.pbxproj
index 48c94c166b..32438af790 100644
--- a/xcode/ge0/ge0.xcodeproj/project.pbxproj
+++ b/xcode/ge0/ge0.xcodeproj/project.pbxproj
@@ -246,7 +246,7 @@
 		3496AB8A1DC1F6CE00C5DDBA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMAPS.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.ge0_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -255,7 +255,7 @@
 		3496AB8B1DC1F6CE00C5DDBA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMAPS.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.ge0_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -309,7 +309,7 @@
 		A8E5413C1F9FBD5B00A1B8FA /* Production Full */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMAPS.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = maps.me.ge0_tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
diff --git a/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
index 3ddf867a10..dc8d12300f 100644
--- a/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -4,5 +4,7 @@
 <dict>
 	<key>BuildSystemType</key>
 	<string>Latest</string>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
 </dict>
 </plist>
diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj
index dc97a3eb89..ab6ec47867 100644
--- a/xcode/tracking/tracking.xcodeproj/project.pbxproj
+++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj
@@ -357,7 +357,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/OMAPS.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "tracking-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -367,7 +367,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/OMAPS.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "tracking-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -393,7 +393,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/OMAPS.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = "tracking-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};