am 69827524: Try to fix bug3119318 without breaking the build this time

Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp

* commit '69827524365ae448d19b2089c46534e925cc2bfd':
  Try to fix bug3119318 without breaking the build this time
This commit is contained in:
Roy West
2010-10-21 17:53:37 -07:00
committed by Android Git Automerger

View File

@@ -1304,10 +1304,16 @@
<string name="sd_insert_summary" product="nosdcard">Insert USB storage for mounting</string> <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 --> <!-- 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> <string name="sd_insert_summary" product="default">Insert an SD card for mounting</string>
<!-- Storage setting item that will mount USB storage if it unmounted -- a user should never see this. [CHAR LIMIT=25] -->
<string name="sd_mount" product="nosdcard">Mount USB storage</string>
<!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. [CHAR LIMIT=25] --> <!-- 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>
<!-- Subtext for Mount USB storage in Storage settings -- 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 mounting the SD card. --> <!-- 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] --> <!-- 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> <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] --> <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card. [CHAR LIMIT=25] -->