From 60e3bb312680a8378a2798fafa5551235a219e70 Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Thu, 16 Jan 2020 14:15:26 -0800
Subject: [PATCH] Closes #5080 - Move site permissions strings for l10n

---
 .../values/permissions_settings_strings.xml   | 45 -------------------
 app/src/main/res/values/strings.xml           | 40 +++++++++++++++++
 2 files changed, 40 insertions(+), 45 deletions(-)
 delete mode 100644 app/src/main/res/values/permissions_settings_strings.xml

diff --git a/app/src/main/res/values/permissions_settings_strings.xml b/app/src/main/res/values/permissions_settings_strings.xml
deleted file mode 100644
index 907753afe..000000000
--- a/app/src/main/res/values/permissions_settings_strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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>
-    <!-- Site Permissions Preferences -->
-    <!-- Preference for reducing image sizes, bandwidth and platform-level optimizations -->
-    <string name="preference_optimize">Optimize</string>
-    <!-- Label summary to explain how the optimize preference works -->
-    <string name="preference_optimize_summary">Lower image quality, throttle streaming bandwidth, and platform-level optimizations</string>
-    <!-- Preference for applying recommend rules to all sites -->
-    <string name="preference_recommended_settings">Use recommended settings</string>
-    <!-- Label summary to explain how the recommended settings work -->
-    <string name="preference_recommended_settings_summary"><![CDATA[
-        <b>Blocked</b>
-
-        <br/> Ads, autoplay sound and video (block playing media with sound), cookies (block third-party trackers cookies), trackers (allow some trackers), pop-up, website redirects. <br/><br/> <b>Ask to allow</b>
-
-        <br/> Camera, location, microphone and notification. <br/><br/> <b>Allowed</b>
-
-        <br/> DRM audio and video, JavaScript, cache and site data, images.]]></string>
-    <!-- Preference for applying custom rules to all sites -->
-    <string name="preference_custom_settings">Use custom settings</string>
-    <!-- Preference category for feature phone permissions likes Camera,Microphone, Location ... etc -->
-    <string name="preference_category_phone_feature">Phone Feature</string>
-    <!--Label that indicates that a user hasn't select a value for a site permission-->
-    <string name="phone_feature_no_decision">No Decision</string>
-    <!-- Alternative explanation label that is shown when a permissions like (camera,location and microphone) is required, this indicate to the user how to enable the permission via Android settings %1$s indicate the name of the permission (camera,location and microphone)  -->
-    <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 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 -->
-    <string name="quick_settings_sheet_insecure_connection">Insecure Connection</string>
-    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites-->
-    <string name="confirm_clear_permissions_on_all_sites">Are you sure that you want to clear all the permissions on all sites?</string>
-    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site-->
-    <string name="confirm_clear_permissions_site">Are you sure that you want to clear all the permissions for this site?</string>
-    <!-- Confirmation message for a dialog confirming if the user wants to set default value a permission for a site-->
-    <string name="confirm_clear_permission_site">Are you sure that you want to clear this permission for this site?</string>
-    <!-- label shown when there are not site exceptions to show in the site exception settings -->
-    <string name="no_site_exceptions">No site exceptions</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 fada3ec72..84e49e8a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1130,4 +1130,44 @@
     <string name="migration_update_app_button">Start %s</string>
     <!-- Accessibility description text for completed migration item (e.g. Bookmarks, History) -->
     <string name="migration_icon_description">Migration status: %s</string>
+
+    <!-- Site Permissions Preferences -->
+    <!-- Preference for reducing image sizes, bandwidth and platform-level optimizations -->
+    <string name="preference_optimize">Optimize</string>
+    <!-- Label summary to explain how the optimize preference works -->
+    <string name="preference_optimize_summary">Lower image quality, throttle streaming bandwidth, and platform-level optimizations</string>
+    <!-- Preference for applying recommend rules to all sites -->
+    <string name="preference_recommended_settings">Use recommended settings</string>
+    <!-- Label summary to explain how the recommended settings work -->
+    <string name="preference_recommended_settings_summary"><![CDATA[
+        <b>Blocked</b>
+
+        <br/> Ads, autoplay sound and video (block playing media with sound), cookies (block third-party trackers cookies), trackers (allow some trackers), pop-up, website redirects. <br/><br/> <b>Ask to allow</b>
+
+        <br/> Camera, location, microphone and notification. <br/><br/> <b>Allowed</b>
+
+        <br/> DRM audio and video, JavaScript, cache and site data, images.]]></string>
+    <!-- Preference for applying custom rules to all sites -->
+    <string name="preference_custom_settings">Use custom settings</string>
+    <!-- Preference category for feature phone permissions likes Camera,Microphone, Location ... etc -->
+    <string name="preference_category_phone_feature">Phone Feature</string>
+    <!--Label that indicates that a user hasn't select a value for a site permission-->
+    <string name="phone_feature_no_decision">No Decision</string>
+    <!-- Alternative explanation label that is shown when a permissions like (camera,location and microphone) is required, this indicate to the user how to enable the permission via Android settings %1$s indicate the name of the permission (camera,location and microphone)  -->
+    <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 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 -->
+    <string name="quick_settings_sheet_insecure_connection">Insecure Connection</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites-->
+    <string name="confirm_clear_permissions_on_all_sites">Are you sure that you want to clear all the permissions on all sites?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site-->
+    <string name="confirm_clear_permissions_site">Are you sure that you want to clear all the permissions for this site?</string>
+    <!-- Confirmation message for a dialog confirming if the user wants to set default value a permission for a site-->
+    <string name="confirm_clear_permission_site">Are you sure that you want to clear this permission for this site?</string>
+    <!-- label shown when there are not site exceptions to show in the site exception settings -->
+    <string name="no_site_exceptions">No site exceptions</string>
 </resources>