From af06d7a94a69d82ef5f2d8082e75c368f4204afb Mon Sep 17 00:00:00 2001
From: Roy West <rwest@google.com>
Date: Thu, 21 Oct 2010 15:47:14 -0700
Subject: [PATCH 1/2] Fix bug3119318, missing Mount USB storage strings

Change-Id: Iefebd97d85ad4a51f604e9a7fa709ba84c94239d
---
 res/values/strings.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4ef11c80a7..b407bd4e3e5 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1302,10 +1302,17 @@
     <string name="sd_insert_summary" product="nosdcard">Insert USB storage for mounting</string>
     <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
     <string name="sd_insert_summary" product="default">Insert an SD card for mounting</string>
+
     <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. [CHAR LIMIT=25] -->
-    <string name="sd_mount">Mount SD card</string>
+    <string name="sd_mount" product="default">Mount SD card</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>
+
+    <!-- Storage settings item title that will result in the phone mounting the USB storage - user should never see this. [CHAR LIMIT=25] -->
+    <string name="sd_mount" product="nosdcard">Mount USB storage</string>
+    <!-- Subtext for Storage settings' Mount USB storage item -- user should never see this. -->
+    <string name="sd_mount_summary" product="nosdcard">Mount the USB storage</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] -->

From 9f869d1198fcf1866ad2a6451df05f5d72653711 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Thu, 21 Oct 2010 16:37:59 -0700
Subject: [PATCH 2/2] Revert "Fix bug3119318, missing Mount USB storage
 strings"

This reverts commit af06d7a94a69d82ef5f2d8082e75c368f4204afb.
---
 res/values/strings.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b407bd4e3e5..e4ef11c80a7 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1302,17 +1302,10 @@
     <string name="sd_insert_summary" product="nosdcard">Insert USB storage for mounting</string>
     <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
     <string name="sd_insert_summary" product="default">Insert an SD card for mounting</string>
-
     <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. [CHAR LIMIT=25] -->
-    <string name="sd_mount" product="default">Mount SD card</string>
+    <string name="sd_mount">Mount SD card</string>
     <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
-    <string name="sd_mount_summary" product="default">Mount the SD card</string>
-
-    <!-- Storage settings item title that will result in the phone mounting the USB storage - user should never see this. [CHAR LIMIT=25] -->
-    <string name="sd_mount" product="nosdcard">Mount USB storage</string>
-    <!-- Subtext for Storage settings' Mount USB storage item -- user should never see this. -->
-    <string name="sd_mount_summary" product="nosdcard">Mount the USB storage</string>
-
+    <string name="sd_mount_summary">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] -->