From cfa97fed4b7c5b9ac0d88bd13e92dbddbc0735d4 Mon Sep 17 00:00:00 2001
From: Landry Racoon <landry314@users.noreply.github.com>
Date: Tue, 2 Mar 2021 13:02:35 -0500
Subject: [PATCH 1/4] Update strings.xml

Cleaned up the wording in the Backup and Restore section to make it clearer and more grammatically correct.

The only issue is I wonder what will happen because I extended the length of string by 2 characters for the password check mark option on line 16. Will it wrap or make the dialog bigger?
---
 app/src/main/res/values/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 704bdad7..dd126571 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,8 +12,8 @@
     <string name="clipboard_error">Error copying text</string>
     <string name="clipboard_copied">Copied to clipboard!</string>
     <string name="report">Report</string>
-    <string name="password">Password (Max 32 chars)</string>
-    <string name="set_password">Set a password (max 32 chars)</string>
+    <string name="password">Password (max 32 chars)</string>
+    <string name="set_password">Password protect (max 32 chars)</string>
     <string name="password_no_max">Password</string>
     <string name="ok">OK</string>
     <string name="yes">Yes</string>
@@ -319,9 +319,9 @@
     <string name="locations">Locations</string>
     <string name="unknown">Unknown</string>
     <string name="removed_from_favs">Removed from Favourites</string>
-    <string name="backup_and_restore">Backup &amp; Restore User Settings</string>
-    <string name="backup_summary">Back up app settings, account login information, and/or favorites data to a plain text or encrypted backup file for later restoration.</string>
-    <string name="backup_warning">If you\'re backing up login info, treat the file as confidential: Keep them somewhere safe!</string>
+    <string name="backup_and_restore">Backup &amp; Restore</string>
+    <string name="backup_summary">Backup Barinsta app settings, account login data, and/or favorites to a plain text or encrypted backup file for later restoration.</string>
+    <string name="backup_warning">If you\'re backing up account login data without password protection, treat the file as confidential and keep it somewhere safe!</string>
     <string name="create_backup">Create new backup file</string>
     <string name="restore_backup">Restore from existing backup file</string>
     <string name="file_chosen_label">File:</string>

From 18774b67a5635c2895eea67bea9f06d9c9d97c54 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Tue, 2 Mar 2021 15:56:44 -0500
Subject: [PATCH 2/4] Apply suggestions from code review

---
 app/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd126571..ccd3b6d4 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="clipboard_error">Error copying text</string>
     <string name="clipboard_copied">Copied to clipboard!</string>
     <string name="report">Report</string>
-    <string name="password">Password (max 32 chars)</string>
     <string name="set_password">Password protect (max 32 chars)</string>
     <string name="password_no_max">Password</string>
     <string name="ok">OK</string>
@@ -321,7 +320,7 @@
     <string name="removed_from_favs">Removed from Favourites</string>
     <string name="backup_and_restore">Backup &amp; Restore</string>
     <string name="backup_summary">Backup Barinsta app settings, account login data, and/or favorites to a plain text or encrypted backup file for later restoration.</string>
-    <string name="backup_warning">If you\'re backing up account login data without password protection, treat the file as confidential and keep it somewhere safe!</string>
+    <string name="backup_warning">If you\'re backing up account login data, treat the file as confidential and keep it somewhere safe!</string>
     <string name="create_backup">Create new backup file</string>
     <string name="restore_backup">Restore from existing backup file</string>
     <string name="file_chosen_label">File:</string>

From 8a07622399e1bc83c226afe634458c9e0649611e Mon Sep 17 00:00:00 2001
From: Landry Racoon <landry314@users.noreply.github.com>
Date: Tue, 2 Mar 2021 16:02:18 -0500
Subject: [PATCH 3/4] Update strings.xml

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccd3b6d4..9495dff8 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="clipboard_error">Error copying text</string>
     <string name="clipboard_copied">Copied to clipboard!</string>
     <string name="report">Report</string>
-    <string name="set_password">Password protect (max 32 chars)</string>
+    <string name="set_password">Password protect file</string>
     <string name="password_no_max">Password</string>
     <string name="ok">OK</string>
     <string name="yes">Yes</string>

From 4c3c1f0b217d592635bbeaff47b547b0198037cd Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Tue, 2 Mar 2021 16:07:16 -0500
Subject: [PATCH 4/4] Update strings.xml

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9495dff8..a8e80ffb 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="clipboard_error">Error copying text</string>
     <string name="clipboard_copied">Copied to clipboard!</string>
     <string name="report">Report</string>
-    <string name="set_password">Password protect file</string>
+    <string name="set_password">Protect file with password</string>
     <string name="password_no_max">Password</string>
     <string name="ok">OK</string>
     <string name="yes">Yes</string>