diff options
author | Jeff Brown <jeffbrown@google.com> | 2012-06-05 19:11:32 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-05 19:11:32 -0700 |
commit | 977ff5426d4941c3a190cc55388c89edbd7a1e60 (patch) | |
tree | f4df48614ad4aae88603a477e52782fa1fb3ca4e /res/values | |
parent | f4e1681d77c8b6593937be94d6a9c1fdda642957 (diff) | |
parent | 56c58d5aef8186a0114be206a2f81216f8c19cf3 (diff) | |
download | packages_apps_settings-977ff5426d4941c3a190cc55388c89edbd7a1e60.zip packages_apps_settings-977ff5426d4941c3a190cc55388c89edbd7a1e60.tar.gz packages_apps_settings-977ff5426d4941c3a190cc55388c89edbd7a1e60.tar.bz2 |
Merge "Revert "Rename and flip meaning of auto-rotate to rotation lock."" into jb-dev
Diffstat (limited to 'res/values')
-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 --> |