Merge pull request #576 from jsoberg/#149-EnglishStringSuggestions

#149 English String suggestions

app/src/main/res/values/strings_auth.xml

@@ -8,8 +8,8 @@
 
     <!-- Messages -->
     <string name="auth_msg_authenticate">Please authenticate to start andOTP!</string>
-    <string name="auth_msg_confirm_encryption">Please confirm your authentication to generate the
+    <string name="auth_msg_confirm_encryption">Please confirm authentication to generate your
-        new encryption key!</string>
+        encryption key!</string>
 
     <!-- Buttons -->
     <string name="auth_button_unlock">Unlock</string>

app/src/main/res/values/strings_intro.xml

@@ -1,39 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="intro_slide1_title">Let\'s get started</string>
-    <string name="intro_slide1_desc">Welcome to <b>andOTP</b>, this wizard will guide you through
+    <string name="intro_slide1_desc">Welcome to <b>andOTP</b>! This wizard will guide you through
-        the initial setup. Please pay attention and read carefully otherwise you could lose data!
+        the initial setup process. Please pay attention and read carefully in order to avoid losing data.
-        \n\nDon\'t worry, you can still change any of the options later in the <b>Settings</b>.</string>
+        \n\nDon\'t worry, you can still change any of these options later on in the <b>Settings</b>.</string>
 
-    <string name="intro_slide2_desc">To ensure the security of your accounts <b>andOTP</b> only
+    <string name="intro_slide2_desc">To ensure the security of your accounts, <b>andOTP</b> uses
-        stores them in encrypted data files. Here you can choose which method of encryption will be
+        encryption to store account data. Here you can choose which method of encryption will be
         used.</string>
-    <string name="intro_slide2_desc_keystore">The KeyStore is a system component of Android for
+    <string name="intro_slide2_desc_keystore">The KeyStore is a system component of Android used to
-        securely storing cryptographic keys. The advantage of this method is that the keys are
+        securely store cryptographic keys. The advantage of using the KeyStore is that the keys are
-        stored separated from the data files and can be backed by hardware cryptography (if your
+        stored separately from <b>andOTP</b>\'s data, and can be backed by hardware-based encryption
-        device supports it). However, as the keys are not stored with the apps data, <b>this method
+        (if your device supports it). However, as the keys are not stored with <b>andOTP</b>\'s data,
-        prevents external backup solutions (like Titanium) from working</b>. If you choose this
+        <b>this method prevents external backup solutions (like Titanium) from working</b>. If you
-        method you will have to rely on the internal backup functions provided by <b>andOTP</b>.
+        choose this method, you will have to rely on the internal backup functions provided by
-        \n\n<b>Warning</b>: The KeyStore is known to cause a lot of problems, please only use it if
+        <b>andOTP</b>.\n\n<b>Warning</b>: The KeyStore is known to cause many problems, so
-        you absolutely have to. If you don\'t mind entering a password / PIN every time you start
+        please only use it if you absolutely have to. If you don\'t mind entering a password / PIN
-        <b>andOTP</b> it is <b>highly recommended to use the password-based encryption instead</b>.</string>
+        every time you start <b>andOTP</b>, it is <b>highly recommended to use the password-based
+        encryption instead</b>.</string>
     <string name="intro_slide2_desc_password">This method will encrypt your data with a key
-        generated from a password or PIN. The main advantage here is that this will work with
+        generated from a password or PIN. The main advantage of using this method is that external
-        external backup solutions (like Titanium) and is much less failure-prone than the KeyStore.
+        backup solutions (like Titanium) will work as expected, and it is much less failure-prone
-        However, you will have to enter your credentials every time you start <b>andOTP</b>.</string>
+        than the KeyStore. However, you will have to enter your credentials every time you start
+        <b>andOTP</b>.</string>
 
-    <string name="intro_slide3_desc_keystore">Here you can setup an authentication to lock
+    <string name="intro_slide3_desc_keystore">Here you can setup an authentication method to lock
-        <b>andOTP</b>. Since you have chosen <b>Android KeyStore</b> as encryption method this is
+        <b>andOTP</b>. Since you have chosen <b>Android KeyStore</b> as your encryption method, this
-        optional.</string>
+        step is optional.</string>
-    <string name="intro_slide3_desc_password">Here you can setup an authentication to lock
+    <string name="intro_slide3_desc_password">Here you can setup an authentication method to lock
-        <b>andOTP</b>. Since you have chosen <b>Password / PIN</b> as encryption method you need to
+        <b>andOTP</b>. Since you have chosen <b>Password / PIN</b> as your encryption method, a
-        set either a password or a PIN to proceed.</string>
+        password or a PIN must be set to proceed.</string>
     <string name="intro_slide3_warn_no_password">Please set a password to continue!</string>
     <string name="intro_slide3_warn_no_pin">Please set a PIN to continue!</string>
     <string name="intro_slide3_warn_confirm_password">Please confirm your password to continue!</string>
     <string name="intro_slide3_warn_confirm_pin">Please confirm your PIN to continue!</string>
 
     <string name="intro_slide4_title">Finished</string>
-    <string name="intro_slide4_desc">Your settings have been saved, you are all set to use
+    <string name="intro_slide4_desc">Your settings have been saved, you are now all set to use
-        <b>andOTP</b> now!</string>
+        <b>andOTP</b>!</string>
 </resources>

app/src/main/res/values/strings_main.xml

@@ -99,7 +99,7 @@
         \"Last used\".\n\nThis message will not be shown again.</string>
 
     <string name="dialog_msg_keystore_error">Failed to load the encryption key from the KeyStore.
-        <b>Any entries that are added will get lost.</b>\n\nTo still be able to use andOTP you can go
+        <b>Any entries that are added will be lost.</b>\n\nTo continue using andOTP, you can go
         to the <b>Settings</b> and switch the <b>Database encryption</b> to <b>Password / PIN</b>.</string>
 
     <!-- Shortcuts -->