From edc84df0374f56c991ddcd97d6f646ef1f20d749 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 4 Jul 2015 22:50:32 +0100
Subject: [PATCH] resources for free/premium conflict dialog

---
 AndroidManifest.xml                    | 4 ++--
 AndroidManifest.xml.pattern            | 4 ++--
 assets/resources/application/ar.xml    | 5 ++++-
 assets/resources/application/be.xml    | 5 ++++-
 assets/resources/application/bg.xml    | 5 ++++-
 assets/resources/application/ca.xml    | 5 ++++-
 assets/resources/application/cs.xml    | 5 ++++-
 assets/resources/application/da.xml    | 5 ++++-
 assets/resources/application/de.xml    | 5 ++++-
 assets/resources/application/el.xml    | 5 ++++-
 assets/resources/application/en.xml    | 5 ++++-
 assets/resources/application/en_US.xml | 5 ++++-
 assets/resources/application/es.xml    | 5 ++++-
 assets/resources/application/eu.xml    | 5 ++++-
 assets/resources/application/fa.xml    | 5 ++++-
 assets/resources/application/fr.xml    | 5 ++++-
 assets/resources/application/gl.xml    | 5 ++++-
 assets/resources/application/hu.xml    | 5 ++++-
 assets/resources/application/hy.xml    | 5 ++++-
 assets/resources/application/it.xml    | 5 ++++-
 assets/resources/application/ja.xml    | 5 ++++-
 assets/resources/application/ka.xml    | 5 ++++-
 assets/resources/application/ko.xml    | 5 ++++-
 assets/resources/application/nb.xml    | 5 ++++-
 assets/resources/application/nl.xml    | 5 ++++-
 assets/resources/application/pl.xml    | 5 ++++-
 assets/resources/application/pt.xml    | 5 ++++-
 assets/resources/application/ro.xml    | 7 +++++--
 assets/resources/application/ru.xml    | 5 ++++-
 assets/resources/application/sr.xml    | 5 ++++-
 assets/resources/application/th.xml    | 5 ++++-
 assets/resources/application/tr.xml    | 5 ++++-
 assets/resources/application/uk.xml    | 5 ++++-
 assets/resources/application/vi.xml    | 5 ++++-
 assets/resources/application/zh.xml    | 5 ++++-
 assets/resources/application/zh_TW.xml | 5 ++++-
 res/values/strings.xml                 | 1 +
 37 files changed, 142 insertions(+), 39 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1eefada6b..93a65ecd4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,7 @@
 		android:name="org.geometerplus.android.fbreader.FBReaderApplication"
 		android:icon="@drawable/fbreader"
 		android:logo="@drawable/fbreader_bw"
-		android:label="FBReader"
+		android:label="@string/app_name"
 	>
 		<activity android:name="org.geometerplus.android.fbreader.error.BookReadingErrorActivity" android:theme="@style/FBReader.Dialog" android:process=":error" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
@@ -56,7 +56,7 @@
 				<category android:name="android.intent.category.DEFAULT"/>
 			</intent-filter>
 		</service>
-		<activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
+		<activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="@string/app_name" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index d4b1cf6e4..c466808ab 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -21,7 +21,7 @@
 		android:name="org.geometerplus.android.fbreader.FBReaderApplication"
 		android:icon="@drawable/fbreader"
 		android:logo="@drawable/fbreader_bw"
-		android:label="FBReader"
+		android:label="@string/app_name"
 	>
 		<activity android:name="org.geometerplus.android.fbreader.error.BookReadingErrorActivity" android:theme="@style/FBReader.Dialog" android:process=":error" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
@@ -56,7 +56,7 @@
 				<category android:name="android.intent.category.DEFAULT"/>
 			</intent-filter>
 		</service>
-		<activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
+		<activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="@string/app_name" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/assets/resources/application/ar.xml b/assets/resources/application/ar.xml
index 314d4b985..107cd4505 100644
--- a/assets/resources/application/ar.xml
+++ b/assets/resources/application/ar.xml
@@ -1186,5 +1186,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml
index 8793f5a03..471856505 100644
--- a/assets/resources/application/be.xml
+++ b/assets/resources/application/be.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml
index 8b31868de..9ee0ec23b 100644
--- a/assets/resources/application/bg.xml
+++ b/assets/resources/application/bg.xml
@@ -1194,5 +1194,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml
index 901a0de4f..3abb9f504 100644
--- a/assets/resources/application/ca.xml
+++ b/assets/resources/application/ca.xml
@@ -1194,5 +1194,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index 7ffab2fd4..b8f946778 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -1197,5 +1197,8 @@
 		<node name="cannotOpenDictionary" value="nelze otevřít slovník"/>
 		<node name="noDictionarySelected" value="není vybrán slovník; opravte to v nastavení Dictan"/>
 	</node>
