PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update language to comply with Android's inclusive language guidance

Browse Source 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I0254b07ba7ba096e33a9da3f828f99434ff07a2d
This commit is contained in:
Edgar Wang
2020-07-29 11:11:32 +08:00
parent 82450ec7f4
commit 7af9ea9c90
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/values/strings.xml
View File

@@ -1670,7 +1670,7 @@
<!-- Bluetooth device details. In the confirmation dialog for unpairing a paired device, this is the label on the button that will complete the unpairing action. -->
<string name="bluetooth_unpair_dialog_forget_confirm_button">Forget device</string>
<!-- Bluetooth settings. The title of the screen to pick which profiles to connect to on the device. For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
<!-- Bluetooth settings. The title of the screen to pick which profiles to connect to on the device. For example, headphones may have both A2DP and headset, this allows the users to choose which one they want to connect to. -->
<string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
<!-- Bluetooth settings. Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
@@ -4129,22 +4129,22 @@
<!-- Text for button that the user should tap when they forgot their work profile PIN [CHAR LIMIT=40] -->
<string name="lockpassword_forgot_pin">Forgot your PIN?</string>
<!-- Message to be used to explain the user that he needs to enter his pattern to continue a
<!-- Message to be used to explain the users that they need to enter their pattern to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_pattern_generic">Use your device pattern to continue</string>
<!-- Message to be used to explain the user that he needs to enter his PIN to continue a
<!-- Message to be used to explain the users that they need to enter their PIN to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_pin_generic">Enter your device PIN to continue</string>
<!-- Message to be used to explain the user that he needs to enter his password to continue a
<!-- Message to be used to explain the users that they need to enter their password to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_password_generic">Enter your device password to continue</string>
<!-- Message to be used to explain the user that he needs to enter his work pattern to continue a
<!-- Message to be used to explain the users that they need to enter their work pattern to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_pattern_generic_profile">Use your work pattern to continue</string>
<!-- Message to be used to explain the user that he needs to enter his work PIN to continue a
<!-- Message to be used to explain the users that they need to enter their work PIN to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_pin_generic_profile">Enter your work PIN to continue</string>
<!-- Message to be used to explain the user that he needs to enter his work password to continue a
<!-- Message to be used to explain the users that they need to enter their work password to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>
@@ -4235,9 +4235,9 @@
<string name="lockpattern_settings_enable_title">Require pattern</string>
<!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
<string name="lockpattern_settings_enable_summary">Must draw pattern to unlock screen</string>
<!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern. If checked, this line is drawn. If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
<!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the users move their finger around while drawing the unlock pattern. If checked, this line is drawn. If unchecked, there is nothing drawn so the users do not reveal their pattern while they unlock the phone.-->
<string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>
<!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the profile unlock pattern. If checked, this line is drawn. If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the profile.-->
<!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the users move their finger around while drawing the profile unlock pattern. If checked, this line is drawn. If unchecked, there is nothing drawn so the users do not reveal their pattern while they unlock the profile.-->
<string name="lockpattern_settings_enable_visible_pattern_title_profile">Make profile pattern visible</string>
<!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
<string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on tap</string>
@@ -4678,7 +4678,7 @@
<string name="auto_replace">Auto-replace</string>
<!-- On Text & language settings screen, setting summary. This is the summary for the "Auto-replace" setting. -->
<string name="auto_replace_summary">Correct mistyped words</string>
<!-- On Text & language settings screen, setting option name. title of the setting to enable autocapitalization of entered text. for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
<!-- On Text & language settings screen, setting option name. title of the setting to enable autocapitalization of entered text. For example, after the users finish a sentence, the next letter they type will automatically be capitalized. [CHAR LIMIT=25] -->
<string name="auto_caps">Auto-capitalization</string>
<!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
<string name="auto_caps_summary">Capitalize first letter in sentences</string>
@@ -5347,17 +5347,17 @@
<string name="secure_lock_encryption_warning">Because you\u2019ve turned on an accessibility service,
your device won’t use your screen lock to enhance data encryption.</string>
<!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
<!-- Message to the users to enter their pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
<string name="enable_service_pattern_reason">Because turning on <xliff:g id="service"
example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your pattern.
</string>
<!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
<!-- Message to the users to enter their PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
<string name="enable_service_pin_reason">Because turning on <xliff:g id="service"
example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your PIN.
</string>
<!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
<!-- Message to the users to enter their password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
<string name="enable_service_password_reason">Because turning on <xliff:g id="service"
example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your password.
</string>
@@ -7057,7 +7057,7 @@
<string name="nfc_how_it_works_title">Paying at the terminal</string>
<!-- Content for text explaning how to pay at a payment terminal in a store -->
<string name="nfc_how_it_works_content">Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol.</string>
<!-- Button the user can click to indicate he understood and dismiss the screen -->
<!-- Button the users can click to indicate they understood and dismiss the screen -->
<string name="nfc_how_it_works_got_it">Got it</string>
<!-- NFC More... title. [CHAR LIMIT=40] -->
<string name="nfc_more_title">More...</string>

4
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -62,8 +62,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
private static final int FINISH_DELAY = 250;
/**
* If we don't see progress during this time, we show an error message to remind the user that
* he needs to lift the finger and touch again.
* If we don't see progress during this time, we show an error message to remind the users that
* they need to lift the finger and touch again.
*/
private static final int HINT_TIMEOUT_DURATION = 2500;