diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-06-05 19:18:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-05 19:18:14 -0700 |
| commit | ebd1a3c5deca5953f4a7b31f325ab7888f88d620 (patch) | |
| tree | b612b6c5ebc708687fb374285782bc7443efe37b /res | |
| parent | f766fa6a820e5b0699faa419986fca3234517db5 (diff) | |
| parent | 977ff5426d4941c3a190cc55388c89edbd7a1e60 (diff) | |
| download | packages_apps_Settings-ebd1a3c5deca5953f4a7b31f325ab7888f88d620.zip packages_apps_Settings-ebd1a3c5deca5953f4a7b31f325ab7888f88d620.tar.gz packages_apps_Settings-ebd1a3c5deca5953f4a7b31f325ab7888f88d620.tar.bz2 | |
am 977ff542: Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
* commit '977ff5426d4941c3a190cc55388c89edbd7a1e60':
Revert "Rename and flip meaning of auto-rotate to rotation lock."
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 4a6610c..4fe86c8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1663,8 +1663,8 @@ <!-- Display settings --><skip/> <!-- Sound & display settings screen, section header for settings related to display --> <string name="display_settings">Display</string> - <!-- Sound & display settings screen, accelerometer-based rotation lock check box label [CHAR LIMIT=30] --> - <string name="accelerometer_title">Rotation lock</string> + <!-- Sound & display settings screen, accelerometer-based rotation check box label --> + <string name="accelerometer_title">Auto-rotate screen</string> <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected --> <string name="accelerometer_summary_on" product="tablet">Switch orientation automatically when rotating tablet</string> <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected --> |