From ebe1f831e7659b63b76c2b39498b68d1fec61673 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Fri, 14 Aug 2015 16:51:39 -0400
Subject: strings & enable service preference

---
 app/src/main/res/layout/autofill_row_layout.xml |  2 --
 app/src/main/res/layout/fragment_autofill.xml   |  8 ++++----
 app/src/main/res/values-cs/strings.xml          |  2 +-
 app/src/main/res/values/strings.xml             | 15 +++++++++++++--
 app/src/main/res/xml/preference.xml             | 14 +++++++++-----
 5 files changed, 27 insertions(+), 14 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml
index 190c651f..6e51fab3 100644
--- a/app/src/main/res/layout/autofill_row_layout.xml
+++ b/app/src/main/res/layout/autofill_row_layout.xml
@@ -20,7 +20,6 @@
             android:id="@+id/app_icon"
             />
 
-
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="wrap_content"
@@ -41,7 +40,6 @@
                 android:textColor="@color/grey_600"/>
         </LinearLayout>
 
-
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
index e5534f41..af2b7017 100644
--- a/app/src/main/res/layout/fragment_autofill.xml
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -16,7 +16,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Use default setting"
+            android:text="@string/autofill_apps_default"
             android:id="@+id/use_default"
             android:layout_gravity="center_vertical"
             android:checked="false"/>
@@ -24,7 +24,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Automatically match"
+            android:text="@string/autofill_apps_first"
             android:id="@+id/first"
             android:layout_gravity="center_vertical"
             android:checked="false"/>
@@ -32,7 +32,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Match with..."
+            android:text="@string/autofill_apps_match_ellipsis"
             android:id="@+id/match"
             android:layout_gravity="center_vertical"
             android:checked="false"
@@ -48,7 +48,7 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Never match"
+            android:text="@string/autofill_apps_never"
             android:id="@+id/never"
             android:layout_gravity="center_vertical"
             android:checked="false"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 309ff2d6..8d97f2ef 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -116,8 +116,8 @@
     <string name="ssh_key_error_dialog_text">Zpráva : \n</string>
     <string name="pref_recursive_filter">Rekurzivní filtrování</string>
     <string name="pref_recursive_filter_hint">Rekurzivní hledání hesel v aktuálním adresáři.</string>
+    <string name="pref_clear_clipboard_title">Zaplnit schránku 20krát</string>
     <string name="pref_clear_clipboard_hint">Uložit dvacet náhodných textů do schránky namísto pouze jednoho. Užitečné pro telefony Samsug, které nabízejí funkci historie schránky.</string>
-    <string name="pref_clear_clipboard">Zaplnit schránku 20krát</string>
 
     <!-- pwgen fragment -->
     <string name="pwgen_generate">Generovat</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa5358e2..447139fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,8 +117,14 @@
     <string name="ssh_key_error_dialog_text">Message : \n</string>
     <string name="pref_recursive_filter">Recursive filtering</string>
     <string name="pref_recursive_filter_hint">Recursively find passwords of the current directory.</string>
+    <string name="pref_autofill_enable_title">Enable autofill</string>
+    <string name="pref_autofill_enable_msg">Tap OK to go to Accessibility settings. Once there, tap Password Store under Services then tap the switch in the top right to turn it on or off.</string>
+    <string name="pref_autofill_apps_title">Per-app settings</string>
+    <string name="pref_autofill_apps_hint">Customize autofill settings for specific apps.</string>
+    <string name="pref_autofill_default_title">Automatically match by default</string>
+    <string name="pref_autofill_default_hint">Default to \'Automatically match\' for apps without custom settings. Otherwise, \'Never match.\'</string>
+    <string name="pref_clear_clipboard_title">Clear clipboard 20 times</string>
     <string name="pref_clear_clipboard_hint">Store nonsense in the clipboard 20 times instead of just once. Useful on Samsung phones that feature clipboard history.</string>
-    <string name="pref_clear_clipboard">Clear clipboard 20 times</string>
 
     <!-- pwgen fragment -->
     <string name="pwgen_generate">Generate</string>
@@ -155,5 +161,10 @@
     <string name="category_string">"Category: "</string>
 
     <!-- Autofill -->
-    <string name="autofill_description">Auto-fills password fields in apps. Only works for Android versions 4.3 and up. Does not rely on the clipboard for Android versions 5.0 and up.</string>
+    <string name="autofill_description">Autofills password fields in apps. Only works for Android versions 4.3 and up. Does not rely on the clipboard for Android versions 5.0 and up.</string>
+    <string name="autofill_fill">Fill</string>
+    <string name="autofill_apps_default">Use default setting</string>
+    <string name="autofill_apps_first">Automatically match</string>
+    <string name="autofill_apps_match_ellipsis">Match with…</string>
+    <string name="autofill_apps_never">Never match</string>
 </resources>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index e8ba80cc..1c977992 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -72,15 +72,19 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Autofill">
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="autofill_enable"
+            android:title="@string/pref_autofill_enable_title"/>
         <Preference
             android:key="autofill_apps"
-            android:summary="Customize autofill settings for specific apps."
-            android:title="Per-app settings"/>
+            android:summary="@string/pref_autofill_apps_hint"
+            android:title="@string/pref_autofill_apps_title"/>
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="autofill_default"
-            android:summary="Default to 'Automatically match' for apps without custom settings. Otherwise, 'Never match.'"
-            android:title="Automatically match by default"/>
+            android:summary="@string/pref_autofill_default_hint"
+            android:title="@string/pref_autofill_default_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Misc">
@@ -88,6 +92,6 @@
             android:defaultValue="false"
             android:key="clear_clipboard_20x"
             android:summary="@string/pref_clear_clipboard_hint"
-            android:title="@string/pref_clear_clipboard" />
+            android:title="@string/pref_clear_clipboard_title" />
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3