From 65425d0f6e5c9f144f54a7033c2da392992e273f Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Fri, 5 Apr 2019 10:16:12 -0700
Subject: [PATCH] For #1274 - Unblocks l10n by fixing string nits

---
 .../fenix/settings/DataChoicesFragment.kt     |  5 ++++
 .../values/permissions_settings_strings.xml   | 14 +++++----
 app/src/main/res/values/static_strings.xml    | 11 +++++++
 app/src/main/res/values/strings.xml           | 29 +++++++++----------
 4 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/values/static_strings.xml

diff --git a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
index e66f77614..29f6943c3 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
@@ -30,6 +30,11 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
                 }
             }
         }
+
+        findPreference<SwitchPreference>(getString(R.string.pref_key_fenix_health_report))?.apply {
+            val appName = getString(R.string.app_name)
+            title = getString(R.string.preferences_fenix_health_report, appName)
+        }
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
diff --git a/app/src/main/res/values/permissions_settings_strings.xml b/app/src/main/res/values/permissions_settings_strings.xml
index 15eb2abff..30e2c74e2 100644
--- a/app/src/main/res/values/permissions_settings_strings.xml
+++ b/app/src/main/res/values/permissions_settings_strings.xml
@@ -45,18 +45,20 @@
     <string name="phone_feature_blocked_by_android_explanation"><![CDATA[
         To allow it: <br/><br/> 1. Go to Android Settings <br/><br/>2. Tap <b>Permissions</b> <br/><br/> 3. Toggle <b>%1$s</b> to ON
         ]]></string>
-    <!--Label that indicates that this option it the recommended one-->
+    <!-- Label that indicates that this option it the recommended one -->
     <string name="phone_feature_recommended">Recommended</string>
-    <!--Button label that take the user to the Android App setting -->
+    <!-- Button label that take the user to the Android App setting -->
     <string name="phone_feature_go_to_settings">Go to Settings</string>
 
-    <!-- Content description (not visible, for screen readers etc.): Quick settings sheet-->
+    <!-- Content description (not visible, for screen readers etc.): Quick settings sheet
+        to give users access to site specific information / settings. For example:
+        Secure settings status and a button to modify site permissions -->
     <string name="quick_settings_sheet">Quick settings sheet</string>
 
-    <!--Label that indicates a site is using a secure connection-->
+    <!-- Label that indicates a site is using a secure connection -->
     <string name="quick_settings_sheet_secure_connection">Secure Connection</string>
-    <!--Label that indicates a site is using a insecure connection-->
+    <!-- Label that indicates a site is using a insecure connection -->
     <string name="quick_settings_sheet_insecure_connection">Insecure Connection</string>
-    <!--button that allows editing site permissions settings-->
+    <!-- button that allows editing site permissions settings -->
     <string name="quick_settings_sheet_manage_site_permissions">Manage site permissions</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml
new file mode 100644
index 000000000..1fc57fd7b
--- /dev/null
+++ b/app/src/main/res/values/static_strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+    <!-- Name of the application -->
+    <string name="app_name" translatable="false">Fenix</string>
+
+    <!-- Preference for developers -->
+    <string name="preference_leakcanary" translatable="false">LeakCanary</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 450436d99..7e8fcf207 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,8 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <resources>
-    <!-- Name of the application -->
-    <string name="app_name">Fenix</string>
+
 
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
@@ -125,8 +124,6 @@
     <string name="preferences_language">Language</string>
     <!-- Preference for data choices -->
     <string name="preferences_data_choices">Data choices</string>
-    <!-- Preference for developers -->
-    <string name="preference_leakcanary">LeakCanary</string>
     <!-- Preference category for developer tools -->
     <string name="developer_tools_category">Developer tools</string>
     <!-- Preference for developers -->
@@ -147,11 +144,11 @@
     <string name="preferences_sign_out">Sign out</string>
     <!-- Label indicating that sync is in progress -->
     <string name="sync_syncing">Syncing</string>
-    <!-- Label summary indicating that sync failed along with a date stamp showing last time it succeeded -->
+    <!-- Label summary indicating that sync failed. The first parameter is the date stamp showing last time it succeeded -->
     <string name="sync_failed_summary">Sync failed. Last success: %s</string>
     <!-- Label summary showing never synced -->
     <string name="sync_failed_never_synced_summary">Sync failed. Last synced: never</string>
-    <!-- Label summary  with a date stamp showing last time synced -->
+    <!-- Label summary the date we last synced. The first parameter is date stamp showing last time synced -->
     <string name="sync_last_synced_summary">Last synced: %s</string>
     <!-- Label summary showing never synced -->
     <string name="sync_never_synced_summary">Last synced: never</string>
@@ -163,8 +160,8 @@
     <string name="preferences_crash_reporter">Crash reporter</string>
     <!-- Preference switch for Mozilla location service -->
     <string name="preferences_mozilla_location_service">Mozilla location service</string>
-    <!-- Preference switch for app health report. -->
-    <string name="preferences_fenix_health_report">Fenix health report</string>
+    <!-- Preference switch for app health report. The first parameter is the name of the application (For example: Fenix) -->
+    <string name="preferences_fenix_health_report">%s health report</string>
 
     <!-- Theme Preferences -->
     <!-- Preference for using light theme -->
@@ -177,15 +174,16 @@
     <string name="preference_follow_device_theme">Follow device theme</string>
 
     <!-- Quick Action Sheet -->
-    <!-- Option in Quick Action Sheet in the browser to share the current page -->
+    <!-- Button in the browser chrome to share the current page -->
     <string name="quick_action_share">Share</string>
-    <!-- Option in Quick Action Sheet in the browser to download the current page -->
+    <!-- Button in the browser chrome to download the current page -->
     <string name="quick_action_download">Download</string>
-    <!-- Option in Quick Action Sheet in the browser to bookmark the current page -->
+    <!-- Button in the browser chrome in the browser to bookmark the current page -->
     <string name="quick_action_bookmark">Bookmark</string>
-    <!-- Option in Quick Action Sheet in the browser to put the the current page in reader mode -->
+    <!-- Button in the browser chrome in the browser to put the the current page in reader mode -->
     <string name="quick_action_read">Read</string>
-    <!-- Content description (not visible, for screen readers etc.): Quick action sheet handle -->
+    <!-- Content description (not visible, for screen readers etc.): Quick action sheet handle to provide users
+        with shortcuts to commonly used actions such as Share, Bookmark etc.. -->
     <string name="quick_action_sheet_handle">Quick actions</string>
 
     <!-- Library -->
@@ -211,7 +209,8 @@
     <string name="content_description_history_menu">History item menu</string>
     <!-- Content description (not visible, for screen readers etc.): "Close button for library settings" -->
     <string name="content_description_close_button">Close</string>
-    <!-- About content. Sentences are separated by two new lines -->
+    <!-- About content. Sentences are separated by two new lines. The first and second parameters are the name of the
+        application. (For example: Fenix) -->
     <string name="about_content">
         %1$s puts you in control.
         \n\n%1$s is produced by Mozilla.
@@ -266,7 +265,7 @@
     <string name="full_screen_notification">Entering full screen mode</string>
 
     <!-- Crashes -->
-    <!-- Title text displayed on the tab crash page -->
+    <!-- Title text displayed on the tab crash page. This first parameter is the name of the application (For example: Fenix) -->
     <string name="tab_crash_title">Sorry. %1$s can’t get that tab back</string>
     <!-- Description text displayed on the tab crash page -->
     <string name="tab_crash_description">You can attempt to restore or close this tab below.</string>