diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:48 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 17:39:48 -0700 |
| commit | e6dd1fa1851302710ac7845d25d8ad8a5b6ee438 (patch) | |
| tree | f5a8545397cd15f5bedf524a0673d88d5dd8d182 /res/values | |
| parent | 72ed6feab24308a0acd1fa2135afa3476759cf39 (diff) | |
| download | packages_apps_settings-e6dd1fa1851302710ac7845d25d8ad8a5b6ee438.zip packages_apps_settings-e6dd1fa1851302710ac7845d25d8ad8a5b6ee438.tar.gz packages_apps_settings-e6dd1fa1851302710ac7845d25d8ad8a5b6ee438.tar.bz2 | |
auto import from //branches/cupcake_rel/...@140373
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index d9480c2..6cfa7f0 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -47,9 +47,9 @@ <!-- Do not translate. This is fed directly to the formatter. --> <item>dd-MM-yyyy</item> <!-- Do not translate. This is fed directly to the formatter. --> - <item>MMM dd, yyyy</item> + <item>MMM d, yyyy</item> <!-- Do not translate. This is fed directly to the formatter. --> - <item>dd-MMM-yyyy</item> + <item>d-MMM-yyyy</item> <!-- Do not translate. This is fed directly to the formatter. --> <item>yyyy-MM-dd</item> </string-array> diff --git a/res/values/strings.xml b/res/values/strings.xml index 356dbef..55a153b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -812,9 +812,9 @@ <!-- Sound & display settings screen, animations check box label --> <string name="animations_title">Animation</string> <!-- Sound & display settings screen, animations option summary text when check box is selected --> - <string name="animations_summary_on">Show screen transition animations</string> + <string name="animations_summary_on">Show animation when opening & closing windows</string> <!-- Sound & display settings screen, animations option summary text when check box is clear --> - <string name="animations_summary_off">Show screen transition animations</string> + <string name="animations_summary_off">Show animation when opening & closing windows</string> <!-- Sound & display settings screen, accelerometer-based rotation check box label --> <string name="accelerometer_title">Orientation</string> <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected --> @@ -1314,6 +1314,13 @@ found in the list of installed applications.</string> <string name="show_password">Visible passwords</string> <!-- On Security & location settings screen, setting check box summary. Summary for the visible passwords setting. --> <string name="show_password_summary">Show password as you type</string> + <!-- Warning message about security implications of enabling an input method, displayed as a dialog + message when the user selects to enable an IME. --> + <string name="ime_security_warning">This input method may be able to collect + all the text you type, including personal data like passwords and credit + card numbers. It comes from the application + <xliff:g id="ime_application_name">%1$s</xliff:g>. + Enable this input method?</string> <!-- User dictionary settings --><skip /> <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. --> |