summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2011-01-07 06:34:55 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-07 06:34:55 -0800
commitb3b98d9b700ac0ae038a63b734287b4d3aad950d (patch)
tree086d907c4d365a5d5c28d61bbd8166f70447202d
parent5f6bcc17e94e53af155570bb4a1c774eada7ec4e (diff)
parent8896079dac2ced0189225b49fdb0182e860b1f73 (diff)
downloadframeworks_base-b3b98d9b700ac0ae038a63b734287b4d3aad950d.zip
frameworks_base-b3b98d9b700ac0ae038a63b734287b4d3aad950d.tar.gz
frameworks_base-b3b98d9b700ac0ae038a63b734287b4d3aad950d.tar.bz2
Merge "Remove obsolete strings (rather than fix l10n guidelines)." into honeycomb
-rw-r--r--packages/SystemUI/res/values-port/strings.xml3
-rw-r--r--packages/SystemUI/res/values-xlarge/strings.xml2
-rw-r--r--packages/SystemUI/res/values/strings.xml7
3 files changed, 1 insertions, 11 deletions
diff --git a/packages/SystemUI/res/values-port/strings.xml b/packages/SystemUI/res/values-port/strings.xml
index d3ab67b..67364a4 100644
--- a/packages/SystemUI/res/values-port/strings.xml
+++ b/packages/SystemUI/res/values-port/strings.xml
@@ -17,7 +17,4 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Rotation lock toast text: shown when rotation lock is turned on in portrait orientation.
- -->
- <string name="toast_rotation_locked">Screen is now locked in portrait orientation.</string>
</resources>
diff --git a/packages/SystemUI/res/values-xlarge/strings.xml b/packages/SystemUI/res/values-xlarge/strings.xml
index 279a135..f7b642d 100644
--- a/packages/SystemUI/res/values-xlarge/strings.xml
+++ b/packages/SystemUI/res/values-xlarge/strings.xml
@@ -18,7 +18,7 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The text for the button in the notification window-shade that clears
- all of the currently visible notifications. -->
+ all of the currently visible notifications. [CHAR LIMIT=10]-->
<string name="status_bar_clear_all_button">Clear all</string>
<!-- System panel ("Quick Settings") -->
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 9737028..df846f1 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -108,11 +108,4 @@
<!-- Recent apps label. Shown as title on recent apps panel -->
<string name="recent_tasks_app_label">Apps</string>
- <!-- Rotation lock toast text: shown when rotation lock is turned off (and the screen will
- auto-rotate based on the accelerometer). [CHAR LIMIT=NONE]-->
- <string name="toast_rotation_free">Screen will rotate automatically.</string>
-
- <!-- Rotation lock toast text: shown when rotation lock is turned on and the orientation is
- undefined. [CHAR LIMIT=NONE] -->
- <string name="toast_rotation_locked">Screen rotation is now locked.</string>
</resources>