am ec0be8ce: Merge "Add CHAR LIMIT to string resources" into honeycomb

* commit 'ec0be8ce2e70041f6133cbe68afcfd561eb4a30d':
  Add CHAR LIMIT to string resources
This commit is contained in:
Tadashi G. Takaoka
2011-01-14 02:15:34 -08:00
committed by Android Git Automerger

View File

@@ -2185,9 +2185,9 @@ found in the list of installed applications.</string>
<string name="auto_replace">Auto-replace</string> <string name="auto_replace">Auto-replace</string>
<!-- On Text & language settings screen, setting summary. This is the summary for the "Auto-replace" setting. --> <!-- 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> <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. --> <!-- 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] -->
<string name="auto_caps">Auto-capitalization</string> <string name="auto_caps">Auto-capitalization</string>
<!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. --> <!-- 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> <string name="auto_caps_summary">Capitalize first letter in sentences</string>
<!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text. for example, it will change an entered "youre" to "you're". --> <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text. for example, it will change an entered "youre" to "you're". -->
<string name="auto_punctuate">Auto-punctuate</string> <string name="auto_punctuate">Auto-punctuate</string>