diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 49 | ||||
| -rw-r--r-- | res/values/styles.xml | 12 |
2 files changed, 37 insertions, 24 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 946d3e8..3c54d1a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -420,6 +420,8 @@ <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed --> <string name="radio_info_neighboring_location_label">Neighboring CID:</string> <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed --> + <string name="radio_info_cellinfo_label">CellInfo:</string> + <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed --> <string name="radio_info_data_attempts_label">Data attempts:</string> <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed --> @@ -1251,13 +1253,13 @@ <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] --> <string name="wifi_wps_onstart_pbc">Press the Wi-Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:</string> <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] --> - <string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi-Fi router. The setup can take upto two minutes to complete.</string> + <string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi-Fi router. The setup can take up to two minutes to complete.</string> <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] --> <string name="wifi_wps_complete">WPS succeeded. Connecting to the network\u2026</string> <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] --> <string name="wifi_wps_connected">Connected to Wi-Fi network <xliff:g id="network_name">%s</xliff:g></string> <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] --> - <string name="wifi_wps_in_progress">WPS is already in progress and can take upto two minutes to complete</string> + <string name="wifi_wps_in_progress">WPS is already in progress and can take up to two minutes to complete</string> <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] --> <string name="wifi_wps_failed_generic">WPS failed. Please try again in a few minutes.</string> <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] --> @@ -1409,7 +1411,7 @@ <!-- Label for the DNS (second one)--> <string name="wifi_dns2">DNS 2</string> <!-- Hint text for DNS --> - <string name="wifi_dns2_hint" translatable="false">4.4.4.4</string> + <string name="wifi_dns2_hint" translatable="false">8.8.4.4</string> <!-- Label for the gateway of the network --> <string name="wifi_gateway">Gateway</string> <!-- Hint text for the gateway --> @@ -1685,13 +1687,17 @@ <!-- Wallpaper settings fragment title [CHAR LIMIT=30] --> <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string> <!-- Display settings screen, trigger for screen saver options --> - <string name="screensaver_settings_title">Screen Candy</string> - <!-- Display settings screen, summary for screen saver options, screen saver is turned on --> - <string name="screensaver_settings_summary_on">Will start upon sleep if connected to power</string> + <string name="screensaver_settings_title">Dream</string> + <!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked --> + <string name="screensaver_settings_summary_both">When docked or asleep and charging</string> + <!-- Display settings screen, summary fragment for screen saver options, activated on sleep --> + <string name="screensaver_settings_summary_sleep">When asleep and charging</string> + <!-- Display settings screen, summary fragment for screen saver options, activated when docked --> + <string name="screensaver_settings_summary_dock">When docked</string> <!-- Display settings screen, summary for screen saver options, screen saver is turned off --> <string name="screensaver_settings_summary_off">Disabled</string> <!-- Screen saver settings, setting option name to select a module --> - <string name="screensaver_component_title">Selected candy</string> + <string name="screensaver_component_title">Selected dream</string> <!-- Screen saver settings, setting option name to change activation timeout --> <string name="screensaver_timeout_title">When to activate</string> <!-- Screen saver settings, setting option summary to change activation timeout --> @@ -1701,8 +1707,11 @@ <!-- Screen saver settings, button allowing the user to test/try the current module --> <string name="screensaver_test">Try it!</string> <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when + the device sleeps --> + <string name="screensaver_activate_on_sleep_title">Start on sleep</string> + <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when the device is docked --> - <string name="screensaver_activate_on_dock_title">Also start when docked</string> + <string name="screensaver_activate_on_dock_title">Start when docked</string> <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions --> <string name="automatic_brightness">Automatic brightness</string> <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size --> @@ -2862,6 +2871,10 @@ <string name="enable_adb">USB debugging</string> <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone --> <string name="enable_adb_summary">Debug mode when USB is connected</string> + <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. --> + <string name="bugreport_in_power">Power menu bug reports</string> + <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power --> + <string name="bugreport_in_power_summary">Include option in power menu for taking a bug report</string> <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source --> <string name="keep_screen_on">Stay awake</string> <!-- setting Checkbox summary whether to keep the screen on when plugged in --> @@ -3390,16 +3403,6 @@ <!-- Summary text of the "automatic restore" setting --> <string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string> - <!-- Take bug report menu title [CHAR LIMIT=NONE] --> - <string name="bugreport_title">Take bug report</string> - <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] --> - <string name="bugreport_message">This will collect information about your - current device state, to send as an e-mail message. It will take a little - time from starting the bug report until it is ready to be sent; please be - patient.</string> - <!-- Button in bugreport dialog to confirm starting the report [CHAR LIMIT=NONE] --> - <string name="report">Report</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 --> @@ -3738,6 +3741,11 @@ <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] --> <string name="show_hw_screen_updates_summary">Flash views inside windows when drawn with the GPU</string> + <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] --> + <string name="show_hw_layers_updates">Show hardware layers updates</string> + <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] --> + <string name="show_hw_layers_updates_summary">Flash hardware layers green when they update</string> + <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] --> <string name="disable_overlays">Disable HW overlays</string> <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] --> @@ -4131,6 +4139,11 @@ <!-- Help URL, Tethering [DO NOT TRANSLATE] --> <string name="help_url_tether" translatable="false"></string> + <!-- User account title [CHAR LIMIT=30] --> + <string name="user_account_title">Account for content</string> + <!-- User picture title [CHAR LIMIT=30] --> + <string name="user_picture_title">Photo ID</string> + <!-- Cell Broadcast settings title [CHAR LIMIT=50] --> <string name="cell_broadcast_settings">Cell broadcasts</string> <!-- Cell Broadcast settings description [CHAR LIMIT=100] --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 42f2837..502d76d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -20,7 +20,7 @@ <item name="android:layout_height">wrap_content</item> <item name="android:layout_width">wrap_content</item> <item name="android:textAppearance">@style/TextAppearance.info_label</item> - <item name="android:paddingRight">4dip</item> + <item name="android:paddingEnd">4dip</item> </style> <style name="info_value"> @@ -37,9 +37,9 @@ <style name="info_layout"> <item name="android:orientation">vertical</item> - <item name="android:paddingLeft">10dip</item> + <item name="android:paddingStart">10dip</item> <item name="android:paddingTop">10dip</item> - <item name="android:paddingRight">10dip</item> + <item name="android:paddingEnd">10dip</item> <item name="android:paddingBottom">10dip</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> @@ -110,10 +110,10 @@ <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_marginTop">8dip</item> - <item name="android:layout_marginLeft">16dip</item> - <item name="android:layout_marginRight">16dip</item> + <item name="android:layout_marginStart">16dip</item> + <item name="android:layout_marginEnd">16dip</item> <item name="android:orientation">vertical</item> - <item name="android:gravity">left</item> + <item name="android:gravity">start</item> </style> <style name="wifi_item_label"> |