From 542a4db3d50b052d835630e44e10c657db5f9180 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 24 Aug 2020 08:33:09 +0700
Subject: [PATCH] chore(android): Tweak languages strings

---
 .../kmapro/KeymanSettingsInstallActivity.java      |  6 +++---
 .../tavultesoft/kmapro/SelectLanguageFragment.java |  2 +-
 .../KMAPro/kMAPro/src/main/res/values/strings.xml  | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsInstallActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsInstallActivity.java
index 2b7cc003f7..dc3f459ae9 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsInstallActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsInstallActivity.java
@@ -89,7 +89,7 @@ public class KeymanSettingsInstallActivity extends AppCompatActivity {
     */
 
     hashMap = new HashMap<>();
-    hashMap.put(titleKey, getString(R.string.add_language_to_installed_keyboard));
+    hashMap.put(titleKey, getString(R.string.add_languages_to_installed_keyboard));
     hashMap.put(subtitleKey, getString(R.string.add_language_subtext));
     icon = String.valueOf(R.drawable.ic_content_add);
     hashMap.put(iconKey, icon);
@@ -108,7 +108,7 @@ public class KeymanSettingsInstallActivity extends AppCompatActivity {
         if (itemTitle.equals(getString(R.string.install_from_other_device))) {
           // Scan QR code not implemented yet
           return false;
-        } else if (itemTitle.equals(getString(R.string.add_language_to_installed_keyboard))) {
+        } else if (itemTitle.equals(getString(R.string.add_languages_to_installed_keyboard))) {
           if (KeyboardController.getInstance().getInstalledPackagesList() == null) {
             // Disable if no keyboard packages installed
             return false;
@@ -155,7 +155,7 @@ public class KeymanSettingsInstallActivity extends AppCompatActivity {
           // TODO
 
         // Add language from keyboard package already installed
-        } else if (itemTitle.equals(getString(R.string.add_language_to_installed_keyboard))) {
+        } else if (itemTitle.equals(getString(R.string.add_languages_to_installed_keyboard))) {
           Intent intent = new Intent(context, SelectPackageActivity.class);
           context.startActivity(intent);
         }
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectLanguageFragment.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectLanguageFragment.java
index 49039988cd..59d39d72c0 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectLanguageFragment.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectLanguageFragment.java
@@ -107,7 +107,7 @@ public final class SelectLanguageFragment extends Fragment implements BlockingSt
     }
     final String keyboardID = keyboard.getKeyboardID();
     final String keyboardName = keyboard.getKeyboardName();
-    String title_install = String.format(getString(R.string.title_select_language_for_package), keyboardName);
+    String title_install = String.format(getString(R.string.title_select_languages_for_package), keyboardName);
     String title_no_install = getString(R.string.all_languages_installed);
     final TextView textView = v.findViewById(R.id.bar_title);
     textView.setText(title_no_install);
diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index b2c5e311ca..46b4985070 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -107,22 +107,22 @@
   <string name="install_from_other_device" comment="Scan QR Code">Install from other device</string>
 
   <!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
-  <string name="add_language_to_installed_keyboard" comment="Install another language from a keyboard package">Add language to installed keyboard</string>
+  <string name="add_languages_to_installed_keyboard" comment="Install additional languages from a keyboard package">Add languages to installed keyboard</string>
 
   <!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
   <string name="add_language_subtext" comment="Additional information for adding another language">(from keyboard package)</string>
 
 
-  <!-- Context: Select Package and Select Language menu -->
-  <string name="title_select_keyboard_package_list" comment="Select a keyboard package to add a language">Select Keyboard Package</string>
+  <!-- Context: Select Package and Select Languages menu -->
+  <string name="title_select_keyboard_package_list" comment="Select a keyboard package to add languages">Select Keyboard Package</string>
 
-  <!-- Context: Select Package and Select Language menu -->
-  <string name="title_select_language_for_package" comment="Select a language name from the keyboard package">Select language for %1$s</string>
+  <!-- Context: Select Package and Select Languages menu -->
+  <string name="title_select_languages_for_package" comment="Select language names from the keyboard package">Select languages for %1$s</string>
 
-  <!-- Context: Select Package and Select Language menu -->
+  <!-- Context: Select Package and Select Languages menu -->
   <string name="added_language_to_keyboard" comment="Notification that a language name is added to a keyboard">Added language %1$s to %2$s</string>
 
-  <!-- Context: Select Package and Select Language menu -->
+  <!-- Context: Select Package and Select Languages menu -->
   <string name="all_languages_installed" comment="Text when all languages from a keyboard package have been installed">All languages already installed</string>