-	<node name="premium" value="FBReader prémiová edice"/>
+	<node name="premium" value="FBReader prémiová edice">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml
index 713f4295f..0f9fd25c8 100644
--- a/assets/resources/application/da.xml
+++ b/assets/resources/application/da.xml
@@ -1187,5 +1187,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index 394d74cd4..85b775b1c 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -1193,5 +1193,8 @@
 		<node name="cannotOpenDictionary" value="Wörterbuch kann nicht geöffnet werden"/>
 		<node name="noDictionarySelected" value="Kein Wörterbuch ausgewählt; Bitte in den Dictan Einstellungen beheben"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition"/>
+	<node name="premium" value="FBReader Premium Edition">
+		<node name="shortTitle" value="FBReader Premium"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml
index 9de6563fd..1c9ec2a4e 100644
--- a/assets/resources/application/el.xml
+++ b/assets/resources/application/el.xml
@@ -1186,5 +1186,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index d775392a2..0c44036c7 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition"/>
+	<node name="premium" value="FBReader Premium Edition">
+		<node name="shortTitle" value="FBReader Premium"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/en_US.xml b/assets/resources/application/en_US.xml
index 3651a71af..0aff29c58 100644
--- a/assets/resources/application/en_US.xml
+++ b/assets/resources/application/en_US.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition"/>
+	<node name="premium" value="FBReader Premium Edition">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml
index e2e6b1362..e5eca2783 100644
--- a/assets/resources/application/es.xml
+++ b/assets/resources/application/es.xml
@@ -1194,5 +1194,8 @@
 		<node name="cannotOpenDictionary" value="No se ha podido abrir el diccionario"/>
 		<node name="noDictionarySelected" value="No se ha seleccionado el diccionario; por favor, configure los ajustes de Dictan"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition"/>
+	<node name="premium" value="FBReader Premium Edition">
+		<node name="shortTitle" value="FBReader Premium"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml
index 6cdde34dd..f9c57fd3d 100644
--- a/assets/resources/application/eu.xml
+++ b/assets/resources/application/eu.xml
@@ -1189,5 +1189,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml
index 2af82be07..2ebb0ee4c 100644
--- a/assets/resources/application/fa.xml
+++ b/assets/resources/application/fa.xml
@@ -1187,5 +1187,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index af7568c99..9b01911cc 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -1181,5 +1181,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml
index 9997ecbf1..4a0fd9c28 100644
--- a/assets/resources/application/gl.xml
+++ b/assets/resources/application/gl.xml
@@ -1178,5 +1178,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index 2ce2800ae..ef06813b6 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -1178,5 +1178,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml
index e13e5146a..b7a6e83cb 100644
--- a/assets/resources/application/hy.xml
+++ b/assets/resources/application/hy.xml
@@ -1194,5 +1194,8 @@
 		<node name="cannotOpenDictionary" value="չհաջողվեց բացել բառարանը"/>
 		<node name="noDictionarySelected" value="բառարան ընտրված չէ, ընտրեք այն Dictan  կարգավորումներում"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index dec560ddc..2b41edcbb 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -1179,5 +1179,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/ja.xml b/assets/resources/application/ja.xml
index c0ff1c1d5..0b5e86aa9 100644
--- a/assets/resources/application/ja.xml
+++ b/assets/resources/application/ja.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="辞書を開くことができません"/>
 		<node name="noDictionarySelected" value="辞書が選択されていません; Dictan で設定を直してください"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml
index 148b0958a..c771ff437 100644
--- a/assets/resources/application/ka.xml
+++ b/assets/resources/application/ka.xml
@@ -1193,5 +1193,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/ko.xml b/assets/resources/application/ko.xml
index b08dab9b9..ebe1db9c2 100644
--- a/assets/resources/application/ko.xml
+++ b/assets/resources/application/ko.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml
index d58ab623d..dc26d0a4c 100644
--- a/assets/resources/application/nb.xml
+++ b/assets/resources/application/nb.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml
index e42ad2a8f..0dd8a4222 100644
--- a/assets/resources/application/nl.xml
+++ b/assets/resources/application/nl.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="Kan woordenlijst niet openen"/>
 		<node name="noDictionarySelected" value="Geen woordenboek geselecteerd; lost dit op in de Dictan-instellingen"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml
