diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 30 | ||||
| -rw-r--r-- | res/values/bools.xml | 4 | ||||
| -rwxr-xr-x | res/values/config.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 332 |
4 files changed, 233 insertions, 140 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 80cb2cf..e89c00c 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -237,6 +237,10 @@ <item>Disconnected</item> <!-- Status message of Wi-Fi when it is a failure. --> <item>Unsuccessful</item> + <!-- Status message of Wi-Fi when it is blocked. --> + <item>Blocked</item> + <!-- Status message of Wi-Fi when connectiong is being verified. --> + <item>Temporarily avoiding poor connection</item> </string-array> <!-- Match this with the order of NetworkInfo.DetailedState. --> <skip /> @@ -262,6 +266,10 @@ <item>Disconnected</item> <!-- Status message of Wi-Fi when it is a failure. --> <item>Unsuccessful</item> + <!-- Status message of Wi-Fi when it is blocked. --> + <item>Blocked</item> + <!-- Status message of Wi-Fi when connectiong is being verified. --> + <item>Temporarily avoiding poor connection</item> </string-array> <!-- Match this with the constants in AccessPoint. --> <skip /> @@ -649,6 +657,28 @@ <item>10</item> </string-array> + <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] --> + <string-array name="animator_duration_scale_entries"> + <item>Animation off</item> + <item>Animation scale .5x</item> + <item>Animation scale 1x</item> + <item>Animation scale 1.5x</item> + <item>Animation scale 2x</item> + <item>Animation scale 5x</item> + <item>Animation scale 10x</item> + </string-array> + + <!-- Values for animator duration scale preference. --> + <string-array name="animator_duration_scale_values" translatable="false" > + <item>0</item> + <item>.5</item> + <item>1</item> + <item>1.5</item> + <item>2</item> + <item>5</item> + <item>10</item> + </string-array> + <!-- Titles for app process limit preference. [CHAR LIMIT=35] --> <string-array name="app_process_limit_entries"> <item>Standard limit</item> diff --git a/res/values/bools.xml b/res/values/bools.xml index 278859b..2d05fbf 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -25,4 +25,8 @@ <!-- Display additional System Update menu if true --> <bool name="config_additional_system_update_setting_enable">false</bool> + + <!-- Whether the bluetooth activation confirmation dialogs should be auto dismissed. + Can be overridden for specific product builds. --> + <bool name="auto_confirm_bluetooth_activation_dialog">false</bool> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 4119b6a..557dadb 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -22,4 +22,11 @@ <string name="additional_system_update" translatable="false"></string> <string name="additional_system_update_menu" translatable="false"></string> + <!-- TODO: This is purely enforced by the interface, and does not affect what + strings may be inserted into the actual content provider. + With the addition of shortcuts, it seems more likely that users will + find this limiting; it would be good to have the interface work with + very long strings too. --> + <integer name="maximum_user_dictionary_word_length" translatable="false">48</integer> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 90b1446..b65339f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -282,12 +282,12 @@ <!-- Notification title when a Bluetooth device wants to pair with us --> <string name="bluetooth_notif_title">Pairing request</string> <!-- Notification message when a Bluetooth device wants to pair with us --> - <string name="bluetooth_notif_message">Touch to pair with <xliff:g id="device_name">%1$s</xliff:g></string> + <string name="bluetooth_notif_message">Touch to pair with <xliff:g id="device_name">%1$s</xliff:g>.</string> <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] --> <string name="bluetooth_show_received_files">Show received files</string> <!-- Strings for BluetoothDevicePicker --> - <string name="device_picker">Bluetooth device picker</string> + <string name="device_picker">Bluetooth device chooser</string> <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode --> <string name="bluetooth_permission_request">"Bluetooth permission request"</string> @@ -335,7 +335,7 @@ <string name="bluetooth_phonebook_request">"Phone book request"</string> <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] --> - <string name="bluetooth_pb_acceptance_dialog_text">%1$s would like to access your contacts and call history. Give access to %2$s?</string> + <string name="bluetooth_pb_acceptance_dialog_text">%1$s wants to access your contacts and call history. Give access to %2$s?</string> <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] --> <string name="bluetooth_pb_remember_choice">Don\'t ask again</string> @@ -402,7 +402,7 @@ <!-- HTTP proxy settings. The error if the exclusion list is not valid --> <string name="proxy_error_invalid_exclusion_list">The exclusion list you typed isn\'t properly formatted. Type a comma-separated list of excluded domains.</string> <!-- HTTP proxy settings. Error msg --> - <string name="proxy_error_empty_port">You must complete the port field.</string> + <string name="proxy_error_empty_port">You need to complete the port field.</string> <!-- HTTP proxy settings. Error msg --> <string name="proxy_error_empty_host_set_port">The port field must be empty if the host field is empty.</string> <!-- HTTP proxy settings. Error msg --> @@ -487,25 +487,25 @@ <string name="band_mode_succeeded">Successful</string> <!-- Instructions after the user changes the mass storage settings --> - <string name="sdcard_changes_instructions">Changes take effect when USB cable is reconnected</string> + <string name="sdcard_changes_instructions">Changes take effect when USB cable is reconnected.</string> <!-- Enable USB mass storage mode checkbox title --> <string name="sdcard_settings_screen_mass_storage_text">Enable USB mass storage</string> <!-- The label for total bytes on SD card --> <string name="sdcard_settings_total_bytes_label">Total bytes:</string> <!-- Message when there is no SD card present [CHAR LIMIT=30] --> - <string name="sdcard_settings_not_present_status" product="nosdcard">USB storage not mounted</string> + <string name="sdcard_settings_not_present_status" product="nosdcard">USB storage not mounted.</string> <!-- Message when there is no SD card present --> - <string name="sdcard_settings_not_present_status" product="default">No SD card</string> + <string name="sdcard_settings_not_present_status" product="default">No SD card.</string> <!-- Th label for the available (free) sapce on the SD card --> <string name="sdcard_settings_available_bytes_label">Available bytes:</string> <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] --> - <string name="sdcard_settings_mass_storage_status" product="nosdcard">USB storage is being used as a mass storage device</string> + <string name="sdcard_settings_mass_storage_status" product="nosdcard">USB storage is being used as a mass storage device.</string> <!-- Message when the SD card is being used by the computer as mass storage --> - <string name="sdcard_settings_mass_storage_status" product="default">SD card is being used as a mass storage device</string> + <string name="sdcard_settings_mass_storage_status" product="default">SD card is being used as a mass storage device.</string> <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] --> - <string name="sdcard_settings_unmounted_status" product="nosdcard">It\'s now safe to remove the USB storage</string> + <string name="sdcard_settings_unmounted_status" product="nosdcard">It\'s now safe to remove the USB storage.</string> <!-- Message when it is safe to remove the SD card --> - <string name="sdcard_settings_unmounted_status" product="default">It\'s now safe to remove the SD card</string> + <string name="sdcard_settings_unmounted_status" product="default">It\'s now safe to remove the SD card.</string> <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] --> <string name="sdcard_settings_bad_removal_status" product="nosdcard">USB storage was removed while still in use!</string> <!-- Error message when the SD card was removed without properly unmounting --> @@ -517,9 +517,9 @@ <!-- Message when it is scanning the SD card for new files --> <string name="sdcard_settings_scanning_status" product="default">Scanning SD card for media\u2026</string> <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] --> - <string name="sdcard_settings_read_only_status" product="nosdcard">USB storage mounted read-only</string> + <string name="sdcard_settings_read_only_status" product="nosdcard">USB storage mounted read-only.</string> <!-- Message when the SD card is mounted as read only --> - <string name="sdcard_settings_read_only_status" product="default">SD card mounted read-only</string> + <string name="sdcard_settings_read_only_status" product="default">SD card mounted read-only.</string> <!-- SetupWizard strings used by DateTimeSettingsSetupWizard. The button label for going to the next screen without storing the setting. [CHAR LIMIT=5] --> <string name="skip_label">Skip</string> <!-- SetupWizard strings used by DateTimeSettingsSetupWizard. The button label for going to the next screen. --> @@ -583,9 +583,9 @@ <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box --> <string name="roaming_turn_it_on_button">Turn it on</string> <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box --> - <string name="roaming_warning">Allow data roaming? You may incur significant roaming charges!</string> + <string name="roaming_warning">When you allow data roaming, you may incur significant roaming charges!</string> <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box --> - <string name="roaming_reenable_title">Attention</string> + <string name="roaming_reenable_title">Allow data roaming?</string> <!-- mobile network settings screen, setting option name --> <string name="networks">Operator selection</string> <!-- mobile network settings screen, setting option summary text --> @@ -623,7 +623,7 @@ <!-- Date & time setting screen setting option title --> <string name="date_time_set_date">Set date</string> <!-- Date & time setting screen setting option title. This setting allows the user to choose how the date should be displayed in apps (what ordering for month and day, etc.) --> - <string name="date_time_date_format">Select date format</string> + <string name="date_time_date_format">Choose date format</string> <!-- Menu item on Select time zone screen --> <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string> <!-- Menu item on Select time zone screen --> @@ -685,8 +685,8 @@ <!-- Informational text in the first confirmation screen before starting device encryption --> <string name="crypt_keeper_desc" product="tablet"> You can encrypt your accounts, settings, downloaded apps and their data, - media, and other files. Once you encrypt your tablet, you must enter a numeric PIN - or password to decrypt it each time you power it on: you can\'t unencrypt your tablet + media, and other files. Once you encrypt your tablet, you need to type a numeric PIN + or password to decrypt it each time you power it on. You can\'t decrypt your tablet except by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose @@ -694,8 +694,8 @@ <!-- Informational text in the first confirmation screen before starting device encryption --> <string name="crypt_keeper_desc" product="default"> You can encrypt your accounts, settings, downloaded apps and their data, - media, and other files. Once you encrypt your phone, you must enter a numeric PIN or - password to decrypt it each time you power it on: you can\'t unencrypt your phone + media, and other files. Once you encrypt your phone, you need to type a numeric PIN or + password to decrypt it each time you power it on. You can\'t decrypt your phone except by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose @@ -714,19 +714,19 @@ <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed --> <string name="crypt_keeper_dialog_need_password_title">No lock screen PIN or password</string> <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed --> - <string name="crypt_keeper_dialog_need_password_message">You must set a lock screen PIN or + <string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or password before you can start encryption.</string> <!-- Title of the final confirmation screen before starting device encryption --> - <string name="crypt_keeper_confirm_title">Confirm encryption</string> + <string name="crypt_keeper_confirm_title">Encrypt?</string> <!-- Warning text in the final confirmation screen before starting device encryption --> <string name="crypt_keeper_final_desc" product="tablet"> - Encrypt tablet? This operation is irreversible and if you interrupt it, you will lose data. + The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the tablet will restart several times. </string> <!-- Warning text in the final confirmation screen before starting device encryption --> <string name="crypt_keeper_final_desc" product="default"> - Encrypt phone? This operation is irreversible and if you interrupt it, you will lose data. + The encryption operation is irreversible and if you interrupt it, you\'ll lose data. Encryption takes an hour or more, during which the phone will restart several times. </string> @@ -754,7 +754,7 @@ Encryption was interrupted and can\'t complete. As a result, the data on your tablet is no longer accessible. \n\n - To resume using your tablet, you must perform a factory reset. + To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account. </string> @@ -763,7 +763,7 @@ <string name="crypt_keeper_failed_summary" product="default"> Encryption was interrupted and can\'t complete. As a result, the data on your phone is no longer accessible. - \n\nTo resume using your phone, you must perform a factory reset. + \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account. </string> @@ -772,7 +772,7 @@ <!-- Security Picker --><skip /> <!-- Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] --> - <string name="lock_settings_picker_title">Select screen lock</string> + <string name="lock_settings_picker_title">Choose screen lock</string> <!-- Title for security picker when choosing a facelock's backup unlock method: Pattern/PIN [CHAR LIMIT=22] --> <string name="backup_lock_settings_picker_title">Choose backup lock</string> @@ -833,11 +833,11 @@ <!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] --> <string name="unlock_set_unlock_mode_biometric_weak">Face Unlock</string> <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] --> - <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string> + <string name="unlock_set_unlock_mode_pattern">Pattern</string> <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] --> - <string name="unlock_set_unlock_mode_pin">Secured with PIN</string> + <string name="unlock_set_unlock_mode_pin">PIN</string> <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] --> - <string name="unlock_set_unlock_mode_password">Secured with password</string> + <string name="unlock_set_unlock_mode_password">Password</string> <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] --> <string name="unlock_disable_lock_title">Turn off screen lock</string> @@ -868,66 +868,66 @@ <string name="lockpassword_continue_label">Continue</string> <!-- Error shown in popup when password is too long --> - <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</string> + <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters.</string> <!-- Error shown in popup when PIN is too long --> - <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits</string> + <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits.</string> <!-- Error shown when in PIN mode and user enters a non-digit --> - <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9</string> + <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9.</string> <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! --> - <string name="lockpassword_pin_recently_used">Device administrator disallows using a recent PIN</string> + <string name="lockpassword_pin_recently_used">Device administrator doesn\'t allow using a recent PIN.</string> <!-- Error shown when in PASSWORD mode and user enters an invalid character --> - <string name="lockpassword_illegal_character">Password contains an illegal character</string> + <string name="lockpassword_illegal_character">Password contains an illegal character.</string> <!-- Error shown when in PASSWORD mode and password is all digits --> - <string name="lockpassword_password_requires_alpha">Password must contain at least one letter</string> + <string name="lockpassword_password_requires_alpha">Password must contain at least one letter.</string> <!-- Error shown when in PASSWORD mode and password doesn't contain any digits --> - <string name="lockpassword_password_requires_digit">Password must contain at least one digit</string> + <string name="lockpassword_password_requires_digit">Password must contain at least one digit.</string> <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols --> - <string name="lockpassword_password_requires_symbol">Password must contain at least one symbol</string> + <string name="lockpassword_password_requires_symbol">Password must contain at least one symbol.</string> <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters --> <plurals name="lockpassword_password_requires_letters"> - <item quantity="one">Password must contain at least 1 letter</item> - <item quantity="other">Password must contain at least %d letters</item> + <item quantity="one">Password must contain at least 1 letter.</item> + <item quantity="other">Password must contain at least %d letters.</item> </plurals> <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters --> <plurals name="lockpassword_password_requires_lowercase"> - <item quantity="one">Password must contain at least 1 lowercase letter</item> - <item quantity="other">Password must contain at least %d lowercase letters</item> + <item quantity="one">Password must contain at least 1 lowercase letter.</item> + <item quantity="other">Password must contain at least %d lowercase letters.</item> </plurals> <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters --> <plurals name="lockpassword_password_requires_uppercase"> - <item quantity="one">Password must contain at least 1 uppercase letter</item> - <item quantity="other">Password must contain at least %d uppercase letters</item> + <item quantity="one">Password must contain at least 1 uppercase letter.</item> + <item quantity="other">Password must contain at least %d uppercase letters.</item> </plurals> <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits --> <plurals name="lockpassword_password_requires_numeric"> - <item quantity="one">Password must contain at least 1 numerical digit</item> - <item quantity="other">Password must contain at least %d numerical digits</item> + <item quantity="one">Password must contain at least 1 numerical digit.</item> + <item quantity="other">Password must contain at least %d numerical digits.</item> </plurals> <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols --> <plurals name="lockpassword_password_requires_symbols"> - <item quantity="one">Password must contain at least 1 special symbol</item> - <item quantity="other">Password must contain at least %d special symbols</item> + <item quantity="one">Password must contain at least 1 special symbol.</item> + <item quantity="other">Password must contain at least %d special symbols.</item> </plurals> <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters --> <plurals name="lockpassword_password_requires_nonletter"> - <item quantity="one">Password must contain at least 1 non-letter character</item> - <item quantity="other">Password must contain at least %d non-letter characters</item> + <item quantity="one">Password must contain at least 1 non-letter character.</item> + <item quantity="other">Password must contain at least %d non-letter characters.</item> </plurals> <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! --> - <string name="lockpassword_password_recently_used">Device administrator disallows using a recent password</string> + <string name="lockpassword_password_recently_used">Device administrator doesn\'t allow using a recent password.</string> <!-- Label for ChoosePassword/PIN OK button --> <string name="lockpassword_ok_label">OK</string> @@ -942,7 +942,7 @@ <string name="lockpattern_tutorial_continue_label">Next</string> <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] --> - <string name="lock_setup" msgid="5507462851158901718">Setup complete</string> + <string name="lock_setup" msgid="5507462851158901718">Setup is complete.</string> <!-- In the security screen, the header title for settings related to device admins --> <string name="device_admin_title">Device administration</string> @@ -987,9 +987,9 @@ <string name="bluetooth_pin_values_hint">Usually 0000 or 1234</string> <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] --> - <string name="bluetooth_enter_pin_other_device">You may also need to enter this PIN on the other device.</string> + <string name="bluetooth_enter_pin_other_device">You may also need to type this PIN on the other device.</string> <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] --> - <string name="bluetooth_enter_passkey_other_device">You may also need to enter this passkey on the other device.</string> + <string name="bluetooth_enter_passkey_other_device">You may also need to type this passkey on the other device.</string> <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] --> <string name="bluetooth_confirm_passkey_msg">To pair with:<br><b><xliff:g id="device_name">%1$s</xliff:g></b><br><br>Make sure it is showing this passkey:<br><b><xliff:g id="passkey">%2$s</xliff:g></b></string> @@ -1018,7 +1018,7 @@ <string name="bluetooth_pairing_rejected_error_message">Pairing rejected by <xliff:g id="device_name">%1$s</xliff:g>.</string> <!-- Message for the error dialog when BT connecting operation fails generically. --> - <string name="bluetooth_connecting_error_message">There was a problem connecting to <xliff:g id="device_name">%1$s</xliff:g>.</string> + <string name="bluetooth_connecting_error_message">Couldn\'t connect to <xliff:g id="device_name">%1$s</xliff:g>.</string> <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices --> <string name="bluetooth_preference_scan_title">Scan for devices</string> @@ -1218,7 +1218,7 @@ <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=75] --> <string name="wifi_wps_in_progress">WPS is already in progress and can take tens of seconds to complete</string> <!-- Text displayed when WPS fails to start [CHAR LIMIT=75] --> - <string name="wifi_wps_failed">Couldn\'t start WPS, try again.</string> + <string name="wifi_wps_failed">Couldn\'t start WPS. Try again.</string> <!-- Label for the SSID of the network --> <string name="wifi_ssid">Network SSID</string> <!-- Label for the security of the connection --> @@ -1315,10 +1315,16 @@ <!-- Button label to connect to a Wi-Fi network --> <string name="wifi_connect">Connect</string> + <!-- Failured notification for connect --> + <string name="wifi_failed_connect_message">Failed to connect to network</string> <!-- Button label to delete a Wi-Fi network --> <string name="wifi_forget">Forget</string> + <!-- Failured notification for forget --> + <string name="wifi_failed_forget_message">Failed to forget network</string> <!-- Button label to save a Wi-Fi network configuration --> <string name="wifi_save">Save</string> + <!-- Failured notification for save --> + <string name="wifi_failed_save_message">Failed to save network</string> <!-- Button label to dismiss the dialog --> <string name="wifi_cancel">Cancel</string> @@ -1375,23 +1381,25 @@ <!-- Wi-Fi p2p / Wi-Fi Direct settings --> <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] --> - <string name="wifi_p2p_settings_title">Wi-Fi direct</string> - <!-- Summary for Wi-fi Direct settings item in the 1st-level settings screen [CHAR LIMIT=50]--> - <string name="wifi_p2p_settings_summary">Set up peer-to-peer connectivity</string> + <string name="wifi_p2p_settings_title">Wi-Fi Direct</string> <string name="wifi_p2p_device_info">Device information</string> - <string name="wifi_p2p_wps_setup">Wi-Fi protected setup</string> - <string name="wifi_p2p_wps_pin">Type PIN</string> <string name="wifi_p2p_persist_network">Remember this connection</string> <!-- Menu option to discover peers--> - <string name="wifi_p2p_menu_search">Search</string> - <!-- Menu option to create a group--> - <string name="wifi_p2p_menu_create_group">Create group</string> - <!-- Menu option to remove a group--> - <string name="wifi_p2p_menu_remove_group">Remove group</string> - <!-- Menu option to Wi-Fi p2p advanced settings --> - <string name="wifi_p2p_menu_advanced">Advanced</string> + <string name="wifi_p2p_menu_search">SEARCH FOR DEVICES</string> + <!-- Menu option when discovery is in progress--> + <string name="wifi_p2p_menu_searching">SEARCHING</string> + <!-- Menu option to Rename--> + <string name="wifi_p2p_menu_rename">Rename device</string> <!-- Title for available p2p devices --> - <string name="wifi_p2p_available_devices">Available devices</string> + <string name="wifi_p2p_peer_devices">PEER DEVICES</string> + <!-- Toast text for a failed connection initiation --> + <string name="wifi_p2p_failed_connect_message">Couldn\'t connect.</string> + <!-- Title for disconnect dialog --> + <string name="wifi_p2p_disconnect_title">Disconnect?</string> + <!-- Message test for disconnection from one device--> + <string name="wifi_p2p_disconnect_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> will end.</string> + <!-- Message test for disconnection from multiple devices--> + <string name="wifi_p2p_disconnect_multiple_message">If you disconnect, your connection with <xliff:g id="peer_name">%1$s</xliff:g> and <xliff:g id="peer_count">%2$s</xliff:g> other devices will end.</string> <!-- Wifi AP settings--> <!-- Label for wifi tether checkbox. Toggles Access Point on/off --> @@ -1401,7 +1409,7 @@ <!-- Subtext for wifi tether checkbox on failure --> <string name="wifi_tether_failed_subtext">Portable Wi-Fi hotspot error</string> <!-- Used to open the ssid and security dialog for Wifi Access Point --> - <string name="wifi_tether_configure_ap_text">Configure Wi-Fi hotspot</string> + <string name="wifi_tether_configure_ap_text">Set up Wi-Fi hotspot</string> <!-- Subtext on configuration preference to indicate SSID and security chosen --> <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> portable Wi-Fi hotspot</string> <!-- Default access point SSID used for tethering --> @@ -1510,8 +1518,6 @@ <string name="ring_volume_title">Ringer volume</string> <!-- Sound settings screen, setting option name checkbox --> <string name="vibrate_in_silent_title">Vibrate when silent</string> - <!-- Sound settings screen, setting option name checkbox --> - <string name="vibrate_on_ring_title">Vibrate and ring</string> <!-- Sound settings screen, setting option name --> <string name="notification_sound_title">Default notification</string> <!-- Sound settings screen, notification light repeat pulsing title --> @@ -1571,9 +1577,9 @@ <!-- Dock not found dialog title --> <string name="dock_not_found_title">Dock not found</string> <!-- Dock not found dialog text --> - <string name="dock_not_found_text" product="tablet">You must dock the tablet before setting up dock audio.</string> + <string name="dock_not_found_text" product="tablet">You need to dock the tablet before setting up dock audio.</string> <!-- Dock not found dialog text --> - <string name="dock_not_found_text" product="default">You must dock the phone before setting up dock audio.</string> + <string name="dock_not_found_text" product="default">You need to dock the phone before setting up dock audio.</string> <!-- Dock settings screen, dock events SFX setting check box label --> <string name="dock_sounds_enable_title">Dock insert sound</string> <!-- Dock settings screen, setting option summary text when check box is selected --> @@ -1744,7 +1750,7 @@ <!-- About phone, status item title. The phone MSID number of the current device.--> <string name="status_msid_number">MSID</string> <!-- About phone, status item title. The phone PRL Version of the current device.--> - <string name="status_prl_version">PRL Version</string> + <string name="status_prl_version">PRL version</string> <!-- About phone, status item title. The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] --> <string name="status_meid_number">MEID</string> <!-- About phone, status item title. The ICCID of the current LTE device. [CHAR LIMIT=30] --> @@ -1784,7 +1790,7 @@ <!-- SD card & phone storage settings screen heading. The total amount of storage space for some storage partition. For example, this is listed under both the "Internal phone storage" section and the "SD card" section --> <string name="memory_size">Total space</string> <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] --> - <string name="memory_calculating_size">Calculating…</string> + <string name="memory_calculating_size">Calculating\u2026</string> <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> <string name="memory_apps_usage">Apps</string> <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] --> @@ -1994,7 +2000,7 @@ <!-- Message to draw an unlock pattern before clearing the device --> <string name="master_clear_gesture_prompt">Draw your unlock pattern</string> <!-- Explanation of drawing unlockp attern to reset phone --> - <string name="master_clear_gesture_explanation">You must draw your unlock pattern to confirm a factory data reset.</string> + <string name="master_clear_gesture_explanation">You need to draw your unlock pattern to confirm a factory data reset.</string> <!-- Master clear failed message --> <string name="master_clear_failed">No reset was performed because the System Clear service isn\'t available.</string> <!-- Master clear confirmation screen title [CHAR LIMIT=30] --> @@ -2026,9 +2032,9 @@ <!-- Message to draw an unlock pattern before clearing the device --> <string name="media_format_gesture_prompt">Draw your unlock pattern</string> <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] --> - <string name="media_format_gesture_explanation" product="nosdcard">You must draw your unlock pattern to confirm that you want to erase the USB storage.</string> + <string name="media_format_gesture_explanation" product="nosdcard">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string> <!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] --> - <string name="media_format_gesture_explanation" product="default">You must draw your unlock pattern to confirm that you want to erase the SD card.</string> + <string name="media_format_gesture_explanation" product="default">You need to draw your unlock pattern to confirm that you want to erase the SD card.</string> <!-- Main settings screen, Call settings title for item to go into the call settings --> <string name="call_settings_title">Call settings</string> @@ -2204,7 +2210,7 @@ <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots --> <string name="lockpattern_recording_incorrect_too_short">Connect at least <xliff:g id="number">%d</xliff:g> dots. Try again:</string> <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern --> - <string name="lockpattern_pattern_entered_header">Pattern recorded!</string> + <string name="lockpattern_pattern_entered_header">Pattern recorded.</string> <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern --> <string name="lockpattern_need_to_confirm">Draw pattern again to confirm:</string> <string name="lockpattern_pattern_confirmed_header">Your new unlock pattern:</string> @@ -2249,7 +2255,7 @@ <!-- ChooseLockPatternTutorial, tutorial screen title --> <string name="lock_title" product="default">Securing your phone</string> <!-- ChooseLockPatternTutorial, tutorial screen text --> - <string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You must connect at least four dots. + <string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You need to connect at least four dots. \n\nReady to start? Touch Next. </string> <!-- ChooseLockPatternTutorial, tutorial screen text --> @@ -2395,8 +2401,7 @@ <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. --> <string name="app_not_found_dlg_title"></string> <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. --> - <string name="app_not_found_dlg_text"> The app wasn\'t -found in the list of installed apps.</string> + <string name="app_not_found_dlg_text"> The app wasn\'t found in the list of installed apps.</string> <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. --> <string name="clear_data_failed">Couldn\'t clear app data.</string> <!-- Manage applications, factory reset dialog title for system applications. --> @@ -2412,7 +2417,7 @@ found in the list of installed apps.</string> <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. --> <string name="security_settings_desc" product="default">This app can access the following on your phone:</string> <string name="computing_size">Computing\u2026</string> - <string name="invalid_size_value">Unable to compute package size</string> + <string name="invalid_size_value">Couldn\'t compute package size.</string> <!-- String displayed when list is empty --> <string name="empty_list_msg">You don\'t have any third-party apps installed.</string> <!-- Manage applications, version string displayed in app snippet --> @@ -2600,8 +2605,20 @@ found in the list of installed apps.</string> <string name="user_dict_settings_summary">""</string> <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. --> <string name="user_dict_settings_add_menu_title">Add</string> - <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. --> + <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] --> <string name="user_dict_settings_add_dialog_title">Add to dictionary</string> + <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] --> + <string name="user_dict_settings_add_dialog_more_options">More options</string> + <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] --> + <string name="user_dict_settings_add_dialog_less_options">Less options</string> + <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] --> + <string name="user_dict_settings_add_dialog_confirm">OK</string> + <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] --> + <string name="user_dict_settings_add_word_option_name">Word:</string> + <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] --> + <string name="user_dict_settings_add_shortcut_option_name">Shortcut:</string> + <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] --> + <string name="user_dict_settings_add_locale_option_name">Language:</string> <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. --> <string name="user_dict_settings_edit_dialog_title">Edit word</string> <!-- User dictionary settings. The title of the context menu item to edit the current word --> @@ -2610,8 +2627,10 @@ found in the list of installed apps.</string> <string name="user_dict_settings_context_menu_delete_title">Delete</string> <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary [CHAR LIMIT=200] --> <string name="user_dict_settings_empty_text">You don\'t have any words in the user dictionary. Add a word by touching the Add (+) button.</string> - <!-- User dictionary settings. The text to show to describe the dictionary common to all languages --> - <string name="user_dict_settings_all_languages">All languages</string> + <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages --> + <string name="user_dict_settings_all_languages">For all languages</string> + <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] --> + <string name="user_dict_settings_more_languages">More languages…</string> <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" --> <string name="testing">Testing</string> @@ -2708,6 +2727,10 @@ found in the list of installed apps.</string> <string name="adb_warning_title">Allow USB debugging?</string> <!-- Warning text to user about the implications of enabling USB debugging --> <string name="adb_warning_message">USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification, and read log data.</string> + <!-- Title of warning dialog about the implications of enabling developer settings --> + <string name="dev_settings_warning_title">Allow development settings?</string> + <!-- Warning text to user about the implications of enabling USB debugging --> + <string name="dev_settings_warning_message">These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave.</string> <!-- Title for the screen that lets the user choose a gadget to add to the home screen (or other screens that can host gadgets). Note to translators: we're still determining @@ -2832,9 +2855,6 @@ found in the list of installed apps.</string> help blind and low-vision users. Do you want to install it for free from Android Market?</string> - <!-- Title for a warning about downloading accessibility scripts displayed as a dialog message - when the user selects to enable script downloading. [CHAR LIMIT=50] --> - <string name="accessibility_script_injection_security_warning_title">Install web scripts?</string> <!-- Warning message about security implications of downloading accessibility scripts, displayed as a dialog message when the user selects to enable script downloading. [CHAR LIMIT=NONE] --> <string name="accessibility_script_injection_security_warning_summary">Do you want apps to @@ -2842,7 +2862,7 @@ found in the list of installed apps.</string> <!-- Warning message that the interaction model changes on enabling touch exploration. [CHAR LIMIT=NONE] --> <string name="accessibility_touch_exploration_warning">This feature changes the - way your device responds to touch. Turn on?</string> + way your device responds to touch. Turn it on?</string> <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] --> <string name="accessibility_service_default_description">No description provided.</string> @@ -2857,7 +2877,7 @@ found in the list of installed apps.</string> <!-- Activity title summary for App Fuel Gauge summary --> <string name="power_usage_summary">What has been using the battery</string> <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] --> - <string name="power_usage_not_available">Battery usage data not available</string> + <string name="power_usage_not_available">Battery usage data isn\'t available.</string> <!-- Display the battery level and status [CHAR_LIMIT=30] --> <string name="power_usage_level_and_status"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string> <!-- Battery usage since unplugged --> @@ -3070,7 +3090,7 @@ found in the list of installed apps.</string> <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed --> <string name="tts_settings_changed_demo">Your settings have changed. This is an example of how they sound.</string> <!-- Error screen when a selected TTS engine can't run because it's missing components --> - <string name="tts_engine_error">The engine you selected is unable to run</string> + <string name="tts_engine_error">The engine you chose can\'t run.</string> <!-- Button text for error screen when a selected TTS engine can't run because it's missing components --> <string name="tts_engine_error_config">Configure</string> <!-- Button text for error screen when a selected TTS engine can't run because it's missing components --> @@ -3112,7 +3132,7 @@ found in the list of installed apps.</string> <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine, to warn the user that this engine cannot be used before the checkbox for that engine in TTS settings is checked. --> - <string name="tts_notif_engine_install_message">Enable new engine before use</string> + <string name="tts_notif_engine_install_message">Enable new engine before use.</string> <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for the image that launches the TTS engine settings when clicked. --> <string name="tts_engine_settings_button">Launch engine settings</string> @@ -3172,7 +3192,7 @@ found in the list of installed apps.</string> <!-- Toast message [CHAR LIMIT=30] --> <string name="credentials_enabled">Credential storage is enabled.</string> <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] --> - <string name="credentials_configure_lock_screen_hint">You must set a lock screen PIN or password before you can use credential storage.</string> + <string name="credentials_configure_lock_screen_hint">You need to set a lock screen PIN or password before you can use credential storage.</string> <!-- Sound settings screen, setting check box label --> <string name="emergency_tone_title">Emergency tone</string> @@ -3204,9 +3224,9 @@ found in the list of installed apps.</string> <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] --> <string name="local_backup_password_title">Desktop backup password</string> <!-- Summary text of the "local backup password" setting when the user has not supplied a password --> - <string name="local_backup_password_summary_none">Desktop full backups aren\'t currently protected.</string> + <string name="local_backup_password_summary_none">Desktop full backups aren\'t currently protected</string> <!-- Summary text of the "local backup password" setting when the user has already supplied a password --> - <string name="local_backup_password_summary_change">Select to change or remove the password for desktop full backups</string> + <string name="local_backup_password_summary_change">Touch to change or remove the password for desktop full backups</string> <!-- Dialog title for confirmation to erase backup data from server --> <string name="backup_erase_dialog_title"></string> @@ -3400,7 +3420,7 @@ found in the list of installed apps.</string> <string name="sync_contacts">Contacts</string> <!-- Message introducing the user to Google Sync. --> <string name="sync_plug"><font fgcolor="#ffffffff">Welcome to Google sync!</font> - \nA Google approach to synchronizing data to allow access to your contacts, appointments, and more from wherever you are. + \nA Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are. </string> <!-- Header title for those settings relating to application syncing. --> @@ -3444,8 +3464,6 @@ found in the list of installed apps.</string> <string name="enter_password">Type password to decrypt storage</string> <!-- This is displayed when the password is entered incorrectly --> <string name="try_again">Try again.</string> - <!-- This error message is displayed when the vpn profile is going to be saved but the vpn service is busy [CHAR LIMIT=NONE] --> - <string name="service_busy">The service is busy. Try again.</string> <!-- the following are for Settings Storage screen --> <!-- Menu item/button 'delete' --> @@ -3464,6 +3482,27 @@ found in the list of installed apps.</string> <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] --> <string name="hdcp_checking_dialog_title">Set HDCP checking behavior</string> + <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] --> + <string name="debug_debugging_category">Debugging</string> + + <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] --> + <string name="debug_app">Select debug app</string> + <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] --> + <string name="debug_app_not_set">No debug application set</string> + <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] --> + <string name="debug_app_set">Debugging application: <xliff:g id="app_name">%1$s</xliff:g></string> + + <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] --> + <string name="select_application">Select application</string> + <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] --> + <string name="no_application">Nothing</string> + + <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] --> + <string name="wait_for_debugger">Wait for debugger</string> + <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] --> + <string name="wait_for_debugger_summary">Debugged application waits for debugger to + attach before executing</string> + <!-- Preference category for user interface debugging development settings. [CHAR LIMIT=25] --> <string name="debug_ui_category">User interface</string> @@ -3488,6 +3527,11 @@ found in the list of installed apps.</string> <!-- UI debug setting: show screen updates summary [CHAR LIMIT=50] --> <string name="show_screen_updates_summary">Flash areas of screen when they update</string> + <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] --> + <string name="disable_overlays">Disable overlays</string> + <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] --> + <string name="disable_overlays_summary">Don\'t use overlays for screen compositing</string> + <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] --> <string name="show_cpu_usage">Show CPU usage</string> <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] --> @@ -3504,6 +3548,9 @@ found in the list of installed apps.</string> <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] --> <string name="transition_animation_scale_title">Transition animation scale</string> + <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] --> + <string name="animator_duration_scale_title">Animator duration scale</string> + <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] --> <string name="debug_applications_category">Apps</string> @@ -3554,13 +3601,13 @@ found in the list of installed apps.</string> <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] --> <string name="data_usage_disable_mobile">Disable mobile data?</string> - <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=32] --> + <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] --> <string name="data_usage_disable_mobile_limit">Set mobile data limit</string> - <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=32] --> + <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] --> <string name="data_usage_disable_4g_limit">Set 4G data limit</string> - <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=32] --> + <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] --> <string name="data_usage_disable_3g_limit">Set 2G-3G data limit</string> - <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=32] --> + <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] --> <string name="data_usage_disable_wifi_limit">Set Wi-Fi data limit</string> <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] --> @@ -3575,9 +3622,9 @@ found in the list of installed apps.</string> <string name="data_usage_tab_3g">2G-3G</string> <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=10] --> - <string name="data_usage_list_mobile">mobile</string> + <string name="data_usage_list_mobile">Mobile</string> <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=10] --> - <string name="data_usage_list_none">none</string> + <string name="data_usage_list_none">None</string> <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] --> <string name="data_usage_enable_mobile">Mobile data</string> @@ -3642,66 +3689,71 @@ found in the list of installed apps.</string> <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call --> <string name="cryptkeeper_return_to_call">Return to call</string> - <!-- Input label for the name of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_name">Name</string> - <!-- Input label for the type of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_type">Type</string> - <!-- Input label for the server address of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_server">Server address</string> - <!-- Checkbox label to enable PPP encryption for a VPN network. [CHAR LIMIT=40] --> + <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_mppe">PPP encryption (MPPE)</string> - <!-- Input label for the L2TP secret of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_l2tp_secret">L2TP secret</string> - <!-- Input label for the IPSec identifier of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_ipsec_identifier">IPSec identifier</string> - <!-- Input label for the IPSec pre-shared key of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_ipsec_secret">IPSec pre-shared key</string> - <!-- Selection label for the IPSec user certificate of a VPN network. [CHAR LIMIT=40] --> + <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_ipsec_user_cert">IPSec user certificate</string> - <!-- Selection label for the IPSec CA certificate of a VPN network. [CHAR LIMIT=40] --> + <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_ipsec_ca_cert">IPSec CA certificate</string> - <!-- Selection label for the IPSec server certificate of a VPN network. [CHAR LIMIT=40] --> + <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_ipsec_server_cert">IPSec server certificate</string> - <!-- Checkbox label to show advanced options of a VPN network. [CHAR LIMIT=40] --> + <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_show_options">Show advanced options</string> - <!-- Input label for the DNS search domains of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_search_domains">DNS search domains</string> - <!-- Input label for the DNS servers of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_dns_servers">DNS servers (e.g. 8.8.8.8)</string> - <!-- Input label for the forwarding routes of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_routes">Forwarding routes (e.g. 10.0.0.0/8)</string> - <!-- Input label for the username of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_username">Username</string> - <!-- Input label for the password of a VPN network. [CHAR LIMIT=40] --> + <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_password">Password</string> - <!-- Checkbox label to save the username and the password for a VPN network. [CHAR LIMIT=40] --> + <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_save_login">Save account information</string> - <!-- Hint for not using an optional feature of a VPN network. [CHAR LIMIT=40] --> + <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_not_used">(not used)</string> <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] --> <string name="vpn_no_ca_cert">(don\'t verify server)</string> <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] --> <string name="vpn_no_server_cert">(received from server)</string> - <!-- Button label to cancel chaning a VPN network. [CHAR LIMIT=40] --> + <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_cancel">Cancel</string> - <!-- Button label to save a VPN network. [CHAR LIMIT=40] --> + <!-- Button label to save a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_save">Save</string> - <!-- Button label to connect to a VPN network. [CHAR LIMIT=40] --> + <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] --> <string name="vpn_connect">Connect</string> - <!-- Dialog title to edit a VPN network. [CHAR LIMIT=40] --> - <string name="vpn_edit">Edit VPN network</string> - <!-- Dialog title to connect to a VPN network. [CHAR LIMIT=40] --> - <string name="vpn_connect_to">Connect to <xliff:g id="network" example="School">%s</xliff:g></string> + <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] --> + <string name="vpn_edit">Edit VPN profile</string> + <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] --> + <string name="vpn_connect_to">Connect to <xliff:g id="profile" example="School">%s</xliff:g></string> <!-- Preference title for VPN settings. [CHAR LIMIT=40] --> <string name="vpn_title">VPN</string> - <!-- Preference title to create a new VPN network. [CHAR LIMIT=40] --> - <string name="vpn_create">Add VPN network</string> - <!-- Menu item to edit a VPN network. [CHAR LIMIT=40] --> - <string name="vpn_menu_edit">Edit network</string> - <!-- Menu item to delete a VPN network. [CHAR LIMIT=40] --> - <string name="vpn_menu_delete">Delete network</string> + <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] --> + <string name="vpn_create">Add VPN profile</string> + <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] --> + <string name="vpn_menu_edit">Edit profile</string> + <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] --> + <string name="vpn_menu_delete">Delete profile</string> + + <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] --> + <string name="vpn_no_network">There is no network connection. Please try again later.</string> + <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] --> + <string name="vpn_missing_cert">A certificate is missing. Please edit the profile.</string> <!-- Tab label for built-in system CA certificates. --> <string name="trusted_credentials_system_tab">System</string> @@ -3734,7 +3786,7 @@ found in the list of installed apps.</string> <!-- Title for touch exploration tutorial lesson 1. --> <string name="accessibility_tutorial_lesson_1_title">Lesson 1: Exploring the screen</string> <!-- Instruction for touch exploration tutorial lesson 1. "Explore by touch" should match the string for "Title for accessibility preference to enable touch exploration mode." --> - <string name="accessibility_tutorial_lesson_1_text_1">After you turn on Explore by Touch, you can touch the screen to learn what\’s under your finger. For example, the current screen contains app icons. Find one of them by touching the screen and sliding your finger around.</string> + <string name="accessibility_tutorial_lesson_1_text_1">When Explore by Touch is turned on, you can touch the screen to learn what\’s under your finger. For example, the current screen contains app icons. Find one of them by touching the screen and sliding your finger around.</string> <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches one icon. --> <string name="accessibility_tutorial_lesson_1_text_2_more">Good. Keep sliding your finger around the screen until you find at least one more icon.</string> <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches a second icon. --> @@ -3759,8 +3811,8 @@ found in the list of installed apps.</string> <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user has scrolled a large amount. --> <string name="accessibility_tutorial_lesson_2_text_4">You have completed the tutorial. To exit, find and touch the <xliff:g id="finish" example="Finish">%s</xliff:g> button.</string> - <!-- Title for spelling correction settings --> - <string name="spellcheckers_settings_title">Spelling correction</string> + <!-- Title for spell checker settings --> + <string name="spellcheckers_settings_title">Spell checker</string> <!-- Prompt for the user to enter their current full-backup password --> <string name="current_backup_pw_prompt">Type your current full backup password here</string> |