SecondScreen 2.7.1 (release 4)

* String fixes
farmerbb · Jun 9, 2018 · ccbeff1 · ccbeff1
1 parent 3d36992
commit ccbeff1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,7 +23,7 @@ android {
         //noinspection OldTargetApi
         targetSdkVersion 25
 
-        versionCode 175
+        versionCode 176
         versionName "2.7.1"
 
         resConfigs "en", "es", "fr", "sk"

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileViewFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileViewFragment.java
@@ -133,14 +133,14 @@ public void onActivityCreated(Bundle savedInstanceState) {
         if("quick_actions".equals(prefCurrent.getString("filename", "0"))) {
             SharedPreferences prefQuick = U.getPrefQuickActions(getActivity());
             if(filename.equals(prefQuick.getString("original_filename", "0"))) {
-                button.setText(getResources().getString(R.string.action_turn_off, getArguments().getString("title")));
+                button.setText(getResources().getString(R.string.action_turn_off_alt, getArguments().getString("title")));
                 button.setOnClickListener(view -> listener.onTurnOffProfileButtonClick());
             } else {
                 button.setText(getResources().getString(R.string.action_load, getArguments().getString("title")));
                 button.setOnClickListener(view -> listener.onLoadProfileButtonClick(filename));
             }
         } else if(filename.equals(prefCurrent.getString("filename", "0"))) {
-            button.setText(getResources().getString(R.string.action_turn_off, getArguments().getString("title")));
+            button.setText(getResources().getString(R.string.action_turn_off_alt, getArguments().getString("title")));
             button.setOnClickListener(view -> listener.onTurnOffProfileButtonClick());
         } else {
             button.setText(getResources().getString(R.string.action_load, getArguments().getString("title")));

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/SettingsFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/SettingsFragment.java
@@ -149,7 +149,7 @@ public void onResume() {
             File file = new File(getActivity().getFilesDir() + File.separator + prefMain.getString("hdmi_load_profile", "show_list"));
             if(file.exists()) {
                 try {
-                    findPreference("hdmi_select_profile").setSummary(getResources().getString(R.string.action_load) + " " + U.getProfileTitle(getActivity(), prefMain.getString("hdmi_load_profile", "show_list")));
+                    findPreference("hdmi_select_profile").setSummary(getResources().getString(R.string.action_load, U.getProfileTitle(getActivity(), prefMain.getString("hdmi_load_profile", "show_list"))));
                 } catch (IOException e) { /* Gracefully fail */ }
             } else
                 findPreference("hdmi_select_profile").setSummary(getResources().getString(R.string.show_list));

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -30,7 +30,8 @@
     <string name="action_save_only">Guardar sólo</string>
     <string name="action_ok">Aceptar</string>
     <string name="action_settings">Configuración</string>
-    <string name="action_turn_off">Cerrar %1$s</string>
+    <string name="action_turn_off">Cerrar</string>
+    <string name="action_turn_off_alt">Cerrar %1$s</string>
     <string name="action_uninstall">Uninstall</string>
     <string name="am_restart_warning">Este método no se recomienda con el mirroring, pantalla inalámbrica</string>
     <string name="any_profile">Cualquier perfil</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -30,7 +30,8 @@
     <string name="action_save_only">Sauvegarder uniquement</string>
     <string name="action_ok">OK</string>
     <string name="action_settings">Paramètres</string>
-    <string name="action_turn_off">Désactiver %1$s</string>
+    <string name="action_turn_off">Désactiver</string>
+    <string name="action_turn_off_alt">Désactiver %1$s</string>
     <string name="action_uninstall">Uninstall</string>
     <string name="am_restart_warning">This option is not recommended when mirroring to wireless displays</string>
     <string name="any_profile">N\'importe quel profile?</string>

diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
@@ -30,7 +30,8 @@
     <string name="action_save_only">Iba uložiť</string>
     <string name="action_ok">OK</string>
     <string name="action_settings">Nastavenia</string>
-    <string name="action_turn_off">Vypnúť %1$s</string>
+    <string name="action_turn_off">Vypnúť</string>
+    <string name="action_turn_off_alt">Vypnúť %1$s</string>
     <string name="action_uninstall">Odinštalovať</string>
     <string name="am_restart_warning">Toto nastavenie nie je odporúčané pri bezdrôtovom zrkadlení</string>
     <string name="any_profile">Žiadny profil</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -30,7 +30,8 @@
     <string name="action_save_only">Save only</string>
     <string name="action_ok">OK</string>
     <string name="action_settings">Settings</string>
-    <string name="action_turn_off">Turn Off %1$s</string>
+    <string name="action_turn_off">Turn Off</string>
+    <string name="action_turn_off_alt">Turn Off %1$s</string>
     <string name="action_uninstall">Uninstall</string>
     <string name="am_restart_warning">This method is not recommended when mirroring to wireless displays</string>
     <string name="any_profile">Any profile</string>