Fix mismatched markup in Settings strings.

Revert "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 titles removed properly;
for now I just made the string empty.

This reverts commit e2db5875f6.

Change-Id: I0f865d1441d990e5e63f2a257a27ae521220af14
This commit is contained in:
Eric Fischer
2011-10-04 14:57:57 -07:00
parent fbcad75a84
commit dfb894c136
2 changed files with 312 additions and 314 deletions

View File

@@ -149,7 +149,7 @@
<item msgid="6490061470416867723">Small</item> <item msgid="6490061470416867723">Small</item>
<item msgid="3579015730662088893">Normal</item> <item msgid="3579015730662088893">Normal</item>
<item msgid="1678068858001018666">Large</item> <item msgid="1678068858001018666">Large</item>
<item msgid="490158884605093126">Extra Large</item> <item msgid="490158884605093126">Extra large</item>
</string-array> </string-array>
<string-array name="entryvalues_font_size" translatable="false"> <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]--> <!-- Push button based configuration involves pushing a button on two connecting devices [CHAR LIMIT=30]-->
<item>Push button</item> <item>Push button</item>
<!-- This involves entering a pin obtained from a peer device [CHAR LIMIT=30] --> <!-- 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] --> <!-- 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> </string-array>
<!-- Match this with the order of WifiP2pDevice.Status --> <!-- Match this with the order of WifiP2pDevice.Status -->
@@ -327,7 +327,7 @@
<item>Invited</item> <item>Invited</item>
<item>Unsuccessful</item> <item>Unsuccessful</item>
<item>Available</item> <item>Available</item>
<item>Out of range</item> <item>Out-of-range</item>
</string-array> </string-array>
@@ -406,9 +406,9 @@
<!-- Display options for UsageStats class --> <!-- Display options for UsageStats class -->
<string-array name="usage_stats_display_order_types"> <string-array name="usage_stats_display_order_types">
<item>Usage Time</item> <item>Usage time</item>
<item>Launch Count</item> <item>Launch count</item>
<item>Application Name</item> <item>App name</item>
</string-array> </string-array>
<!-- EAP method --> <!-- 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]--> <!-- 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> <item>Push button</item>
<!-- WPS pin method based configuration. This requires entering a pin obtained from the access point [CHAR LIMIT=25] --> <!-- 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] --> <!-- 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> </string-array>
<!-- Wi-Fi IP settings. --> <!-- Wi-Fi IP settings. -->

File diff suppressed because it is too large Load Diff