From 4512300752b65ab7cd280d1fc153334b847656a9 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 9 Feb 2021 18:10:21 +0100
Subject: [PATCH] Refactor translation names & remove no translate unclear file

---
 OsmAnd/build.gradle                | 3 +++
 OsmAnd/res/values/no_translate.xml | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index e49cd28611..11c9388fa0 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -131,16 +131,19 @@ android {
 			dimension "version"
 			applicationId "net.osmand"
 			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", ""
 		}
 		amazonFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
 			resValue "string", "app_name", "OsmAnd+"
+			resValue "string", "app_edition", ""
 		}
 		huawei {
 			dimension "version"
 			applicationId "net.osmand.huawei"
 			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", ""
 		}
 
         // Build that includes 3D OpenGL release
diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 1bbd142295..2ae0fc4ec5 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name">OsmAnd~</string>
+    <!-- Part of build.gradle -->
+    <!-- <string name="app_name">OsmAnd~</string> -->
+    <!-- <string name="app_edition"></string> -->
     <!-- string name="app_version_suffix"></string -->
 
     <!-- Not translatable -->
@@ -8,11 +10,7 @@
     <string name="srtm_plugin_price">€2,99</string>
     <string name="sea_depth_maps_price">€1,39</string>
     <string name="osm_live">OsmAnd Live</string>
-    <string name="ga_api_key">UA-28342846-2</string>
-    <string name="ga_dispatchPeriod">10</string>
-    <string name="ga_debug">true</string>
     <string name="openstreetmap_copyright"><a href="https://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
-    <string name="app_edition"></string>
     <string name="support_email">support@osmand.net</string>
     <string name="preferred_locale_no_translate">Display language</string>
     <string name="system_locale_no_translate">Device language</string>