From 2cba6246097d41faf5318a7118dc4fc3e68ea1e8 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Thu, 24 Oct 2019 08:24:19 -0700
Subject: [PATCH] No issue: Fixes string issues for l10n (#6158)

Issues found here: https://github.com/mozilla-l10n/android-l10n/pull/89
---
 app/src/main/AndroidManifest.xml                          | 2 +-
 .../fenix/components/PrivateShortcutCreateManager.kt      | 4 ++--
 .../mozilla/fenix/session/SessionNotificationService.kt   | 2 +-
 app/src/main/res/values/strings.xml                       | 8 ++++----
 docs/architectureexample/ContactsController.kt            | 1 -
 docs/architectureexample/ContactsInteractor.kt            | 1 -
 docs/architectureexample/ContactsStore.kt                 | 1 -
 docs/architectureexample/ContactsView.kt                  | 1 -
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a4593e02e..0de89f95e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,7 +124,7 @@
         <!-- Launch in private mode alias -->
         <activity-alias
             android:name="org.mozilla.fenix.alias.IntentReceiverActivity"
-            android:label="@string/app_name_private"
+            android:label="@string/app_name_private_2"
             android:icon="@mipmap/ic_launcher_private"
             android:roundIcon="@mipmap/ic_launcher_private_round"
             android:targetActivity=".IntentReceiverActivity">
diff --git a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
index 3e5939e79..6173bf0ed 100644
--- a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt
@@ -39,8 +39,8 @@ object PrivateShortcutCreateManager {
 
         val icon = IconCompat.createWithResource(context, R.mipmap.ic_launcher_private_round)
         val shortcut = ShortcutInfoCompat.Builder(context, UUID.randomUUID().toString())
-            .setShortLabel(context.getString(R.string.app_name_private))
-            .setLongLabel(context.getString(R.string.app_name_private))
+            .setShortLabel(context.getString(R.string.app_name_private_2))
+            .setLongLabel(context.getString(R.string.app_name_private_2))
             .setIcon(icon)
             .setIntent(Intent(context, HomeActivity::class.java).apply {
                 action = Intent.ACTION_VIEW
diff --git a/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt b/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt
index 38de2ae2a..a3e9f048f 100644
--- a/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt
+++ b/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt
@@ -70,7 +70,7 @@ class SessionNotificationService : Service() {
         return NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
             .setOngoing(true)
             .setSmallIcon(R.drawable.ic_pbm_notification)
-            .setContentTitle(getString(R.string.app_name_private))
+            .setContentTitle(getString(R.string.app_name_private_2))
             .setContentText(getString(R.string.notification_pbm_delete_text))
             .setContentIntent(createNotificationIntent())
             .setVisibility(NotificationCompat.VISIBILITY_SECRET)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fc4c23e2..fca35c000 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,8 +2,8 @@
    - 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>
-    <!-- App name for private browsing mode, only the "(Private)" portion should be localized. -->
-    <string name="app_name_private">Private Firefox Preview</string>
+    <!-- App name for private browsing mode, only the "Private" portion should be localized. -->
+    <string name="app_name_private_2">Private Firefox Preview</string>
 
     <!-- Home Fragment -->
     <!-- Content description (not visible, for screen readers etc.): "Three dot" menu button. -->
@@ -174,7 +174,7 @@
     <string name="developer_tools_category">Developer tools</string>
     <!-- Preference for developers -->
     <string name="preferences_remote_debugging">Remote debugging via USB</string>
-    <!-- Preference title for switch preference to show search suggestions -->
+    <!-- Preference title for switch preference to show search shortcuts -->
     <string name="preferences_show_search_shortcuts">Show search shortcuts</string>
     <!-- Preference title for switch preference to show search suggestions -->
     <string name="preferences_show_search_suggestions">Show search suggestions</string>
@@ -891,7 +891,7 @@
     <!-- Description of tracking content that can be blocked by Enhanced Tracking Protection -->
     <string name="etp_tracking_content_description">Stops outside ads, videos, and other content from loading that contains tracking code. May affect some website functionality.</string>
     <!-- Enhanced Tracking Protection Onboarding Message shown in a dialog above the toolbar. The first parameter is the name of the application (For example: Fenix) -->
-    <string name="etp_onboarding_message_2">%s is blocking trackers on this site when the shield is purple. Tap it to see what\'s blocked.</string>
+    <string name="etp_onboarding_message_2">%s is blocking trackers on this site when the shield is purple. Tap it to see what’s blocked.</string>
     <!-- Enhanced Tracking Protection message that protection is currently on for this site -->
     <string name="etp_panel_on">Protections are ON for this site</string>
     <!-- Enhanced Tracking Protection message that protection is currently off for this site -->
diff --git a/docs/architectureexample/ContactsController.kt b/docs/architectureexample/ContactsController.kt
index e87b455f7..cfa4d691e 100644
--- a/docs/architectureexample/ContactsController.kt
+++ b/docs/architectureexample/ContactsController.kt
@@ -2,7 +2,6 @@
  * 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/. */
 
-
 // This is example code for the 'Simplified Example' section of
 // /docs/architecture-overview.md
 class ContactsController(
diff --git a/docs/architectureexample/ContactsInteractor.kt b/docs/architectureexample/ContactsInteractor.kt
index ccc686e7b..6f1493a55 100644
--- a/docs/architectureexample/ContactsInteractor.kt
+++ b/docs/architectureexample/ContactsInteractor.kt
@@ -2,7 +2,6 @@
  * 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/. */
 
-
 // This is example code for the 'Simplified Example' section of
 // /docs/architecture-overview.md
 class ContactsInteractor(
diff --git a/docs/architectureexample/ContactsStore.kt b/docs/architectureexample/ContactsStore.kt
index 070f565a9..807ab8fca 100644
--- a/docs/architectureexample/ContactsStore.kt
+++ b/docs/architectureexample/ContactsStore.kt
@@ -2,7 +2,6 @@
  * 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/. */
 
-
 // This is example code for the 'Simplified Example' section of
 // /docs/architecture-overview.md
 class ContactsStore(
diff --git a/docs/architectureexample/ContactsView.kt b/docs/architectureexample/ContactsView.kt
index 6637f1c02..a3af84372 100644
--- a/docs/architectureexample/ContactsView.kt
+++ b/docs/architectureexample/ContactsView.kt
@@ -2,7 +2,6 @@
  * 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/. */
 
-
 // This is example code for the 'Simplified Example' section of
 // /docs/architecture-overview.md
 class ContactsView(