diff options
| author | Claudia de Veaux <deveaux@google.com> | 2011-10-04 12:52:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-04 12:52:16 -0700 |
| commit | bbb7097a6871ae463fb865c7fe47c5500f5a6c6a (patch) | |
| tree | 515f99f97e5e73f25b6dd0159cd6a6b3289eb8d0 /res/values/arrays.xml | |
| parent | e6abedd6b88b14101a00877be1255c1094b76e55 (diff) | |
| parent | e2db5875f6e84398a976135c321697a506aaf4df (diff) | |
| download | packages_apps_Settings-bbb7097a6871ae463fb865c7fe47c5500f5a6c6a.zip packages_apps_Settings-bbb7097a6871ae463fb865c7fe47c5500f5a6c6a.tar.gz packages_apps_Settings-bbb7097a6871ae463fb865c7fe47c5500f5a6c6a.tar.bz2 | |
Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl""
Diffstat (limited to 'res/values/arrays.xml')
| -rw-r--r-- | res/values/arrays.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 7bd76a9..5ee80bf 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -149,7 +149,7 @@ <item msgid="6490061470416867723">Small</item> <item msgid="3579015730662088893">Normal</item> <item msgid="1678068858001018666">Large</item> - <item msgid="490158884605093126">Extra large</item> + <item msgid="490158884605093126">Extra Large</item> </string-array> <string-array name="entryvalues_font_size" translatable="false"> @@ -315,9 +315,9 @@ <!-- Push button based configuration involves pushing a button on two connecting devices [CHAR LIMIT=30]--> <item>Push button</item> <!-- This involves entering a pin obtained from a peer device [CHAR LIMIT=30] --> - <item>PIN from peer device</item> + <item>Pin from peer device</item> <!-- This involves generating a pin from this device [CHAR LIMIT=20] --> - <item>PIN from this device</item> + <item>Pin from this device</item> </string-array> <!-- Match this with the order of WifiP2pDevice.Status --> @@ -327,7 +327,7 @@ <item>Invited</item> <item>Unsuccessful</item> <item>Available</item> - <item>Out-of-range</item> + <item>Out of range</item> </string-array> @@ -406,9 +406,9 @@ <!-- Display options for UsageStats class --> <string-array name="usage_stats_display_order_types"> - <item>Usage time</item> - <item>Launch count</item> - <item>App name</item> + <item>Usage Time</item> + <item>Launch Count</item> + <item>Application Name</item> </string-array> <!-- EAP method --> @@ -435,9 +435,9 @@ <!-- WPS is a new standard that allowes secure connection establishment to a home wireless network using a simplified process. WPS push button based configuration involves pushing a button on the router and the device [CHAR LIMIT=25]--> <item>Push button</item> <!-- WPS pin method based configuration. This requires entering a pin obtained from the access point [CHAR LIMIT=25] --> - <item>PIN from access point</item> + <item>Pin from access point</item> <!-- WPS pin method based configuration. This requires generating a pin from this device [CHAR LIMIT=25] --> - <item>PIN from this device</item> + <item>Pin from this device</item> </string-array> <!-- Wi-Fi IP settings. --> |