FP2-1600 : OOBE translations contain old texts
Upped the Launcher Version so that the changes will appear. Also changed some resource references
JIRA-ID : FPII-1600
Change-Id: Iba6a041a5e6a609d03b5fb581c5111780601cff1
(cherry picked from commit 77d18667dc61be0f0ae9edc5b82723d890163e62)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43ecc6e..32bd6fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.fairphone.fplauncher3"
- android:versionCode="6"
- android:versionName="6 (FP2 - 1.1)">
+ android:versionCode="7"
+ android:versionName="7 (FP2 - 1.1)">
<uses-sdk
android:minSdkVersion="17"
diff --git a/res/layout/fp_oobe_texts.xml b/res/layout/fp_oobe_texts.xml
index f7166f9..629cf15 100644
--- a/res/layout/fp_oobe_texts.xml
+++ b/res/layout/fp_oobe_texts.xml
@@ -79,7 +79,7 @@
android:layout_marginTop="56dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
- android:text="@string/workspace_cling_longpress_title" />
+ android:text="@string/oobe_longpress_title" />
<TextView
style="@style/oobe_description"
diff --git a/res/layout/longpress_cling_content.xml b/res/layout/longpress_cling_content.xml
index 47a8e97..62e0a5b 100644
--- a/res/layout/longpress_cling_content.xml
+++ b/res/layout/longpress_cling_content.xml
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:paddingLeft="36dp"
android:paddingRight="36dp"
- android:text="@string/workspace_cling_longpress_title"
+ android:text="@string/oobe_longpress_title"
android:textColor="#E1000000"
android:textSize="24sp" />
@@ -40,4 +40,4 @@
android:textColor="#FFFFFFFF"
android:textSize="14sp" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/longpress_cling_welcome_content.xml b/res/layout/longpress_cling_welcome_content.xml
index dd4f8d7..4fd09c2 100644
--- a/res/layout/longpress_cling_welcome_content.xml
+++ b/res/layout/longpress_cling_welcome_content.xml
@@ -23,7 +23,7 @@
android:fontFamily="sans-serif-medium"
android:paddingLeft="36dp"
android:paddingRight="36dp"
- android:text="@string/workspace_cling_longpress_title"
+ android:text="@string/oobe_longpress_title"
android:textColor="#E1000000"
android:textSize="20sp" />
@@ -51,4 +51,4 @@
android:textColor="#FFFFFFFF"
android:textSize="14sp" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f711a3a..478d21b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -52,7 +52,7 @@
<string name="migration_cling_description" msgid="2752413805582227644">"Importar ícones e pastas dos ecrãs principais antigos?"</string>
<string name="migration_cling_copy_apps" msgid="946331230090919440">"COPIAR ÍCONES"</string>
<string name="migration_cling_use_default" msgid="2626475813981258626">"COMEÇAR DO INÍCIO"</string>
- <string name="workspace_cling_longpress_title" msgid="9173998993909018310">"Imagens de fundo, widgets e definições"</string>
+ <string name="workspace_cling_longpress_title" msgid="9173998993909018310">"Imagens de fundo, widgets e aplicações"</string>
<string name="workspace_cling_longpress_description" msgid="4119994475505235248">"Toque sem soltar no fundo para personalizar"</string>
<string name="workspace_cling_longpress_dismiss" msgid="368660286867640874">"COMPREENDI"</string>
<string name="folder_opened" msgid="94695026776264709">"Pasta aberta, <xliff:g id="WIDTH">%1$d</xliff:g> por <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
@@ -69,4 +69,4 @@
<string name="abandoned_search" msgid="891119232568284442">"Pesquisar"</string>
<string name="abandoned_promises_title" msgid="7096178467971716750">"Esta aplicação não está instalada"</string>
<string name="abandoned_promise_explanation" msgid="3990027586878167529">"A aplicação deste ícone não está instalada. Pode removê-lo ou pesquisar a aplicação e instalá-la manualmente."</string>
-</resources>
\ No newline at end of file
+</resources>