index 155a6e9e8..68a907296 100644
--- a/assets/resources/application/pl.xml
+++ b/assets/resources/application/pl.xml
@@ -1178,5 +1178,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml
index 4158bf627..ff39f0b2c 100755
--- a/assets/resources/application/pt.xml
+++ b/assets/resources/application/pt.xml
@@ -1192,5 +1192,8 @@
 		<node name="cannotOpenDictionary" value="Não foi possível abrir dicionário"/>
 		<node name="noDictionarySelected" value="Dicionário não selecionado; por favor ajuste as definições Dictan"/>
 	</node>
-	<node name="premium" value="FBReader - Edição Premium"/>
+	<node name="premium" value="FBReader - Edição Premium">
+		<node name="shortTitle" value="FBReader Premium"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml
index 19aacff95..608471dc4 100644
--- a/assets/resources/application/ro.xml
+++ b/assets/resources/application/ro.xml
@@ -766,7 +766,7 @@
 			<node name="errorToastDuration" value="Cât timp pentru a afisa mesajul de eroare"/>
 			<node name="sourceLanguage" value="Traducere din">
 				<node name="detect" value="Autodetectare limba"/>
-				</node>
+			</node>
 			<node name="targetLanguage" value="Tradu in">
 				<node name="any" value="toate limbile"/>
 			</node>
@@ -1181,5 +1181,8 @@
 		<node name="cannotOpenDictionary" value="Nu se poate deschide dictionarul"/>
 		<node name="noDictionarySelected" value="Dictionar ne selectat; vă rugăm să ajustați setările Dictionar"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition"/>
+	<node name="premium" value="FBReader Premium Edition">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index b20c9b0a4..f776903f1 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -1197,7 +1197,10 @@
 		<node name="cannotOpenDictionary" value="не удалось открыть словать"/>
 		<node name="noDictionarySelected" value="словарь не выбран; сделайте это в настроках Dictan"/>
 	</node>
-	<node name="premium" value="FBReader Premium"/>
+	<node name="premium" value="FBReader Premium">
+		<node name="shortTitle" value="FBReader Premium"/>
+		<node name="conflict" value="Кажется, у вас установлены и FBReader, и FBReader Premium. Который из них вы хотите запустить?"/>
+	</node>
 	<node name="dictionary">
 		<node name="Yandex.Translate" value="Яндекс.Переводчик"/>
 	</node>
diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml
index eacc58b90..eba5113e6 100644
--- a/assets/resources/application/sr.xml
+++ b/assets/resources/application/sr.xml
@@ -1188,5 +1188,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml
index a8d1699f4..3235c77c5 100644
--- a/assets/resources/application/th.xml
+++ b/assets/resources/application/th.xml
@@ -1178,5 +1178,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml
index 6a3dd5499..2f9c19351 100644
--- a/assets/resources/application/tr.xml
+++ b/assets/resources/application/tr.xml
@@ -1188,7 +1188,10 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 	<node name="dictionary">
 		<node name="Yandex.Translate" value="Yandex.Çeviri"/>
 	</node>
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index 9b4f555bc..e2129dac9 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -1178,7 +1178,10 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 	<node name="dictionary">
 		<node name="Yandex.Translate" value="Яндекс.Перекладач"/>
 	</node>
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index 195986a58..4d39c7595 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -1179,5 +1179,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index 62ced80e5..e69f348ab 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -1178,5 +1178,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml
index a80eb653d..7e0b8c795 100644
--- a/assets/resources/application/zh_TW.xml
+++ b/assets/resources/application/zh_TW.xml
@@ -1178,5 +1178,8 @@
 		<node name="cannotOpenDictionary" value="Cannot open dictionary" toBeTranslated="true"/>
 		<node name="noDictionarySelected" value="Dictionary not selected; please adjust Dictan settings" toBeTranslated="true"/>
 	</node>
-	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true"/>
+	<node name="premium" value="FBReader Premium Edition" toBeTranslated="true">
+		<node name="shortTitle" value="FBReader Premium" toBeTranslated="true"/>
+		<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?" toBeTranslated="true"/>
+	</node>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 890c2effd..251f9a7d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="app_name">FBReader</string>
 	<string name="empty_string"></string>
 </resources>