diff --git a/android/build.gradle b/android/build.gradle
index 4004e97c4f..c11dfd7527 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -43,10 +43,9 @@ android {
   sourceSets.main {
     manifest.srcFile 'AndroidManifest.xml'
     java.srcDirs = ['src']
-    // Flurry key is separated because res/values/strings.xml is auto-generated by tools/unix/update_localizations.sh
-    res.srcDirs = ['res', 'flavors/res-flurry']
+    res.srcDirs = ['res']
     // assets folder is auto-generated by tools/android/update_assets.sh, so we keep all static resources in separate folders.
-    assets.srcDirs = ['assets', 'flavors/assets-mrgs']
+    assets.srcDirs = ['assets', 'assets-mrgs']
     jniLibs.srcDirs = ['libs']
   }
 
diff --git a/android/flavors/res-flurry/values/strings.xml b/android/flavors/res-flurry/values/strings.xml
deleted file mode 100644
index 117c794b86..0000000000
--- a/android/flavors/res-flurry/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
-  <string name="flurry_app_key">***REMOVED***</string>
-</resources>
diff --git a/android/res/values/prefs_names.xml b/android/res/values/donottranslate.xml
similarity index 56%
rename from android/res/values/prefs_names.xml
rename to android/res/values/donottranslate.xml
index ab01766e63..a246faf38e 100644
--- a/android/res/values/prefs_names.xml
+++ b/android/res/values/donottranslate.xml
@@ -1,6 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="shared_user_label" translatable="false">Maps With Me</string>
 
+  <!-- FLURRY -->
+  <string name="flurry_app_key" translatable="false">***REMOVED***</string>
+
+  <!-- FB -->
+  <string name="fb_app_id" translatable="false">185237551520383</string>
+
+  <!-- MAT -->
+  <string name="advertiser_id" translatable="false">14130</string>
+  <string name="conversion_key" translatable="false">***REMOVED***</string>
+
+  <!-- MRGS -->
+  <string name="mrgs_key" translatable="false">***REMOVED***</string>
+  <string name="mrgs_id" translatable="false">150</string>
+
+  <!-- Font names -->
+  <string name="robotoLight" translatable="false">sans-serif-light</string>
+  <string name="robotoRegular" translatable="false">sans-serif</string>
+  <string name="robotoCondensed" translatable="false">sans-serif-condensed</string>
+  <!-- roboto thin (android 4.2)-->
+  <string name="robotoThin" translatable="false">sans-serif-thin</string>
+  <!--  roboto medium (android 5.0)-->
+  <string name="robotoMedium" translatable="false">sans-serif-medium</string>
+
+  <!--  Prefs -->
   <string name="pref_allow_stat" translatable="false">AllowStat</string>
   <string name="pref_munits" translatable="false">MeasurementUnits</string>
   <string name="pref_storage_activity" translatable="false">StorageActivity</string>
@@ -19,5 +44,4 @@
   <string name="pref_subscribe" translatable="false">Subscribe</string>
   <string name="pref_settings" translatable="false">Settings</string>
   <string name="pref_file_name" translatable="false">MapsMePrefs</string>
-
 </resources>
\ No newline at end of file
diff --git a/android/res/values/fb.xml b/android/res/values/fb.xml
deleted file mode 100644
index f1c354e075..0000000000
--- a/android/res/values/fb.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
-    <string name="fb_app_id">185237551520383</string>
-</resources>
\ No newline at end of file
diff --git a/android/res/values/fonts.xml b/android/res/values/fonts.xml
deleted file mode 100644
index f35194c0cd..0000000000
--- a/android/res/values/fonts.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="robotoLight">sans-serif-light</string>
-  <string name="robotoRegular">sans-serif</string>
-  <string name="robotoCondensed">sans-serif-condensed</string>
-  <!-- roboto thin (android 4.2)-->
-  <string name="robotoThin">sans-serif-thin</string>
-  <!--  roboto medium (android 5.0)-->
-  <string name="robotoMedium">sans-serif-medium</string>
-
-</resources>
\ No newline at end of file
diff --git a/android/res/values/mat.xml b/android/res/values/mat.xml
deleted file mode 100644
index 143223631c..0000000000
--- a/android/res/values/mat.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
-    <string name="advertiser_id">14130</string>
-    <string name="conversion_key">***REMOVED***</string>
-</resources>
\ No newline at end of file
diff --git a/android/res/values/mrgs.xml b/android/res/values/mrgs.xml
deleted file mode 100644
index b71152b6af..0000000000
--- a/android/res/values/mrgs.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<resources>
-  <string name="mrgs_key">***REMOVED***</string>
-  <string name="mrgs_id">150</string>
-</resources>
\ No newline at end of file
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f54541738c..23fd54be37 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -4,8 +4,6 @@
 <!-- Language: en -->
 <resources>
 	<!-- SECTION: Strings -->
-	<!-- DO NOT TRANSLATE! Used only on Android for special purposes. -->
-	<string name="shared_user_label">Maps With Me</string>
 	<!-- About button text (should be short) -->
 	<string name="about">About</string>
 	<!-- Button text (should be short) -->
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index 73a5487608..227134691f 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "نبذة عنا";
 
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index e3c7284271..1c79533148 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "O aplikaci";
 
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index 756766496f..d996e713d1 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Om app";
 
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 99312d6654..82d695b3a4 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Über Karten";
 
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index 88c23957d0..906f3fdc61 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "About";
 
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 1e15a6b2e5..bbe9a0b9e4 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Acerca de";
 
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index df37842430..ab5fe9056b 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "À propos de";
 
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index fd8cc6b6f5..f1d9cc19ac 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "A programról";
 
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index bdfbd3f4c7..ba039636c5 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Informazioni";
 
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index afe5f411f5..34f68b6f63 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "情報";
 
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index ccaf223b12..04e10d54f9 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "소개";
 
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index c9682665e4..194b64ae8c 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Over";
 
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index 19332fc7b5..df9b4f6686 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "O programie";
 
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index cd2e70ff93..acb47b3350 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Sobre";
 
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 5cf80c2dbe..45c1ab6f76 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "О программе";
 
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index aac391e36d..31607bb95d 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "O aplikácii";
 
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index f48fc9fa90..511255709b 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Om";
 
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index de31d0be83..a352b3f86d 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "เกี่ยวกับ";
 
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index 203bc58152..d559b62181 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Hakkında";
 
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index b68c1afc5f..80451e1257 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "Про програму";
 
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index 5810ea65ee..d1ad175808 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "关于";
 
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index d9fc5fda79..7a60ec73b2 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -6,9 +6,6 @@
 
 /********** Strings **********/
 
-/* DO NOT TRANSLATE! Used only on Android for special purposes. */
-"shared_user_label" = "Maps With Me";
-
 /* About button text (should be short) */
 "about" = "關於";
 
diff --git a/strings.txt b/strings.txt
index 9dec15e08c..7740c3a414 100644
--- a/strings.txt
+++ b/strings.txt
@@ -1,10 +1,5 @@
 [[Strings]]
-  [shared_user_label]
-    en = Maps With Me
-    tags = android
-    comment = DO NOT TRANSLATE! Used only on Android for special purposes.
-
-  [about]
+ [about]
     tags = tizen
     en = About
     comment = About button text (should be short)