From 841b34fcff835d7ca9a63fa91b361ef77e3ae765 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Sat, 14 Jul 2012 00:28:13 -0700
Subject: [PATCH] [android] Fix android:sharedUserLabel - equal for all apps.
 It's needed for installation.

---
 android/MapsWithMeLite/AndroidManifest.xml | 6 +++---
 android/MapsWithMePro/AndroidManifest.xml  | 2 +-
 android/res/values/strings.xml             | 2 ++
 iphone/Maps/de.lproj/Localizable.strings   | 3 +++
 iphone/Maps/en.lproj/Localizable.strings   | 3 +++
 iphone/Maps/es.lproj/Localizable.strings   | 3 +++
 iphone/Maps/fr.lproj/Localizable.strings   | 3 +++
 iphone/Maps/it.lproj/Localizable.strings   | 3 +++
 iphone/Maps/ja.lproj/Localizable.strings   | 3 +++
 iphone/Maps/ko.lproj/Localizable.strings   | 3 +++
 iphone/Maps/ru.lproj/Localizable.strings   | 3 +++
 strings.txt                                | 3 +++
 12 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/android/MapsWithMeLite/AndroidManifest.xml b/android/MapsWithMeLite/AndroidManifest.xml
index d2b982e7fa..d66458da51 100644
--- a/android/MapsWithMeLite/AndroidManifest.xml
+++ b/android/MapsWithMeLite/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.mapswithme.maps"
-      android:versionCode="205"
-      android:versionName="2.0.5"
+      android:versionCode="210"
+      android:versionName="2.1.0"
       android:installLocation="preferExternal"
       android:sharedUserId="com.mapswithme"
-      android:sharedUserLabel="@string/app_name">
+      android:sharedUserLabel="@string/shared_user_label">
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
     <uses-feature android:required="true" android:name="android.hardware.touchscreen.multitouch" />
diff --git a/android/MapsWithMePro/AndroidManifest.xml b/android/MapsWithMePro/AndroidManifest.xml
index e6c2e54aa3..fd95031e60 100644
--- a/android/MapsWithMePro/AndroidManifest.xml
+++ b/android/MapsWithMePro/AndroidManifest.xml
@@ -5,7 +5,7 @@
       android:versionName="2.1.0"
       android:installLocation="preferExternal"
       android:sharedUserId="com.mapswithme"
-      android:sharedUserLabel="@string/app_name">
+      android:sharedUserLabel="@string/shared_user_label">
     <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
     <uses-feature android:required="true" android:name="android.hardware.touchscreen.multitouch" />
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index a762dd41c1..d0a8979d8f 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -4,6 +4,8 @@
 <!-- Language: en -->
 <resources>
 	<!-- Strings -->
+	<!-- Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. -->
+	<string name="shared_user_label">Maps With Me</string>
 	<!-- Dialog text when paid version become available on the market. Showed only once. -->
 	<string name="pro_version_available">A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?</string>
 	<!-- About button text (should be short! @todo - fix french) -->
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 20bb383c3e..3088fdd125 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "Die neue kostenpflichtige Version von MapsWithMe mit Suchfunktion ist erhältlich. Möchten Sie sie jetzt herunterladen?";
 
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index a735e9987d..86df6f2dfd 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?";
 
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 5a837dfb42..0f409c98f2 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "Salió una nueva versión de pago, ¿quieres descargala ahora?";
 
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index f9d110222c..e46a522536 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "La nouvelle version payante de MapsWithMe est accessible. Voulez vous l'installer maintenant?";
 
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index abcb40cd83..3cc8b32717 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?";
 
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index 01590ec874..b7a850daef 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "MapsWithMe完全版ならオフラインサーチでさらにナビゲートが簡単です。今すぐご入手下さい！";
 
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index a86afc99d7..214cd18f9a 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "오프라인 검색 기능의 MapsWithMe의 풀버젼으로 보다 쉽게 검색하세요. 지금 구매하세요!";
 
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 53100326c2..7fc2542a61 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -6,6 +6,9 @@
 
 /********** Strings **********/
 
+/* Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere. */
+"shared_user_label" = "Maps With Me";
+
 /* Dialog text when paid version become available on the market. Showed only once. */
 "pro_version_available" = "Вышла платная версия MapsWithMe с поиском. Хотите установить её прямо сейчас?";
 
diff --git a/strings.txt b/strings.txt
index c90d611ad0..5256d2c635 100644
--- a/strings.txt
+++ b/strings.txt
@@ -1,4 +1,7 @@
 [[Strings]]
+	[shared_user_label]
+		en = Maps With Me
+		comment = Used in Android manifest for all apps (Lite and Pro), because it should be equal everywere.
 	[pro_version_available]
 		en = A paid version of MapsWithMe, featuring search, is available for download. Would you like to get it now?
 		comment = Dialog text when paid version become available on the market. Showed only once.