From 7be5f359ec851fba624a1cc552c0049ded4bc25d Mon Sep 17 00:00:00 2001 From: Mohit Date: Thu, 10 Sep 2020 13:33:02 +0530 Subject: [PATCH 1/8] Removed the updater subtitle from settings --- .../settings/system/SystemUpdatePreferenceController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index 88715bf4d6f..e165e784bf5 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -85,6 +85,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { return false; } + @Override public CharSequence getSummary() { CharSequence summary = mContext.getString(R.string.android_version_summary, @@ -117,7 +118,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { } break; } - return summary; + return ""; } /** -- GitLab From 029131f608fa9cf6f395a3d253011f45fea10470 Mon Sep 17 00:00:00 2001 From: Mohit Date: Fri, 11 Sep 2020 11:41:45 +0530 Subject: [PATCH 2/8] Settings: Rename 'Security & location' to 'Security & Privacy' --- res/values/strings.xml | 679 +++++++++++++++++++++-------------------- 1 file changed, 353 insertions(+), 326 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a5d9af02172..f59bf21a3e8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,5 +1,4 @@ - - Switch - + + Unknown @@ -48,7 +48,8 @@ Please enable developer options first. - + + Wireless & networks @@ -105,7 +106,7 @@ Unavailable - IMS Registration: %1$s\u000AVoice over LTE: %2$s\u000AVoice over WiFi: %3$s\u000AVideo Calling: %4$s\u000AUT Interface: %5$s + IMS Registration: %1$s\u000AVoice over LTE: %2$s\u000AVoice over WiFi: %3$s\u000AVideo Calling: %4$s\u000AUT Interface: %5$s In Service @@ -165,7 +166,7 @@ Preview - Preview, page %1$d of %2$d + Preview, page %1$d of %2$d Make the text on screen smaller or larger. @@ -178,15 +179,12 @@ Servez à ce monsieur une bière et des kiwis. Sample text - + The Wonderful Wizard of Oz - + Chapter 11: The Wonderful Emerald City of Oz - + Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. @@ -733,7 +731,8 @@ Choose a network operator - + + Date & time @@ -783,7 +782,7 @@ Time Zone - Time zones in %1$s + Time zones in %1$s Select UTC offset @@ -791,15 +790,15 @@ Sort by time zone - %1$s starts on %2$s. + %1$s starts on %2$s. - %1$s (%2$s) + %1$s (%2$s) - %2$s (%1$s) + %2$s (%1$s) - Uses %1$s. %2$s starts on %3$s. + Uses %1$s. %2$s starts on %3$s. - Uses %1$s. No daylight savings time. + Uses %1$s. No daylight savings time. Daylight savings time @@ -816,7 +815,8 @@ [CHAR LIMIT=20] --> Time - + + Automatically lock @@ -841,7 +841,7 @@ None - %1$d / %2$d + %1$d / %2$d E.g., Joe\u2019s Android. @@ -860,7 +860,7 @@ Accounts - Security & location + Security & Privacy Encryption & credentials @@ -886,7 +886,8 @@ Screen lock, fingerprint Screen lock - + + Fingerprint @@ -1005,7 +1006,7 @@ Lift finger, then touch sensor again - You can add up to %d fingerprints + You can add up to %d fingerprints You\u2019ve added the maximum number of fingerprints @@ -1015,7 +1016,7 @@ Remove all fingerprints? - Remove \'%1$s\' + Remove \'%1$s\' Do you want to delete this fingerprint? @@ -1097,14 +1098,14 @@ Wait while your tablet - is being encrypted. ^1% complete. + is being encrypted. ^1% complete. Wait while your phone - is being encrypted. ^1% complete. + is being encrypted. ^1% complete. Wait while your tablet - is being encrypted. Time remaining: ^1 + is being encrypted. Time remaining: ^1 Wait while your phone - is being encrypted. Time remaining: ^1 + is being encrypted. Time remaining: ^1 To unlock your tablet, turn it off and then on. To unlock your phone, turn it off and then on. @@ -1112,7 +1113,7 @@ Warning: Your device will be wiped after - ^1 more failed attempts to be unlocked! + ^1 more failed attempts to be unlocked! @@ -1164,9 +1165,11 @@ Switch input method - + + - + + Secure your tablet @@ -1222,17 +1225,19 @@ Screen lock options - + + Screen lock - %1$s / Immediately after sleep + %1$s / Immediately after sleep - %1$s / %2$s after sleep + %1$s / %2$s after sleep - + + Work profile lock @@ -1397,19 +1402,19 @@ Dismiss - Must be at least %d characters + Must be at least %d characters - PIN must be at least %d digits + PIN must be at least %d digits Continue Must be fewer than - %d characters + %d characters Must be fewer than - %d digits + %d digits Must contain only digits 0-9 @@ -1435,37 +1440,37 @@ Must contain at least 1 letter - Must contain at least %d letters + Must contain at least %d letters Must contain at least 1 lowercase letter - Must contain at least %d lowercase letters + Must contain at least %d lowercase letters Must contain at least 1 uppercase letter - Must contain at least %d uppercase letters + Must contain at least %d uppercase letters Must contain at least 1 numerical digit - Must contain at least %d numerical digits + Must contain at least %d numerical digits Must contain at least 1 special symbol - Must contain at least %d special symbols + Must contain at least %d special symbols Must contain at least 1 non-letter character - Must contain at least %d non-letter characters + Must contain at least %d non-letter characters @@ -1521,7 +1526,7 @@ 1 active trust agent - %d active trust agents + %d active trust agents @@ -1768,9 +1773,9 @@ %1$d Mbps - %s wants to turn on Wi-Fi + %s wants to turn on Wi-Fi - %s wants to turn off Wi-Fi + %s wants to turn off Wi-Fi @@ -1797,7 +1802,8 @@ When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts, and more.\n\nJust bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed. - + + Wi\u2011Fi @@ -1939,7 +1945,8 @@ Wi\u2011Fi scanning turned on - + + Advanced options @@ -2087,7 +2094,8 @@ All passwords for this network will be deleted - + + Saved networks @@ -2322,7 +2330,7 @@ Roaming preference - %1$s + %1$s Roaming preference @@ -2375,7 +2383,7 @@ Carrier - + Display Sound @@ -2477,18 +2485,19 @@ Accounts - Work profile accounts - %s + Work profile accounts - %s Personal profile accounts - Work account - %s + Work account - %s - Personal account - %s + Personal account - %s Search - + + Display @@ -2800,9 +2809,9 @@ Phone number, signal, etc. - Storage + Storage - Storage + Storage Storage settings @@ -3020,66 +3029,66 @@ Portable storage - %1$s used of %2$s + %1$s used of %2$s - ^1 ^2 + ^1 ^2 - Used of %1$s + Used of %1$s - Total used of %1$s + Total used of %1$s - %1$s is mounted + %1$s is mounted - Couldn\u2019t mount %1$s + Couldn\u2019t mount %1$s - %1$s is safely ejected + %1$s is safely ejected - Couldn\u2019t safely eject %1$s + Couldn\u2019t safely eject %1$s - %1$s is formatted + %1$s is formatted - Couldn\u2019t format %1$s + Couldn\u2019t format %1$s Rename storage - This ^1 is safely ejected, but still available. -\n\nTo use this ^1, you have to mount it first. + This ^1 is safely ejected, but still available. +\n\nTo use this ^1, you have to mount it first. - This ^1 is corrupted. -\n\nTo use this ^1, you have to set it up first. + This ^1 is corrupted. +\n\nTo use this ^1, you have to set it up first. - This device doesn\u2019t support this ^1. -\n\nTo use this ^1 with this device, you have to set it up first. + This device doesn\u2019t support this ^1. +\n\nTo use this ^1 with this device, you have to set it up first. - After formatting, you can use this ^1 in other devices. -\n\nAll data on this ^1 will be erased. Consider backing up first. + After formatting, you can use this ^1 in other devices. +\n\nAll data on this ^1 will be erased. Consider backing up first. \n\nBack up photos & other media \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. \n\nBack up apps -\nAll apps stored on this ^1 will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device. +\nAll apps stored on this ^1 will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device. - When you eject this ^1, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted. -\n\nThis ^1 is formatted to work on this device only. It won\u2019t work on any others. + When you eject this ^1, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted. +\n\nThis ^1 is formatted to work on this device only. It won\u2019t work on any others. - To use the apps, photos, or data this ^1 contains, reinsert it. + To use the apps, photos, or data this ^1 contains, reinsert it. \n\nAlternatively, you can choose to forget this storage if the device isn\u2019t available. \n\nIf you choose to forget, all the data the device contains will be lost forever. \n\nYou can reinstall the apps later, but their data stored on this device will be lost. - Forget ^1? + Forget ^1? - All the apps, photos, and data stored on this ^1 will be lost forever. + All the apps, photos, and data stored on this ^1 will be lost forever. Apps @@ -3096,21 +3105,21 @@ System - Explore ^1 + Explore ^1 Other includes shared files saved by apps, files downloaded from the internet or Bluetooth, Android files, and so on. -\n\nTo see the visible contents of this ^1, tap Explore. +\n\nTo see the visible contents of this ^1, tap Explore. - System includes files used to run Android version %s + System includes files used to run Android version %s - ^1 may have saved photos, music, apps, or other data, using ^2 of storage. -\n\nTo view details, switch to ^1. + ^1 may have saved photos, music, apps, or other data, using ^2 of storage. +\n\nTo view details, switch to ^1. - Set up your ^1 + Set up your ^1 Use as portable storage @@ -3123,31 +3132,31 @@ Format as internal storage - This requires the ^1 to be formatted to make it secure. -\n\nAfter formatting, this ^1 will only work in this device. -\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. + This requires the ^1 to be formatted to make it secure. +\n\nAfter formatting, this ^1 will only work in this device. +\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. Format as portable storage - This requires the ^1 to be formatted. -\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. + This requires the ^1 to be formatted. +\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. Erase & format - Formatting ^1\u2026 + Formatting ^1\u2026 - Don\u2019t remove the ^1 while it\u2019s being formatting. + Don\u2019t remove the ^1 while it\u2019s being formatting. Move data to new storage - You can move your photos, files, and some apps to this new ^1. -\n\nThe move takes about ^2 and will free ^3 on internal storage. Some apps won\u2019t work while it\u2019s underway. + You can move your photos, files, and some apps to this new ^1. +\n\nThe move takes about ^2 and will free ^3 on internal storage. Some apps won\u2019t work while it\u2019s underway. @@ -3158,7 +3167,7 @@ Move data now - The move takes about ^1. It will free ^2 on ^3. + The move takes about ^1. It will free ^2 on ^3. Move @@ -3167,47 +3176,47 @@ During the move: -\n\u2022 Don\u2019t remove the ^1. +\n\u2022 Don\u2019t remove the ^1. \n\u2022 Some apps won\u2019t work correctly. \n\u2022 Keep the device charged. - Your ^1 is ready to use + Your ^1 is ready to use - Your ^1 is all set to use with photos and other media. + Your ^1 is all set to use with photos and other media. - Your new ^1 is working. + Your new ^1 is working. \n\nTo move photos, files, and app data to this device, go to Settings > Storage. - Move ^1 + Move ^1 - Moving ^1 and its data to ^2 will take only a few moments. You won\u2019t be able to use the app until the move is complete. -\n\nDon\u2019t remove the ^2 during the move. + Moving ^1 and its data to ^2 will take only a few moments. You won\u2019t be able to use the app until the move is complete. +\n\nDon\u2019t remove the ^2 during the move. - To move data you need to unlock user ^1. + To move data you need to unlock user ^1. - Moving ^1\u2026 + Moving ^1\u2026 - Don\u2019t remove the ^1 during the move. -\n\nThe ^2 app on this device won\u2019t be available until the move is complete. + Don\u2019t remove the ^1 during the move. +\n\nThe ^2 app on this device won\u2019t be available until the move is complete. Cancel move - This ^1 appears to be slow. + This ^1 appears to be slow. \n\nYou can continue, but apps moved to this location may stutter and data transfers may take a long time. -\n\nConsider using a faster ^1 for better performance. +\n\nConsider using a faster ^1 for better performance. - How will you use this ^1? + How will you use this ^1? Use for extra tablet storage @@ -3233,26 +3242,26 @@ Set up later - Format this ^1? + Format this ^1? - This ^1 needs to be formatted to store apps, files, and media. -\n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device. + This ^1 needs to be formatted to store apps, files, and media. +\n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device. - Format ^1 + Format ^1 - Move content to ^1? + Move content to ^1? - You can move files, media, and certain apps to this ^1. -\n\nThis move will free up ^2 of your tablet\u2019s storage and should take around ^3. + You can move files, media, and certain apps to this ^1. +\n\nThis move will free up ^2 of your tablet\u2019s storage and should take around ^3. - You can move files, media, and certain apps to this ^1. -\n\nThis move will free up ^2 of your phone\u2019s storage and should take around ^3. + You can move files, media, and certain apps to this ^1. +\n\nThis move will free up ^2 of your phone\u2019s storage and should take around ^3. During the move: - Don\u2019t remove the ^1 + Don\u2019t remove the ^1 Some apps won\u2019t work @@ -3269,23 +3278,23 @@ Moving content\u2026 - Slow ^1 + Slow ^1 - You can still use this ^1, but it may be slow. -\n\nApps stored on this ^2 may not work properly, and content transfers could take a long time. -\n\nTry using a faster ^3, or use this ^4 for portable storage instead. + You can still use this ^1, but it may be slow. +\n\nApps stored on this ^2 may not work properly, and content transfers could take a long time. +\n\nTry using a faster ^3, or use this ^4 for portable storage instead. Start over Continue - You can move content to ^1 + You can move content to ^1 - To move content to ^1, go to Settings > Storage + To move content to ^1, go to Settings > Storage - Your content was moved to ^1. -\n\nTo manage this ^2, go to Settings > Storage. + Your content was moved to ^1. +\n\nTo manage this ^2, go to Settings > Storage. Battery status @@ -3461,7 +3470,7 @@ Factory reset is not available for this user - Erasing + Erasing Please wait... @@ -3611,7 +3620,8 @@ Location sources - + + About tablet @@ -3632,16 +3642,20 @@ Regulatory labels Safety & regulatory manual - + + Copyright - + + License - + + Terms and conditions - + + System WebView License @@ -3654,7 +3668,8 @@ There is a problem loading the manual. - + + Third-party licenses @@ -3857,7 +3872,8 @@ Same as device screen lock - + + Manage apps @@ -3875,7 +3891,7 @@ Recently opened apps - See all %1$d apps + See all %1$d apps @@ -4165,7 +4181,8 @@ More info on %1$s - + + Running @@ -4281,7 +4298,8 @@ features of your phone may stop working correctly until you power it off and then on again. - + + Languages, input & gestures @@ -4368,7 +4386,8 @@ Send vibration to game controller when connected - + + Choose keyboard layout @@ -4378,11 +4397,13 @@ Default - + + Keyboard layouts - + + Personal dictionary @@ -4551,7 +4572,7 @@ When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\nTo zoom, tap the Accessibility button, then tap anywhere on the screen.\n
  • Drag 2 or more fingers to scroll
    • \n
  • Pinch 2 or more fingers to adjust zoom
\n\nTo zoom temporarily, tap the Accessibility button, then touch & hold anywhere on the screen.\n
  • Drag to move around the screen
    • \n
  • Lift finger to zoom out
\n\nYou can’t zoom in on the keyboard or navigation bar. - The Accessibility button is set to %1$s. To use magnification, touch & hold the Accessibility button, then select magnification. + The Accessibility button is set to %1$s. To use magnification, touch & hold the Accessibility button, then select magnification. Volume key shortcut @@ -4637,32 +4658,32 @@ - Extremely short delay (%1$d ms) - Extremely short delay (%1$d ms) + Extremely short delay (%1$d ms) + Extremely short delay (%1$d ms) - Very short delay (%1$d ms) - Very short delay (%1$d ms) + Very short delay (%1$d ms) + Very short delay (%1$d ms) - Short delay (%1$d ms) - Short delay (%1$d ms) + Short delay (%1$d ms) + Short delay (%1$d ms) - Long delay (%1$d ms) - Long delay (%1$d ms) + Long delay (%1$d ms) + Long delay (%1$d ms) - Very long delay (%1$d ms) - Very long delay (%1$d ms) + Very long delay (%1$d ms) + Very long delay (%1$d ms) - Ring %1$s, touch %2$s + Ring %1$s, touch %2$s Ring & notification set to off @@ -4735,7 +4756,7 @@ Default - Color + Color Default @@ -4764,9 +4785,9 @@ Use - %1$s? + %1$s? - %1$s + %1$s needs to: - If you turn on %1$s, your device won’t use your screen lock to enhance + If you turn on %1$s, your device won’t use your screen lock to enhance data encryption. @@ -4784,18 +4804,15 @@ your device won’t use your screen lock to enhance data encryption. - Because turning on %1$s affects data encryption, you need to confirm your pattern. + Because turning on %1$s affects data encryption, you need to confirm your pattern. - Because turning on %1$s affects data encryption, you need to confirm your PIN. + Because turning on %1$s affects data encryption, you need to confirm your PIN. - Because turning on %1$s affects data encryption, you need to confirm your password. + Because turning on %1$s affects data encryption, you need to confirm your password. @@ -4805,10 +4822,10 @@ interacting with an app. - Stop %1$s? + Stop %1$s? Tapping OK will - stop %1$s. + stop %1$s. No services installed @@ -4894,19 +4911,19 @@ %1$s\n%2$s - Configuring %1$s + Configuring %1$s - Printing %1$s + Printing %1$s - Cancelling %1$s + Cancelling %1$s - Printer error %1$s + Printer error %1$s - Printer blocked %1$s + Printer blocked %1$s Search box shown @@ -5334,7 +5351,7 @@ Over-counted power use - %d mAh + %d mAh Used for ^1 @@ -5361,9 +5378,9 @@ Battery usage - Since full charge + Since full charge - Manage battery usage + Manage battery usage Battery left estimate is based on your device usage @@ -5439,7 +5456,7 @@ %3$s - %1$s + %1$s of RAM used over %2$s @@ -5499,7 +5516,8 @@ Cached - + + Voice input & output @@ -5509,7 +5527,8 @@ Android keyboard - + + Voice input settings @@ -5650,7 +5669,7 @@ Incorrect password. You have one more chance before credential storage is erased. - Incorrect password. You have %1$d more chances before credential storage is erased. + Incorrect password. You have %1$d more chances before credential storage is erased. Credential storage is erased. @@ -5669,7 +5688,8 @@ Set behavior when an emergency call is placed - + + Backup @@ -5701,7 +5721,8 @@ Stop backing up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps), plus erase all copies on remote servers? Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages, and photos. - + + Device admin settings @@ -5770,17 +5791,17 @@ a user is configuring password for a network. The argument should be the name of the network. [CHAR LIMIT=50] --> - Connect to Wi\u2011Fi network %s + Connect to Wi\u2011Fi network %s - Connecting to Wi\u2011Fi network %s\u2026 + Connecting to Wi\u2011Fi network %s\u2026 - Connected to Wi\u2011Fi network %s + Connected to Wi\u2011Fi network %s @@ -5905,7 +5926,8 @@ Auto-sync app data - + + Sync is ON @@ -5994,9 +6016,9 @@ Misc files - selected %1$d out of %2$d + selected %1$d out of %2$d - %1$s out of %2$s + %1$s out of %2$s Select all @@ -6160,9 +6182,9 @@ If you restrict background mobile data, some apps and services won\u2019t work unless you\u2019re connected to Wi\u2011Fi.\n\nThis setting affects all users on this phone. - ^1 ^2\nwarning + ^1 ^2\nwarning - ^1 ^2\nlimit + ^1 ^2\nlimit @@ -6171,14 +6193,14 @@ Removed apps and users - %1$s received, %2$s sent + %1$s received, %2$s sent - %2$s: about %1$s used. + %2$s: about %1$s used. - %2$s: about %1$s used, as measured by your tablet. Your carrier\u2019s data usage accounting may differ. + %2$s: about %1$s used, as measured by your tablet. Your carrier\u2019s data usage accounting may differ. - %2$s: about %1$s used, as measured by your phone. Your carrier\u2019s data usage accounting may differ. + %2$s: about %1$s used, as measured by your phone. Your carrier\u2019s data usage accounting may differ. Network restrictions @@ -6282,13 +6304,13 @@ Forget - Connect to %s + Connect to %s Disconnect this VPN? Disconnect - Version %s + Version %s Forget VPN @@ -6306,7 +6328,7 @@ Turn on - %1$s can\'t connect + %1$s can\'t connect This app doesn\'t support always-on VPN @@ -6382,7 +6404,7 @@ Credential details - Removed credential: %s + Removed credential: %s No user credentials installed @@ -6406,7 +6428,8 @@ "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] --> Additional system updates - + + @@ -6437,7 +6460,7 @@ - + Multiple users @@ -6462,7 +6485,7 @@ Admin - You (%s) + You (%s) Nickname @@ -6563,7 +6586,7 @@ Emergency information - Info & contacts for %1$s + Info & contacts for %1$s Allow apps and content @@ -6572,7 +6595,8 @@ Expand settings for application - + + Tap & pay How it works @@ -6605,7 +6629,8 @@ Set as your preference? Always use %1$s when you Tap & pay? Always use %1$s instead of %2$s when you Tap & pay? - + + Restrictions @@ -6617,7 +6642,8 @@ Show notifications - + + Help & feedback @@ -6816,7 +6842,7 @@ Location - Let apps use your location information + Let apps use your location information Back @@ -7100,7 +7126,7 @@ - Ring volume at %1$s + Ring volume at %1$s Volume, vibration, Do Not Disturb @@ -7198,7 +7224,7 @@ 1 rule - %d rules + %d rules @@ -7223,7 +7249,7 @@ Total Silence - No sound except %1$s + No sound except %1$s No sound except alarms and media @@ -7256,7 +7282,7 @@ Total silence - %1$s: %2$s + %1$s: %2$s Block visual disturbances @@ -7350,22 +7376,22 @@ Turn off now - Do Not Disturb is on until %s + Do Not Disturb is on until %s Do Not Disturb will stay on until you turn it off - Do Not Disturb was automatically turned on by a rule (%s) + Do Not Disturb was automatically turned on by a rule (%s) - Do Not Disturb was automatically turned on by an app (%s) + Do Not Disturb was automatically turned on by an app (%s) Priority only - %1$s. %2$s + %1$s. %2$s On / %1$s @@ -7388,16 +7414,16 @@ 1 hour (unless turned on automatically) - %d hours (unless turned on automatically) + %d hours (unless turned on automatically) - %d minutes (unless turned on automatically) + %d minutes (unless turned on automatically) 1 rule can turn on automatically - %d rules can turn on automatically + %d rules can turn on automatically @@ -7418,11 +7444,11 @@ Not muted - Muted, but allow %1$s + Muted, but allow %1$s - Muted, but allow %1$s and %2$s + Muted, but allow %1$s and %2$s - Muted, but allow %1$s, %2$s, and %3$s + Muted, but allow %1$s, %2$s, and %3$s Messages, events & reminders @@ -7493,7 +7519,7 @@ Add custom sound? - This file will be copied to the %s folder + This file will be copied to the %s folder Ringtones @@ -7678,7 +7704,7 @@ Allow notification access for - %1$s? + %1$s? @@ -7702,7 +7728,7 @@ Allow VR service access for - %1$s? + %1$s? @@ -7764,8 +7790,8 @@ - %d category - %d categories + %d category + %d categories @@ -7778,14 +7804,14 @@ On for all apps - Off for %d app - Off for %d apps + Off for %d app + Off for %d apps - %d category deleted - %d categories deleted + %d category deleted + %d categories deleted @@ -7876,7 +7902,7 @@ Choose rule type - Delete \u201c%1$s\u201d rule? + Delete \u201c%1$s\u201d rule? Delete @@ -7885,7 +7911,7 @@ Unknown - These settings can\'t be changed right now. An app (%1$s) has automatically turned on Do Not Disturb with custom behavior." + These settings can\'t be changed right now. An app (%1$s) has automatically turned on Do Not Disturb with custom behavior." These settings can\'t be changed right now. An app has automatically turned on Do Not Disturb with custom behavior." @@ -7909,13 +7935,13 @@ During events for - During events for %1$s + During events for %1$s any calendar - Where reply is %1$s + Where reply is %1$s Any calendar @@ -7936,10 +7962,10 @@ Rule not found. - On / %1$s + On / %1$s - %1$s\n%2$s + %1$s\n%2$s Days @@ -7960,10 +7986,10 @@ ,\u0020 - %1$s - %2$s + %1$s - %2$s - %1$s to %2$s + %1$s to %2$s Calls @@ -7980,7 +8006,7 @@ 1 other - %d others + %d others @@ -8053,10 +8079,10 @@ Allow repeat callers - From %1$s + From %1$s - From %1$s and %2$s + From %1$s and %2$s If the same person calls a second time within a %d minute period @@ -8083,25 +8109,25 @@ End time - %s next day + %s next day Change to alarms only indefinitely - Change to alarms only for one minute until %2$s - Change to alarms only for %1$d minutes (until %2$s) + Change to alarms only for one minute until %2$s + Change to alarms only for %1$d minutes (until %2$s) - Change to alarms only for one hour until %2$s - Change to alarms only for %1$d hours until %2$s + Change to alarms only for one hour until %2$s + Change to alarms only for %1$d hours until %2$s - Change to alarms only until %1$s + Change to alarms only until %1$s Change to always interrupt @@ -8207,13 +8233,13 @@ Require password? - When you enter your PIN to start this device, accessibility services like %1$s won\u2019t yet be available. + When you enter your PIN to start this device, accessibility services like %1$s won\u2019t yet be available. - When you enter your pattern to start this device, accessibility services like %1$s won\u2019t yet be available. + When you enter your pattern to start this device, accessibility services like %1$s won\u2019t yet be available. - When you enter your password to start this device, accessibility services like %1$s won\u2019t yet be available. + When you enter your password to start this device, accessibility services like %1$s won\u2019t yet be available. Note: After a reboot, this app can\'t start until you unlock your phone @@ -8235,7 +8261,7 @@ Other defaults - %1$s used in %2$s + %1$s used in %2$s Internal storage @@ -8244,7 +8270,7 @@ App data usage - %1$s used since %2$s + %1$s used since %2$s Storage used @@ -8260,11 +8286,11 @@ On - On / %1$s + On / %1$s Off - %1$d of %2$d categories turned off + %1$d of %2$d categories turned off Silenced @@ -8282,26 +8308,26 @@ - %d category turned off - %d categories turned off + %d category turned off + %d categories turned off - %d permission granted - %d permissions granted + %d permission granted + %d permissions granted - %d of %d permission granted - %d of %d permissions granted + %d of %d permission granted + %d of %d permissions granted - %d additional permission - %d additional permissions + %d additional permission + %d additional permissions @@ -8346,7 +8372,7 @@ App permissions - Apps using %1$s + Apps using %1$s Tap to wake @@ -8361,10 +8387,10 @@ Don\u2019t open supported links - Open %s + Open %s - Open %s and other URLs + Open %s and other URLs No app opening supported links @@ -8372,7 +8398,7 @@ One app opening supported links - %d apps opening supported links + %d apps opening supported links @@ -8462,13 +8488,13 @@ Memory details - Always running (%s) + Always running (%s) - Sometimes running (%s) + Sometimes running (%s) - Rarely running (%s) + Rarely running (%s) Maximum @@ -8477,16 +8503,16 @@ Average - Maximum %1$s + Maximum %1$s - Average %1$s + Average %1$s - %1$s / %2$s + %1$s / %2$s - %1$s (%2$d) + %1$s (%2$d) Battery optimization @@ -8535,10 +8561,10 @@ - Allowing %1$s to always run in the background may reduce battery life. + Allowing %1$s to always run in the background may reduce battery life. \n\nYou can change this later from Settings > Apps & notifications. - %1$s use since last full charge + %1$s use since last full charge Power management @@ -8556,7 +8582,7 @@ Additional permissions - %1$d more + %1$d more Share bug report? @@ -8709,7 +8735,7 @@ Details - %1$s avg memory used in last 3 hours + %1$s avg memory used in last 3 hours No memory used in last 3 hours @@ -8737,8 +8763,8 @@ - 1 app used memory in the last %2$s - %1$d apps used memory in the last %2$s + 1 app used memory in the last %2$s + %1$d apps used memory in the last %2$s @@ -8751,7 +8777,7 @@ No data used - Allow access to Do Not Disturb for %1$s? + Allow access to Do Not Disturb for %1$s? The app will be able to turn on/off Do Not Disturb and make changes to related settings. @@ -8759,7 +8785,7 @@ Must stay turned on because notification access is on - Revoke access to Do Not Disturb for %1$s? + Revoke access to Do Not Disturb for %1$s? All Do Not Disturb rules created by this app will be removed. @@ -8777,7 +8803,7 @@ Recommended for better battery life - Allow %s to ignore battery optimizations? + Allow %s to ignore battery optimizations? None @@ -8787,7 +8813,7 @@ prevent your admin from tracking data usage for apps in your work profile - %1$d of %2$d characters used + %1$d of %2$d characters used @@ -8811,7 +8837,7 @@ Display over other apps - %1$d of %2$d apps allowed to display over other apps + %1$d of %2$d apps allowed to display over other apps Apps with permission @@ -8831,7 +8857,7 @@ write modify system settings - %1$d of %2$d apps allowed to modify system settings + %1$d of %2$d apps allowed to modify system settings Can install other apps @@ -8904,46 +8930,46 @@ Not connected - %1$s of data used + %1$s of data used - ^1 used on Wi\u2011Fi + ^1 used on Wi\u2011Fi Off for 1 app - Off for %d apps + Off for %d apps On for all apps - %1$d apps installed + %1$d apps installed 24 apps installed - %1$s used - %2$s free + %1$s used - %2$s free - Internal storage: %1$s used - %2$s free + Internal storage: %1$s used - %2$s free - Sleep after %1$s of inactivity + Sleep after %1$s of inactivity Wallpaper, sleep, font size Sleep after 10 minutes of inactivity - Avg %1$s of %2$s memory used + Avg %1$s of %2$s memory used - Signed in as %1$s + Signed in as %1$s - %1$s is default + %1$s is default On @@ -8955,7 +8981,7 @@ Back up disabled - Updated to Android %1$s + Updated to Android %1$s Update available @@ -9097,13 +9123,13 @@ 1 suggestion - %1$d suggestions + %1$d suggestions +1 suggestion - +%1$d suggestions + +%1$d suggestions @@ -9149,13 +9175,13 @@ Ethernet - ^1 mobile data + ^1 mobile data - ^1 Wi-Fi data + ^1 Wi-Fi data - ^1 ethernet data + ^1 ethernet data %1$s Data warning @@ -9187,7 +9213,7 @@ 1 restriction - %1$d restrictions + %1$d restrictions @@ -9224,7 +9250,7 @@ 1 app allowed to use unrestricted data when Data Saver is on - %1$d apps allowed to use unrestricted data when Data Saver is on + %1$d apps allowed to use unrestricted data when Data Saver is on @@ -9327,7 +9353,7 @@ On - Will turn on at %1$s + Will turn on at %1$s Off @@ -9435,7 +9461,7 @@ 1 app can use unrestricted data - %d apps can use unrestricted data + %d apps can use unrestricted data @@ -9501,7 +9527,7 @@ Winscope Trace - %1$s - %2$s + %1$s - %2$s Work profile settings @@ -9513,19 +9539,19 @@ 1 hour - %s hours + %s hours 1 minute - %s minutes + %s minutes 1 second - %s seconds + %s seconds @@ -9645,7 +9671,7 @@ Unavailable on carrier-locked devices Please restart the device to enable device protection feature. - %1$s total made available\n\nLast ran on %2$s + %1$s total made available\n\nLast ran on %2$s Instant apps @@ -9666,7 +9692,7 @@ Your storage is now being managed by the storage manager - Accounts for %1$s + Accounts for %1$s Configure @@ -9688,14 +9714,15 @@ Sync off for all items - + + Managed device info Changes & settings managed by your organization - Changes & settings managed by %s + Changes & settings managed by %s To provide access to your work data, your organization may change settings and install software on your device.\n\nFor more details, contact your organization\'s admin. @@ -9743,7 +9770,7 @@ Default keyboard - Set to %s + Set to %s Always-on VPN turned on @@ -9781,7 +9808,7 @@ This device is managed by your organization. - This device is managed by %s. + This device is managed by %s. " " @@ -9830,9 +9857,9 @@ Files - ^1 ^2 + ^1 ^2 - Used of %1$s + Used of %1$s used @@ -9855,9 +9882,9 @@ Space used - (uninstalled for user %s) + (uninstalled for user %s) - (disabled for user %s) + (disabled for user %s) @@ -9898,7 +9925,7 @@ Display network name in status bar - Storage Manager: ^1 + Storage Manager: ^1 Off @@ -9976,7 +10003,7 @@ - %1$s (%2$s) + %1$s (%2$s) @@ -10054,11 +10081,11 @@ Take call on - Improve tablet\'s battery life + Improve tablet\'s battery life - Improve device\'s battery life + Improve device\'s battery life - Improve phone\'s battery life + Improve phone\'s battery life -- GitLab From 2f26f2b740f565684e058dca61d3638653fd578b Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Fri, 11 Sep 2020 08:09:53 +0000 Subject: [PATCH 3/8] Revert "Settings: Rename 'Security & location' to 'Security & Privacy'" This reverts commit 029131f608fa9cf6f395a3d253011f45fea10470 --- res/values/strings.xml | 679 ++++++++++++++++++++--------------------- 1 file changed, 326 insertions(+), 353 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index f59bf21a3e8..a5d9af02172 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,4 +1,5 @@ - Switch - - + Unknown @@ -48,8 +48,7 @@ Please enable developer options first. - - + Wireless & networks @@ -106,7 +105,7 @@ Unavailable - IMS Registration: %1$s\u000AVoice over LTE: %2$s\u000AVoice over WiFi: %3$s\u000AVideo Calling: %4$s\u000AUT Interface: %5$s + IMS Registration: %1$s\u000AVoice over LTE: %2$s\u000AVoice over WiFi: %3$s\u000AVideo Calling: %4$s\u000AUT Interface: %5$s In Service @@ -166,7 +165,7 @@ Preview - Preview, page %1$d of %2$d + Preview, page %1$d of %2$d Make the text on screen smaller or larger. @@ -179,12 +178,15 @@ Servez à ce monsieur une bière et des kiwis. Sample text - + The Wonderful Wizard of Oz - + Chapter 11: The Wonderful Emerald City of Oz - + Even with eyes protected by the green spectacles Dorothy and her friends were at first dazzled by the brilliancy of the wonderful City. The streets were lined with beautiful houses all built of green marble and studded everywhere with sparkling emeralds. They walked over a pavement of the same green marble, and where the blocks were joined together were rows of emeralds, set closely, and glittering in the brightness of the sun. @@ -731,8 +733,7 @@ Choose a network operator - - + Date & time @@ -782,7 +783,7 @@ Time Zone - Time zones in %1$s + Time zones in %1$s Select UTC offset @@ -790,15 +791,15 @@ Sort by time zone - %1$s starts on %2$s. + %1$s starts on %2$s. - %1$s (%2$s) + %1$s (%2$s) - %2$s (%1$s) + %2$s (%1$s) - Uses %1$s. %2$s starts on %3$s. + Uses %1$s. %2$s starts on %3$s. - Uses %1$s. No daylight savings time. + Uses %1$s. No daylight savings time. Daylight savings time @@ -815,8 +816,7 @@ [CHAR LIMIT=20] --> Time - - + Automatically lock @@ -841,7 +841,7 @@ None - %1$d / %2$d + %1$d / %2$d E.g., Joe\u2019s Android. @@ -860,7 +860,7 @@ Accounts - Security & Privacy + Security & location Encryption & credentials @@ -886,8 +886,7 @@ Screen lock, fingerprint Screen lock - - + Fingerprint @@ -1006,7 +1005,7 @@ Lift finger, then touch sensor again - You can add up to %d fingerprints + You can add up to %d fingerprints You\u2019ve added the maximum number of fingerprints @@ -1016,7 +1015,7 @@ Remove all fingerprints? - Remove \'%1$s\' + Remove \'%1$s\' Do you want to delete this fingerprint? @@ -1098,14 +1097,14 @@ Wait while your tablet - is being encrypted. ^1% complete. + is being encrypted. ^1% complete. Wait while your phone - is being encrypted. ^1% complete. + is being encrypted. ^1% complete. Wait while your tablet - is being encrypted. Time remaining: ^1 + is being encrypted. Time remaining: ^1 Wait while your phone - is being encrypted. Time remaining: ^1 + is being encrypted. Time remaining: ^1 To unlock your tablet, turn it off and then on. To unlock your phone, turn it off and then on. @@ -1113,7 +1112,7 @@ Warning: Your device will be wiped after - ^1 more failed attempts to be unlocked! + ^1 more failed attempts to be unlocked! @@ -1165,11 +1164,9 @@ Switch input method - - + - - + Secure your tablet @@ -1225,19 +1222,17 @@ Screen lock options - - + Screen lock - %1$s / Immediately after sleep + %1$s / Immediately after sleep - %1$s / %2$s after sleep + %1$s / %2$s after sleep - - + Work profile lock @@ -1402,19 +1397,19 @@ Dismiss - Must be at least %d characters + Must be at least %d characters - PIN must be at least %d digits + PIN must be at least %d digits Continue Must be fewer than - %d characters + %d characters Must be fewer than - %d digits + %d digits Must contain only digits 0-9 @@ -1440,37 +1435,37 @@ Must contain at least 1 letter - Must contain at least %d letters + Must contain at least %d letters Must contain at least 1 lowercase letter - Must contain at least %d lowercase letters + Must contain at least %d lowercase letters Must contain at least 1 uppercase letter - Must contain at least %d uppercase letters + Must contain at least %d uppercase letters Must contain at least 1 numerical digit - Must contain at least %d numerical digits + Must contain at least %d numerical digits Must contain at least 1 special symbol - Must contain at least %d special symbols + Must contain at least %d special symbols Must contain at least 1 non-letter character - Must contain at least %d non-letter characters + Must contain at least %d non-letter characters @@ -1526,7 +1521,7 @@ 1 active trust agent - %d active trust agents + %d active trust agents @@ -1773,9 +1768,9 @@ %1$d Mbps - %s wants to turn on Wi-Fi + %s wants to turn on Wi-Fi - %s wants to turn off Wi-Fi + %s wants to turn off Wi-Fi @@ -1802,8 +1797,7 @@ When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam web pages, YouTube videos, contacts, and more.\n\nJust bring the devices together (typically back to back) and then tap your screen. The app determines what gets beamed. - - + Wi\u2011Fi @@ -1945,8 +1939,7 @@ Wi\u2011Fi scanning turned on - - + Advanced options @@ -2094,8 +2087,7 @@ All passwords for this network will be deleted - - + Saved networks @@ -2330,7 +2322,7 @@ Roaming preference - %1$s + %1$s Roaming preference @@ -2383,7 +2375,7 @@ Carrier - + Display Sound @@ -2485,19 +2477,18 @@ Accounts - Work profile accounts - %s + Work profile accounts - %s Personal profile accounts - Work account - %s + Work account - %s - Personal account - %s + Personal account - %s Search - - + Display @@ -2809,9 +2800,9 @@ Phone number, signal, etc. - Storage + Storage - Storage + Storage Storage settings @@ -3029,66 +3020,66 @@ Portable storage - %1$s used of %2$s + %1$s used of %2$s - ^1 ^2 + ^1 ^2 - Used of %1$s + Used of %1$s - Total used of %1$s + Total used of %1$s - %1$s is mounted + %1$s is mounted - Couldn\u2019t mount %1$s + Couldn\u2019t mount %1$s - %1$s is safely ejected + %1$s is safely ejected - Couldn\u2019t safely eject %1$s + Couldn\u2019t safely eject %1$s - %1$s is formatted + %1$s is formatted - Couldn\u2019t format %1$s + Couldn\u2019t format %1$s Rename storage - This ^1 is safely ejected, but still available. -\n\nTo use this ^1, you have to mount it first. + This ^1 is safely ejected, but still available. +\n\nTo use this ^1, you have to mount it first. - This ^1 is corrupted. -\n\nTo use this ^1, you have to set it up first. + This ^1 is corrupted. +\n\nTo use this ^1, you have to set it up first. - This device doesn\u2019t support this ^1. -\n\nTo use this ^1 with this device, you have to set it up first. + This device doesn\u2019t support this ^1. +\n\nTo use this ^1 with this device, you have to set it up first. - After formatting, you can use this ^1 in other devices. -\n\nAll data on this ^1 will be erased. Consider backing up first. + After formatting, you can use this ^1 in other devices. +\n\nAll data on this ^1 will be erased. Consider backing up first. \n\nBack up photos & other media \nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. \n\nBack up apps -\nAll apps stored on this ^1 will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device. +\nAll apps stored on this ^1 will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device. - When you eject this ^1, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted. -\n\nThis ^1 is formatted to work on this device only. It won\u2019t work on any others. + When you eject this ^1, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted. +\n\nThis ^1 is formatted to work on this device only. It won\u2019t work on any others. - To use the apps, photos, or data this ^1 contains, reinsert it. + To use the apps, photos, or data this ^1 contains, reinsert it. \n\nAlternatively, you can choose to forget this storage if the device isn\u2019t available. \n\nIf you choose to forget, all the data the device contains will be lost forever. \n\nYou can reinstall the apps later, but their data stored on this device will be lost. - Forget ^1? + Forget ^1? - All the apps, photos, and data stored on this ^1 will be lost forever. + All the apps, photos, and data stored on this ^1 will be lost forever. Apps @@ -3105,21 +3096,21 @@ System - Explore ^1 + Explore ^1 Other includes shared files saved by apps, files downloaded from the internet or Bluetooth, Android files, and so on. -\n\nTo see the visible contents of this ^1, tap Explore. +\n\nTo see the visible contents of this ^1, tap Explore. - System includes files used to run Android version %s + System includes files used to run Android version %s - ^1 may have saved photos, music, apps, or other data, using ^2 of storage. -\n\nTo view details, switch to ^1. + ^1 may have saved photos, music, apps, or other data, using ^2 of storage. +\n\nTo view details, switch to ^1. - Set up your ^1 + Set up your ^1 Use as portable storage @@ -3132,31 +3123,31 @@ Format as internal storage - This requires the ^1 to be formatted to make it secure. -\n\nAfter formatting, this ^1 will only work in this device. -\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. + This requires the ^1 to be formatted to make it secure. +\n\nAfter formatting, this ^1 will only work in this device. +\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. Format as portable storage - This requires the ^1 to be formatted. -\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. + This requires the ^1 to be formatted. +\n\nFormatting erases all data currently stored on the ^1. To avoid losing the data, consider backing it up. Erase & format - Formatting ^1\u2026 + Formatting ^1\u2026 - Don\u2019t remove the ^1 while it\u2019s being formatting. + Don\u2019t remove the ^1 while it\u2019s being formatting. Move data to new storage - You can move your photos, files, and some apps to this new ^1. -\n\nThe move takes about ^2 and will free ^3 on internal storage. Some apps won\u2019t work while it\u2019s underway. + You can move your photos, files, and some apps to this new ^1. +\n\nThe move takes about ^2 and will free ^3 on internal storage. Some apps won\u2019t work while it\u2019s underway. @@ -3167,7 +3158,7 @@ Move data now - The move takes about ^1. It will free ^2 on ^3. + The move takes about ^1. It will free ^2 on ^3. Move @@ -3176,47 +3167,47 @@ During the move: -\n\u2022 Don\u2019t remove the ^1. +\n\u2022 Don\u2019t remove the ^1. \n\u2022 Some apps won\u2019t work correctly. \n\u2022 Keep the device charged. - Your ^1 is ready to use + Your ^1 is ready to use - Your ^1 is all set to use with photos and other media. + Your ^1 is all set to use with photos and other media. - Your new ^1 is working. + Your new ^1 is working. \n\nTo move photos, files, and app data to this device, go to Settings > Storage. - Move ^1 + Move ^1 - Moving ^1 and its data to ^2 will take only a few moments. You won\u2019t be able to use the app until the move is complete. -\n\nDon\u2019t remove the ^2 during the move. + Moving ^1 and its data to ^2 will take only a few moments. You won\u2019t be able to use the app until the move is complete. +\n\nDon\u2019t remove the ^2 during the move. - To move data you need to unlock user ^1. + To move data you need to unlock user ^1. - Moving ^1\u2026 + Moving ^1\u2026 - Don\u2019t remove the ^1 during the move. -\n\nThe ^2 app on this device won\u2019t be available until the move is complete. + Don\u2019t remove the ^1 during the move. +\n\nThe ^2 app on this device won\u2019t be available until the move is complete. Cancel move - This ^1 appears to be slow. + This ^1 appears to be slow. \n\nYou can continue, but apps moved to this location may stutter and data transfers may take a long time. -\n\nConsider using a faster ^1 for better performance. +\n\nConsider using a faster ^1 for better performance. - How will you use this ^1? + How will you use this ^1? Use for extra tablet storage @@ -3242,26 +3233,26 @@ Set up later - Format this ^1? + Format this ^1? - This ^1 needs to be formatted to store apps, files, and media. -\n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device. + This ^1 needs to be formatted to store apps, files, and media. +\n\nFormatting will erase existing content on the ^2. To avoid losing content, back it up to another ^3 or device. - Format ^1 + Format ^1 - Move content to ^1? + Move content to ^1? - You can move files, media, and certain apps to this ^1. -\n\nThis move will free up ^2 of your tablet\u2019s storage and should take around ^3. + You can move files, media, and certain apps to this ^1. +\n\nThis move will free up ^2 of your tablet\u2019s storage and should take around ^3. - You can move files, media, and certain apps to this ^1. -\n\nThis move will free up ^2 of your phone\u2019s storage and should take around ^3. + You can move files, media, and certain apps to this ^1. +\n\nThis move will free up ^2 of your phone\u2019s storage and should take around ^3. During the move: - Don\u2019t remove the ^1 + Don\u2019t remove the ^1 Some apps won\u2019t work @@ -3278,23 +3269,23 @@ Moving content\u2026 - Slow ^1 + Slow ^1 - You can still use this ^1, but it may be slow. -\n\nApps stored on this ^2 may not work properly, and content transfers could take a long time. -\n\nTry using a faster ^3, or use this ^4 for portable storage instead. + You can still use this ^1, but it may be slow. +\n\nApps stored on this ^2 may not work properly, and content transfers could take a long time. +\n\nTry using a faster ^3, or use this ^4 for portable storage instead. Start over Continue - You can move content to ^1 + You can move content to ^1 - To move content to ^1, go to Settings > Storage + To move content to ^1, go to Settings > Storage - Your content was moved to ^1. -\n\nTo manage this ^2, go to Settings > Storage. + Your content was moved to ^1. +\n\nTo manage this ^2, go to Settings > Storage. Battery status @@ -3470,7 +3461,7 @@ Factory reset is not available for this user - Erasing + Erasing Please wait... @@ -3620,8 +3611,7 @@ Location sources - - + About tablet @@ -3642,20 +3632,16 @@ Regulatory labels Safety & regulatory manual - - + Copyright - - + License - - + Terms and conditions - - + System WebView License @@ -3668,8 +3654,7 @@ There is a problem loading the manual. - - + Third-party licenses @@ -3872,8 +3857,7 @@ Same as device screen lock - - + Manage apps @@ -3891,7 +3875,7 @@ Recently opened apps - See all %1$d apps + See all %1$d apps @@ -4181,8 +4165,7 @@ More info on %1$s - - + Running @@ -4298,8 +4281,7 @@ features of your phone may stop working correctly until you power it off and then on again. - - + Languages, input & gestures @@ -4386,8 +4368,7 @@ Send vibration to game controller when connected - - + Choose keyboard layout @@ -4397,13 +4378,11 @@ Default - - + Keyboard layouts - - + Personal dictionary @@ -4572,7 +4551,7 @@ When magnification is turned on, use the Accessibility button at the bottom of the screen to quickly magnify.\n\nTo zoom, tap the Accessibility button, then tap anywhere on the screen.\n
  • Drag 2 or more fingers to scroll
    • \n
  • Pinch 2 or more fingers to adjust zoom
\n\nTo zoom temporarily, tap the Accessibility button, then touch & hold anywhere on the screen.\n
  • Drag to move around the screen
    • \n
  • Lift finger to zoom out
\n\nYou can’t zoom in on the keyboard or navigation bar. - The Accessibility button is set to %1$s. To use magnification, touch & hold the Accessibility button, then select magnification. + The Accessibility button is set to %1$s. To use magnification, touch & hold the Accessibility button, then select magnification. Volume key shortcut @@ -4658,32 +4637,32 @@ - Extremely short delay (%1$d ms) - Extremely short delay (%1$d ms) + Extremely short delay (%1$d ms) + Extremely short delay (%1$d ms) - Very short delay (%1$d ms) - Very short delay (%1$d ms) + Very short delay (%1$d ms) + Very short delay (%1$d ms) - Short delay (%1$d ms) - Short delay (%1$d ms) + Short delay (%1$d ms) + Short delay (%1$d ms) - Long delay (%1$d ms) - Long delay (%1$d ms) + Long delay (%1$d ms) + Long delay (%1$d ms) - Very long delay (%1$d ms) - Very long delay (%1$d ms) + Very long delay (%1$d ms) + Very long delay (%1$d ms) - Ring %1$s, touch %2$s + Ring %1$s, touch %2$s Ring & notification set to off @@ -4756,7 +4735,7 @@ Default - Color + Color Default @@ -4785,9 +4764,9 @@ Use - %1$s? + %1$s? - %1$s + %1$s needs to: - If you turn on %1$s, your device won’t use your screen lock to enhance + If you turn on %1$s, your device won’t use your screen lock to enhance data encryption. @@ -4804,15 +4784,18 @@ your device won’t use your screen lock to enhance data encryption. - Because turning on %1$s affects data encryption, you need to confirm your pattern. + Because turning on %1$s affects data encryption, you need to confirm your pattern. - Because turning on %1$s affects data encryption, you need to confirm your PIN. + Because turning on %1$s affects data encryption, you need to confirm your PIN. - Because turning on %1$s affects data encryption, you need to confirm your password. + Because turning on %1$s affects data encryption, you need to confirm your password. @@ -4822,10 +4805,10 @@ interacting with an app. - Stop %1$s? + Stop %1$s? Tapping OK will - stop %1$s. + stop %1$s. No services installed @@ -4911,19 +4894,19 @@ %1$s\n%2$s - Configuring %1$s + Configuring %1$s - Printing %1$s + Printing %1$s - Cancelling %1$s + Cancelling %1$s - Printer error %1$s + Printer error %1$s - Printer blocked %1$s + Printer blocked %1$s Search box shown @@ -5351,7 +5334,7 @@ Over-counted power use - %d mAh + %d mAh Used for ^1 @@ -5378,9 +5361,9 @@ Battery usage - Since full charge + Since full charge - Manage battery usage + Manage battery usage Battery left estimate is based on your device usage @@ -5456,7 +5439,7 @@ %3$s - %1$s + %1$s of RAM used over %2$s @@ -5516,8 +5499,7 @@ Cached - - + Voice input & output @@ -5527,8 +5509,7 @@ Android keyboard - - + Voice input settings @@ -5669,7 +5650,7 @@ Incorrect password. You have one more chance before credential storage is erased. - Incorrect password. You have %1$d more chances before credential storage is erased. + Incorrect password. You have %1$d more chances before credential storage is erased. Credential storage is erased. @@ -5688,8 +5669,7 @@ Set behavior when an emergency call is placed - - + Backup @@ -5721,8 +5701,7 @@ Stop backing up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps), plus erase all copies on remote servers? Automatically back up device data (such as Wi-Fi passwords and call history) and app data (such as settings and files stored by apps) remotely.\n\nWhen you turn on automatic backup, device and app data is periodically saved remotely. App data can be any data that an app has saved (based on developer settings), including potentially sensitive data such as contacts, messages, and photos. - - + Device admin settings @@ -5791,17 +5770,17 @@ a user is configuring password for a network. The argument should be the name of the network. [CHAR LIMIT=50] --> - Connect to Wi\u2011Fi network %s + Connect to Wi\u2011Fi network %s - Connecting to Wi\u2011Fi network %s\u2026 + Connecting to Wi\u2011Fi network %s\u2026 - Connected to Wi\u2011Fi network %s + Connected to Wi\u2011Fi network %s @@ -5926,8 +5905,7 @@ Auto-sync app data - - + Sync is ON @@ -6016,9 +5994,9 @@ Misc files - selected %1$d out of %2$d + selected %1$d out of %2$d - %1$s out of %2$s + %1$s out of %2$s Select all @@ -6182,9 +6160,9 @@ If you restrict background mobile data, some apps and services won\u2019t work unless you\u2019re connected to Wi\u2011Fi.\n\nThis setting affects all users on this phone. - ^1 ^2\nwarning + ^1 ^2\nwarning - ^1 ^2\nlimit + ^1 ^2\nlimit @@ -6193,14 +6171,14 @@ Removed apps and users - %1$s received, %2$s sent + %1$s received, %2$s sent - %2$s: about %1$s used. + %2$s: about %1$s used. - %2$s: about %1$s used, as measured by your tablet. Your carrier\u2019s data usage accounting may differ. + %2$s: about %1$s used, as measured by your tablet. Your carrier\u2019s data usage accounting may differ. - %2$s: about %1$s used, as measured by your phone. Your carrier\u2019s data usage accounting may differ. + %2$s: about %1$s used, as measured by your phone. Your carrier\u2019s data usage accounting may differ. Network restrictions @@ -6304,13 +6282,13 @@ Forget - Connect to %s + Connect to %s Disconnect this VPN? Disconnect - Version %s + Version %s Forget VPN @@ -6328,7 +6306,7 @@ Turn on - %1$s can\'t connect + %1$s can\'t connect This app doesn\'t support always-on VPN @@ -6404,7 +6382,7 @@ Credential details - Removed credential: %s + Removed credential: %s No user credentials installed @@ -6428,8 +6406,7 @@ "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] --> Additional system updates - - + @@ -6460,7 +6437,7 @@ - + Multiple users @@ -6485,7 +6462,7 @@ Admin - You (%s) + You (%s) Nickname @@ -6586,7 +6563,7 @@ Emergency information - Info & contacts for %1$s + Info & contacts for %1$s Allow apps and content @@ -6595,8 +6572,7 @@ Expand settings for application - - + Tap & pay How it works @@ -6629,8 +6605,7 @@ Set as your preference? Always use %1$s when you Tap & pay? Always use %1$s instead of %2$s when you Tap & pay? - - + Restrictions @@ -6642,8 +6617,7 @@ Show notifications - - + Help & feedback @@ -6842,7 +6816,7 @@ Location - Let apps use your location information + Let apps use your location information Back @@ -7126,7 +7100,7 @@ - Ring volume at %1$s + Ring volume at %1$s Volume, vibration, Do Not Disturb @@ -7224,7 +7198,7 @@ 1 rule - %d rules + %d rules @@ -7249,7 +7223,7 @@ Total Silence - No sound except %1$s + No sound except %1$s No sound except alarms and media @@ -7282,7 +7256,7 @@ Total silence - %1$s: %2$s + %1$s: %2$s Block visual disturbances @@ -7376,22 +7350,22 @@ Turn off now - Do Not Disturb is on until %s + Do Not Disturb is on until %s Do Not Disturb will stay on until you turn it off - Do Not Disturb was automatically turned on by a rule (%s) + Do Not Disturb was automatically turned on by a rule (%s) - Do Not Disturb was automatically turned on by an app (%s) + Do Not Disturb was automatically turned on by an app (%s) Priority only - %1$s. %2$s + %1$s. %2$s On / %1$s @@ -7414,16 +7388,16 @@ 1 hour (unless turned on automatically) - %d hours (unless turned on automatically) + %d hours (unless turned on automatically) - %d minutes (unless turned on automatically) + %d minutes (unless turned on automatically) 1 rule can turn on automatically - %d rules can turn on automatically + %d rules can turn on automatically @@ -7444,11 +7418,11 @@ Not muted - Muted, but allow %1$s + Muted, but allow %1$s - Muted, but allow %1$s and %2$s + Muted, but allow %1$s and %2$s - Muted, but allow %1$s, %2$s, and %3$s + Muted, but allow %1$s, %2$s, and %3$s Messages, events & reminders @@ -7519,7 +7493,7 @@ Add custom sound? - This file will be copied to the %s folder + This file will be copied to the %s folder Ringtones @@ -7704,7 +7678,7 @@ Allow notification access for - %1$s? + %1$s? @@ -7728,7 +7702,7 @@ Allow VR service access for - %1$s? + %1$s? @@ -7790,8 +7764,8 @@ - %d category - %d categories + %d category + %d categories @@ -7804,14 +7778,14 @@ On for all apps - Off for %d app - Off for %d apps + Off for %d app + Off for %d apps - %d category deleted - %d categories deleted + %d category deleted + %d categories deleted @@ -7902,7 +7876,7 @@ Choose rule type - Delete \u201c%1$s\u201d rule? + Delete \u201c%1$s\u201d rule? Delete @@ -7911,7 +7885,7 @@ Unknown - These settings can\'t be changed right now. An app (%1$s) has automatically turned on Do Not Disturb with custom behavior." + These settings can\'t be changed right now. An app (%1$s) has automatically turned on Do Not Disturb with custom behavior." These settings can\'t be changed right now. An app has automatically turned on Do Not Disturb with custom behavior." @@ -7935,13 +7909,13 @@ During events for - During events for %1$s + During events for %1$s any calendar - Where reply is %1$s + Where reply is %1$s Any calendar @@ -7962,10 +7936,10 @@ Rule not found. - On / %1$s + On / %1$s - %1$s\n%2$s + %1$s\n%2$s Days @@ -7986,10 +7960,10 @@ ,\u0020 - %1$s - %2$s + %1$s - %2$s - %1$s to %2$s + %1$s to %2$s Calls @@ -8006,7 +7980,7 @@ 1 other - %d others + %d others @@ -8079,10 +8053,10 @@ Allow repeat callers - From %1$s + From %1$s - From %1$s and %2$s + From %1$s and %2$s If the same person calls a second time within a %d minute period @@ -8109,25 +8083,25 @@ End time - %s next day + %s next day Change to alarms only indefinitely - Change to alarms only for one minute until %2$s - Change to alarms only for %1$d minutes (until %2$s) + Change to alarms only for one minute until %2$s + Change to alarms only for %1$d minutes (until %2$s) - Change to alarms only for one hour until %2$s - Change to alarms only for %1$d hours until %2$s + Change to alarms only for one hour until %2$s + Change to alarms only for %1$d hours until %2$s - Change to alarms only until %1$s + Change to alarms only until %1$s Change to always interrupt @@ -8233,13 +8207,13 @@ Require password? - When you enter your PIN to start this device, accessibility services like %1$s won\u2019t yet be available. + When you enter your PIN to start this device, accessibility services like %1$s won\u2019t yet be available. - When you enter your pattern to start this device, accessibility services like %1$s won\u2019t yet be available. + When you enter your pattern to start this device, accessibility services like %1$s won\u2019t yet be available. - When you enter your password to start this device, accessibility services like %1$s won\u2019t yet be available. + When you enter your password to start this device, accessibility services like %1$s won\u2019t yet be available. Note: After a reboot, this app can\'t start until you unlock your phone @@ -8261,7 +8235,7 @@ Other defaults - %1$s used in %2$s + %1$s used in %2$s Internal storage @@ -8270,7 +8244,7 @@ App data usage - %1$s used since %2$s + %1$s used since %2$s Storage used @@ -8286,11 +8260,11 @@ On - On / %1$s + On / %1$s Off - %1$d of %2$d categories turned off + %1$d of %2$d categories turned off Silenced @@ -8308,26 +8282,26 @@ - %d category turned off - %d categories turned off + %d category turned off + %d categories turned off - %d permission granted - %d permissions granted + %d permission granted + %d permissions granted - %d of %d permission granted - %d of %d permissions granted + %d of %d permission granted + %d of %d permissions granted - %d additional permission - %d additional permissions + %d additional permission + %d additional permissions @@ -8372,7 +8346,7 @@ App permissions - Apps using %1$s + Apps using %1$s Tap to wake @@ -8387,10 +8361,10 @@ Don\u2019t open supported links - Open %s + Open %s - Open %s and other URLs + Open %s and other URLs No app opening supported links @@ -8398,7 +8372,7 @@ One app opening supported links - %d apps opening supported links + %d apps opening supported links @@ -8488,13 +8462,13 @@ Memory details - Always running (%s) + Always running (%s) - Sometimes running (%s) + Sometimes running (%s) - Rarely running (%s) + Rarely running (%s) Maximum @@ -8503,16 +8477,16 @@ Average - Maximum %1$s + Maximum %1$s - Average %1$s + Average %1$s - %1$s / %2$s + %1$s / %2$s - %1$s (%2$d) + %1$s (%2$d) Battery optimization @@ -8561,10 +8535,10 @@ - Allowing %1$s to always run in the background may reduce battery life. + Allowing %1$s to always run in the background may reduce battery life. \n\nYou can change this later from Settings > Apps & notifications. - %1$s use since last full charge + %1$s use since last full charge Power management @@ -8582,7 +8556,7 @@ Additional permissions - %1$d more + %1$d more Share bug report? @@ -8735,7 +8709,7 @@ Details - %1$s avg memory used in last 3 hours + %1$s avg memory used in last 3 hours No memory used in last 3 hours @@ -8763,8 +8737,8 @@ - 1 app used memory in the last %2$s - %1$d apps used memory in the last %2$s + 1 app used memory in the last %2$s + %1$d apps used memory in the last %2$s @@ -8777,7 +8751,7 @@ No data used - Allow access to Do Not Disturb for %1$s? + Allow access to Do Not Disturb for %1$s? The app will be able to turn on/off Do Not Disturb and make changes to related settings. @@ -8785,7 +8759,7 @@ Must stay turned on because notification access is on - Revoke access to Do Not Disturb for %1$s? + Revoke access to Do Not Disturb for %1$s? All Do Not Disturb rules created by this app will be removed. @@ -8803,7 +8777,7 @@ Recommended for better battery life - Allow %s to ignore battery optimizations? + Allow %s to ignore battery optimizations? None @@ -8813,7 +8787,7 @@ prevent your admin from tracking data usage for apps in your work profile - %1$d of %2$d characters used + %1$d of %2$d characters used @@ -8837,7 +8811,7 @@ Display over other apps - %1$d of %2$d apps allowed to display over other apps + %1$d of %2$d apps allowed to display over other apps Apps with permission @@ -8857,7 +8831,7 @@ write modify system settings - %1$d of %2$d apps allowed to modify system settings + %1$d of %2$d apps allowed to modify system settings Can install other apps @@ -8930,46 +8904,46 @@ Not connected - %1$s of data used + %1$s of data used - ^1 used on Wi\u2011Fi + ^1 used on Wi\u2011Fi Off for 1 app - Off for %d apps + Off for %d apps On for all apps - %1$d apps installed + %1$d apps installed 24 apps installed - %1$s used - %2$s free + %1$s used - %2$s free - Internal storage: %1$s used - %2$s free + Internal storage: %1$s used - %2$s free - Sleep after %1$s of inactivity + Sleep after %1$s of inactivity Wallpaper, sleep, font size Sleep after 10 minutes of inactivity - Avg %1$s of %2$s memory used + Avg %1$s of %2$s memory used - Signed in as %1$s + Signed in as %1$s - %1$s is default + %1$s is default On @@ -8981,7 +8955,7 @@ Back up disabled - Updated to Android %1$s + Updated to Android %1$s Update available @@ -9123,13 +9097,13 @@ 1 suggestion - %1$d suggestions + %1$d suggestions +1 suggestion - +%1$d suggestions + +%1$d suggestions @@ -9175,13 +9149,13 @@ Ethernet - ^1 mobile data + ^1 mobile data - ^1 Wi-Fi data + ^1 Wi-Fi data - ^1 ethernet data + ^1 ethernet data %1$s Data warning @@ -9213,7 +9187,7 @@ 1 restriction - %1$d restrictions + %1$d restrictions @@ -9250,7 +9224,7 @@ 1 app allowed to use unrestricted data when Data Saver is on - %1$d apps allowed to use unrestricted data when Data Saver is on + %1$d apps allowed to use unrestricted data when Data Saver is on @@ -9353,7 +9327,7 @@ On - Will turn on at %1$s + Will turn on at %1$s Off @@ -9461,7 +9435,7 @@ 1 app can use unrestricted data - %d apps can use unrestricted data + %d apps can use unrestricted data @@ -9527,7 +9501,7 @@ Winscope Trace - %1$s - %2$s + %1$s - %2$s Work profile settings @@ -9539,19 +9513,19 @@ 1 hour - %s hours + %s hours 1 minute - %s minutes + %s minutes 1 second - %s seconds + %s seconds @@ -9671,7 +9645,7 @@ Unavailable on carrier-locked devices Please restart the device to enable device protection feature. - %1$s total made available\n\nLast ran on %2$s + %1$s total made available\n\nLast ran on %2$s Instant apps @@ -9692,7 +9666,7 @@ Your storage is now being managed by the storage manager - Accounts for %1$s + Accounts for %1$s Configure @@ -9714,15 +9688,14 @@ Sync off for all items - - + Managed device info Changes & settings managed by your organization - Changes & settings managed by %s + Changes & settings managed by %s To provide access to your work data, your organization may change settings and install software on your device.\n\nFor more details, contact your organization\'s admin. @@ -9770,7 +9743,7 @@ Default keyboard - Set to %s + Set to %s Always-on VPN turned on @@ -9808,7 +9781,7 @@ This device is managed by your organization. - This device is managed by %s. + This device is managed by %s. " " @@ -9857,9 +9830,9 @@ Files - ^1 ^2 + ^1 ^2 - Used of %1$s + Used of %1$s used @@ -9882,9 +9855,9 @@ Space used - (uninstalled for user %s) + (uninstalled for user %s) - (disabled for user %s) + (disabled for user %s) @@ -9925,7 +9898,7 @@ Display network name in status bar - Storage Manager: ^1 + Storage Manager: ^1 Off @@ -10003,7 +9976,7 @@ - %1$s (%2$s) + %1$s (%2$s) @@ -10081,11 +10054,11 @@ Take call on - Improve tablet\'s battery life + Improve tablet\'s battery life - Improve device\'s battery life + Improve device\'s battery life - Improve phone\'s battery life + Improve phone\'s battery life -- GitLab From 06e63362ac3b5be5f0e47a7f41fd448072977a72 Mon Sep 17 00:00:00 2001 From: Mohit Date: Fri, 11 Sep 2020 14:31:25 +0530 Subject: [PATCH 4/8] Settings: Rename 'Security & location' to 'Security & Privacy' --- res/values-en-rAU/strings.xml | 2 +- res/values-en-rCA/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values-en-rXC/strings.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index ec07be753fd..f3304b69217 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -382,7 +382,7 @@ "Location" "Use location" "Accounts" - "Security & location" + "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index cee6e36f0e3..e85ef831103 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -382,7 +382,7 @@ "Location" "Use location" "Accounts" - "Security & location" + "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index a0e5ef2bf53..484719d8ac9 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -382,7 +382,7 @@ "Location" "Use location" "Accounts" - "Security & location" + "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index ec07be753fd..f3304b69217 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -382,7 +382,7 @@ "Location" "Use location" "Accounts" - "Security & location" + "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index c3c6efb0efb..217d70eb229 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -380,7 +380,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎Location‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎Use location‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎Accounts‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎Security & location‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎Security & Privacy" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎Encryption & credentials‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎Phone encrypted‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎Phone not encrypted‎‏‎‎‏‎" -- GitLab From 8f71ff22dab591dfaeb1cbc70fb1591e7d57f657 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Wed, 23 Sep 2020 12:48:31 +0530 Subject: [PATCH 5/8] Rename 'Security & location' to 'Security & Privacy' and removed wrong translations --- res/values-af/strings.xml | 1 - res/values-am/strings.xml | 1 - res/values-ar/strings.xml | 1 - res/values-as/strings.xml | 1 - res/values-az/strings.xml | 1 - res/values-b+sr+Latn/strings.xml | 1 - res/values-be/strings.xml | 1 - res/values-bg/strings.xml | 1 - res/values-bn/strings.xml | 1 - res/values-bs/strings.xml | 1 - res/values-ca/strings.xml | 1 - res/values-cs/strings.xml | 1 - res/values-cy/strings.xml | 1 - res/values-da/strings.xml | 1 - res/values-de/strings.xml | 1 - res/values-el/strings.xml | 1 - res/values-en-rAU/strings.xml | 1 - res/values-en-rCA/strings.xml | 1 - res/values-en-rGB/strings.xml | 1 - res/values-en-rIN/strings.xml | 1 - res/values-en-rXC/strings.xml | 1 - res/values-es-rUS/strings.xml | 1 - res/values-es/strings.xml | 1 - res/values-et/strings.xml | 1 - res/values-eu/strings.xml | 1 - res/values-fa/strings.xml | 1 - res/values-fi/strings.xml | 1 - res/values-fr-rCA/strings.xml | 1 - res/values-fr/strings.xml | 1 - res/values-gl/strings.xml | 1 - res/values-gu/strings.xml | 1 - res/values-hi/strings.xml | 1 - res/values-hr/strings.xml | 1 - res/values-hu/strings.xml | 1 - res/values-hy/strings.xml | 1 - res/values-in/strings.xml | 1 - res/values-is/strings.xml | 1 - res/values-it/strings.xml | 1 - res/values-iw/strings.xml | 1 - res/values-ja/strings.xml | 1 - res/values-ka/strings.xml | 1 - res/values-kk/strings.xml | 1 - res/values-km/strings.xml | 1 - res/values-kn/strings.xml | 1 - res/values-ko/strings.xml | 1 - res/values-ky/strings.xml | 1 - res/values-lo/strings.xml | 1 - res/values-lt/strings.xml | 1 - res/values-lv/strings.xml | 1 - res/values-mk/strings.xml | 1 - res/values-ml/strings.xml | 1 - res/values-mn/strings.xml | 1 - res/values-mr/strings.xml | 1 - res/values-ms/strings.xml | 1 - res/values-my/strings.xml | 1 - res/values-nb/strings.xml | 1 - res/values-ne/strings.xml | 1 - res/values-nl/strings.xml | 1 - res/values-or/strings.xml | 1 - res/values-pa/strings.xml | 1 - res/values-pl/strings.xml | 1 - res/values-pt-rBR/strings.xml | 1 - res/values-pt-rPT/strings.xml | 1 - res/values-pt/strings.xml | 1 - res/values-ro/strings.xml | 1 - res/values-ru/strings.xml | 1 - res/values-si/strings.xml | 1 - res/values-sk/strings.xml | 1 - res/values-sl/strings.xml | 1 - res/values-sq/strings.xml | 1 - res/values-sr/strings.xml | 1 - res/values-sv/strings.xml | 1 - res/values-sw/strings.xml | 1 - res/values-ta/strings.xml | 1 - res/values-te/strings.xml | 1 - res/values-th/strings.xml | 1 - res/values-tl/strings.xml | 1 - res/values-tr/strings.xml | 1 - res/values-uk/strings.xml | 1 - res/values-ur/strings.xml | 1 - res/values-uz/strings.xml | 2 -- res/values-vi/strings.xml | 1 - res/values-zh-rCN/strings.xml | 1 - res/values-zh-rHK/strings.xml | 1 - res/values-zh-rTW/strings.xml | 1 - res/values-zu/strings.xml | 1 - res/values/strings.xml | 2 +- .../settings/system/SystemUpdatePreferenceController.java | 7 +------ 88 files changed, 2 insertions(+), 94 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 046684d6bde..0395631749c 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -381,7 +381,6 @@ "Ligging" "Gebruik ligging" "Rekeninge" - "Sekuriteit en ligging" "Enkripsie en eiebewyse" "Foon is geënkripteer" "Foon is nie geënkripteer nie" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 0175cae2431..ccb1a5d18f9 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -381,7 +381,6 @@ "አካባቢ" "አካባቢን ተጠቀም" "መለያዎች" - "ደህንነት እና ሥፍራ" "ምስጠራ እና ምስክርነቶች" "ስልክ ተመስጥሯል" "ስልክ አልተመሰጠረም" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 500c7a1805b..08bc7e0aef6 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -389,7 +389,6 @@ "الموقع" "استخدام الموقع الجغرافي" "الحسابات" - "الأمان والموقع الجغرافي" "التشفير وبيانات الاعتماد" "تم تشفير الهاتف" "الهاتف ليس مشفّرًا." diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index d71b0466874..ccb62558095 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -380,7 +380,6 @@ "অৱস্থান" "অৱস্থান ব্যৱহাৰ কৰক" "একাউণ্টসমূহ" - "নিৰাপত্তা আৰু অৱস্থান" "এনক্ৰিপশ্বন আৰু ক্ৰেডেনশ্বিয়েলসমূহ" "ফ\'ন এনক্ৰিপ্ট কৰা হ’ল" "ফ\'ন এনক্ৰিপ্ট কৰা নহ\'ল" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index b487a1e64ee..a7ff98d544b 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -381,7 +381,6 @@ "Yer" "Məkan istifadə edin" "Hesablar" - "Güvənlik və məkan" "Şifrələmə və kredensiallar" "Telefon şifrələnib" "Telefon şifrələnmədi" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 12e09768b1d..e0920f56b70 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -383,7 +383,6 @@ "Lokacija" "Koristi lokaciju" "Nalozi" - "Bezbednost i lokacija" "Šifrovanje i akreditivi" "Telefon je šifrovan" "Telefon nije šifrovan" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 2bc50f06aad..3f3663db369 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -385,7 +385,6 @@ "Месцазнаходжанне" "Выкарыстаць месцазнаходжанне" "Уліковыя запісы" - "Бяспека і месцазнаходжанне" "Шыфраванне і ўліковыя даныя" "Тэлефон зашыфраваны" "Тэлефон не зашыфраваны" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 33c6ef40845..803fc1472bd 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -381,7 +381,6 @@ "Местоположение" "Използване на местоположението" "Профили" - "Сигурност и местоположение" "Шифроване и идентификационни данни" "Телефонът е шифрован" "Телефонът не е шифрован" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 22efe7a7c67..b5b802be5f6 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -381,7 +381,6 @@ "লোকেশন" "লোকেশন ব্যবহার করুন" "অ্যাকাউন্টগুলি" - "নিরাপত্তা ও লোকেশন" "এনক্রিপশন ও ক্রেডেনশিয়াল" "ফোন এনক্রিপশন" "ফোন এনক্রিপ্ট করা হয়নি" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index e15d9c15198..bfeac803527 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -383,7 +383,6 @@ "Lokacija" "Koristi lokaciju" "Računi" - "Sigurnost i lokacija" "Šifriranje i akreditivi" "Telefon je šifriran" "Telefon nije šifriran" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index ff5ab36ae56..e5413e998ff 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -381,7 +381,6 @@ "Ubicació" "Utilitza la ubicació" "Comptes" - "Seguretat i ubicació" "Encriptació i credencials" "Telèfon encriptat" "El telèfon no està encriptat" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 288f9360d0c..68848a673df 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -385,7 +385,6 @@ "Poloha" "Používat polohu" "Účty" - "Zabezpečení a poloha" "Šifrování a identifikační údaje" "Telefon je zašifrován" "Telefon není šifrován" diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml index 978edbdd901..59b323a6f93 100644 --- a/res/values-cy/strings.xml +++ b/res/values-cy/strings.xml @@ -399,7 +399,6 @@ ac ẏna gẏntaf ẏ dẏỽetpỽẏt ẏ geir hỽnnỽ ac ẏ diharebir et Lleoliad Defnyddio lleoliad Cyfrifon - Diogelwch a lleoliad Amgryptio a thystnodiadau Ffôn wedi\'i amgryptio Ffôn heb ei amgryptio diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index ce57ee190e9..c6964948ec3 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -381,7 +381,6 @@ "Placering" "Brug placering" "Konti" - "Sikkerhed og placering" "Kryptering og loginoplysninger" "Telefonen er krypteret" "Telefonen er ikke krypteret" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index a648cb943b6..7de977f35fb 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -380,7 +380,6 @@ "Standort" "Standort verwenden" "Konten" - "Sicherheit & Standort" "Verschlüsselung & Anmeldedaten" "Smartphone verschlüsselt" "Smartphone nicht verschlüsselt" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 0aa53df7572..14bc982072b 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -381,7 +381,6 @@ "Τοποθεσία" "Χρήση τοποθεσίας" "Λογαριασμοί" - "Ασφάλεια και τοποθεσία" "Κρυπτογράφηση και διαπιστευτήρια" "Το τηλέφωνο είναι κρυπτογραφημένο" "Το τηλέφωνο δεν είναι κρυπτογραφημένο" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index f3304b69217..6b9775de28e 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -382,7 +382,6 @@ "Location" "Use location" "Accounts" - "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index e85ef831103..8a876f1d9f9 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -382,7 +382,6 @@ "Location" "Use location" "Accounts" - "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 484719d8ac9..3a0613bbc35 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -382,7 +382,6 @@ "Location" "Use location" "Accounts" - "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index f3304b69217..6b9775de28e 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -382,7 +382,6 @@ "Location" "Use location" "Accounts" - "Security & Privacy" "Encryption & credentials" "Phone encrypted" "Phone not encrypted" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 217d70eb229..75164a5dd72 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -380,7 +380,6 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎Location‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎Use location‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎Accounts‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎Security & Privacy" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎Encryption & credentials‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎Phone encrypted‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎Phone not encrypted‎‏‎‎‏‎" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 165e42b7a2b..964fea5ef4f 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -382,7 +382,6 @@ "Ubicación" "Usar ubicación" "Cuentas" - "Seguridad y ubicación" "Encriptación y credenciales" "Teléfono encriptado" "Teléfono no encriptado" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 3c919e3b74a..eaed4b06b7a 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -382,7 +382,6 @@ "Ubicación" "Utilizar ubicación" "Cuentas" - "Seguridad y ubicación" "Cifrado y credenciales" "Teléfono cifrado" "Teléfono no cifrado" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index f444f325c65..5b907ee4092 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -381,7 +381,6 @@ "Asukoht" "Kasuta asukohta" "Kontod" - "Turvalisus ja asukoht" "Krüpteerimine ja mandaat" "Telefon on krüpteeritud" "Telefon ei ole krüpteeritud" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index f7ebfc4a3fb..dafc6df2251 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -381,7 +381,6 @@ "Kokapena" "Erabili kokapena" "Kontuak" - "Segurtasuna eta kokapena" "Enkriptatzea eta kredentzialak" "Enkriptatuta dago telefonoa" "Telefonoa ez dago enkriptatuta" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index afd23462cf2..b329a1f011a 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -381,7 +381,6 @@ "مکان" "استفاده از مکان" "حساب‌ها" - "امنیت و موقعیت مکانی" "رمزگذاری و اعتبارنامه" "تلفن رمزگذاری شده است" "تلفن رمزگذاری‌ نشده است" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 59cfbf516ae..afd9449be20 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -381,7 +381,6 @@ "Sijainti" "Käytä sijaintia" "Tilit" - "Suojaus ja sijainti" "Salaus ja kirjautumistiedot" "Puhelimen tiedot on salattu." "Puhelinta ei salattu" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index b357da486f4..9e6bae4ab7d 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -382,7 +382,6 @@ "Position" "Utiliser ma position" "Comptes" - "Sécurité et localisation" "Cryptage et authentifiants" "Téléphone crypté" "Téléphone non chiffré" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ebf2f3c5b6e..abd97b88896 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -382,7 +382,6 @@ "Localisation" "Utiliser ma position" "Comptes" - "Sécurité et localisation" "Chiffrement et identifiants" "Téléphone chiffré" "Téléphone non chiffré" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 5b5ad74c253..e25c1db653b 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -381,7 +381,6 @@ "Localización" "Usar a localización" "Contas" - "Seguranza e localización" "Encriptación e credenciais" "Teléfono encriptado" "O teléfono non está encriptado" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 085d8a6f79f..b35e040b7c8 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -381,7 +381,6 @@ "સ્થાન" "સ્થાનનો ઉપયોગ કરો" "એકાઉન્ટ્સ" - "સુરક્ષા અને સ્થાન" "એન્ક્રિપ્શન અને ઓળખપત્રો" "ફોન એન્ક્રિપ્ટ કર્યો" "ફોન એન્ક્રિપ્ટ કરેલો નથી" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 5dd030bdc1f..f2e4cc0b4dd 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -381,7 +381,6 @@ "जगह" "जगह की जानकारी की सुविधा का इस्तेमाल करें" "खाते" - "सुरक्षा और जगह" "सुरक्षित करना और क्रेडेंशियल" "फ़ोन सुरक्षित किया गया है" "फ़ोन सुरक्षित नहीं है" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 1a7c8604882..70a0dbef78a 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -383,7 +383,6 @@ "Lokacija" "Upotreba lokacije" "Računi" - "Sigurnost i lokacija" "Enkripcija i vjerodajnice" "Telefon je kriptiran" "Telefon nije kriptiran" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 3c45279e476..40f0bac3ac5 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -381,7 +381,6 @@ "Tartózkodási hely" "Helyadatok használata" "Fiókok" - "Biztonság és hely" "Titkosítás és hitelesítési adatok" "Telefon titkosítva" "A telefon nincs titkosítva" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 1293a23fe61..6a9ec36f4da 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -381,7 +381,6 @@ "Տեղադրություն" "Օգտագործել տեղորոշումը" "Հաշիվներ" - "Անվտանգություն և տեղորոշում" "Գաղտնագրում և մուտքի տվյալներ" "Հեռախոսը գաղտնագրված է" "Հեռախոսը գաղտնագրված չէ" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 3d9da0555f1..30aa6773d7e 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -381,7 +381,6 @@ "Lokasi" "Gunakan lokasi" "Akun" - "Keamanan & lokasi" "Enkripsi & kredensial" "Telepon dienkripsi" "Ponsel tidak dienkripsi" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 69a68c656ce..e1902ed568f 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -381,7 +381,6 @@ "Staðsetning" "Nota staðsetningu" "Reikningar" - "Öryggi og staðsetning" "Dulkóðun og skilríki" "Sími dulkóðaður" "Síminn er ekki dulkóðaður" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index d5ec2e02698..2945e241654 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -381,7 +381,6 @@ "Geolocalizzazione" "Usa posizione" "Account" - "Sicurezza e posizione" "Crittografia e credenziali" "Telefono criptato" "Telefono non criptato" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 1efd2ba1f2f..bf3be9169ec 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -385,7 +385,6 @@ "מיקום" "שימוש במיקום" "חשבונות" - "אבטחה ומיקום" "הצפנה ופרטי כניסה" "טלפון מוצפן" "הטלפון לא מוצפן" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 7e1fdb859d6..e0e36ba3a15 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -381,7 +381,6 @@ "位置情報" "位置情報の使用" "アカウント" - "セキュリティと現在地情報" "暗号化と認証情報" "スマートフォンの暗号化" "スマートフォンが暗号化されていません" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 242df4b348f..e89339537cb 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -381,7 +381,6 @@ "მდებარეობა" "მდებარეობის გამოყენება" "ანგარიშები" - "უსაფრთხოება და მდებარეობა" "დაშიფვრა და ავტორიზაციის მონაცემები" "ტელეფონი დაშიფრულია" "ტელეფონი არაა დაშიფრული" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index eeb584fe01b..74290aced62 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -381,7 +381,6 @@ "Орналасу" "Орынды пайдалану" "Есептік жазбалар" - "Қауіпсіздік және орналасу" "Шифрлау және тіркелу деректері" "Телефон шифрланған" "Телефон шифрланбаған" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 6a76c1d6b27..a05fceb5024 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -381,7 +381,6 @@ "ទី​តាំង​" "ប្រើទីតាំង" "គណនី" - "សុវត្ថិភាព និងទីតាំង" "ការ​អ៊ីនគ្រីប និងព័ត៌មានសម្គាល់ខ្លួន" "បានអ៊ិនគ្រីបទូរសព្ទ" "ទូរសព្ទ​មិនបាន​អិុនគ្រីប​ទេ" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index e1bd97342d7..b4b9d32c843 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -381,7 +381,6 @@ "ಸ್ಥಳ" "ಸ್ಥಳ ಬಳಸಿ" "ಖಾತೆಗಳು" - "ಭದ್ರತೆ ಮತ್ತು ಸ್ಥಳ" "ಎನ್‌ಕ್ರಿಪ್ಶನ್ & ರುಜುವಾತುಗಳು" "ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ" "ಫೋನ್ ಅನ್ನು ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿಲ್ಲ" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 84e11cd1890..2427bbba347 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -381,7 +381,6 @@ "위치" "위치 사용" "계정" - "보안 및 위치" "암호화 및 사용자 인증 정보" "휴대전화 암호화됨" "휴대전화가 암호화되지 않았습니다." diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 7c4537a30ac..ebf8114b341 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -380,7 +380,6 @@ "Жайгашкан жер" "Жайгашкан жерди колдонуу" "Каттоо эсептери" - "Коопсуздук жана жайгашкан жер" "Шифрлөө/каттоо маалыматы" "Телефон шифрленген" "Телефон шифрленген эмес" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 4e6e4d90c25..2f21a981123 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -381,7 +381,6 @@ "ສະຖານທີ່" "ໃຊ້​ສະຖານທີ່" "ບັນຊີ" - "ຄວາມປອດໄພ ແລະ ສະຖານທີ່" "ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ" "ເຂົ້າລະຫັດໂທລະສັບແລ້ວ" "ໂທລະສັບບໍ່ໄດ້ຖືກເຂົ້າລະຫັດ" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 4dc57c3e67e..9fc001e20dc 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -385,7 +385,6 @@ "Vietovė" "Naudoti vietovę" "Paskyros" - "Saugumas ir vieta" "Šifruotė ir prisijungimo duomenys" "Telefonas užšifruotas" "Telefonas nešifruotas" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index b798e136de4..5c0023a2f9e 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -383,7 +383,6 @@ "Atrašanās vieta" "Izmantot atrašanās vietu" "Konti" - "Drošība un atrašanās vieta" "Šifrēšana un akreditācijas dati" "Tālrunis ir šifrēts" "Tālrunis nav šifrēts" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 3d137f22d68..afeabb6f1f8 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -381,7 +381,6 @@ "Локација" "Користи ја локацијата" "Сметки" - "Безбедност и локација" "Шифрирање и акредитиви" "Телефонот е шифриран" "Телефонот не е шифриран" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index c13d1920229..304b5be6969 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -381,7 +381,6 @@ "ലൊക്കേഷൻ" "ലൊക്കേഷൻ ഉപയോഗിക്കുക" "അക്കൗണ്ടുകൾ" - "സുരക്ഷയും ലൊക്കേഷനും" "എൻക്രിപ്‌ഷനും ക്രെഡന്‍ഷ്യലുകളും" "ഫോൺ എൻക്രിപ്‌റ്റ് ചെയ്‌തു" "ഫോൺ എൻക്രിപ്റ്റ് ചെയ്‌തിട്ടില്ല" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index ef8a9f3b861..060c917e88b 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -381,7 +381,6 @@ "Байршил" "Байршлыг ашиглах" "Бүртгэл" - "Аюулгүй байдал & байршил" "Шифр, мандат үнэмлэх" "Утсыг кодолсон" "Утсыг шифрлээгүй байна" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index f1f5b188ef7..29641bde006 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -381,7 +381,6 @@ "स्थान" "स्‍थान वापरा" "खाती" - "सुरक्षितता आणि स्थान" "एंक्रिप्शन आणि क्रेडेंशियल" "फोन एंक्रिप्ट केला" "फोन एंक्रिप्‍ट केला नाही" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 5795d07a508..029cd7fb0ec 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -381,7 +381,6 @@ "Lokasi" "Gunakan lokasi" "Akaun" - "Keselamatan & lokasi" "Penyulitan & bukti kelayakan" "Telefon disulitkan" "Telefon tidak disulitkan" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 0e58f4a7195..ad8ab6a1bbf 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -381,7 +381,6 @@ "တည်နေရာ" "တည်နေရာကို သုံးရန်" "အကောင့်များ" - "လုံခြုံရေးနှင့် တည်နေရာ" "အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ" "ဖုန်းကို အသွင်ဝှက်ထားသည်" "ဖုန်းကို အသွင်ဝှက်မထားပါ" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 5b33ff8f566..19c18e0bf0a 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -381,7 +381,6 @@ "Posisjon" "Bruk posisjon" "Kontoer" - "Sikkerhet og posisjon" "Kryptering og legitimasjon" "Telefonen er kryptert" "Telefonen er ikke kryptert" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 3b01d08e26d..c0341205878 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -381,7 +381,6 @@ "स्थान" "स्थान प्रयोग गर्नुहोस्" "खाताहरू" - "सुरक्षा र स्थान" "इन्क्रिप्सन र प्रमाणहरू" "फोन इन्क्रिप्ट गरिएको छ" "फोन इन्क्रिप्ट गरिएको छैन" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 048019a81da..ad5654448ab 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -381,7 +381,6 @@ "Locatie" "Locatie gebruiken" "Accounts" - "Beveiliging en locatie" "Versleuteling en gegevens" "Telefoon versleuteld" "Telefoon niet gecodeerd" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 2d222c658a9..b33d885ba30 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -380,7 +380,6 @@ "ଲୋକେଶନ୍‌" "ଲୋକେଶନ୍ ବ୍ୟବହାର କରନ୍ତୁ" "ଆକାଉଣ୍ଟ" - "ସୁରକ୍ଷା ଓ ଲୋକେଶନ୍‌" "ଏନକ୍ରିପ୍ସନ୍‌ ଓ କ୍ରେଡେନଶିଆଲ୍‌" "ଫୋନ୍‌ଟି ଏନ୍‌କ୍ରିପ୍ଟ ହୋଇଛି" "ଫୋନ୍ ଏନକ୍ରିପ୍ଟ ହୋଇନାହିଁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 270cf73196b..0930c50c6a2 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -381,7 +381,6 @@ "ਟਿਕਾਣਾ" "ਟਿਕਾਣੇ ਦੀ ਵਰਤੋਂ ਕਰੋ" "ਖਾਤੇ" - "ਸੁਰੱਖਿਆ ਅਤੇ ਟਿਕਾਣਾ" "ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ" "ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ" "ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਗਿਆ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 8d5ca707063..b2bcf6f84c2 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -385,7 +385,6 @@ "Lokalizacja" "Użyj lokalizacji" "Konta" - "Lokalizacja i blokady" "Szyfrowanie i dane logowania" "Telefon zaszyfrowany" "Telefon nie jest zaszyfrowany" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index c123bb86c0e..a0822ce3015 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -381,7 +381,6 @@ "Localização" "Usar local" "Contas" - "Segurança e local" "Criptografia e credenciais" "Smartphone criptografado" "O smartphone não está criptografado" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index aa2d6cf9e28..04dff22c70d 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -381,7 +381,6 @@ "Localização" "Utilizar a localização" "Contas" - "Segurança e localização" "Encriptação e credenciais" "Dados do telemóvel encriptados" "Telemóvel não encriptado." diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index c123bb86c0e..a0822ce3015 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -381,7 +381,6 @@ "Localização" "Usar local" "Contas" - "Segurança e local" "Criptografia e credenciais" "Smartphone criptografado" "O smartphone não está criptografado" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 8d9b63aefb2..e1eb560ca34 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -383,7 +383,6 @@ "Locație" "Utilizați locația" "Conturi" - "Securitate și locație" "Criptare și date de conectare" "Telefon criptat" "Telefonul nu este criptat" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 5b21dfa8476..aa6d8947b6d 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -385,7 +385,6 @@ "Местоположение" "Использовать местоположение" "Аккаунты" - "Защита и местоположение" "Шифрование и учетные данные" "Телефон зашифрован" "Шифрование не включено" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index be0348e1fb8..97d2d3e0cd4 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -381,7 +381,6 @@ "ස්ථානය" "ස්ථානය භාවිත කරන්න" "ගිණුම්" - "ආරක්ෂාව සහ ස්ථානය" "සංකේතනය සහ අක්තපත්‍ර" "දුරකතනය සංකේතනය කර ඇත" "දුරකතනය සංකේතනය කර නැත" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 595c405893b..8954cf868d6 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -385,7 +385,6 @@ "Poloha" "Používať polohu" "Účty" - "Zabezpečenie a poloha" "Šifrovanie a poverenia" "Telefón zašifrovaný" "Telefón nie je šifrovaný" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 6eb6e8ab602..68fd6428fdb 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -385,7 +385,6 @@ "Lokacija" "Uporaba lokacije" "Računi" - "Varnost in lokacija" "Šifriranje in poverilnice" "Telefon je šifriran" "Telefon ni šifriran" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 5f55e787de4..a7ae16d081f 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -381,7 +381,6 @@ "Vendndodhja" "Përdor vendndodhjen" "Llogaritë" - "Siguria dhe vendndodhja" "Enkriptimi dhe kredencialet" "Telefoni është i enkriptuar" "Telefoni nuk është i enkriptuar" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 58ff7e8fdce..5b13c0b473b 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -383,7 +383,6 @@ "Локација" "Користи локацију" "Налози" - "Безбедност и локација" "Шифровање и акредитиви" "Телефон је шифрован" "Телефон није шифрован" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 6f6ca84bcff..190c52d2cb8 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -381,7 +381,6 @@ "Plats" "Använd plats" "Konton" - "Säkerhet och plats" "Kryptering och användaruppgifter" "Mobilen är krypterad" "Mobilen är inte krypterad" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index a727bb80ee6..7b569e1f651 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -381,7 +381,6 @@ "Kutambua Eneo" "Tumia mahali" "Akaunti" - "Mahali na usalama" "Vitambulisho na usimbaji fiche" "Simu imesimbwa kwa njia fiche" "Simu haijasimbwa" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index abffbb9f901..3592ecb597c 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -381,7 +381,6 @@ "இருப்பிடம்" "இருப்பிடத்தைப் பயன்படுத்து" "கணக்குகள்" - "பாதுகாப்பு & இருப்பிடம்" "என்கிரிப்ஷன் & அனுமதிச் சான்றுகள்" "ஃபோன் என்கிரிப்ட் செய்யப்பட்டது" "மொபைல் என்கிரிப்ட் செய்யப்படவில்லை" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 0a195932409..a2dc667bb01 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -381,7 +381,6 @@ "స్థానం" "స్థానం ఉపయోగించండి" "ఖాతాలు" - "భద్రత & స్థానం" "ఎన్‌క్రిప్షన్ & ఆధారాలు" "ఫోన్ ఎన్‌క్రిప్ట్ చేయబడింది" "ఫోన్ ఎన్‌క్రిప్ట్ చేయబడలేదు" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 6e3f4db8ae3..6b2a9dfe33b 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -381,7 +381,6 @@ "ตำแหน่ง" "ใช้ตำแหน่ง" "บัญชี" - "ความปลอดภัยและตำแหน่ง" "การเข้ารหัสลับและข้อมูลรับรอง" "โทรศัพท์ที่เข้ารหัส" "โทรศัพท์ไม่ได้เข้ารหัส" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 083c727699a..369530d690d 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -381,7 +381,6 @@ "Lokasyon" "Gumamit ng lokasyon" "Mga Account" - "Seguridad at lokasyon" "Pag-encrypt at mga kredensyal" "Naka-encrypt ang telepono" "Hindi naka-encrypt ang telepono" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 1b8fd87380d..1fc7d072627 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -381,7 +381,6 @@ "Konum" "Konumu kullan" "Hesaplar" - "Güvenlik ve konum" "Şifreleme ve kimlik bilgileri" "Telefon şifrelendi" "Telefon şifrelenmedi" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index c12ca5a14c8..4cb9e82ec3d 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -385,7 +385,6 @@ "Місцезнаходження" "Використовувати геодані" "Облікові записи" - "Безпека та місцезнаходження" "Шифрування й облікові дані" "Телефон зашифровано" "Телефон не зашифровано" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 0e52286c9c7..8efcc0976da 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -381,7 +381,6 @@ "مقام" "مقام استعمال کریں" "اکاؤنٹس" - "سیکیورٹی اور مقام" "مرموز کاری اور اسناد" "فون مرموز کیا گيا" "فون مرموز کردہ نہیں ہے" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index b3fdc4218ab..aa7a2884465 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -381,8 +381,6 @@ "Joylashuv" "Joylashuv axborotidan foydalanish" "Hisoblar" - "Xavfsizlik va joylashuv" - "Shifrlash va hisob ma’lumotlari" "Telefon shifrlangan" "Telefon shifrlanmagan" "Qurilma shifrlangan" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index c82ae85e94b..1f1cddba6da 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -381,7 +381,6 @@ "Vị trí" "Sử dụng vị trí" "Tài khoản" - "Bảo mật và vị trí" "Mã hóa và thông tin đăng nhập" "Đã mã hóa điện thoại" "Điện thoại không được mã hóa" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index f7581d2ddab..e28e57bd779 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -382,7 +382,6 @@ "位置信息" "使用位置信息" "帐号" - "安全性和位置信息" "加密与凭据" "手机已加密" "手机未加密" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 510e37678d6..e55d117d463 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -381,7 +381,6 @@ "位置" "使用位置資訊" "帳戶" - "安全性和位置" "加密和憑證" "手機已加密" "手機未加密" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 6c8efa029f3..6b3b8520164 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -381,7 +381,6 @@ "定位" "使用位置資訊" "帳戶" - "安全性與位置資訊" "加密和憑證" "電話已加密" "手機未經加密處理" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 598583bb031..15288ebfd2d 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -381,7 +381,6 @@ "Indawo" "Sebenzisa indawo" "Ama-akhawunti" - "Ukuvikela nendawo" "Ukubethela nokuqinisekisa" "Ifoni ibethelwe" "Ifoni ayibetheliwe" diff --git a/res/values/strings.xml b/res/values/strings.xml index a5d9af02172..6b02393fcbf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -860,7 +860,7 @@ Accounts - Security & location + Security & Privacy Encryption & credentials diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index e165e784bf5..e9dcf30858f 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -112,13 +112,8 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { Log.d(TAG, "Update statue unknown"); // fall through to next branch case SystemUpdateManager.STATUS_IDLE: - final String version = updateInfo.getString(SystemUpdateManager.KEY_TITLE); - if (!TextUtils.isEmpty(version)) { - summary = mContext.getString(R.string.android_version_summary, version); - } - break; } - return ""; + return summary; } /** -- GitLab From cf0aee1b19cadbe41b90a039773e51eb4f5996f5 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Wed, 23 Sep 2020 14:14:32 +0530 Subject: [PATCH 6/8] Removed the updater subtitle from settings --- .../settings/system/SystemUpdatePreferenceController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index e9dcf30858f..e1aa50d5308 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -88,8 +88,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { @Override public CharSequence getSummary() { - CharSequence summary = mContext.getString(R.string.android_version_summary, - Build.VERSION.RELEASE); + CharSequence summary = ""; final FutureTask bundleFutureTask = new FutureTask<>( // Put the API call in a future to avoid StrictMode violation. () -> mUpdateManager.retrieveSystemUpdateInfo()); -- GitLab From 36381bb5aae5f7f190022ab70e19ac9eb52c909e Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Thu, 24 Sep 2020 09:17:52 +0000 Subject: [PATCH 7/8] Rename the updater settings entry to "System Updater" --- res/xml/system_dashboard_fragment.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml index 9ad12dd4e72..6108bbe8d1d 100644 --- a/res/xml/system_dashboard_fragment.xml +++ b/res/xml/system_dashboard_fragment.xml @@ -58,8 +58,7 @@ android:summary="@string/summary_placeholder" android:icon="@drawable/ic_system_update" android:order="-30" - settings:keywords="@string/keywords_system_update_settings" - settings:controller="com.android.settings.system.SystemUpdatePreferenceController"> + settings:keywords="@string/keywords_system_update_settings"> -- GitLab From ce62db982e7057e59d0ea1f21de4233287071931 Mon Sep 17 00:00:00 2001 From: Mohit Mali Date: Thu, 24 Sep 2020 10:59:40 +0000 Subject: [PATCH 8/8] Update res/xml/system_dashboard_fragment.xml --- res/xml/system_dashboard_fragment.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml index 6108bbe8d1d..61fa90f303b 100644 --- a/res/xml/system_dashboard_fragment.xml +++ b/res/xml/system_dashboard_fragment.xml @@ -58,6 +58,7 @@ android:summary="@string/summary_placeholder" android:icon="@drawable/ic_system_update" android:order="-30" + settings:controller="com.android.settings.system.SystemUpdatePreferenceController" settings:keywords="@string/keywords_system_update_settings"> -- GitLab