summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-19 16:44:23 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-10-19 16:49:14 -0700
commitc4ddcbd347d4fb7f9c3f82d721f410f524889d0c (patch)
treebc901c9ead440843688ba7e64c2c4100fc7d91a1 /res
parent9c8ba9f1af1bf4fc622bec05b32beae8f334513c (diff)
downloadpackages_apps_settings-c4ddcbd347d4fb7f9c3f82d721f410f524889d0c.zip
packages_apps_settings-c4ddcbd347d4fb7f9c3f82d721f410f524889d0c.tar.gz
packages_apps_settings-c4ddcbd347d4fb7f9c3f82d721f410f524889d0c.tar.bz2
Fix build
This was causing a resource conflict in open-source crespo builds Change-Id: I7b683d735c851b830fdbab90c78096736ca4f5dd
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f94ba7..e00d3c2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1336,9 +1336,9 @@
<!-- About phone screen, summary of the item to go into the phone status screen -->
<string name="device_status_summary">Phone number, signal, etc.</string>
<!-- Main settings screen item's title to go into the SD card and storage settings screen [CHAR LIMIT=25] -->
- <string name="storage_settings" product="nosdcard">Shared &amp; secure storage storage</string>
+ <string name="storage_settings" product="nosdcard">Shared &amp; secure storage</string>
<!-- Main settings screen item's title to go into the SD card and storage settings screen-->
- <string name="storage_settings">Storage</string>
+ <string name="storage_settings" product="default">Storage</string>
<!-- SD card and storage settings screen title -->
<string name="storage_settings_title">Storage settings</string>
<!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
@@ -1413,7 +1413,7 @@
<!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. [CHAR LIMIT=30] -->
<string name="sd_mount_summary" product="nosdcard">Mount the internal USB storage</string>
<!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
- <string name="sd_mount_summary">Mount the SD card</string>
+ <string name="sd_mount_summary" product="default">Mount the SD card</string>
<!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage. [CHAR LIMIT=25] -->
<string name="sd_format" product="nosdcard">Erase USB storage</string>
<!-- SD card & phone storage settings item title that will result in the phone formatting the SD card. [CHAR LIMIT=25] -->