Revise copy (#656)

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

2 files changed, 24 insertions, 22 deletions

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 6b757fd6..522fe6cc 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -43,7 +43,11 @@
         <item>9</item>
         <item>10</item>
     </string-array>
-    <string-array name="pwgen_provider">
+    <string-array name="pwgen_provider_labels">
+        <item>Classic</item>
+        <item>XKPasswd</item>
+    </string-array>
+    <string-array name="pwgen_provider_values">
         <item>classic</item>
         <item>xkpasswd</item>
     </string-array>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbc88eaf..288b93f2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,11 +10,11 @@
     <string name="dialog_delete">Delete directory</string>
     <string name="dialog_do_not_delete">Cancel</string>
     <string name="title_activity_git_clone">Repository information</string>
-    <string name="title_activity_git_config" translatable="false">Git Configurations</string>
+    <string name="title_activity_git_config" translatable="false">Git configuration</string>
 
     <!-- Password Store -->
-    <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string>
-    <string name="key_dialog_text">You have to select your "PGP-Key ID" before initializing the repository</string>
+    <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or running any synchronization operation.</string>
+    <string name="key_dialog_text">You have to select your PGP key ID before initializing the repository</string>
     <string name="delete_dialog_text">Are you sure you want to delete the password %1$s?</string>
     <string name="move">Move</string>
     <string name="edit">Edit</string>
@@ -29,15 +29,14 @@
     <string name="password_exists_message">This will overwrite %1$s with %2$s.</string>
 
     <!-- git commits -->
-    <string name="git_commit_add_text">Add password for %1$s using android password store.</string>
-    <string name="git_commit_edit_text">"Edit %1$s using android password store."</string>
-    <string name="git_commit_folder_text">"Folder %1$s created using android password store."</string>
-    <string name="git_commit_remove_text">"Remove %1$s from store."</string>
-    <string name="git_commit_move_text">"Rename %1$s to %2$s."</string>
-    <string name="git_commit_increment_text">"Increment HOTP counter for %1$s."</string>
+    <string name="git_commit_add_text">Add generated password for %1$s using android password store.</string>
+    <string name="git_commit_edit_text">Edit password for %1$s using android password store.</string>
+    <string name="git_commit_remove_text">Remove %1$s from store.</string>
+    <string name="git_commit_move_text">Rename %1$s to %2$s.</string>
+    <string name="git_commit_increment_text">Increment HOTP counter for %1$s.</string>
 
     <!-- PGPHandler -->
-    <string name="provider_toast_text">No OpenPGP Provider selected!</string>
+    <string name="provider_toast_text">No OpenPGP provider selected!</string>
     <string name="clipboard_password_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string>
     <string name="clipboard_password_no_clear_toast_text">Password copied to clipboard</string>
     <string name="clipboard_username_toast_text">Username copied to clipboard</string>
@@ -134,13 +133,13 @@
     <string name="pref_git_delete_repo">Delete repository</string>
     <string name="pref_dialog_delete_title">Clear repository</string>
     <string name="pref_crypto_title">Crypto</string>
-    <string name="pref_provider_title">Select OpenPGP Provider</string>
-    <string name="pref_key_title">Select OpenPGP Key id</string>
+    <string name="pref_provider_title">Select OpenPGP provider</string>
+    <string name="pref_key_title">Select OpenPGP key ID</string>
     <string name="pref_no_key_selected">No key selected</string>
     <string name="pref_general_title">General</string>
-    <string name="pref_password_title">Password Show Time</string>
-    <string name="pref_password_dialog_title">Set the time (in seconds) you want the password to be in clipboard. 0 means forever.</string>
-    <string name="pref_copy_title">Automatically copy Password</string>
+    <string name="pref_show_time_title">Password show time</string>
+    <string name="pref_show_time_summary">Set the time (in seconds) you want the password to be in clipboard. 0 means forever. Current value: %1$s</string>
+    <string name="pref_copy_title">Automatically copy password</string>
     <string name="pref_copy_dialog_title">Automatically copy the password to the clipboard after decryption was successful.</string>
     <string name="ssh_key_success_dialog_title">SSH-key imported</string>
     <string name="ssh_key_error_dialog_title">Error while trying to import the ssh-key</string>
@@ -148,9 +147,9 @@
     <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_sort_order_title">Password sort order</string>
-    <string name="pref_folder_first_sort_order">Folders First</string>
-    <string name="pref_file_first_sort_order">Files First</string>
-    <string name="pref_type_independent_sort_order">Type Independent</string>
+    <string name="pref_folder_first_sort_order">Folders first</string>
+    <string name="pref_file_first_sort_order">Files first</string>
+    <string name="pref_type_independent_sort_order">Type independent</string>
     <string name="pref_autofill_title">Autofill</string>
     <string name="pref_autofill_enable_title">Enable autofill</string>
     <string name="pref_autofill_enable_msg">Tap OK to go to Accessibility settings. There, tap Password Store under Services then tap the switch in the top right to turn it on or off.</string>
@@ -160,7 +159,7 @@
     <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_autofill_always_title">Always show dialog</string>
-    <string name="pref_autofill_full_path_title">Show Full Path</string>
+    <string name="pref_autofill_full_path_title">Show full path</string>
     <string name="pref_autofill_full_path_hint">Show full path of matching password files</string>
     <string name="pref_misc_title">Misc</string>
     <string name="pref_clear_clipboard_title">Clear clipboard 20 times</string>
@@ -172,7 +171,7 @@
     <string name="prefs_use_default_file_picker">Use default file picker</string>
     <string name="prefs_clear_after_copy_title">Automatically clear the clipboard after copy</string>
     <string name="prefs_clear_after_copy_summary">After an automatic copy or a manual copy of the password, the clipboard will be automatically cleared.</string>
-    <string name="prefs_export_passwords_title">Export Passwords</string>
+    <string name="prefs_export_passwords_title">Export passwords</string>
     <string name="prefs_export_passwords_summary">Exports the encrypted passwords to an external directory</string>
     <string name="prefs_version">Version</string>
 
@@ -208,7 +207,6 @@
     <string name="xkpwgen_pref_custom_dict_picker_title">Custom worldlist file</string>
     <string name="xkpwgen_pref_custom_dict_picker_summary">Tap to pick a custom wordlist file containing one word per line</string>
 
-
     <!-- ssh keygen fragment -->
     <string name="ssh_keygen_length">Length</string>
     <string name="ssh_keygen_passphrase">Passphrase</string>