am 398dd4a2: am f6e40485: Merge "Allow importing contacts from mulitple sims" into lmp-sprout-dev
* commit '398dd4a25edc4518c173ad520d162ea13e49c0c4':
Allow importing contacts from mulitple sims
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index c3df245..77c38d7 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -421,8 +421,11 @@
<!-- Action string for selecting SIM for importing contacts -->
<string name="import_from_sim">Import from SIM card</string>
- <!-- Action string for selecting SIM for importing contacts, when more than one SIM card -->
- <string name="import_from_sim_number">Import from SIM card #<xliff:g id="sim_number" example="2">%d</xliff:g></string>
+ <!-- Action string for selecting a SIM subscription for importing contacts -->
+ <string name="import_from_sim_summary">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g> - <xliff:g id="sim_number">%2$s</xliff:g></string>
+
+ <!-- Action string for selecting a SIM subscription for importing contacts, without a phone number -->
+ <string name="import_from_sim_summary_no_number">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g></string>
<!-- Action string for selecting (USB) storage for importing contacts [CHAR LIMIT=30] -->
<string name="import_from_sdcard" product="default">Import from storage</string>