Merge "Rename ContactSocialWidget to SocialWidget. Remove camelHumps from package"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 831a99e..378cc38 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -662,13 +662,13 @@
-->
<string name="description_plus_button">plus</string>
- <!-- Dialog title shown when shared storage does not exist [CHAR LIMIT=25] -->
- <string name="no_sdcard_title" product="nosdcard">Shared storage unavailable</string>
+ <!-- Dialog title shown when USB storage does not exist [CHAR LIMIT=25] -->
+ <string name="no_sdcard_title" product="nosdcard">USB storage unavailable</string>
<!-- Dialog title shown when SD Card does not exist -->
<string name="no_sdcard_title" product="default">No SD card</string>
- <!-- Dialog message shown when shared storage does not exist [CHAR LIMIT=30] -->
- <string name="no_sdcard_message" product="nosdcard">No shared storage detected</string>
+ <!-- Dialog message shown when USB storage does not exist [CHAR LIMIT=30] -->
+ <string name="no_sdcard_message" product="nosdcard">No USB storage detected</string>
<!-- Dialog message shown when SDcard does not exist -->
<string name="no_sdcard_message" product="default">No SD card detected</string>
@@ -678,13 +678,13 @@
<!-- Action string for selecting SIM for importing contacts -->
<string name="import_from_sim">Import from SIM card</string>
- <!-- Action string for selecting shared storage for importing contacts [CHAR LIMIT=25] -->
- <string name="import_from_sdcard" product="nosdcard">Import from shared storage</string>
+ <!-- Action string for selecting USB storage for importing contacts [CHAR LIMIT=25] -->
+ <string name="import_from_sdcard" product="nosdcard">Import from USB storage</string>
<!-- Action string for selecting SD Card for importing contacts -->
<string name="import_from_sdcard" product="default">Import from SD card</string>
- <!-- Action that exports all contacts to shared storage [CHAR LIMIT=25] -->
- <string name="export_to_sdcard" product="nosdcard">Export to shared storage</string>
+ <!-- Action that exports all contacts to USB storage [CHAR LIMIT=25] -->
+ <string name="export_to_sdcard" product="nosdcard">Export to USB storage</string>
<!-- Action that exports all contacts to SD Card -->
<string name="export_to_sdcard" product="default">Export to SD card</string>
@@ -707,18 +707,18 @@
<string name="import_all_vcard_string">Import all vCard files</string>
<!-- Dialog message shown when searching VCard data from SD Card [CHAR LIMIT=NONE] -->
- <string name="searching_vcard_message" product="nosdcard">Searching for vCard data in shared storage</string>
+ <string name="searching_vcard_message" product="nosdcard">Searching for vCard data in USB storage</string>
<!-- Dialog message shown when searching VCard data from SD Card -->
<string name="searching_vcard_message" product="default">Searching for vCard data on SD card</string>
<!-- Dialog title shown when scanning VCard data failed. [CHAR LIMIT=NONE] -->
- <string name="scanning_sdcard_failed_title" product="nosdcard">Scanning shared storage failed</string>
+ <string name="scanning_sdcard_failed_title" product="nosdcard">Scanning USB storage failed</string>
<!-- Dialog title shown when scanning VCard data failed. -->
<string name="scanning_sdcard_failed_title" product="default">Scanning SD card failed</string>
<!-- Dialog message shown when searching VCard data failed.
An exact reason for the failure should [CHAR LIMIT=NONE] -->
- <string name="scanning_sdcard_failed_message" product="nosdcard">Scanning shared storage failed (Reason: \"<xliff:g id="fail_reason">%s</xliff:g>\")</string>
+ <string name="scanning_sdcard_failed_message" product="nosdcard">Scanning USB storage failed (Reason: \"<xliff:g id="fail_reason">%s</xliff:g>\")</string>
<!-- Dialog message shown when searching VCard data failed.
An exact reason for the failure should -->
<string name="scanning_sdcard_failed_message" product="default">Scanning SD card failed (Reason: \"<xliff:g id="fail_reason">%s</xliff:g>\")</string>
@@ -744,7 +744,7 @@
<!-- The failed reason shown when the system could not find any vCard file
(with extension ".vcf" in SDCard.) [CHAR LIMIT=NONE] -->
- <string name="fail_reason_no_vcard_file" product="nosdcard">No vCard file found in the shared storage</string>
+ <string name="fail_reason_no_vcard_file" product="nosdcard">No vCard file found in the USB storage</string>
<!-- The failed reason shown when the system could not find any vCard file
(with extension ".vcf" in SDCard.) -->
<string name="fail_reason_no_vcard_file" product="default">No vCard file found on the SD card</string>
@@ -824,7 +824,7 @@
<!-- The failed reason shown when vCard exporter could not create a file for the vCard since
there are too many files relevant to vCard. [CHAR LIMIT=NONE] -->
- <string name="fail_reason_too_many_vcard" product="nosdcard">Too many vCard files on the shared storage</string>
+ <string name="fail_reason_too_many_vcard" product="nosdcard">Too many vCard files in the USB storage</string>
<!-- The failed reason shown when vCard exporter could not create a file for the vCard since
there are too many files relevant to vCard. -->
<string name="fail_reason_too_many_vcard" product="default">Too many vCard files on the SD card</string>