am 42765f6a: Let the user choose where to export vcards to 1/3

* commit '42765f6a00cedc980529cead74f829ddb3d05f16':
  Let the user choose where to export vcards to 1/3

3 files changed, 7 insertions, 8 deletions

diff --git a/res/values/donottranslate_config.xml b/res/values/donottranslate_config.xml
index fe690ada..af6aa5ed 100644
--- a/res/values/donottranslate_config.xml
+++ b/res/values/donottranslate_config.xml
@@ -78,8 +78,8 @@
          entirely disable SIM import on a per-product basis. -->
     <bool name="config_allow_sim_import">true</bool>
 
-    <!-- Flag indicating whether Contacts app is allowed to export contacts to SDCard -->
-    <bool name="config_allow_export_to_sdcard">true</bool>
+    <!-- Flag indicating whether Contacts app is allowed to export contacts -->
+    <bool name="config_allow_export">true</bool>
 
     <!-- Flag indicating whether Contacts app is allowed to share contacts with devices outside -->
     <bool name="config_allow_share_visible_contacts">true</bool>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 093901ba..41cee452 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -31,7 +31,6 @@
     <item type="id" name="dialog_cancel_failed"/>
 
     <!-- For ExportVCardActivity -->
-    <item type="id" name="dialog_export_confirmation"/>
     <item type="id" name="dialog_exporting_vcard"/>
     <item type="id" name="dialog_fail_to_export_with_reason"/>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4b8a29d..d9a68f56 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -507,6 +507,9 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
     <!-- The title shown when exporting vCard is successfuly finished [CHAR LIMIT=40] -->
     <string name="exporting_vcard_finished_title">Finished exporting <xliff:g id="filename" example="export.vcf">%s</xliff:g>.</string>
 
+    <!-- The filename that is suggested that users use when exporting vCards. Should include the .vcf extension. CHAR LIMIT=40] -->
+    <string name="exporting_vcard_filename">contacts.vcf</string>
+
     <!-- The title shown when exporting vCard is canceled (probably by a user)
          The argument is file name the user canceled importing.
          [CHAR LIMIT=40] -->
@@ -547,9 +550,6 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
     <!-- Dialog message shown when SDcard does not exist. [CHAR LIMIT=30] -->
     <string name="no_sdcard_message" product="default">No SD card was found.</string>
 
-    <!-- Dialog message shown when a user confirms whether he/she export Contact data [CHAR LIMIT=NONE] -->
-    <string name="confirm_export_message">Your contact list will be exported to file: <xliff:g id="vcard_filename">%s</xliff:g>.</string>
-
     <!-- Description shown when importing vCard data.
          The argument is the name of a contact which is being read.
          [CHAR LIMIT=20] -->
@@ -657,8 +657,8 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
          [CHAR LIMIT=20] -->
     <string name="progress_notifier_message">Importing <xliff:g id="current_number">%s</xliff:g>/<xliff:g id="total_number">%s</xliff:g>: <xliff:g id="name" example="Joe Due">%s</xliff:g></string>
 
-    <!-- Action that exports all contacts to (USB) storage [CHAR LIMIT=25] -->
-    <string name="export_to_sdcard" product="default">Export to storage</string>
+    <!-- Action that exports all contacts to a user selected destination. [CHAR LIMIT=25] -->
+    <string name="export" product="default">Export</string>
 
     <!-- Contact preferences related strings -->