PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 92acdba0 to master

Browse Source 
Change-Id: I3598e15091fdb2593a2d9d56f6bf646ddc87e879
This commit is contained in:
Eric Fischer
2010-10-21 18:31:02 -07:00
parent 2ae29ff0ed 92acdba01c
commit d947937f4d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -1406,12 +1406,14 @@
<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="nosdcard">Mount shared storage</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. -->
<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. [CHAR LIMIT=30] -->
<string name="sd_mount_summary" product="nosdcard">Mount the internal USB storage</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. -->
<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] -->