am c63742c8: Merge change I87d7f224 into eclair

Merge commit 'c63742c8fa533b6fc879f12ccecc2a51c1aca23b' into eclair-plus-aosp

* commit 'c63742c8fa533b6fc879f12ccecc2a51c1aca23b':
  Correct "on-screen" to "onscreen"; fix tts screen title
This commit is contained in:
Roy West
2009-09-28 13:44:51 -07:00
committed by Android Git Automerger

View File

@@ -1565,7 +1565,7 @@ found in the list of installed applications.</string>
<!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" -->
<string name="input_methods_settings_label_format"><xliff:g id="ime_name">%1$s</xliff:g> settings</string>
<!-- Summary for on-screen keyboard settings -->
<string name="onscreen_keyboard_settings_summary">On-screen keyboard settings</string>
<string name="onscreen_keyboard_settings_summary">Onscreen keyboard settings</string>
<!-- Title for built-in keyboard settings -->
<string name="builtin_keyboard_settings_title">Device keyboard</string>
<!-- Summary for built-in keyboard settings -->
@@ -1868,7 +1868,7 @@ found in the list of installed applications.</string>
<!-- Summary of setting on main settings screen. This item will take the user to the screen to tweak settings related to the text-to-speech functionality -->
<string name="tts_settings_summary">Set text-to-speech options</string>
<!-- Main TTS Settings screen title -->
<string name="tts_settings_title">Speech synthesizer controls</string>
<string name="tts_settings_title">Text-to-speech settings</string>
<!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
<string name="use_default_tts_settings_title">Always use my settings</string>
<!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->