Import translations. DO NOT MERGE
am: f5b4b7d6ef -s ours
Change-Id: I93ea971ba3861d2130f288f08af0fc6c1ae12168
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 89fbc4d..5bdf99d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
- android:versionCode="10614"
- android:versionName="1.6.14">
+ android:versionCode="10700"
+ android:versionName="1.7.0">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
diff --git a/AndroidManifest_common.xml b/AndroidManifest_common.xml
index b2a3c88..06c9352 100644
--- a/AndroidManifest_common.xml
+++ b/AndroidManifest_common.xml
@@ -213,7 +213,7 @@
<!-- Used to set options -->
<activity
- android:name=".common.preference.ContactsPreferenceActivity"
+ android:name=".preference.ContactsPreferenceActivity"
android:label="@string/activity_title_settings"
android:theme="@style/ContactsPreferencesTheme"
android:launchMode="singleTop"
@@ -226,13 +226,13 @@
<!-- Used to filter contacts list by account -->
<activity
- android:name=".common.list.AccountFilterActivity"
+ android:name=".list.AccountFilterActivity"
android:label="@string/activity_title_contacts_filter"
android:theme="@style/ContactListFilterTheme" />
<!-- Used to select display and sync groups -->
<activity
- android:name=".common.list.CustomContactListFilterActivity"
+ android:name=".list.CustomContactListFilterActivity"
android:label="@string/custom_list_filter"
android:theme="@style/ContactListFilterTheme" />
@@ -386,7 +386,7 @@
<!-- Stub service used to keep our process alive long enough for
background threads to finish their operations. -->
<service
- android:name=".common.util.EmptyService"
+ android:name=".util.EmptyService"
android:exported="false" />
<!-- Service to save a contact -->
@@ -394,6 +394,11 @@
android:name=".ContactSaveService"
android:exported="false" />
+ <!-- Service to import contacts from the SIM card -->
+ <service
+ android:name=".SimImportService"
+ android:exported="false" />
+
<!-- Attaches a photo to a contact. Started from external applications -->
<activity android:name=".activities.AttachPhotoActivity"
android:label="@string/attach_photo_dialog_title"
@@ -406,7 +411,7 @@
</activity>
<!-- vCard related -->
- <activity android:name=".common.vcard.ImportVCardActivity"
+ <activity android:name=".vcard.ImportVCardActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:theme="@style/BackgroundOnlyTheme">
<intent-filter>
@@ -418,7 +423,7 @@
</intent-filter>
</activity>
- <activity android:name=".common.vcard.NfcImportVCardActivity"
+ <activity android:name=".vcard.NfcImportVCardActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:theme="@style/BackgroundOnlyTheme">
<intent-filter>
@@ -429,16 +434,16 @@
</intent-filter>
</activity>
- <activity android:name=".common.vcard.CancelActivity"
+ <activity android:name=".vcard.CancelActivity"
android:theme="@style/BackgroundOnlyTheme" />
- <activity android:name=".common.vcard.SelectAccountActivity"
+ <activity android:name=".vcard.SelectAccountActivity"
android:theme="@style/BackgroundOnlyTheme" />
- <activity android:name=".common.vcard.ExportVCardActivity"
+ <activity android:name=".vcard.ExportVCardActivity"
android:theme="@style/BackgroundOnlyTheme" />
- <activity android:name=".common.vcard.ShareVCardActivity"
+ <activity android:name=".vcard.ShareVCardActivity"
android:theme="@style/BackgroundOnlyTheme" />
<activity android:name=".activities.SimImportActivity"
@@ -447,7 +452,7 @@
<service
- android:name=".common.vcard.VCardService"
+ android:name=".vcard.VCardService"
android:exported="false" />
<!-- end vCard related -->
@@ -478,7 +483,7 @@
</intent-filter>
</activity>
- <activity android:name="com.android.contacts.common.dialog.CallSubjectDialog"
+ <activity android:name="com.android.contacts.dialog.CallSubjectDialog"
android:theme="@style/Theme.CallSubjectDialogTheme"
android:windowSoftInputMode="stateVisible|adjustResize">
<intent-filter>
diff --git a/proguard.flags b/proguard.flags
index e918c62..19d09fa 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -13,75 +13,80 @@
-keep class com.google.android.libraries.material.featurehighlight.** { *; }
# Needed for tests
--keep class com.android.contacts.common.compat.CompatUtils { *; }
+-keep class com.android.contacts.compat.CompatUtils { *; }
-keep class com.android.contacts.common.Collapser { *; }
-keep class com.android.contacts.common.ContactPhotoManager { *; }
-keep class com.android.contacts.common.ContactsUtils { *; }
--keep class com.android.contacts.common.database.NoNullCursorAsyncQueryHandler { *; }
--keep class com.android.contacts.common.database.SimContactDao { *; }
--keep class com.android.contacts.common.database.SimContactDao$* { *; }
--keep class com.android.contacts.common.format.FormatUtils { *; }
--keep class com.android.contacts.common.format.TextHighlighter { *; }
--keep class com.android.contacts.common.list.ContactListItemView { *; }
--keep class com.android.contacts.common.list.ContactsSectionIndexer { *; }
--keep class com.android.contacts.common.location.CountryDetector { *; }
--keep class com.android.contacts.common.model.account.AccountDisplayInfo { *; }
--keep class com.android.contacts.common.model.account.AccountDisplayInfoFactory { *; }
--keep class com.android.contacts.common.model.account.AccountType { *; }
--keep class com.android.contacts.common.model.account.AccountType$* { *; }
--keep class com.android.contacts.common.model.account.AccountTypeWithDataSet { *; }
--keep class com.android.contacts.common.model.account.AccountWithDataSet { *; }
--keep class com.android.contacts.common.model.account.BaseAccountType { *; }
--keep class com.android.contacts.common.model.account.BaseAccountType$* { *; }
--keep class com.android.contacts.common.model.account.DeviceLocalAccountType { *; }
--keep class com.android.contacts.common.model.account.ExchangeAccountType { *; }
--keep class com.android.contacts.common.model.account.ExternalAccountType { *; }
--keep class com.android.contacts.common.model.account.FallbackAccountType { *; }
--keep class com.android.contacts.common.model.account.GoogleAccountType { *; }
--keep class com.android.contacts.common.model.account.SimAccountType { *; }
--keep class com.android.contacts.common.model.AccountTypeManager { *; }
--keep class com.android.contacts.common.model.AccountTypeManagerImpl { *; }
--keep class com.android.contacts.common.model.BuilderWrapper { *; }
--keep class com.android.contacts.common.model.Contact { *; }
--keep class com.android.contacts.common.model.ContactLoader { *; }
--keep class com.android.contacts.common.model.Cp2DeviceLocalAccountLocator { *; }
--keep class com.android.contacts.common.model.CPOWrapper { *; }
--keep class com.android.contacts.common.model.dataitem.DataItem { *; }
--keep class com.android.contacts.common.model.dataitem.DataKind { *; }
--keep class com.android.contacts.common.model.dataitem.EmailDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.EventDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.ImDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.NicknameDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.NoteDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.OrganizationDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.PhoneDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.RelationDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.SipAddressDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.StructuredNameDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.StructuredPostalDataItem { *; }
--keep class com.android.contacts.common.model.dataitem.WebsiteDataItem { *; }
--keep class com.android.contacts.common.model.DeviceLocalAccountLocator { *; }
--keep class com.android.contacts.common.model.RawContact { *; }
--keep class com.android.contacts.common.model.RawContactDelta { *; }
--keep class com.android.contacts.common.model.RawContactDeltaList { *; }
--keep class com.android.contacts.common.model.RawContactModifier { *; }
--keep class com.android.contacts.common.model.ValuesDelta { *; }
+-keep class com.android.contacts.database.NoNullCursorAsyncQueryHandler { *; }
+-keep class com.android.contacts.database.SimContactDao { *; }
+-keep class com.android.contacts.database.SimContactDao$* { *; }
+-keep class com.android.contacts.database.SimContactDaoImpl { *; }
+-keep class com.android.contacts.format.FormatUtils { *; }
+-keep class com.android.contacts.format.TextHighlighter { *; }
+-keep class com.android.contacts.list.ContactListItemView { *; }
+-keep class com.android.contacts.list.ContactsSectionIndexer { *; }
+-keep class com.android.contacts.location.CountryDetector { *; }
+-keep class com.android.contacts.model.account.AccountDisplayInfo { *; }
+-keep class com.android.contacts.model.account.AccountDisplayInfoFactory { *; }
+-keep class com.android.contacts.model.account.AccountType { *; }
+-keep class com.android.contacts.model.account.AccountType$* { *; }
+-keep class com.android.contacts.model.account.AccountTypeWithDataSet { *; }
+-keep class com.android.contacts.model.account.AccountWithDataSet { *; }
+-keep class com.android.contacts.model.account.BaseAccountType { *; }
+-keep class com.android.contacts.model.account.BaseAccountType$* { *; }
+-keep class com.android.contacts.model.account.DeviceLocalAccountType { *; }
+-keep class com.android.contacts.model.account.ExchangeAccountType { *; }
+-keep class com.android.contacts.model.account.ExternalAccountType { *; }
+-keep class com.android.contacts.model.account.FallbackAccountType { *; }
+-keep class com.android.contacts.model.account.GoogleAccountType { *; }
+-keep class com.android.contacts.model.account.SimAccountType { *; }
+-keep class com.android.contacts.model.AccountTypeManager { *; }
+-keep class com.android.contacts.model.AccountTypeManagerImpl { *; }
+-keep class com.android.contacts.model.BuilderWrapper { *; }
+-keep class com.android.contacts.model.Contact { *; }
+-keep class com.android.contacts.model.ContactLoader { *; }
+-keep class com.android.contacts.model.Cp2DeviceLocalAccountLocator { *; }
+-keep class com.android.contacts.model.CPOWrapper { *; }
+-keep class com.android.contacts.model.dataitem.DataItem { *; }
+-keep class com.android.contacts.model.dataitem.DataKind { *; }
+-keep class com.android.contacts.model.dataitem.EmailDataItem { *; }
+-keep class com.android.contacts.model.dataitem.EventDataItem { *; }
+-keep class com.android.contacts.model.dataitem.ImDataItem { *; }
+-keep class com.android.contacts.model.dataitem.NicknameDataItem { *; }
+-keep class com.android.contacts.model.dataitem.NoteDataItem { *; }
+-keep class com.android.contacts.model.dataitem.OrganizationDataItem { *; }
+-keep class com.android.contacts.model.dataitem.PhoneDataItem { *; }
+-keep class com.android.contacts.model.dataitem.RelationDataItem { *; }
+-keep class com.android.contacts.model.dataitem.SipAddressDataItem { *; }
+-keep class com.android.contacts.model.dataitem.StructuredNameDataItem { *; }
+-keep class com.android.contacts.model.dataitem.StructuredPostalDataItem { *; }
+-keep class com.android.contacts.model.dataitem.WebsiteDataItem { *; }
+-keep class com.android.contacts.model.DeviceLocalAccountLocator { *; }
+-keep class com.android.contacts.model.RawContact { *; }
+-keep class com.android.contacts.model.RawContactDelta { *; }
+-keep class com.android.contacts.model.RawContactDeltaList { *; }
+-keep class com.android.contacts.model.RawContactModifier { *; }
+-keep class com.android.contacts.model.SimCard { *; }
+-keep class com.android.contacts.model.SimContact { *; }
+-keep class com.android.contacts.model.ValuesDelta { *; }
-keep class com.android.contacts.common.MoreContactUtils { *; }
--keep class com.android.contacts.common.preference.ContactsPreferences { *; }
+-keep class com.android.contacts.preference.ContactsPreferences { *; }
-keep class com.android.contacts.common.test.mocks.MockContactPhotoManager { *; }
--keep class com.android.contacts.common.testing.InjectedServices { *; }
--keep class com.android.contacts.common.util.BitmapUtil { *; }
--keep class com.android.contacts.common.util.ContactDisplayUtils { *; }
--keep class com.android.contacts.common.util.DateUtils { *; }
--keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory { *; }
--keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory$* { *; }
--keep class com.android.contacts.common.util.NameConverter { *; }
--keep class com.android.contacts.common.util.PermissionsUtil { *; }
--keep class com.android.contacts.common.util.SearchUtil { *; }
--keep class com.android.contacts.common.util.SearchUtil$* { *; }
+-keep class com.android.contacts.testing.InjectedServices { *; }
+-keep class com.android.contacts.util.BitmapUtil { *; }
+-keep class com.android.contacts.util.ContactDisplayUtils { *; }
+-keep class com.android.contacts.util.DateUtils { *; }
+-keep class com.android.contacts.util.DeviceLocalAccountTypeFactory { *; }
+-keep class com.android.contacts.util.DeviceLocalAccountTypeFactory$* { *; }
+-keep class com.android.contacts.util.NameConverter { *; }
+-keep class com.android.contacts.util.PermissionsUtil { *; }
+-keep class com.android.contacts.util.SearchUtil { *; }
+-keep class com.android.contacts.util.SearchUtil$* { *; }
-keep class com.android.contacts.ContactsApplication { *; }
-keep class com.android.contacts.ContactSaveService { *; }
-keep class com.android.contacts.ContactSaveService$* { *; }
+-keep class com.android.contacts.SimImportService { *; }
+-keep class com.android.contacts.SimImportService$* { *; }
-keep class com.android.contacts.DynamicShortcuts { *; }
-keep class com.android.contacts.editor.ContactEditorUtils { *; }
-keep class com.android.contacts.editor.EditorUiUtils { *; }
@@ -92,6 +97,8 @@
-keep class com.android.contacts.interactions.ContactInteractionUtil { *; }
-keep class com.android.contacts.util.SyncUtil { *; }
-keep class com.android.contacts.widget.CompositeListAdapter { *; }
+-keep class com.google.common.base.Function { *; }
+-keep class com.google.common.base.Functions { *; }
-keep class com.google.common.base.Objects { *; }
-keep class com.google.common.base.Preconditions { *; }
-keep class com.google.common.collect.ImmutableMap { *; }
diff --git a/res/layout/contact_list_content.xml b/res/layout/contact_list_content.xml
index 39f669f..8a96268 100644
--- a/res/layout/contact_list_content.xml
+++ b/res/layout/contact_list_content.xml
@@ -78,7 +78,7 @@
android:enabled="false" >
<view
- class="com.android.contacts.common.list.PinnedHeaderListView"
+ class="com.android.contacts.list.PinnedHeaderListView"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/contact_list_filter_item.xml b/res/layout/contact_list_filter_item.xml
index 9f297e6..4d1fbca 100644
--- a/res/layout/contact_list_filter_item.xml
+++ b/res/layout/contact_list_filter_item.xml
@@ -16,7 +16,7 @@
<view
xmlns:android="http://schemas.android.com/apk/res/android"
- class="com.android.contacts.common.list.ContactListFilterView"
+ class="com.android.contacts.list.ContactListFilterView"
android:descendantFocusability="blocksDescendants"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/contact_picker_content.xml b/res/layout/contact_picker_content.xml
index 36734c5..382121a 100644
--- a/res/layout/contact_picker_content.xml
+++ b/res/layout/contact_picker_content.xml
@@ -21,7 +21,7 @@
<include layout="@layout/contact_list_card"/>
<view
- class="com.android.contacts.common.list.PinnedHeaderListView"
+ class="com.android.contacts.list.PinnedHeaderListView"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/contact_tile_frequent.xml b/res/layout/contact_tile_frequent.xml
index b1e83ce..6fd38fc 100644
--- a/res/layout/contact_tile_frequent.xml
+++ b/res/layout/contact_tile_frequent.xml
@@ -15,7 +15,7 @@
-->
<view
xmlns:android="http://schemas.android.com/apk/res/android"
- class="com.android.contacts.common.list.ContactTileFrequentView"
+ class="com.android.contacts.list.ContactTileFrequentView"
android:focusable="true"
android:background="?android:attr/selectableItemBackground">
@@ -27,7 +27,7 @@
android:paddingTop="?list_item_padding_top"
android:paddingBottom="?list_item_padding_bottom">
- <com.android.contacts.common.widget.LayoutSuppressingImageView
+ <com.android.contacts.widget.LayoutSuppressingImageView
android:id="@+id/contact_tile_image"
android:layout_width="?list_item_photo_size"
android:layout_height="?list_item_photo_size"
diff --git a/res/layout/contact_tile_frequent_phone.xml b/res/layout/contact_tile_frequent_phone.xml
index f87dff7..8fcdd31 100644
--- a/res/layout/contact_tile_frequent_phone.xml
+++ b/res/layout/contact_tile_frequent_phone.xml
@@ -18,7 +18,7 @@
<view
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contact_tile_frequent_phone"
- class="com.android.contacts.common.list.ContactTilePhoneFrequentView"
+ class="com.android.contacts.list.ContactTilePhoneFrequentView"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:nextFocusLeft="@+id/contact_tile_quick">
@@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <com.android.contacts.common.widget.LayoutSuppressingQuickContactBadge
+ <com.android.contacts.widget.LayoutSuppressingQuickContactBadge
android:id="@id/contact_tile_quick"
android:layout_width="64dip"
android:layout_height="64dip"
diff --git a/res/layout/contact_tile_starred.xml b/res/layout/contact_tile_starred.xml
index 777cc05..10716cb 100644
--- a/res/layout/contact_tile_starred.xml
+++ b/res/layout/contact_tile_starred.xml
@@ -16,7 +16,7 @@
<view
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ex="http://schemas.android.com/apk/res-auto"
- class="com.android.contacts.common.list.ContactTileStarredView"
+ class="com.android.contacts.list.ContactTileStarredView"
android:focusable="true"
android:background="?android:attr/selectableItemBackground">
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
ex:direction="widthToHeight"
ex:ratio="1.0"
- class="com.android.contacts.common.widget.ProportionalLayout" >
+ class="com.android.contacts.widget.ProportionalLayout" >
<ImageView
android:id="@+id/contact_tile_image"
android:layout_width="match_parent"
diff --git a/res/layout/contact_tile_starred_quick_contact.xml b/res/layout/contact_tile_starred_quick_contact.xml
index ecbe583..2579034 100644
--- a/res/layout/contact_tile_starred_quick_contact.xml
+++ b/res/layout/contact_tile_starred_quick_contact.xml
@@ -19,13 +19,13 @@
android:paddingRight="1dip"
android:paddingEnd="1dip"
android:background="@null"
- class="com.android.contacts.common.list.ContactTileStarredView" >
+ class="com.android.contacts.list.ContactTileStarredView" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <com.android.contacts.common.widget.LayoutSuppressingImageView
+ <com.android.contacts.widget.LayoutSuppressingImageView
android:id="@+id/contact_tile_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/join_contact_picker_list_content.xml b/res/layout/join_contact_picker_list_content.xml
index 5bde895..04b0556 100644
--- a/res/layout/join_contact_picker_list_content.xml
+++ b/res/layout/join_contact_picker_list_content.xml
@@ -42,7 +42,7 @@
android:layout_height="match_parent">
<include layout="@layout/contact_list_card"/>
<view
- class="com.android.contacts.common.list.PinnedHeaderListView"
+ class="com.android.contacts.list.PinnedHeaderListView"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/pinned_header_list_demo.xml b/res/layout/pinned_header_list_demo.xml
index c717b35..a674c01 100644
--- a/res/layout/pinned_header_list_demo.xml
+++ b/res/layout/pinned_header_list_demo.xml
@@ -23,7 +23,7 @@
>
<view
- class="com.android.contacts.common.list.PinnedHeaderListView"
+ class="com.android.contacts.list.PinnedHeaderListView"
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0dip"
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
index 0ba4336..edfd904 100644
--- a/res/layout/select_account_list_item.xml
+++ b/res/layout/select_account_list_item.xml
@@ -15,7 +15,7 @@
-->
<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
-<view class="com.android.contacts.common.widget.ActivityTouchLinearLayout"
+<view class="com.android.contacts.widget.ActivityTouchLinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5816f7a..187c9b8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontak</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontakte · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontak · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakte · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontak · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Vanaf Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Vanaf <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Bel terug"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" by kontakte?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> van <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontakte"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Name van jou kontakte"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Geen program is gevind om hierdie aksie te hanteer nie."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik om na die vorige skerm terug te keer"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Vandag"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Vandag om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Môre om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Titellose geleentheid)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Stel"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Kitsboodskappe"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klik om kontakredakteur uit te vou."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klik om kontakredakteur in te vou."</string>
<string name="content_description_directions" msgid="2686791825798189335">"rigtingaanwysings na ligging"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"onlangse SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik om te reageer"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"onlangse SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik om te reageer"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"inkomend"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"uitgaande"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"gemis"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"onlangse oproep. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik om terug te bel"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"onlangse oproep. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik om terug te bel"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Jy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts werk beter as jy die persoon se Hangouts-identifiseerder in die e-posveld of foonveld invoer."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Meer velde"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Geskakelde kontak</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> geskakelde kontakte"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"KOPPEL KONTAKTE"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"KANSELLEER"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Hierdie kontak"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Moontlike duplikate"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Hierdie kontakte kan dalk dieselfde persoon wees. Jy kan hulle as \'n enkele kontak koppel."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Van jou rekeninge af"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Kies foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Van <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Vee <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> uit"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Vee <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> uit"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Vee <xliff:g id="DATA_KIND">%s</xliff:g> uit"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto van <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> af is nie gemerk nie"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto van <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> af is gemerk"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto van onbekende rekening af is nie gemerk nie"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto van onbekende rekening af is gemerk"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Voorstelle"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Kanselleer uitvoer van <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Kon nie vCard invoer/uitvoer kanselleer nie"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Onbekende fout"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Kon nie \"<xliff:g id="FILE_NAME">%s</xliff:g>\" open nie: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Kon nie \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" open nie: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Kon nie die uitvoerder aktiveer nie: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Daar is geen uitvoerbare kontak nie."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Jy het \'n vereiste toestemming gedeaktiveer."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontak ontvang via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Voer kontakte uit?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Kas tans..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Voer <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> in: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Voer <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> in: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Voer uit na .vcf-lêer"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Rangskik volgens"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Voornaam"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Vee uit"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellips"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> s."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> uur <xliff:g id="MINUTES_1">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min. <xliff:g id="SECONDS">%2$s</xliff:g> s."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> uur <xliff:g id="MINUTES_1">%2$s</xliff:g> min. <xliff:g id="SECONDS">%3$s</xliff:g> sek."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Hierdie kortpad is gedeaktiveer."</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontak is verwyder"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Voer in"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Geen verbinding nie"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Wys meer"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Klaar SIM-kaart ingevoer"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Kon nie SIM-kaart invoer nie"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Voer tans SIM in"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 146536e..ee944fd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> እውቂያዎች</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> እውቂያዎች · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> እውቂያዎች · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> እውቂያዎች · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> እውቂያዎች · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"ከGoogle"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"ከ<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"ጥሪ መልስ"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"<xliff:g id="EMAIL">%s</xliff:g> ወደ እውቅያዎች ዝርዝር ይታከል"</string>
<string name="description_plus_button" msgid="515164827856229880">"ተጨማሪ"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> ከ <xliff:g id="TOTAL_NUMBER">%s</xliff:g> እውቂያዎች"</string>
<string name="search_settings_description" msgid="2675223022992445813">"የዕውቂያዎችዎ ስሞች"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ይህን እርምጃ ለማስተናገድ ምንም መተግበሪያ አልተገኘም፡፡"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ወደ ቀዳሚው ማያ ገጽ ለመመለስ ጠቅ ያድርጉ"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ዛሬ"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"ዛሬ <xliff:g id="TIME_INTERVAL">%s</xliff:g> ላይ"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"ነገ <xliff:g id="TIME_INTERVAL">%s</xliff:g> ላይ"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>፣ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>፣ <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ርዕስ-አልባ ክስተት)"</string>
<string name="date_time_set" msgid="4761419824439606690">"አዘጋጅ"</string>
<string name="header_im_entry" msgid="3581720979640225615">"ፈጣን መልዕክት"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"የእውቂያ አርታዒን ለመዘርጋት ጠቅ ያድርጉ።"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"የእውቂያ አርታዒን ለመሰብሰብ ጠቅ ያድርጉ።"</string>
<string name="content_description_directions" msgid="2686791825798189335">"ወደ አካባቢ የሚወስዱ አቅጣጫዎች"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"የቅርብ ጊዜ ኤስኤምኤስ። <xliff:g id="MESSAGE_BODY">%s</xliff:g>። <xliff:g id="PHONE_NUMBER">%s</xliff:g>። <xliff:g id="DATE">%s</xliff:g>። ምላሽ ለመስጠት ጠቅ ያድርጉ"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"የቅርብ ጊዜ ኤስኤምኤስ። <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>። <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>። <xliff:g id="DATE">%3$s</xliff:g>። ምላሽ ለመስጠት ጠቅ ያድርጉ"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ገቢ"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ወጪ"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ያመለጡ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"የቅርብ ጊዜ ጥሪ። <xliff:g id="CALL_TYPE">%s</xliff:g>። <xliff:g id="PHONE_NUMBER">%s</xliff:g>። <xliff:g id="DATE">%s</xliff:g>። መልሰው ለመደወል ጠቅ ያድርጉ"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"የቅርብ ጊዜ ጥሪ። <xliff:g id="CALL_TYPE">%1$s</xliff:g>። <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>። <xliff:g id="DATE">%3$s</xliff:g>። መልሰው ለመደወል ጠቅ ያድርጉ"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"እርስዎ፦ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"የግለሰቡን የHangouts ለይቶ አዋቂ ወደ ኢሜይል መስኩ ወይም የስልክ መስኩ በሚያስገቡበት ጊዜ Hangouts በተሻለ ሁኔታ ይሰራል።"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"ተጨማሪ መስኮች"</string>
@@ -312,7 +311,6 @@
<item quantity="other">የተገናኙ እውቂያዎች (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> የተገናኙ እውቂያዎች"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ዕውቂያዎችን አገናኝ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ይቅር"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ይህ እውቂያ"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ሊሆኑ የሚችሉ ድግምግሞሽ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ይህ እውቂያ ተመሳሳይ ሰው ሊሆን ይችላል። እንደ ነጠላ እውቂያ በአንድ ላይ ሊያገናኙዋቸው ይችላሉ።"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"ከእርስዎ መለያዎች"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ፎቶ ይምረጡ"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"ከ<xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>ን ሰርዝ"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>ን ሰርዝ"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g>ን ሰርዝ"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"ከ<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> የመጣ ፎቶ አልተረጋገጠም"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"ከ<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> የመጣ ፎቶ ተረጋግጧል"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"ካልታወቀ መለያ የመጣ ፎቶ ምልክት አልተደረገበትም"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"ካልታወቀ መለያ የመጣ ፎቶ ምልክት ተደርጎበታል"</string>
<string name="menu_assistant" msgid="5760693735722052454">"ጥቆማዎች"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"የ<xliff:g id="FILENAME">%s</xliff:g> ወደ ውጭ መላክ ይቅር?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard ማስመጣት/ወደ ውጪ መላክ ይቅር ማለት አልተቻለም"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"ያልታወቀ ስህተት"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ፡<xliff:g id="EXACT_REASON">%s</xliff:g> መክፈት አልተቻለም"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ፡<xliff:g id="EXACT_REASON">%2$s</xliff:g> መክፈት አልተቻለም"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"ላኪው፡\"<xliff:g id="EXACT_REASON">%s</xliff:g>\" ለማስነሳት አልተቻለም"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ምንም ወደ ውጭ መላክ የሚችል ዕውቂያ የለም"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"አንድ የሚያስፈልግ ፈቃድ አስወግደዋል።"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"በ NFC የደረሱ ዕውቂያዎች"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"እውቅያዎች ላክ"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"በመሸጎጥ ላይ"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"በማስገባት ላይ<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>፡<xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"በማስገባት ላይ<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>፡<xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"ወደ .vcf ፋይል ላክ"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ደርድር በ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"የራስ ስም"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"ሰርዝ"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"ሶስት ነጥብ"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> ሴ"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> ደቂቃ <xliff:g id="SECONDS">%s</xliff:g> ሴ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ሰዓት <xliff:g id="MINUTES_1">%s</xliff:g> ደቂቃ <xliff:g id="SECONDS">%s</xliff:g> ሴ"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> ደቂቃ <xliff:g id="SECONDS">%2$s</xliff:g> ሴ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ሰዓት <xliff:g id="MINUTES_1">%2$s</xliff:g> ደቂቃ <xliff:g id="SECONDS">%3$s</xliff:g> ሴ"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ይህ አቋራጭ ተወግዷል"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"እውቂያ ተወግዷል"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ከውጭ አምጣ"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"ምንም ግንኙነት የለም"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"ሲም"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"ተጨማሪ አሳይ"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"ሲም ካርድ ማምጣት ጨርሷል"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"ሲም ካርድ ማምጣት አልተቻለም"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ሲም በማምጣት ላይ"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 61feaf4..71fe805 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -91,12 +91,12 @@
<item quantity="one">جهة اتصال واحدة (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="zero"><xliff:g id="COUNT_2">%d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="two"><xliff:g id="COUNT_2">%d</xliff:g> جهتا اتصال · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> جهات اتصال · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="zero"><xliff:g id="COUNT_2">%1$d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="two"><xliff:g id="COUNT_2">%1$d</xliff:g> جهتا اتصال · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> جهات اتصال · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> جهة اتصال · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"من Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"من <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -187,7 +187,6 @@
<string name="returnCall" msgid="8171961914203617813">"معاودة اتصال بمكالمة فائتة"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"هل ترغب في إضافة \"<xliff:g id="EMAIL">%s</xliff:g>\" إلى جهات الاتصال؟"</string>
<string name="description_plus_button" msgid="515164827856229880">"علامة زائد"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> من <xliff:g id="TOTAL_NUMBER">%s</xliff:g> من جهات الاتصال"</string>
<string name="search_settings_description" msgid="2675223022992445813">"أسماء جهات الاتصال"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"لم يتم العثور على تطبيق يمكنه مباشرة هذا الإجراء."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"انقر للرجوع إلى الشاشة السابقة"</string>
@@ -303,7 +302,7 @@
<string name="today" msgid="8041090779381781781">"اليوم"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"اليوم في <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"غدًا في <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>، <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>، <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(حدث بدون اسم)"</string>
<string name="date_time_set" msgid="4761419824439606690">"تعيين"</string>
<string name="header_im_entry" msgid="3581720979640225615">"المراسلة الفورية"</string>
@@ -320,11 +319,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"يمكنك النقر لتوسيع محرر جهات الاتصال."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"يمكنك النقر لتصغير محرر جهات الاتصال."</string>
<string name="content_description_directions" msgid="2686791825798189335">"الاتجاهات إلى الموقع"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"رسائل SMS الأخيرة. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. انقر للرد"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"رسائل SMS الأخيرة. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. انقر للرد"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"الواردة"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"الصادرة"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"الفائتة"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"المكالمة الأخيرة. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. انقر لمعاودة الاتصال"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"المكالمة الأخيرة. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. انقر لمعاودة الاتصال"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"أنت: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"تعمل Hangouts بشكل أفضل عند إدخال معرف الشخص في Hangouts في حقل البريد الإلكتروني أو حقل الهاتف."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"المزيد من الحقول"</string>
@@ -344,7 +343,6 @@
<item quantity="one">جهة اتصال مرتبطة</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> جهة اتصال مرتبطة"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ربط جهات الاتصال"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"إلغاء"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -371,7 +369,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"جهة الاتصال هذه"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"التكرارات المحتملة"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ربما تمثل جهات الاتصال هذه شخصًا واحدًا. يمكنك ربطها معًا كجهة اتصال واحدة."</string>
@@ -379,10 +376,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"من حساباتك"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"اختيار صورة"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"من <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"حذف <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"حذف <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"حذف <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"تم إلغاء تحديد صورة من <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"تم تحديد صورة من <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"لم يتم تحديد صورة من حساب غير معروف"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"تم تحديد صورة من حساب غير معروف"</string>
<string name="menu_assistant" msgid="5760693735722052454">"الاقتراحات"</string>
@@ -566,7 +561,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"هل تريد إلغاء تصدير <xliff:g id="FILENAME">%s</xliff:g>؟"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"تعذر إلغاء استيراد/تصدير vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"خطأ غير معروف."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"تعذر فتح \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"تعذر فتح \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"تعذر بدء المُصدر: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ليست هناك جهة اتصال قابلة للتصدير."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"لقد عطلت إذنًا مطلوبًا."</string>
@@ -608,7 +603,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"استلام ج اتص.NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"تصدير جهات الاتصال؟"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"تخزين مؤقت"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"استيراد <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"استيراد <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"تصدير إلى ملف vcf."</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ترتيب بحسب"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"الاسم الأول"</string>
@@ -677,8 +672,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"حذف"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"علامة حذف"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> دقيقة <xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ساعة <xliff:g id="MINUTES_1">%s</xliff:g> دقيقة <xliff:g id="SECONDS">%s</xliff:g> ثانية"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> دقيقة <xliff:g id="SECONDS">%2$s</xliff:g> ثانية"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ساعة <xliff:g id="MINUTES_1">%2$s</xliff:g> دقيقة <xliff:g id="SECONDS">%3$s</xliff:g> ثانية"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"تم تعطيل هذا الاختصار"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"تمت إزالة جهة الاتصال"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"استيراد"</string>
@@ -705,4 +700,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"لا اتصال"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"شريحة SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"عرض المزيد"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"انتهى استيراد شريحة SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"تعذر استيراد شريحة SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"استيراد SIM"</string>
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index a3f04d2..ea5feef 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google\'dan"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> hesabından"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Zəngi qaytarın"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" kontaktlara əlavə olunsun?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontaktdan <xliff:g id="CURRENT_NUMBER">%s</xliff:g> kontakt"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktlarınızın adları"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Bu əməliyyatı idarə etmək üçün heç bir tətbiq tapılmadı."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Öncəki ekrana qayıtmaq üçün klikləyin"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Bu gün"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Bu gün saat <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Sabah saat <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Başlıqsız tədbir)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Ayarlayın"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Əlaqə redaktorunu genişləndirmək üçün klikləyin."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Əlaqə redaktorunu yığışdırmaq üçün klikləyin."</string>
<string name="content_description_directions" msgid="2686791825798189335">"məkana istiqamətlər"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"son sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. cavab üçün klikləyin"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"son sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. cavab üçün klikləyin"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"gələn"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"gedən"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"buraxılmış"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"son çağrı. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. zəng etmək üçün klikləyin"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"son çağrı. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. zəng etmək üçün klikləyin"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Siz hər hansı bir şəxsin Görüşlə bağlı identifikatorlarını e-poçt sahəsi və ya telefon sahəsinə daxil edəndə, Görüş yerləri daha yaxşı işləyir."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Daha çox sahə"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Əlaqələnmiş kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> əlaqələnmiş kontakt"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"KONTAKTLARI ƏLAQƏLƏNDİRİN"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"LƏĞV EDİN"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Bu kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mümkün dublikatlar"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Bu kontaktlar eyni şəxsə aid ola bilər. Onları bir kontaktda birləşdirə bilərsiniz."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Hesablarınızdan"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Foto seçin"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> hesabından"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> datasını silin"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> datasını silin"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> datasını silin"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>istifadəçisindən gələn foto yoxlanmadı"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> istifadəçisindən gələn foto yoxlandı"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Naməlum hesabdan olan foto yoxlanmadı"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Naməlum hesabdan olan foto yoxlandı"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Təkliflər"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> eksportu ləğv edilsin?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Vizit kart importunu/eksportunu ləğv etmək mümkün olmadı"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Naməlum xəta."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" açmaq olmadı: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" açmaq olmadı: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Eksporteri başlatmaq olmadı: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Eksport edilə bilən heç bir kontakt yoxdur."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Tələb olunan icazəni deaktiv etmisiniz."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt NFC üzərindən alınıb"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kontaktlar eksport olunsun?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Keşləndirilir"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"İmport edilir: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"İmport edilir: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf fayldan eksport edin"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sıralayın:"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Ad"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Silin"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellips"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> saniyə"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> dəq <xliff:g id="SECONDS">%s</xliff:g> san"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> saat <xliff:g id="MINUTES_1">%s</xliff:g> dəqiqə <xliff:g id="SECONDS">%s</xliff:g> saniyə"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> dəq <xliff:g id="SECONDS">%2$s</xliff:g> san"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> saat <xliff:g id="MINUTES_1">%2$s</xliff:g> dəqiqə <xliff:g id="SECONDS">%3$s</xliff:g> saniyə"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Bu qısayol deaktiv edildi"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt silindi"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"İmport"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Bağlantı yoxdur"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Daha çox göstərin"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM kartın importu tamamlandı"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM kartı import etmək olmadı"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM import edilir"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 62f283a..f2fbcb3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> контакт</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> контакт · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> контакт · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"От Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"От <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Отговаряне на обаждане"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Да се добави ли „<xliff:g id="EMAIL">%s</xliff:g>“ към контакти?"</string>
<string name="description_plus_button" msgid="515164827856229880">"плюс"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> от <xliff:g id="TOTAL_NUMBER">%s</xliff:g> контакта"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Имена на контактите ви"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Не бе намерено приложение за извършване на това действие."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Кликнете за връщане към предишния екран"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Днес"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Днес от <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Утре от <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Неозаглавено събитие)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Задаване"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Незабавно съобщение"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Кликнете за разгъване на редактора за контакти."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Кликнете за свиване на редактора за контакти."</string>
<string name="content_description_directions" msgid="2686791825798189335">"упътвания до местоположението"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Скорошен SMS. „<xliff:g id="MESSAGE_BODY">%s</xliff:g>“ от <xliff:g id="PHONE_NUMBER">%s</xliff:g> на <xliff:g id="DATE">%s</xliff:g>. Кликнете за отговор"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Скорошен SMS. „<xliff:g id="MESSAGE_BODY">%1$s</xliff:g>“ от <xliff:g id="PHONE_NUMBER">%2$s</xliff:g> на <xliff:g id="DATE">%3$s</xliff:g>. Кликнете за отговор"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"входящо"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"изходящо"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропуснато"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Скорошно обаждане (<xliff:g id="CALL_TYPE">%s</xliff:g>) от <xliff:g id="PHONE_NUMBER">%s</xliff:g> на <xliff:g id="DATE">%s</xliff:g>. Кликнете за обратно обаждане"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Скорошно обаждане (<xliff:g id="CALL_TYPE">%1$s</xliff:g>) от <xliff:g id="PHONE_NUMBER">%2$s</xliff:g> на <xliff:g id="DATE">%3$s</xliff:g>. Кликнете за обратно обаждане"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Вие: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts работи по-добре, когато въведете съответния идентификатор на човека в полето за имейл или телефон."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Още полета"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Свързан контакт</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> свързани контакта"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"СВЪРЗВАНЕ НА КОНТАКТИТЕ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ОТКАЗ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Този контакт"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Възможни дубликати"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Тези контакти може да са един и същи човек. Можете да ги свържете в един."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"От профилите ви"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Избиране на снимка"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"От <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Изтриване на <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Изтриване на <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Изтриване на <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Снимката от <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> е без отметка"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Снимката от <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> е с отметка"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Неизбрана снимка от неизвестен профил"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Избрана снимка от неизвестен профил"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Предложения"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Да се анулира ли експортирането на <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Импорт./експорт. не можа да се анулира"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Неизвестна грешка."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"„<xliff:g id="FILE_NAME">%s</xliff:g>“ не можа да се отвори: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"„<xliff:g id="FILE_NAME">%1$s</xliff:g>“ не можа да се отвори: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Експортирането не можа да започне: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Няма контакт, позволяващ експортиране."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Деактивирахте задължително разрешение."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Контакт: Получ. чрез NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Да се експортират ли контактите?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кешира се"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Импортира се <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Импортира се <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Експорт като .vcf файл"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Сортиране по"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Собствено име"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Изтриване"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Многоточие"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ч <xliff:g id="MINUTES_1">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> мин <xliff:g id="SECONDS">%2$s</xliff:g> сек"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ч <xliff:g id="MINUTES_1">%2$s</xliff:g> мин <xliff:g id="SECONDS">%3$s</xliff:g> сек"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Този пряк път е деактивиран"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Контактът бе премахнат"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Импортиране"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Няма връзка"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM карта"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Показване на още"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Импортирането от SIM картата завърши"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Импортирането от SIM картата не успя"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импортира се от SIM картата"</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 6aa57bf..6794bc9 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি পরিচিতি</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g>টি পরিচিতি · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g>টি পরিচিতি · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g>টি পরিচিতি · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g>টি পরিচিতি · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google থেকে"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> থেকে"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"মিস হয়ে যওয়া নম্বরে পুনরায় কল করুন"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"পরিচিতিগুলিতে <xliff:g id="EMAIL">%s</xliff:g> যোগ করবেন?"</string>
<string name="description_plus_button" msgid="515164827856229880">"যোগ চিহ্ন"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g>টির মধ্যে <xliff:g id="CURRENT_NUMBER">%s</xliff:g>টি পরিচিতি"</string>
<string name="search_settings_description" msgid="2675223022992445813">"আপনার পরিচিতিগুলির নামগুলি"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"এই ক্রিয়াটিকে চালনা করার জন্য কোনো অ্যাপ্লিকেশান পাওয়া যায়নি৷"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"পূর্ববর্তী স্ক্রীনে প্রত্যাবর্তন করার জন্য ক্লিক করুন"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"আজ"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"আজ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"আগামীকাল <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(শিরোনামহীন ইভেন্ট)"</string>
<string name="date_time_set" msgid="4761419824439606690">"সেট করুন"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"পরিচিতি সম্পাদক প্রসারিত করতে ক্লিক করুন৷"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"পরিচিতি সম্পাদক সঙ্কুচিত করতে ক্লিক করুন৷"</string>
<string name="content_description_directions" msgid="2686791825798189335">"অবস্থান জানার দিকনির্দেশ"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"সাম্প্রতিক sms৷ <xliff:g id="MESSAGE_BODY">%s</xliff:g>৷ <xliff:g id="PHONE_NUMBER">%s</xliff:g>৷ <xliff:g id="DATE">%s</xliff:g>৷ প্রতিক্রিয়া জানাতে ক্লিক করুন"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"সাম্প্রতিক sms৷ <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>৷ <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>৷ <xliff:g id="DATE">%3$s</xliff:g>৷ প্রতিক্রিয়া জানাতে ক্লিক করুন"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"আগত"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"আউটগোয়িং"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"মিস করা"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"সাম্প্রতিক কল৷ <xliff:g id="CALL_TYPE">%s</xliff:g>৷ <xliff:g id="PHONE_NUMBER">%s</xliff:g>৷ <xliff:g id="DATE">%s</xliff:g>৷ ঘুরিয়ে কল করতে ক্লিক করুন"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"সাম্প্রতিক কল৷ <xliff:g id="CALL_TYPE">%1$s</xliff:g>৷ <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>৷ <xliff:g id="DATE">%3$s</xliff:g>৷ ঘুরিয়ে কল করতে ক্লিক করুন"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"আপনি: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"আপনি যখন ইমেল বা ফোন নম্বর লেখার ক্ষেত্রটিতে ব্যক্তির Hangouts সনাক্তকারী লেখেন তখন Hangouts আরো ভালো কাজ করে৷"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"আরো ফিল্ড"</string>
@@ -312,7 +311,6 @@
<item quantity="other">লিঙ্ক করা পরিচিতিগুলি (<xliff:g id="COUNT">%d</xliff:g>টি)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g>টি লিঙ্ক করা পরিচিতি"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"পরিচিতি লিঙ্ক করুন"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"বাতিল করুন"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>টি)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>টি)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"এই পরিচিতি"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"সম্ভাব্য সদৃশগুলি"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"এই পরিচিতিগুলি একই ব্যক্তির হতে পারে৷ আপনি সেগুলিকে একটি একক পরিচিতি হিসাবে লিঙ্ক করতে পারবেন৷"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"আপনার অ্যাকাউন্টগুলি থেকে"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ফটো বেছে নিন"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> থেকে"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> মুছুন"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> মুছুন"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> মুছুন"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> এর থেকে ফটো পরীক্ষা করা হয়নি"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> এর থেকে ফটো পরীক্ষা করা হয়েছে"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"অজানা অ্যাকাউন্টের ফটোতে টিক চিহ্ন দেওয়া হয়নি"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"অজানা অ্যাকাউন্টের ফটোতে টিক চিহ্ন দেওয়া হয়েছে"</string>
<string name="menu_assistant" msgid="5760693735722052454">"প্রস্তাবনা"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> এর রপ্তানি বাতিল করবেন?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard এর আমদানি/রপ্তানি বাতিল করা যায়নি"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"অজানা ত্রুটি৷"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" খোলা যায়নি: <xliff:g id="EXACT_REASON">%s</xliff:g>৷"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" খোলা যায়নি: <xliff:g id="EXACT_REASON">%2$s</xliff:g>৷"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"রপ্তানিকারক শুরু করা যায়নি: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"৷"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"রফতানিযোগ্য কোনো পরিচিতি নেই৷"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"আপনি একটি প্রয়োজনীয় অনুমতি অক্ষম করেছেন৷"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC এর মাধ্যমে পরিচিতি প্রাপ্ত হয়েছে"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"পরিচিতিগুলি রপ্তানি করবেন?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ক্যাশ করা হচ্ছে"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"আমদানি করা হচ্ছে, <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"আমদানি করা হচ্ছে, <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ফাইলে রপ্তানি করুন"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"এই অনুসারে সাজান"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"প্রথম নাম"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"মুছুন"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"এলিপসিস"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> সেকেন্ড"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> মিনিট <xliff:g id="SECONDS">%s</xliff:g> সেকেন্ড"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ঘণ্টা <xliff:g id="MINUTES_1">%s</xliff:g> মিনিট <xliff:g id="SECONDS">%s</xliff:g> সেকেন্ড"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> মিনিট <xliff:g id="SECONDS">%2$s</xliff:g> সেকেন্ড"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ঘণ্টা <xliff:g id="MINUTES_1">%2$s</xliff:g> মিনিট <xliff:g id="SECONDS">%3$s</xliff:g> সেকেন্ড"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"এই শর্টকাটটি অক্ষম করা হয়েছে"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"পরিচিতিটি সরানো হয়েছে"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"আমদানি করুন"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"কোনো সংযোগ নেই"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"আরো দেখান"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM কার্ড আমদানি করা সমাপ্ত হয়েছে"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM কার্ড আমদানি করা গেল না"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM আমদানি করা হচ্ছে"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f9e4297..a8089bb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacte</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contactes · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacte · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactes · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacte · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"De Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"De <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Retorna la trucada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Voleu afegir \"<xliff:g id="EMAIL">%s</xliff:g>\" als contactes?"</string>
<string name="description_plus_button" msgid="515164827856229880">"més"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contactes"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Noms dels contactes"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No s\'ha trobat cap aplicació per processar aquesta acció."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Fes clic per tornar a la pantalla anterior"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Avui"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Avui a les <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Demà a les <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Esdeveniment sense títol)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Estableix"</string>
<string name="header_im_entry" msgid="3581720979640225615">"MI"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Fes clic per desplegar l\'editor de contactes."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Fes clic per replegar l\'editor de contactes."</string>
<string name="content_description_directions" msgid="2686791825798189335">"indicacions cap a la ubicació"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS recent. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Fes clic per respondre."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS recent. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Fes clic per respondre."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrant"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"sortints"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdudes"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Trucada recent. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Fes clic per tornar la trucada."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Trucada recent. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Fes clic per tornar la trucada."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Usuari: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona millor si introdueixes l\'identificador de Hangouts de la persona corresponent al camp de l\'adreça electrònica o del telèfon."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Més camps"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Contacte enllaçat</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contactes enllaçats"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ENLLAÇA ELS CONTACTES"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCEL·LA"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Aquest contacte"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possibles duplicats"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"És possible que aquests contactes corresponguin a la mateixa persona. Els pots enllaçar i crear un contacte únic."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Dels teus comptes"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Tria una foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Del compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Suprimeix <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Suprimeix <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Suprimeix <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto del compte <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> no seleccionada"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto del compte <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> seleccionada"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"No s\'ha seleccionat la foto d\'un compte desconegut"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"S\'ha seleccionat la foto d\'un compte desconegut"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggeriments"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Vols cancel·lar l\'exportació de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"No es pot cancel·lar la imp./exp. vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"S\'ha produït un error desconegut."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"No s\'ha pogut obrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"No s\'ha pogut obrir \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"No s\'ha pogut iniciar l\'exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"No hi ha cap contacte que es pugui exportar."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Has desactivat un permís obligatori."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contac. reb. NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportació contactes"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Desament a la memòria cau"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"S\'està important <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"S\'està important <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exporta a un fitxer .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordena per"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nom"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Suprimeix"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Punts suspensius"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> hr <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> hr <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Aquesta drecera s\'ha desactivat"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"El contacte s\'ha suprimit"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importa"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Sense connexió"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostra més"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importació de la targeta SIM completada"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"No s\'ha pogut importar de la targeta SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"S\'estan important els contactes de la SIM"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 674e45e..47b7841 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -87,10 +87,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> kontakty · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontaktů · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakty · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktů · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Z účtu Googlu"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Z účtu služby <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"Zpětné volání"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Chcete přidat „<xliff:g id="EMAIL">%s</xliff:g>“ do kontaktů?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> z <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontaktů"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Jména vašich kontaktů"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aplikace potřebná k provedení této akce nebyla nalezena."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknutím se vrátíte na předchozí obrazovku"</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"Dnes"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Dnes v <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Zítra v <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Událost bez názvu)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Nastavit"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Chat"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kliknutím rozbalíte editor kontaktů."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kliknutím sbalíte editor kontaktů."</string>
<string name="content_description_directions" msgid="2686791825798189335">"trasy k místům"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"nedávná sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknutím odpovíte"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"nedávná sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknutím odpovíte"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"příchozí"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"odchozí"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"zmeškaný"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"nedávný hovor. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknutím zavoláte zpět"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"nedávný hovor. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknutím zavoláte zpět"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Vy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Aplikace Hangouts funguje lépe, když do pole pro e-mail nebo pro telefon zadáte identifikátor osoby ve službě Hangouts."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Další pole"</string>
@@ -328,7 +327,6 @@
<item quantity="one">Propojený kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Počet propojených kontaktů: <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"PROPOJIT KONTAKTY"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ZRUŠIT"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Tento kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Možná duplicita"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Tyto kontakty možná reprezentují stejného člověka. Můžete je propojit a vytvořit z nich jeden kontakt."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Z vašich účtů"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Výběr fotky"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Z účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Smazat <xliff:g id="DATA_KIND">%s</xliff:g> (<xliff:g id="DATA_TYPE">%s </xliff:g>)"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Smazat <xliff:g id="DATA_KIND">%2$s</xliff:g> (<xliff:g id="DATA_TYPE">%1$s </xliff:g>)"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Smazat <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Fotka z účtu <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> není vybrána"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Vybrána fotka z účtu <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Fotka z neznámého účtu nebyla vybrána"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Fotka z neznámého účtu byla vybrána"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Návrhy"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Zrušit export souboru <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Import/export vizitky vCard nelze zrušit"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Neznámá chyba."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Soubor <xliff:g id="FILE_NAME">%s</xliff:g> nelze otevřít: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Soubor <xliff:g id="FILE_NAME">%1$s</xliff:g> nelze otevřít: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nelze spustit nástroj pro export: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Žádný kontakt nelze exportovat."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Zakázali jste nutné oprávnění."</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt přijatý přes NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportovat kontakty?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Ukládání do mezipaměti"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Probíhá import: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Probíhá import: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportovat do souboru VCF"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Řadit podle"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Jméno"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Smazat"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Tři tečky"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Tato zkratka byla deaktivována"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt byl odebrán"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importovat"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nejste připojeni"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM karta"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Zobrazit více"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Import ze SIM karty byl dokončen"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Ze SIM karty se nepodařilo importovat"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importování ze SIM karty"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7a7831a..6bbe570 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kontaktpersoner</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> kontaktperson · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontaktpersoner · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktperson · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktpersoner · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Fra Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Fra <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Ring tilbage"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Føj \"<xliff:g id="EMAIL">%s</xliff:g>\" til kontaktpersoner?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> af <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontakter"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Navne på dine kontakter"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Der blev ikke fundet nogen app, der kan håndtere denne handling."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik for at gå tilbage til forrige skærmbillede"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"I dag"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"I dag kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"I morgen kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Ikke-navngiven begivenhed)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Angiv"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Chat"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klik for at udvide værktøjet til redigering af kontaktpersoner."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klik for at skjule værktøjet til redigering af kontaktpersoner."</string>
<string name="content_description_directions" msgid="2686791825798189335">"rutevejledning til placering"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"seneste sms-besked. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Klik for at svare"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"seneste sms-besked. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Klik for at svare"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"indgående"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"udgående"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ubesvarede"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"seneste opkald. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Klik for at ringe tilbage"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"seneste opkald. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Klik for at ringe tilbage"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Dig: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts fungerer bedre, når du indtaster personens Hangouts-id i e-mailfeltet eller telefonfeltet."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Flere felter"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Sammenflettede kontaktpersoner (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> sammenflettede kontaktpersoner"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"SAMMENFLET KONTAKTPERSONER"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANNULLER"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Denne kontaktperson"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mulige dubletter"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Disse kontaktpersoner kan være den samme person. Du kan sammenflette dem til én enkelt kontaktperson."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Fra dine konti"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Vælg billede"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Fra <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Slet <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Slet <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Slet <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Billede fra <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> er ikke valgt"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Billede fra <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> er valgt"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Der er ikke markeret et billede fra en ukendt konto"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Et billede fra en ukendt konto er markeret"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Forslag"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Vil du annullere eksport af <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Import/eksport af vCard kunne ikke annulleres"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Ukendt fejl."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" kunne ikke åbnes: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" kunne ikke åbnes: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Eksportfunktionen kunne ikke startes: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Der er ingen kontaktpersoner, der kan eksporteres."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Du har deaktiveret en påkrævet tilladelse."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksporter kontakter?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Cachelagrer"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importerer <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importerer <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksportér til .vcf-fil"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortér efter"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Fornavn"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Slet"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipse"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> t. <xliff:g id="MINUTES_1">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min. <xliff:g id="SECONDS">%2$s</xliff:g> sek."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> t. <xliff:g id="MINUTES_1">%2$s</xliff:g> min. <xliff:g id="SECONDS">%3$s</xliff:g> sek."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Denne genvej er blevet deaktiveret"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontaktpersonen blev fjernet"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importér"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Der er ingen forbindelse"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM-kort"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Vis flere"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM-kortet blev importeret"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM-kortet kunne ikke importeres"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kortet importeres"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8edb126..b200e63 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> Kontakte · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> Kontakte · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Von Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Von <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Zurückrufen"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" zu den Kontakten hinzufügen?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> von <xliff:g id="TOTAL_NUMBER">%s</xliff:g> Kontakten"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Namen meiner Kontakte"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Für diese Aktion wurde keine App gefunden."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klicke hier, um zum vorherigen Bildschirm zurückzukehren."</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Heute"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Heute um <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Morgen um <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Unbenannter Termin)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Festlegen"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Chat"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Zum Maximieren des Kontakteditors klicken"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Zum Minimieren des Kontakteditors klicken"</string>
<string name="content_description_directions" msgid="2686791825798189335">"Wegbeschreibung"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Letzte SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Zum Antworten klicken."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Letzte SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Zum Antworten klicken."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"Eingehend"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"Ausgehend"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"Verpasst"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Letzter Anruf. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Für Rückruf klicken."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Letzter Anruf. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Für Rückruf klicken."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ich: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funktioniert besser, wenn du die Hangouts-ID der Person in das E-Mail- oder Telefonfeld eingibst."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Weitere Felder"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Verknüpfter Kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> verknüpfte Kontakte"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"Kontakte verknüpfen"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"Abbrechen"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Dieser Kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mögliche Duplikate"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Bei diesen Kontakten könnte es sich um dieselbe Person handeln. Du kannst sie zu einem einzigen Kontakt verknüpfen."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Aus meinen Konten"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Foto auswählen"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Von <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> löschen"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> löschen"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> löschen"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto von <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>nicht ausgewählt"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto von <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>ausgewählt"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto aus unbekanntem Konto nicht ausgewählt"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto aus unbekanntem Konto ausgewählt"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Vorschläge"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Export von <xliff:g id="FILENAME">%s</xliff:g> abbrechen?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard-Import/-Export nicht abgebrochen"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Unbekannter Fehler"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" konnte nicht geöffnet werden: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" konnte nicht geöffnet werden: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Exportprogramm konnte nicht gestartet werden: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Es ist kein exportierbarer Kontakt vorhanden."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Du hast eine erforderliche Berechtigung deaktiviert."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt erhalten per NCF"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kontakte exportieren?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Caching läuft..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> wird importiert: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> wird importiert: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"In VCF-Datei exportieren"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortieren nach"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Vorname"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Löschen"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Auslassungszeichen"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Diese Verknüpfung wurde deaktiviert"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt wurde entfernt"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importieren"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Keine Verbindung"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mehr anzeigen"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importieren der SIM-Karte abgeschlossen"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM-Karte konnte nicht importiert werden"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM wird importiert"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 81cba9d..864164c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> επαφή</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> επαφές · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> επαφή · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> επαφές · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> επαφή · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Από την Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Από: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Επιστροφή κλήσης"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Προσθήκη του \"<xliff:g id="EMAIL">%s</xliff:g>\" στις επαφές?"</string>
<string name="description_plus_button" msgid="515164827856229880">"συν"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> από <xliff:g id="TOTAL_NUMBER">%s</xliff:g> επαφές"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Ονόματα των επαφών σας"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Δεν βρέθηκε εφαρμογή για τη διαχείριση αυτής της ενέργειας."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Κάντε κλικ για να επιστρέψετε στην προηγούμενη οθόνη"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Σήμερα"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Σήμερα στις <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Αύριο στις <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Εκδήλωση χωρίς τίτλο)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Ορισμός"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Ανταλλαγή άμεσων μηνυμάτων (IM)"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Κάντε κλικ για επέκταση της επεξεργασίας επαφών."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Κάντε κλικ για σύμπτυξη της επεξεργασίας επαφών."</string>
<string name="content_description_directions" msgid="2686791825798189335">"οδηγίες προς την τοποθεσία"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"πρόσφατο sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. κάντε κλικ για απάντηση"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"πρόσφατο sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. κάντε κλικ για απάντηση"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"εισερχόμενες"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"εξερχόμενες"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"αναπάντητες"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"πρόσφατη κλήση. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. κάντε κλικ για επιστροφή της κλήσης"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"πρόσφατη κλήση. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. κάντε κλικ για επιστροφή της κλήσης"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Εσείς: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Το Hangouts λειτουργεί καλύτερα όταν εισάγετε το αναγνωριστικό Hangouts του ατόμου στο πεδίο ηλεκτρονικού ταχυδρομείου ή τηλεφώνου."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Περισσότερα πεδία"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Συνδεδεμένη επαφή</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> συνδεδεμένες επαφές"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ΣΥΝΔΕΣΗ ΕΠΑΦΩΝ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ΑΚΥΡΩΣΗ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Αυτή η επαφή"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Πιθανά διπλότυπα"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Αυτές οι επαφές μπορεί να αντιστοιχούν στο ίδιο άτομο. Μπορείτε να τις συνδέσετε σε μία μεμονωμένη επαφή."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Από τους λογαριασμούς σας"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Επιλογή φωτογραφίας"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Από <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Διαγραφή <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Διαγραφή <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Διαγραφή <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Δεν επιλέχθηκε φωτογραφία από <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Επιλέχθηκε φωτογραφία από <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Δεν επιλέχθηκε φωτογραφία από άγνωστο λογαριασμό"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Επιλέχθηκε φωτογραφία από άγνωστο λογαριασμό"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Προτάσεις"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Να ακυρωθεί η εξαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g>;"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Αδ.ακύρ.εισαγ./εξαγ.vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Άγνωστο σφάλμα."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Δεν ήταν δυνατό το άνοιγμα του αρχείου \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Δεν ήταν δυνατό το άνοιγμα του αρχείου \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Δεν ήταν δυνατή η έναρξη του εξαγωγέα: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Δεν υπάρχει επαφή με δυνατότητα εξαγωγής."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Απενεργοποιήσατε μια απαιτούμενη άδεια."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Λήψ.επ.μέσω ΕΚΠ"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Εξαγωγή επαφών;"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Προσωρινή αποθήκευση"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Εισαγωγή <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Εισαγωγή <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Εξαγωγή σε αρχείο .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ταξινόμηση κατά"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Όνομα"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Πλήκτρο Delete"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Αποσιωπητικά"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> δ."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> λ <xliff:g id="SECONDS">%s</xliff:g> δ."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ώ. <xliff:g id="MINUTES_1">%s</xliff:g> λ. <xliff:g id="SECONDS">%s</xliff:g> δ."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> λ <xliff:g id="SECONDS">%2$s</xliff:g> δ."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ώ. <xliff:g id="MINUTES_1">%2$s</xliff:g> λ. <xliff:g id="SECONDS">%3$s</xliff:g> δ."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Η συντόμευση απενεργοποιήθηκε"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Η επαφή καταργήθηκε"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Εισαγωγή"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Δεν υπάρχει σύνδεση"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Εμφάνιση περισσότερων"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Ολοκληρώθηκε εισαγωγή από κάρτα SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Μη δυνατή εισαγωγή από κάρτα SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Εισαγωγή από SIM"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 2a2a8c0..319ebab 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"From Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"From <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Return call"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Add \"<xliff:g id="EMAIL">%s</xliff:g>\" to contacts?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> of <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contacts"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Names of your contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No app was found to handle this action."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Click to return to previous screen"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Today"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Today at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Tomorrow at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Untitled event)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Set"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Click to expand contact editor."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Click to collapse contact editor."</string>
<string name="content_description_directions" msgid="2686791825798189335">"directions to location"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"recent SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to respond"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"recent SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. click to respond"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"incoming"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"outgoing"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"missed"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"recent call. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to call back"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"recent call. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. click to call back"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"You: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"More fields"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Linked contact</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> linked contacts"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LINK CONTACTS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCEL"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"This contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possible duplicates"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"These contacts might be the same person. You can link them together as a single contact."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"From your accounts"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Choose photo"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"From <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Delete <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Delete <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Delete <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Photo from <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>not checked"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Photo from <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>checked"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Photo from unknown account not selected"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Photo from unknown account selected"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggestions"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Couldn\'t cancel vCard import/export"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Unknown error."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Couldn\'t open \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Couldn\'t open \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Couldn\'t start the exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"There is no exportable contact."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"You have disabled a required permission."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contact received over NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Export contacts?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Caching"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importing <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importing <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Export to .vcf file"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sort by"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"First name"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Delete"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipsis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> hr <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> sec"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> hr <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> sec"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"This shortcut has been disabled"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Contact was removed"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Import"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"No connection"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Show more"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Finished importing SIM card"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Couldn\'t import SIM card"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2a2a8c0..319ebab 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"From Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"From <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Return call"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Add \"<xliff:g id="EMAIL">%s</xliff:g>\" to contacts?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> of <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contacts"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Names of your contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No app was found to handle this action."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Click to return to previous screen"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Today"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Today at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Tomorrow at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Untitled event)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Set"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Click to expand contact editor."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Click to collapse contact editor."</string>
<string name="content_description_directions" msgid="2686791825798189335">"directions to location"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"recent SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to respond"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"recent SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. click to respond"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"incoming"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"outgoing"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"missed"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"recent call. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to call back"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"recent call. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. click to call back"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"You: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"More fields"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Linked contact</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> linked contacts"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LINK CONTACTS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCEL"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"This contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possible duplicates"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"These contacts might be the same person. You can link them together as a single contact."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"From your accounts"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Choose photo"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"From <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Delete <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Delete <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Delete <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Photo from <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>not checked"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Photo from <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>checked"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Photo from unknown account not selected"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Photo from unknown account selected"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggestions"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Couldn\'t cancel vCard import/export"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Unknown error."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Couldn\'t open \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Couldn\'t open \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Couldn\'t start the exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"There is no exportable contact."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"You have disabled a required permission."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contact received over NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Export contacts?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Caching"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importing <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importing <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Export to .vcf file"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sort by"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"First name"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Delete"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipsis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> hr <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> sec"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> hr <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> sec"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"This shortcut has been disabled"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Contact was removed"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Import"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"No connection"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Show more"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Finished importing SIM card"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Couldn\'t import SIM card"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2a2a8c0..319ebab 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"From Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"From <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Return call"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Add \"<xliff:g id="EMAIL">%s</xliff:g>\" to contacts?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> of <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contacts"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Names of your contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No app was found to handle this action."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Click to return to previous screen"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Today"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Today at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Tomorrow at <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Untitled event)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Set"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Click to expand contact editor."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Click to collapse contact editor."</string>
<string name="content_description_directions" msgid="2686791825798189335">"directions to location"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"recent SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to respond"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"recent SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. click to respond"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"incoming"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"outgoing"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"missed"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"recent call. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. click to call back"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"recent call. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. click to call back"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"You: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts works better when you enter the person\'s Hangouts identifier into the email field or phone field."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"More fields"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Linked contact</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> linked contacts"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LINK CONTACTS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCEL"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"This contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possible duplicates"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"These contacts might be the same person. You can link them together as a single contact."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"From your accounts"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Choose photo"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"From <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Delete <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Delete <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Delete <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Photo from <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>not checked"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Photo from <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>checked"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Photo from unknown account not selected"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Photo from unknown account selected"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggestions"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Couldn\'t cancel vCard import/export"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Unknown error."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Couldn\'t open \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Couldn\'t open \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Couldn\'t start the exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"There is no exportable contact."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"You have disabled a required permission."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contact received over NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Export contacts?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Caching"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importing <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importing <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Export to .vcf file"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sort by"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"First name"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Delete"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipsis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> hr <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> sec"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> hr <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> sec"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"This shortcut has been disabled"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Contact was removed"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Import"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"No connection"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Show more"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Finished importing SIM card"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Couldn\'t import SIM card"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importing SIM"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f0ed779..20d2446 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contactos <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"De Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"De <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Regresar llamada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"¿Deseas agregar \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos?"</string>
<string name="description_plus_button" msgid="515164827856229880">"más"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contactos"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nombres de tus contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No se encontró ninguna aplicación que pueda realizar esta acción."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Haz clic para volver a la pantalla anterior."</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hoy"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hoy a la hora <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Mañana a la hora <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento sin título)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Establecer"</string>
<string name="header_im_entry" msgid="3581720979640225615">"MI"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Haz clic aquí para expandir el editor de contacto."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Haz clic aquí para contraer el editor de contacto."</string>
<string name="content_description_directions" msgid="2686791825798189335">"instrucciones sobre cómo llegar a la ubicación"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS reciente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Haz clic para responder."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS reciente. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Haz clic para responder."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrante"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"realizada"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Llamada reciente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Haz clic para devolver la llamada."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Llamada reciente. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Haz clic para devolver la llamada."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Tú: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona mejor si ingresas el identificador de Hangouts de la persona en el campo de correo electrónico o teléfono."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Más campos"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Contacto vinculado</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contactos vinculados"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"VINCULAR CONTACTOS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCELAR"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Este contacto"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Posibles duplicados"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Es posible que estos contactos sean de la misma persona. Puedes vincularlos como un solo contacto."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"De tus cuentas"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Elegir foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Desde <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Borrar <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Borrar <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Borrar <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"No se seleccionó la foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Se seleccionó la foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"No se seleccionó la foto de una cuenta desconocida"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Se seleccionó la foto de una cuenta desconocida"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugerencias"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"¿Deseas cancelar la exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"No se canceló la impor./expor. de vCard."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Error desconocido"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"No se pudo abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"No se pudo abrir \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"No se pudo iniciar el exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"No hay contactos para exportar."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Inhabilitaste un permiso necesario."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contac recib NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"¿Exportar contactos?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Almacenando en caché"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportar al archivo .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordenar por"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nombre"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Borrar"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Elipsis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Este acceso directo se inhabilitó"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Se quitó el contacto"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importar"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Sin conexión"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostrar más"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Terminó la importación de la tarjeta SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"No se pudo importar la tarjeta SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando la tarjeta SIM"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 68e4e73..61211d3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"De Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"De <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Devolver llamada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"¿Quieres añadir \"<xliff:g id="EMAIL">%s</xliff:g>\" a Contactos?"</string>
<string name="description_plus_button" msgid="515164827856229880">"más"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contactos"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nombres de tus contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No se ha detectado ninguna aplicación que pueda hacer esta acción."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Haz clic para volver a la pantalla anterior"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hoy"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hoy a las <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Mañana a las <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento sin título)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Establecer"</string>
<string name="header_im_entry" msgid="3581720979640225615">"MI"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Haz clic para ampliar el editor de contactos."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Haz clic para contraer el editor de contactos."</string>
<string name="content_description_directions" msgid="2686791825798189335">"indicaciones para llegar a la ubicación"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms reciente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. haz clic para responder"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms reciente. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. haz clic para responder"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"recibida"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"realizada"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"llamada reciente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. haz clic para devolver la llamada"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"llamada reciente. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. haz clic para devolver la llamada"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Tú: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona mejor si se introduce el identificador de Hangouts de la persona en el campo del correo electrónico o en el campo del teléfono."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Más campos"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Contacto enlazado</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contactos enlazados"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"VINCULAR CONTACTOS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCELAR"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Este contacto"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Posibles duplicados"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Es posible que estos contactos se correspondan a la misma persona. Puedes enlazarlos y crear un único contacto."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"De tus cuentas"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Elegir foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"De <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Eliminar <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Eliminar <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Eliminar <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> no seleccionada"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> seleccionada"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"No se ha seleccionado una foto de una fuente desconocida"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Se ha seleccionado una foto de una fuente desconocida"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugerencias"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"¿Seguro que quieres cancelar la exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Error al cancelar la importación/exportación de vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Error desconocido"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"No se ha podido abrir el archivo \"<xliff:g id="FILE_NAME">%s</xliff:g>\" (<xliff:g id="EXACT_REASON">%s</xliff:g>)."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"No se ha podido abrir el archivo \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" (<xliff:g id="EXACT_REASON">%2$s</xliff:g>)."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"No se ha podido iniciar la exportación: (\"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"No hay contactos que exportar."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Has inhabilitado un permiso necesario."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contacto recibido por NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"¿Exportar contactos?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Almacenando en caché"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportar a archivo .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordenar por"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nombre"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Eliminar"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Puntos suspensivos"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Se ha inhabilitado este acceso directo"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"El contacto se ha eliminado"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importar"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"No hay conexión"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostrar más"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Se ha importado la tarjeta SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"No se ha podido importar la tarjeta SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se está importando la tarjeta SIM"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index cfd84d6..6e16b35 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontakti · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakti · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google\'ilt"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Kontolt <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Tagasihelistamine"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Kas lisada „<xliff:g id="EMAIL">%s</xliff:g>” kontaktidesse?"</string>
<string name="description_plus_button" msgid="515164827856229880">"pluss"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontaktist"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Teie kontaktide nimed"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Selle toimingu käsitsemiseks ei leitud ühtegi rakendust."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klõpsake eelmisele ekraanikuvale naasmiseks"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Täna"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Täna kell <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Homme kell <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Pealkirjata sündmus)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Määra"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Kiirsuhtlus"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klõpsake kontaktiredigeerija laiendamiseks."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klõpsake kontaktiredigeerija ahendamiseks."</string>
<string name="content_description_directions" msgid="2686791825798189335">"juhised asukohta"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"viimane SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klõpsake vastamiseks"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"viimane SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klõpsake vastamiseks"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"sissetulevad"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"väljaminevad"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"vastamata"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"viimane kõne. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klõpsake tagasihelistamiseks"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"viimane kõne. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klõpsake tagasihelistamiseks"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Teie: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts toimib paremini, kui sisestate isiku Hangoutsi koodi e-posti aadressi või telefoninumbri väljale."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Rohkem välju"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Lingitud kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> lingitud kontakti"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LINGI KONTAKTID"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"TÜHISTA"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"See kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Võimalikud duplikaadid"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Need kontaktid võivad olla sama isik. Saate need linkida üheks kontaktiks."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Teie kontodelt"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Foto valimine"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Kontolt <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Kustuta <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Kustuta <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Kustuta <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto kasutajalt <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> pole märgitud"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto kasutajalt <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> on märgitud"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Tundmatult kontolt pärinev foto pole märgitud"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Tundmatult kontolt pärinev foto on märgitud"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Soovitused"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Kas tühistada faili <xliff:g id="FILENAME">%s</xliff:g> eksportimine?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCardi impordi/ekspordi tühist. ebaõnn."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Tundmatu viga."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Faili „<xliff:g id="FILE_NAME">%s</xliff:g>” ei saa avada: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Faili „<xliff:g id="FILE_NAME">%1$s</xliff:g>” ei saa avada: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Eksportijat ei saa lähtestada: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Eksporditavad kontaktid puuduvad."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Olete nõutud loa keelanud."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt võeti vastu NFC kaudu"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksportida kontakt?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Vahemällu salvestamine"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importimine: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importimine: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksportimine VCF-faili"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortimisalus:"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Eesnimi"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Kustuta"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Mõttepunktid"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"See otsetee on keelatud"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt eemaldati"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Impordi"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Ühendus puudub"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM-kaart"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Kuva rohkem"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM-kaardi importimine viidi lõpule"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM-kaarti ei õnnestunud importida"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kaardi importimine"</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 2c2c25f..199dba8 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontaktu</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google-koak"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> kontukoak"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Itzuli deia"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" kontaktuetan gehitu?"</string>
<string name="description_plus_button" msgid="515164827856229880">"gehi"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontaktu"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktuen izenak"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ez da ekintza kudeatzeko aplikaziorik aurkitu."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Egin klik hemen aurreko pantailara itzultzeko"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Gaur"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Gaur (<xliff:g id="TIME_INTERVAL">%s</xliff:g>)"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Bihar (<xliff:g id="TIME_INTERVAL">%s</xliff:g>)"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g> (<xliff:g id="TIME_INTERVAL">%s</xliff:g>)"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g> (<xliff:g id="TIME_INTERVAL">%2$s</xliff:g>)"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Izenik gabeko gertaera)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Ezarri"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Egin klik kontaktuen editorea zabaltzeko."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Egin klik kontaktuen editorea tolesteko."</string>
<string name="content_description_directions" msgid="2686791825798189335">"kokapenerako jarraibideak"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"duela gutxiko SMSa. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. sakatu erantzuteko"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"duela gutxiko SMSa. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. sakatu erantzuteko"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"sarrerakoa"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"irteerakoa"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"galdua"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"duela gutxiko deia. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. sakatu deitzeko"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"duela gutxiko deia. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. sakatu deitzeko"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Zu: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts-ek hobeto funtzionatzen du pertsonaren Hangouts identifikatzailea idazten baduzu helbide elektronikoaren edo telefonoaren eremuan."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Eremu gehiago"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Lotutako kontaktua</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> kontaktu lotuta"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LOTU KONTAKTUAK"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"UTZI"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Kontaktu hau"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Baliteke bikoiztuak egotea"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Kontaktu hauek pertsona bera izan daitezke. Lotu egin ditzakezu, informazioa kontaktu bakarrean bilduta izateko."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Zure kontuetatik"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Aukeratu argazkia"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Kontua: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Ezabatu <xliff:g id="DATA_TYPE">%s </xliff:g> <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Ezabatu <xliff:g id="DATA_TYPE">%1$s </xliff:g> <xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Ezabatu <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Ez da hautatu <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> erabiltzailearen kontuko argazkia"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Hautatu da <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> erabiltzailearen kontuko argazkia"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Kontu ezezaguneko argazkia hautatu gabe dago"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Kontu ezezaguneko argazkia hautatu da"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Iradokizunak"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> fitxategiaren esportazioa bertan behera utzi nahi duzu?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Ezin da vCard inportazioa edo esportazioa utzi"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Errore ezezaguna."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Ezin izan da \"<xliff:g id="FILE_NAME">%s</xliff:g>\" ireki. Arrazoia: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Ezin izan da \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ireki. Arrazoia: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Ezin izan da esportatzailea hasi. Arrazoia: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Ez dago esporta daitekeen kontakturik."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Beharrezkoa den baimen bat desgaitu duzu."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontaktua NFC bidez jaso da"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kontaktuak esportatu nahi dituzu?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Cachean gordetzen"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> inportatzen: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> inportatzen: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Esportatu .vcf gisa"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordenatzeko irizpidea"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Izena"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Ezabatu"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Elipsia"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Lasterbidea desgaitu egin da"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kendu da kontaktua"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Inportatu"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Ez dago konexiorik"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM txart."</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Erakutsi gehiago"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Inportatu da SIM txartela"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Ezin izan da inportatu SIM txartela"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM txartela inportatzen"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9386a8d..6ac80b9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> مخاطب</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> مخاطب · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> مخاطب · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> مخاطب · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> مخاطب · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"از Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"از <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"برگرداندن تماس"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" به مخاطبین افزوده شود؟"</string>
<string name="description_plus_button" msgid="515164827856229880">"به اضافه"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> از <xliff:g id="TOTAL_NUMBER">%s</xliff:g> مخاطب"</string>
<string name="search_settings_description" msgid="2675223022992445813">"نامهای مخاطبین شما"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"برنامهای برای انجام این عملکرد یافت نشد."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"برای بازگشت به صفحه قبلی کلیک کنید"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"امروز"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"امروز در <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"فردا در <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>، <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>، <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(رویداد بدون عنوان)"</string>
<string name="date_time_set" msgid="4761419824439606690">"تنظیم"</string>
<string name="header_im_entry" msgid="3581720979640225615">"پیام فوری"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"برای بزرگ کردن ویرایشگر مخاطب کلیک کنید."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"برای کوچک کردن ویرایشگر مخاطب کلیک کنید."</string>
<string name="content_description_directions" msgid="2686791825798189335">"مسیرها به مکان"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"پیامک اخیر. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. برای پاسخ دادن کلیک کنید"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"پیامک اخیر. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. برای پاسخ دادن کلیک کنید"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ورودی"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"خروجی"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"بیپاسخ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"تماس اخیر. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. برای بازگرداندن تماس کلیک کنید"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"تماس اخیر. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. برای بازگرداندن تماس کلیک کنید"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"شما: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"وقتی شناسه Hangouts شخص را در فیلد رایانامه یا فیلد تلفن وارد کنید، Hangouts بهتر کار میکند."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"فیلدهای بیشتر"</string>
@@ -312,7 +311,6 @@
<item quantity="other">مخاطب پیونددادهشده (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> مخاطب پیوند داده شده"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"پیوند دادن مخاطبین"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"لغو"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"این مخاطب"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"مخاطبین تکراری ممکن"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ممکن است این مخاطبها یک نفر باشند. میتوانید آنها را بهعنوان یک مخاطب به هم پیوند دهید."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"از حسابهای شما"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"انتخاب عکس"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"از <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"حذف <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"حذف <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"حذف <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"عکس <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> انتخاب نشد"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"عکس <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> انتخاب شد"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"عکس از حساب نامشخص انتخاب نشده است"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"عکس از حساب نامشخص انتخاب شده است"</string>
<string name="menu_assistant" msgid="5760693735722052454">"پیشنهادها"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"صادر کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"نمیتوان وارد کردن/ صادر کردن کارت ویزیت را لغو کرد"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"خطای ناشناس."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" باز نشد: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" باز نشد: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"صادر کننده راهاندازی نشد: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"هیچ مخاطب قابل صدوری موجود نیست."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"یک اجازه الزامی را غیرفعال کردید."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"مخاطب از طریق NFC رسید"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"مخاطبین صادر شوند؟"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"در حال ذخیره در حافظهٔ پنهان"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"وارد کردن <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"وارد کردن <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"صادر کردن به فایل .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"مرتبسازی براساس"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"نام"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"حذف"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"سه نقطه"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> دقیقه <xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ساعت <xliff:g id="MINUTES_1">%s</xliff:g> دقیقه <xliff:g id="SECONDS">%s</xliff:g> ثانیه"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> دقیقه <xliff:g id="SECONDS">%2$s</xliff:g> ثانیه"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ساعت <xliff:g id="MINUTES_1">%2$s</xliff:g> دقیقه <xliff:g id="SECONDS">%3$s</xliff:g> ثانیه"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"میانبر غیرفعال شده است"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"محاطب حذف شد"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"وارد کردن"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"اتصال برقرار نیست"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"سیم کارت"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"نمایش موارد بیشتر"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"وارد کردن سیم کارت تمام شد"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"سیم کارت وارد نشد"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"وارد کردن سیم کارت"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 650afba..465a052 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yhteystieto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> yhteystietoa, <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yhteystieto, <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> yhteystietoa, <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> yhteystieto, <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Googlelta"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Tililtä <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Soita takaisin"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Lisätäänkö <xliff:g id="EMAIL">%s</xliff:g> yhteystietoihin?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%s</xliff:g> yhteystietoa"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Yhteystietojen nimet"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tätä toimintoa käsittelevää sovellusta ei löydy."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Palaa edelliseen näyttöön klikkaamalla"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Tänään"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Tänään klo <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Huomenna klo <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Nimetön tapahtuma)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Käytä"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Pikaviesti"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Laajenna yhteystietojen muokkausnäkymä klikkaamalla."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Tiivistä yhteystietojen muokkausnäkymä klikkaamalla."</string>
<string name="content_description_directions" msgid="2686791825798189335">"reittiohjeet sijaintiin"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Viimeisin tekstiviesti. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Vastaa klikkaamalla."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Viimeisin tekstiviesti. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Vastaa klikkaamalla."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"saapuva"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"lähtevä"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"vastaamaton"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Viimeisin puhelu. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Soita takaisin klikkaamalla."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Viimeisin puhelu. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Soita takaisin klikkaamalla."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Sinä: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts toimii paremmin, kun kirjoitat käyttäjän Hangouts-tunnuksen sähköposti- tai puhelinnumerokenttään."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Lisää kenttiä"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Linkitetty yhteystieto</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> yhdistettyä kontaktia"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LINKITÄ YHTEYSTIEDOT"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"PERUUTA"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Tämä kontakti"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mahdolliset kaksoiskappaleet"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Nämä yhteystiedot saattavat kuulua samalle henkilölle. Voit linkittää ne yhdeksi yhteystiedoksi."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Omista tileistäsi"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Valitse valokuva"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Tili: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Poista <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Poista <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Poista <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Tilin <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> kuvaa ei ole valittuna."</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Tilin <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> kuva on valittuna."</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Tuntemattoman tilin kuva ei ole valittuna."</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Tuntemattoman tilin kuva on valittuna."</string>
<string name="menu_assistant" msgid="5760693735722052454">"Ehdotukset"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Peruuta kohteen <xliff:g id="FILENAME">%s</xliff:g> vienti?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCardin tuonnin/viennin peruutus epäonn."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Tuntematon virhe."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Tiedostoa \"<xliff:g id="FILE_NAME">%s</xliff:g>\" ei voi avata: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Tiedostoa \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ei voi avata: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Vientiohjelman käynnistys epäonnistui: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Ei vietäviä yhteystietoja."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Olet poistanut käytöstä tarvittavan käyttöoikeuden."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakti saatu (NFC)"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Vie yhteystietoja?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Vie välimuistiin"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Tuodaan <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Tuodaan <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Vie .vcf-tiedostoon"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Lajitteluperuste"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Etunimi"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Poista"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipsi"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> t <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> t <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Pikakuvake on poistettu käytöstä"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Yhteystieto poistettiin"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Tuo"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Ei yhteyttä"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM-kortti"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Näytä lisää"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM-kortin tuominen valmis"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM-kortin tuominen epäonnistui"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Tuodaan SIM-kortin yhteystietoja"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 338293d..f7cd6c9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contacts</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> contact · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contact · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"De Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"De <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Rappeler"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> sur <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contacts"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Noms de vos contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aucune application pouvant gérer cette action n\'a été trouvée."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Cliquez ici pour revenir à l\'écran précédent"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Aujourd\'hui"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Aujourd\'hui à <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Demain à <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Événement sans titre)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Définir"</string>
<string name="header_im_entry" msgid="3581720979640225615">"MI"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Cliquez pour développer l\'éditeur de contact."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Cliquez pour réduire l\'éditeur de contact."</string>
<string name="content_description_directions" msgid="2686791825798189335">"itinéraire vers le lieu"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Texto récent : « <xliff:g id="MESSAGE_BODY">%s</xliff:g> », de <xliff:g id="PHONE_NUMBER">%s</xliff:g>, le <xliff:g id="DATE">%s</xliff:g>. Touchez l\'écran pour répondre à ce message."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Texto récent : « <xliff:g id="MESSAGE_BODY">%1$s</xliff:g> », de <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, le <xliff:g id="DATE">%3$s</xliff:g>. Touchez l\'écran pour répondre à ce message."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrant"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"sortant"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"manqué"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Appel récent : <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Touchez l\'écran pour rappeler ce numéro."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Appel récent : <xliff:g id="CALL_TYPE">%1$s</xliff:g>, <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>. Touchez l\'écran pour rappeler ce numéro."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Vous : <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Google Hangout fonctionne mieux lorsque vous entrez l\'identifiant Hangout de la personne dans le champ de l\'adresse de courriel ou du numéro de téléphone."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Autres champs"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Contacts associés (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contacts associés"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ASSOCIER LES CONTACTS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANNULER"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one"> (<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other"> (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g> <xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ce contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Doublons possibles"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Ces contacts correspondent peut-être à la même personne. Vous pouvez les regrouper dans un seul contact."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"De vos comptes"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Sélectionner une photo"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"De <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Effacer <xliff:g id="DATA_TYPE">%s </xliff:g> <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Effacer <xliff:g id="DATA_TYPE">%1$s </xliff:g> <xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Effacer <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Photo <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> – <xliff:g id="USER_NAME">%s </xliff:g> non cochée"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Photo <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> – <xliff:g id="USER_NAME">%s </xliff:g> cochée"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Photo d\'un compte inconnu non sélectionnée"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Photo d\'un compte inconnu sélectionnée"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggestions"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Annuler l\'exportation du fichier <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Impossible annuler import./export. vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Erreur inconnue."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Impossible d\'ouvrir le fichier <xliff:g id="FILE_NAME">%s</xliff:g> pour la raison suivante : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Impossible d\'ouvrir le fichier <xliff:g id="FILE_NAME">%1$s</xliff:g> pour la raison suivante : <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Impossible de démarrer le programme d\'exportation pour la raison suivante : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Aucun contact ne peut être exporté."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Vous avez désactivé une autorisation obligatoire."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contact reçu via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exporter les contacts?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Mise en cache…"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importation <xliff:g id="CURRENT_NUMBER">%s</xliff:g> sur <xliff:g id="TOTAL_NUMBER">%s</xliff:g> (<xliff:g id="NAME">%s</xliff:g>)"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importation <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> (<xliff:g id="NAME">%3$s</xliff:g>)"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exporter en format .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Trier par"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Prénom"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Supprimer"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipse"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ce raccourci a été désactivé"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Le contact a été supprimé"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importer"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Aucune connexion"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"Carte SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Afficher plus"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importation de la carte SIM terminée"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Impossible d\'importer la carte SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation des contacts SIM en cours…"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c5fa0de..c003a3a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contacts</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> contact · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contact · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Contacts Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Contacts de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Rappeler"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts ?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> sur <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contacts"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Noms de vos contacts"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aucune application pouvant gérer cette action n\'a été trouvée."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Cliquez pour revenir à l\'écran précédent."</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Aujourd\'hui"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Aujourd\'hui, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Demain, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Événement sans titre)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Définir"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Messagerie instantanée"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Cliquez pour développer l\'éditeur de contact."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Cliquez pour réduire l\'éditeur de contact."</string>
<string name="content_description_directions" msgid="2686791825798189335">"itinéraire vers le lieu"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS récent : \"<xliff:g id="MESSAGE_BODY">%s</xliff:g>\", <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Appuyez sur l\'écran pour répondre à ce message."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS récent : \"<xliff:g id="MESSAGE_BODY">%1$s</xliff:g>\", <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>. Appuyez sur l\'écran pour répondre à ce message."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrant"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"sortant"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"manqué"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Appel récent : <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Appuyez sur l\'écran pour rappeler ce numéro."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Appel récent : <xliff:g id="CALL_TYPE">%1$s</xliff:g>, <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>. Appuyez sur l\'écran pour rappeler ce numéro."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Vous : <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Les Hangouts fonctionnent mieux si vous saisissez l\'identifiant Hangouts de la personne concernée dans le champ de l\'adresse e-mail ou du numéro de téléphone."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Autres champs"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Contacts associés (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contacts associés"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ASSOCIER LES CONTACTS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANNULER"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g> – <xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ce contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Doublons potentiels"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Ces contacts correspondent peut-être à la même personne. Vous pouvez les regrouper dans un seul contact."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"De vos comptes"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Sélectionner une photo"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Du compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Supprimer l\'élément \"<xliff:g id="DATA_TYPE">%s </xliff:g> – <xliff:g id="DATA_KIND">%s</xliff:g>\""</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Supprimer l\'élément \"<xliff:g id="DATA_TYPE">%1$s </xliff:g> – <xliff:g id="DATA_KIND">%2$s</xliff:g>\""</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Supprimer l\'élément \"<xliff:g id="DATA_KIND">%s</xliff:g>\""</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Photo <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> – <xliff:g id="USER_NAME">%s </xliff:g> non cochée"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Photo <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> – <xliff:g id="USER_NAME">%s </xliff:g> cochée"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Photo d\'un compte inconnu non sélectionnée"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Photo d\'un compte inconnu sélectionnée"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggestions"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Annuler l\'exportation de \"<xliff:g id="FILENAME">%s</xliff:g>\" ?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Impossible annuler import./export. vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Erreur inconnue."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Impossible d\'ouvrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\" pour la raison suivante : <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Impossible d\'ouvrir \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" pour la raison suivante : <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Impossible de démarrer le programme d\'exportation : \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Aucun contact ne peut être exporté."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Vous avez désactivé une autorisation obligatoire."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contact reçu via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exporter contacts ?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Mise en cache…"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importation en cours <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> : <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importation en cours <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> : <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exporter vers fichier VCF"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Trier par"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Prénom"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Supprimer"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipse"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min et <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min et <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min et <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ce raccourci a été désactivé."</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Le contact a été supprimé."</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importer"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Aucune connexion"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"Carte SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Afficher plus"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importation depuis la carte SIM terminée"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Échec de l\'importation depuis la carte SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importation depuis la carte SIM..."</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 96a4d0b..e7fc56e 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"De Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"De <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Devolver chamada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Engadir \"<xliff:g id="EMAIL">%s</xliff:g>\" aos contactos?"</string>
<string name="description_plus_button" msgid="515164827856229880">"máis"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contactos"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos teus contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Non se encontrou ningunha aplicación para procesar esta acción."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Fai clic para volver á pantalla anterior"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hoxe"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hoxe ás <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Mañá ás <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento sen título)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Configurar"</string>
<string name="header_im_entry" msgid="3581720979640225615">"MI"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Fai clic para ampliar o editor de contactos."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Fai clic para contraer o editor de contactos."</string>
<string name="content_description_directions" msgid="2686791825798189335">"indicacións para a localización"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. fai clic para responder"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. fai clic para responder"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrante"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"saínte"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. fai clic para devolver a chamada"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. fai clic para devolver a chamada"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ti: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona mellor se introduces o identificador de Hangouts da persoa no campo do correo electrónico ou do teléfono."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Máis campos"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Contacto ligado</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Ligáronse <xliff:g id="COUNT">%d</xliff:g> contactos"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LIGAR CONTACTOS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCELAR"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Este contacto"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Posibles duplicados"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Estes contactos poden referirse á mesma persoa. Podes ligalos nun contacto único."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Das túas contas"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Escoller foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"De <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Eliminar <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Eliminar <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Eliminar <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Non se seleccionou a foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Seleccionouse a foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Non se seleccionou a foto dunha conta descoñecida"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Seleccionouse a foto dunha conta descoñecida"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suxestións"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Queres cancelar a exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Imposible cancelar import./export. vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Erro descoñecido."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Non se puido abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Non se puido abrir \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Non se puido iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Non hai ningún contacto exportable."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Desactivaches un permiso necesario."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contacto recibido por NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Queres exportar contactos?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Almacenando na caché"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportar a ficheiro .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordenar por"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nome"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Eliminar"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Puntos suspensivos"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Desactivouse o atallo"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Eliminouse o contacto"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importar"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Sen conexión"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostrar máis"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Finalizou a importación da tarxeta SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Non se puido importar a tarxeta SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando SIM"</string>
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index bd56f31..12622ea 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> સંપર્ક</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> સંપર્ક · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> સંપર્ક · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> સંપર્ક · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> સંપર્ક · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google થી"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> થી"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"વળતો કૉલ"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" ને સંપર્કોમાં ઉમેરીએ?"</string>
<string name="description_plus_button" msgid="515164827856229880">"પ્લસ"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> માંથી <xliff:g id="CURRENT_NUMBER">%s</xliff:g> સંપર્કો"</string>
<string name="search_settings_description" msgid="2675223022992445813">"તમારા સંપર્કોના નામ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"આ ક્રિયાને હેન્ડલ કરવા માટે કોઈ ઍપ્લિકેશન મળી નહીં."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"પાછલી સ્ક્રીન પર પાછા આવવા માટે ક્લિક કરો"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"આજે"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"<xliff:g id="TIME_INTERVAL">%s</xliff:g> વાગ્યે આજે"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"<xliff:g id="TIME_INTERVAL">%s</xliff:g> વાગ્યે આવતીકાલે"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(અનામાંકિત ઇવેન્ટ)"</string>
<string name="date_time_set" msgid="4761419824439606690">"સેટ કરો"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"સંપર્ક સંપાદક વિસ્તૃત કરવા માટે ક્લિક કરો."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"સંપર્ક સંપાદકને સંકુચિત કરવા માટે ક્લિક કરો."</string>
<string name="content_description_directions" msgid="2686791825798189335">"સ્થાન માટેનાં દિશા નિર્દેશો"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"તાજેતરનો sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. પ્રતિસાદ આપવા ક્લિક કરો"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"તાજેતરનો sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. પ્રતિસાદ આપવા ક્લિક કરો"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"આવનારા"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"આઉટગોઇંગ"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"છૂટેલ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"તાજેતરનો કૉલ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. કૉલ બેક કરવા ક્લિક કરો"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"તાજેતરનો કૉલ. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. કૉલ બેક કરવા ક્લિક કરો"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"તમે: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"જ્યારે તમે વ્યક્તિના Hangouts ઓળખકર્તાને ઇમેઇલ ફીલ્ડ અથવા ફોન ફીલ્ડમાં દાખલ કરો છો ત્યારે Hangouts વધુ સારું કામ કરે છે."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"વધુ ફીલ્ડ્સ"</string>
@@ -312,7 +311,6 @@
<item quantity="other">લિંક કરેલ સંપર્કો (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> લિંક કરેલ સંપર્ક"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"સંપર્કો લિંક કરો"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"રદ કરો"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"આ સંપર્ક"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"સંભવિત ડુપ્લિકેટ્સ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"આ સંપર્કો એક જ વ્યક્તિ હોઈ શકે છે. તમે તેઓને એકલ સંપર્ક તરીકે એકસાથે લિંક કરી શકો છો."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"તમારા એકાઉન્ટ્સમાંથી"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ફોટો પસંદ કરો"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> માંથી"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> કાઢી નાખો"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> કાઢી નાખો"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> કાઢી નાખો"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ની તસ્વીર ચેક કરી નથી"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ની તસ્વીર ચેક કરી"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"અજાણ્યાં એકાઉન્ટનો ફોટો ચેક ન કર્યો"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"અજાણ્યાં એકાઉન્ટનો ફોટો ચેક કર્યો"</string>
<string name="menu_assistant" msgid="5760693735722052454">"સૂચનો"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> ની નિકાસ રદ કરીએ?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard આયાત/નિકાસને રદ કરી શક્યાં નહીં"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"અજાણી ભૂલ."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ખોલી શક્યાં નથી: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ખોલી શક્યાં નથી: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"નિકાસકર્તા શરૂ કરી શક્યાં નહીં: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"કોઈ નિકાસયોગ્ય સંપર્ક નથી."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"તમે આવશ્યક પરવાનગી અક્ષમ કરી છે."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC પર સંપર્ક પ્રાપ્ત"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"સંપર્કો નિકાસ કરીએ?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"કેશ કરી રહ્યાં છે"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> આયાત કરે છે: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> આયાત કરે છે: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ફાઇલ પર નિકાસ કરો"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"આ પ્રમાણે સૉર્ટ કરો"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"નામ"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"કાઢી નાખો"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"અધ્યાહાર"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> સેકંડ"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> મિનિટ <xliff:g id="SECONDS">%s</xliff:g> સેકંડ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> કલાક <xliff:g id="MINUTES_1">%s</xliff:g> મિનિટ <xliff:g id="SECONDS">%s</xliff:g> સેકંડ"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> મિનિટ <xliff:g id="SECONDS">%2$s</xliff:g> સેકંડ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> કલાક <xliff:g id="MINUTES_1">%2$s</xliff:g> મિનિટ <xliff:g id="SECONDS">%3$s</xliff:g> સેકંડ"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"આ શૉર્ટકટ અક્ષમ કરવામાંં આવેલ છે"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"સંપર્ક દૂર કર્યો હતો"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"આયાત કરો"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"કોઈ કનેક્શન નથી"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"વધુ બતાવો"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM કાર્ડ આયાત કરવાનું સમાપ્ત થયું"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM કાર્ડ આયાત કરી શક્યાં નથી"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM આયાત કરી રહ્યાં છે"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 928f6ed..2db5706 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> संपर्क</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google से"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> से"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"रिटर्न कॉल"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" को संपर्कों में जोड़ें?"</string>
<string name="description_plus_button" msgid="515164827856229880">"जोड़ें"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> में से <xliff:g id="CURRENT_NUMBER">%s</xliff:g> संपर्क"</string>
<string name="search_settings_description" msgid="2675223022992445813">"आपके संपर्कों के नाम"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"यह कार्यवाही प्रबंधित करने के लिए कोई ऐप्स नहीं मिला."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"पिछली स्क्रीन पर लौटने के लिए क्लिक करें"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"आज"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"आज <xliff:g id="TIME_INTERVAL">%s</xliff:g> बजे"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"कल <xliff:g id="TIME_INTERVAL">%s</xliff:g> बजे"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(शीर्षक रहित इवेंट)"</string>
<string name="date_time_set" msgid="4761419824439606690">"सेट करें"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"संपर्क संपादक को विस्तृत करने के लिए क्लिक करें."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"संपर्क संपादक को संक्षिप्त करने के लिए क्लिक करें."</string>
<string name="content_description_directions" msgid="2686791825798189335">"स्थान के लिए दिशा निर्देश"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"हाल ही का एसएमएस. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. जवाब देने के लिए क्लिक करें"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"हाल ही का एसएमएस. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. जवाब देने के लिए क्लिक करें"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"इनकमिंग"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"आउटगोइंग"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"छूटा"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"हाल ही का कॉल. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. पुनः कॉल करने के लिए क्लिक करें"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"हाल ही का कॉल. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. पुनः कॉल करने के लिए क्लिक करें"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"आप: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts तब बेहतर कार्य करता है जब आप व्यक्ति के Hangouts पहचानकर्ता को ईमेल फ़ील्ड या फ़ोन फ़ील्ड में डालते हैं."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"अधिक फ़ील्ड"</string>
@@ -312,7 +311,6 @@
<item quantity="other">लिंक किए गए संपर्क (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> लिंक किए गए संपर्क"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"संपर्क लिंक करें"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"अभी नहीं"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"यह संपर्क"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"संभावित प्रतिलिपि"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"हो सकता है कि ये संपर्क एक ही व्यक्ति हो. आप उन्हें एकल संपर्क के रूप में एक साथ लिंक कर सकते हैं."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"आपके खातों से"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"फ़ोटो चुनें"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> की ओर से"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> हटाएं"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> हटाएं"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> हटाएं"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>की फ़ोटो चेक नहीं की गई"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>की फ़ोटो चेक की गई"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"अज्ञात खाते की फ़ोटो नहीं जांची गई"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"अज्ञात खाते की फ़ोटो जांची गई"</string>
<string name="menu_assistant" msgid="5760693735722052454">"सुझाव"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> का निर्यात रहने दें?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard आयात/निर्यात रद्द नहीं हो सका"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"अज्ञात त्रुटि."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" नहीं खोली जा सकी: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" नहीं खोली जा सकी: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"निर्यातकर्ता प्रारंभ नहीं किया जा सका: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"कोई निर्यात-योग्य संपर्क नहीं है."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"आपने एक आवश्यक अनुमति को अक्षम कर दिया है."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC पर प्राप्त संपर्क"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"संपर्क निर्यात करें?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"संचय कर रहा है"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> आयात कर रहा है: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> आयात कर रहा है: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf फाइल में निर्यात करें"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"इससे क्रमित करें"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"नाम"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"हटाएं"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"पदलोप चिह्न"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> सेकंड"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> मि. <xliff:g id="SECONDS">%s</xliff:g> से."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> घंटे <xliff:g id="MINUTES_1">%s</xliff:g> मिनट <xliff:g id="SECONDS">%s</xliff:g> सेकंड"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> मि. <xliff:g id="SECONDS">%2$s</xliff:g> से."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> घंटे <xliff:g id="MINUTES_1">%2$s</xliff:g> मिनट <xliff:g id="SECONDS">%3$s</xliff:g> सेकंड"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"इस शॉर्टकट को अक्षम कर दिया गया है"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"संपर्क निकाल दिया गया था"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"आयात करें"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"कोई कनेक्शन नहीं"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"सिम"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"और दिखाएं"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM कार्ड का आयात पूर्ण"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM कार्ड आयात नहीं किया जा सका"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM को आयात किया जा रहा है"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d7d3a8c..3851cec 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -85,9 +85,9 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kontakata</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> kontakta · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontakata · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakta · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakata · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"S Google računa"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"S računa: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -169,7 +169,6 @@
<string name="returnCall" msgid="8171961914203617813">"Povratni poziv"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Dodati \"<xliff:g id="EMAIL">%s</xliff:g>\" kontaktima?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> od <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontakata"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nazivi vaših kontakata"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nije pronađena nijedna aplikacija koja može provesti ovu radnju."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknite za povratak na prethodni zaslon"</string>
@@ -282,7 +281,7 @@
<string name="today" msgid="8041090779381781781">"Danas"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Danas u <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Sutra u <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Događaj bez naslova)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Postavi"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -299,11 +298,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kliknite da bi se alat za uređivanje kontakta proširio."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kliknite da bi se alat za uređivanje kontakta sažeo."</string>
<string name="content_description_directions" msgid="2686791825798189335">"upute do lokacije"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"nedavni sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknite za odgovor"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"nedavni sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknite za odgovor"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"dolazno"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"odlazno"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"propušteno"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"nedavni poziv. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknite za uzvratni poziv"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"nedavni poziv. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknite za uzvratni poziv"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funkcionira bolje kada unesete njegov identifikator osobe u polje e-adrese ili telefona."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Više polja"</string>
@@ -320,7 +319,6 @@
<item quantity="other">Povezani kontakti (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Povezani kontakti (<xliff:g id="COUNT">%d</xliff:g>)"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"POVEŽI KONTAKTE"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ODUSTANI"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -338,7 +336,6 @@
<item quantity="few">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ovaj kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mogući duplikati"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Ti bi se kontakti mogli odnositi na istu osobu. Možete ih povezati u jedan kontakt."</string>
@@ -346,10 +343,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"S vaših računa"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Odabir fotografije"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"S računa <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Izbriši <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Izbriši <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Izbriši <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Slika s računa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> nije odabrana"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotografija s računa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> odabrana"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Fotografija s nepoznatog računa nije odabrana"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Fotografija s nepoznatog računa odabrana"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Prijedlozi"</string>
@@ -527,7 +522,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Otkazati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Uvoz/izvoz kartice vCard nije otkazan"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Nepoznata pogreška."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Datoteku \"<xliff:g id="FILE_NAME">%s</xliff:g>\" nije moguće otvoriti radi: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Datoteku \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" nije moguće otvoriti radi: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Alat za izvoz ne može se pokrenuti; razlog: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nema kontakata koji se mogu izvoziti."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Onemogućili ste obavezno dopuštenje."</string>
@@ -569,7 +564,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt NFC-om"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Izvesti kontakte?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Spremanje u predmemoriju"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Uvoz <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Uvoz <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Izvoz u .vcf datoteku"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Poredano po"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Ime"</string>
@@ -635,8 +630,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Izbriši"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Tri točke"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ovaj je prečac onemogućen"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt je uklonjen"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Uvezi"</string>
@@ -660,4 +655,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nema veze"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Prikaži više"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Dovršen je uvoz SIM kartice"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Nije moguće uvesti SIM karticu"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvoz SIM kontakata"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4c717fd..63746cc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> névjegy</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> névjegy · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> névjegy · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> névjegy · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> névjegy · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"A Google rendszeréből"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Innen: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Visszahívás"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Hozzáadja a(z) \"<xliff:g id="EMAIL">%s</xliff:g>\"címet a Címtárhoz?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plusz"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> névjegy"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Ismerősök nevei"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nincs megfelelő alkalmazás a művelet elvégzésére."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kattintással visszatér az előző képernyőre"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Ma"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Ma <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Holnap <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Névtelen esemény)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Beállítás"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Azonnali üzenetküldés"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kattintson a névjegyszerkesztő kibontásához."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kattintson a névjegyszerkesztő összecsukásához."</string>
<string name="content_description_directions" msgid="2686791825798189335">"útvonalterv a helyhez"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS a közelmúltban. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kattintson, ha választ szeretne küldeni"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS a közelmúltban. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kattintson, ha választ szeretne küldeni"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"bejövő"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"kimenő"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"nem fogadott"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"hívás a közelmúltban. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kattintson a visszahíváshoz"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"hívás a közelmúltban. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kattintson a visszahíváshoz"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ön: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"A Hangouts jobban működik, ha a személy Hangouts-azonosítóját adja meg az e-mail vagy telefonszám mezőben."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"További mezők"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Társított névjegy</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> összekapcsolt névjegy"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"NÉVJEGYEK TÁRSÍTÁSA"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"MÉGSE"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ez a névjegy"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Lehetséges ismétlődések"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Lehet, hogy ezek a névjegyek ugyanahhoz a személyhez tartoznak. Lehetőség van a névjegyek egyesítésére."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Az Ön fiókjaiból"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Fotó kiválasztása"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Innen: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"A(z) <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> törlése"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"A(z) <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> törlése"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"A(z) <xliff:g id="DATA_KIND">%s</xliff:g> törlése"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"A következőtől származó fotó nincs kiválasztva: <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"A következőtől származó fotó kiválasztva: <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Az ismeretlen fiókból származó kép nincs kiválasztva"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Ismeretlen fiókból származó kép kiválasztva"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Javaslatok"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Megszakítja <xliff:g id="FILENAME">%s</xliff:g> exportálását?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard imp./exp. megszakítása sikertelen"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Ismeretlen hiba."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"A(z) \"<xliff:g id="FILE_NAME">%s</xliff:g>\" fájl nem nyitható meg: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"A(z) \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" fájl nem nyitható meg: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nem sikerült elindítani az exportálót: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nincs exportálható névjegy."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Letiltott egy szükséges engedélyt."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC-n kapott névjegy"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportálni szeretné?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Gyorsítótárazás"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importálás - <xliff:g id="TOTAL_NUMBER">%s</xliff:g>/<xliff:g id="CURRENT_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importálás - <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>/<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportálás .vcf fájlba"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Rendezés"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Utónév"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Törlés"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Három pont"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> másodperc"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> perc, <xliff:g id="SECONDS">%s</xliff:g> mp"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> óra, <xliff:g id="MINUTES_1">%s</xliff:g> perc, <xliff:g id="SECONDS">%s</xliff:g> mp"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> perc, <xliff:g id="SECONDS">%2$s</xliff:g> mp"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> óra, <xliff:g id="MINUTES_1">%2$s</xliff:g> perc, <xliff:g id="SECONDS">%3$s</xliff:g> mp"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"A parancsikon le van tiltva"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Névjegy eltávolítva"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importálás"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nincs kapcsolat"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Több megjelenítése"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"A SIM-kártya importálása befejeződött"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Nem sikerült importálni a SIM-kártyát"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-kártya importálása folyamatban"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 051f8ab..60a6de1 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> կոնտակտ</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> կոնտակտ · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> կոնտակտ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google-ից"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> հաշվից"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Հետ զանգել"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Ավելացնե՞լ «<xliff:g id="EMAIL">%s</xliff:g>»-ը կոնտակտներին:"</string>
<string name="description_plus_button" msgid="515164827856229880">"գումարել"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>-ը <xliff:g id="TOTAL_NUMBER">%s</xliff:g> կոնտակտից"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Ձեր կոնտակտների անունները"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Այս գործողությունը կատարելու համար ոչ մի ծրագիր չի գտնվել:"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Սեղմեք՝ նախորդ էկրանին վերադառնալու համար"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Այսօր"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Այսօր՝ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Վաղը՝ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Անվերնագիր միջոցառում)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Սահմանել"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Սեղմեք՝ կոնտակտների խմբագրիչը ընդարձակելու համար:"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Սեղմեք՝ կոնտակտների խմբագրիչը կոծկելու համար:"</string>
<string name="content_description_directions" msgid="2686791825798189335">"Երթուղիներ"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"վերջին SMS-ը՝ <xliff:g id="MESSAGE_BODY">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>, սեղմեք՝ պատասխանելու համար"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"վերջին SMS-ը՝ <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>, <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>, սեղմեք՝ պատասխանելու համար"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"մուտքային"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ելքային"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"բաց թողնված"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"վերջին զանգը՝ <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>, սեղմեք՝ հետ զանգելու համար"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"վերջին զանգը՝ <xliff:g id="CALL_TYPE">%1$s</xliff:g>, <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>, սեղմեք՝ հետ զանգելու համար"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Դուք՝ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts-ն ավելի լավ կաշխատի, եթե էլփոստի կամ հեռախոսի դաշտում մուտքագրեք Hangouts-ի օգտվողի նույնացուցիչը:"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Լրացուցիչ դաշտեր"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Կցած կոնտակտներ (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> կապված կոնտակտ"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ՄԻԱԿՑԵԼ ԿՈՆՏԱԿՏՆԵՐԸ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ՉԵՂԱՐԿԵԼ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Այս կոնտակտը"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Հնարավոր կրկնօրինակներ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Այս կոնտակտները հնարավոր է միևնույն մարդու կոնտակտներ են։ Կարող եք դրանք միակցել և ստեղծել մեկ կոնտակտ։"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Ձեր հաշիվներից"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Ընտրել լուսանկար"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> հաշվից"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Ջնջել <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Ջնջել <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Ջնջել <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> հաշվի լուսանկարը չի նշվել"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> հաշվի լուսանկարը նշվել է"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Անհայտ հաշվից լուսանկարն ընտրված չէ"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Անհայտ հաշվից լուսանկարն ընտրված է"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Առաջարկներ"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Չեղարկե՞լ <xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Հնարավոր չէ չեղարկել vCard-ի ներմուծումը/արտահանումը"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Անհայտ սխալ:"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Հնարավոր չէ բացել \"<xliff:g id="FILE_NAME">%s</xliff:g>\"-ը. պատճառը` <xliff:g id="EXACT_REASON">%s</xliff:g>:"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Հնարավոր չէ բացել \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"-ը. պատճառը` <xliff:g id="EXACT_REASON">%2$s</xliff:g>:"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Հնարավոր չէ մեկնարկել արտահանողը. պատճառը` «<xliff:g id="EXACT_REASON">%s</xliff:g>»:"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Արտահանելի կոնտակտ չկա:"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Դուք անջատել եք անհրաժեշտ թույլտվությունը:"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC-ով ստացված կոտակտ"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Արտահանե՞լ կոնտկատները"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Քեշավորում"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%s</xliff:g> : <xliff:g id="NAME">%s</xliff:g>-ի ներմուծում"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> : <xliff:g id="NAME">%3$s</xliff:g>-ի ներմուծում"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Արտահանել .vcf ֆայլ"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Դասավորել ըստ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Անվան"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Ջնջել"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Բազմակետ"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> վ"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> ր <xliff:g id="SECONDS">%s</xliff:g> վ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ժ <xliff:g id="MINUTES_1">%s</xliff:g> ր <xliff:g id="SECONDS">%s</xliff:g> վ"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> ր <xliff:g id="SECONDS">%2$s</xliff:g> վ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ժ <xliff:g id="MINUTES_1">%2$s</xliff:g> ր <xliff:g id="SECONDS">%3$s</xliff:g> վ"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Այս դյուրանցումն անջատվել է"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Կոնտակտը հեռացվել է"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Ներմուծել"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Կապ չկա"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM քարտ"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Ցուցադրել ավելի շատ"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM քարտի ներմուծումն ավարտվեց"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Չհաջողվեց ներմուծել SIM քարտը"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM քարտի ներմուծում"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 70188d8..70d805b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontak</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontak · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontak · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontak · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontak · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Dari Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Dari <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Panggilan kembali"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Tambahkan \"<xliff:g id="EMAIL">%s</xliff:g>\" ke kontak?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> dari <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontak"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nama kontak Anda"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tidak ada apl yang ditemukan untuk menangani tindakan ini."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik untuk kembali ke layar sebelumnya"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hari ini"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hari ini pukul <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Besok pukul <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Acara tanpa judul)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Setel"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klik untuk meluaskan editor kontak."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klik untuk menciutkan editor kontak."</string>
<string name="content_description_directions" msgid="2686791825798189335">"petunjuk arah ke lokasi"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms terbaru. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik untuk menanggapi"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms terbaru. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik untuk menanggapi"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"masuk"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"keluar"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"tak terjawab"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"panggilan telepon terbaru. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik untuk menelepon balik"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"panggilan telepon terbaru. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik untuk menelepon balik"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Anda: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts bekerja lebih baik jika Anda memasukkan pengidentifikasi Hangouts orang tersebut ke bidang email atau bidang ponsel."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Bidang lainnya"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Kontak tertaut</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> kontak tertaut"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"TAUTKAN KONTAK"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"BATAL"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Kontak ini"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Kemungkinan duplikat"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Semua kontak ini mungkin orang yang sama. Anda dapat menautkannya sebagai satu kontak."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Dari akun Anda"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Pilih foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Dari <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Hapus <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Hapus <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Hapus <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto dari <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>tidak dicentang"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto dari <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>dicentang"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto dari akun tak dikenal tidak dicentang"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto dari akun tak dikenal dicentang"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Saran"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Batalkan ekspor <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Tidak dpt membatalkan impor/ekspor vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Kesalahan tidak dikenal."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Tidak dapat membuka \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Tidak dapat membuka \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Tidak dapat memulai pengeskpor: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Tidak ada kontak yang dapat diekspor."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Anda telah menonaktifkan izin yang diperlukan."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontak yang diterima lewat NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Ekspor kontak?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Menyimpan ke cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Mengimpor <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Mengimpor <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Ekspor ke file .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Urutkan menurut"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nama depan"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Hapus"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Elipsis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> dtk"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> mnt <xliff:g id="SECONDS">%s</xliff:g> dtk"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> j <xliff:g id="MINUTES_1">%s</xliff:g> mnt <xliff:g id="SECONDS">%s</xliff:g> dtk"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> mnt <xliff:g id="SECONDS">%2$s</xliff:g> dtk"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> j <xliff:g id="MINUTES_1">%2$s</xliff:g> mnt <xliff:g id="SECONDS">%3$s</xliff:g> dtk"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Pintasan ini telah dinonaktifkan"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontak telah dihapus"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Impor"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Tidak ada sambungan"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Tampilkan lebih banyak"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Selesai mengimpor kartu SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Tidak dapat mengimpor kartu SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimpor SIM"</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 7b0d196..ef29def 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tengiliðir</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> tengiliður · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> tengiliðir · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> tengiliður · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> tengiliðir · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Af Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Af <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Hringja til baka"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Bæta „<xliff:g id="EMAIL">%s</xliff:g>“ við tengiliði?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plús"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> af <xliff:g id="TOTAL_NUMBER">%s</xliff:g> tengiliðum"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nöfn tengiliðanna þinna"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ekkert forrit fannst sem getur framkvæmt þessa aðgerð."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Smelltu til að fara aftur á fyrri skjá"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Í dag"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Í dag klukkan <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Á morgun klukkan <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g> kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Ónefndur viðburður)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Nota"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Spjall"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Smelltu til að stækka tengiliðaritilinn."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Smelltu til að draga saman tengiliðaritilinn."</string>
<string name="content_description_directions" msgid="2686791825798189335">"leiðarlýsing að stað"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"nýleg sms-skilaboð. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. smelltu til að svara"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"nýleg sms-skilaboð. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. smelltu til að svara"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"móttekið"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"hringt"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ósvarað"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"nýlegt símtal. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. smelltu til að hringja til baka"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"nýlegt símtal. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. smelltu til að hringja til baka"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Þú: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts virkar betur ef þú slærð Hangouts auðkenni viðkomandi inn í netfangsreitinn eða símanúmersreitinn."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Fleiri reitir"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Tengdir tengiliðir (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> tengdir tengiliðir"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"TENGJA TENGILIÐI SAMAN"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"HÆTTA VIÐ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Þessi tengiliður"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mögulegar tvítekningar"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Hugsanlegt er að þessir tengiliðir séu sama manneskjan. Þú getur tengt þá saman í einn tengilið."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Af reikningunum þínum"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Velja mynd"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Af <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Eyða <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Eyða <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Eyða <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Mynd frá <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>ekki valin"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Mynd frá <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>valin"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Mynd af óþekktum reikningi ekki valin"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Mynd af óþekktum reikningi valin"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Tillögur"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Hætta við útflutning á <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Ekki tókst að hætta við flutning vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Óþekkt villa."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Ekki tókst að opna „<xliff:g id="FILE_NAME">%s</xliff:g>“: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Ekki tókst að opna „<xliff:g id="FILE_NAME">%1$s</xliff:g>“: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Ekki tókst að ræsa útflutningsverkfærið: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Engir tengiliðir sem flytja má út."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Þú hefur gert nauðsynlegt leyfi óvirkt."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Tengiliður móttekinn um NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Flytja út tengiliði?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Setur í skyndiminni"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Flytur inn <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Flytur inn <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Flytja út í .vcf-skrá"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Raða eftir"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Fornafn"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Eyða"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Þrípunktur"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> m. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> klst. <xliff:g id="MINUTES_1">%s</xliff:g> mín. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> m. <xliff:g id="SECONDS">%2$s</xliff:g> sek."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> klst. <xliff:g id="MINUTES_1">%2$s</xliff:g> mín. <xliff:g id="SECONDS">%3$s</xliff:g> sek."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Þessi flýtileið hefur verið gerð óvirk"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Tengiliður var fjarlægður"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Flytja inn"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Engin tenging"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Sýna meira"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Lauk við að flytja inn SIM-kort"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Gat ekki flutt inn SIM-kort"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Flytur inn SIM-kort"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8fe777d..f5f0829 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contatto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contatti · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contatto · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contatti · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contatto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Di Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Da <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Chiama numero"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Aggiungi \"<xliff:g id="EMAIL">%s</xliff:g>\" ai contatti?"</string>
<string name="description_plus_button" msgid="515164827856229880">"più"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> contatti su <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"I nomi dei tuoi contatti"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nessuna applicazione trovata per gestire questa azione."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Fai clic per tornare alla schermata precedente"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Oggi"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Oggi alle ore <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Domani alle ore <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento senza titolo)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Imposta"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Chat"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Fai clic per espandere l\'editor contatti."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Fai clic per comprimere l\'editor contatti."</string>
<string name="content_description_directions" msgid="2686791825798189335">"indicazioni per la posizione"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. fai clic per rispondere"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. fai clic per rispondere"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"in arrivo"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"in uscita"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"senza risposta"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"chiamata recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. fai clic per richiamare"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"chiamata recente. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. fai clic per richiamare"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Tu: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funziona meglio se inserisci l\'identificatore Hangouts della persona nel campo dell\'indirizzo email o del numero di telefono."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Altri campi"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Contatto collegato</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contatti collegati"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"COLLEGA CONTATTI"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANNULLA"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Questo contatto"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possibili duplicati"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Questi contatti potrebbero riguardare la stessa persona. Puoi collegarli per creare un unico contatto."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Dei tuoi account"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Scegli foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Da <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Elimina <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Elimina <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Elimina <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto di <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> non selezionata"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto di <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> selezionata"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto di un account sconosciuto non selezionata"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto di un account sconosciuto selezionata"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggerimenti"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Annullare l\'esportazione di <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Annullam. import./esport. vCard non riuscito"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Errore sconosciuto."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Apertura di \"<xliff:g id="FILE_NAME">%s</xliff:g>\" non riuscita: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Apertura di \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" non riuscita: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Avvio dell\'utilità di esportazione non riuscito: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nessun contatto esportabile."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Hai disattivato un\'autorizzazione obbligatoria."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contatto ricevuto via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Esportare contatti?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Memorizzazione nella cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importazione di <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importazione di <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Esporta in file .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordina per"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nome"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Cancella"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellissi"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> m <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> m <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> m <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Questa scorciatoia è stata disattivata"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Contatto rimosso"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importa"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nessuna connessione"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostra altro"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importazione della scheda SIM completata"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Impossibile importare la scheda SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importazione della SIM"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 62f0ffe..6a34313 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -87,10 +87,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> איש קשר</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="two"><xliff:g id="COUNT_2">%d</xliff:g> אנשי קשר · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> אנשי קשר · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> אנשי קשר · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> איש קשר · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="two"><xliff:g id="COUNT_2">%1$d</xliff:g> אנשי קשר · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> אנשי קשר · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> אנשי קשר · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> איש קשר · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"מ-Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"מ-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"התקשר בחזרה"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"להוסיף את \"<xliff:g id="EMAIL">%s</xliff:g>\" לאנשי הקשר?"</string>
<string name="description_plus_button" msgid="515164827856229880">"חיבור"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> מתוך <xliff:g id="TOTAL_NUMBER">%s</xliff:g> אנשי קשר"</string>
<string name="search_settings_description" msgid="2675223022992445813">"השמות של אנשי הקשר"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"לא נמצאה אפליקציה שיכולה לטפל בפעולה זו."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"לחץ כדי לחזור אל המסך הקודם"</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"היום"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"היום ב-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"מחר ב-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(אירוע ללא שם)"</string>
<string name="date_time_set" msgid="4761419824439606690">"הגדר"</string>
<string name="header_im_entry" msgid="3581720979640225615">"הודעות מיידיות"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"לחץ כדי להרחיב את עורך אנשי הקשר."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"לחץ כדי לכווץ את עורך אנשי הקשר."</string>
<string name="content_description_directions" msgid="2686791825798189335">"הנחיות הגעה למיקום"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"הודעת SMS אחרונה. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. לחץ כדי להשיב"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"הודעת SMS אחרונה. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. לחץ כדי להשיב"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"נכנסת"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"יוצאת"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"לא נענתה"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"שיחה אחרונה. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. לחץ כדי להתקשר חזרה"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"שיחה אחרונה. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. לחץ כדי להתקשר חזרה"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"אתה: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts פועל טוב יותר כשאתה מזין את מזהה ה-Hangouts של המשתמש בשדה האימייל או בשדה הטלפון."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"שדות נוספים"</string>
@@ -328,7 +327,6 @@
<item quantity="one">איש קשר מקושר אחד</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> אנשי קשר מקושרים"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"קשר אנשי קשר"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"בטל"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"איש קשר זה"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"כפילויות אפשריות"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ייתכן שאנשי הקשר האלו הם אותו אדם. תוכל לקשר אותם ביחד כאיש קשר יחיד."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"מהחשבונות שלך"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"בחירת תמונה"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"מאת <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"מחק את <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"מחק את <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"מחק <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"תמונה מ-<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>לא סומנה"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"תמונה מ-<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>סומנה"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"לא סומנה תמונה מחשבון לא ידוע"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"סומנה תמונה מחשבון לא ידוע"</string>
<string name="menu_assistant" msgid="5760693735722052454">"הצעות"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"לבטל את הייצוא של <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"לא ניתן לבטל ייבוא/ייצוא של vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"שגיאה לא ידועה."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"לא ניתן לפתוח את \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"לא ניתן לפתוח את \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"לא ניתן להפעיל את המייצא: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"אין אנשי קשר הניתנים לייצוא."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"השבתת הרשאה נדרשת."</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"איש הקשר התקבל באמצעות NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"לייצא את אנשי הקשר?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"הופך לקובץ שמור"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"מייבא <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"מייבא <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"יצא לקובץ .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"מיין לפי"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"שם פרטי"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"מחיקה"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"שלוש נקודות"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> שניות"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> דקות ו-<xliff:g id="SECONDS">%s</xliff:g> שניות"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> שעות, <xliff:g id="MINUTES_1">%s</xliff:g> דקות ו-<xliff:g id="SECONDS">%s</xliff:g> שניות"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> דקות ו-<xliff:g id="SECONDS">%2$s</xliff:g> שניות"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> שעות, <xliff:g id="MINUTES_1">%2$s</xliff:g> דקות ו-<xliff:g id="SECONDS">%3$s</xliff:g> שניות"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"קיצור הדרך הזה הושבת"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"איש הקשר הוסר"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ייבא"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"אין חיבור"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"כרטיס SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"הצג עוד"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"הייבוא מכרטיס ה-SIM הסתיים"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"לא ניתן היה לייבא מכרטיס ה-SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"הייבוא מכרטיס ה-SIM מתבצע"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7cebb8b..ae200a6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 件の連絡先</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> 件の連絡先 · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 件の連絡先 · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> 件の連絡先 · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 件の連絡先 · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google アカウントから"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> から"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"発信"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"<xliff:g id="EMAIL">%s</xliff:g> を連絡先に追加しますか？"</string>
<string name="description_plus_button" msgid="515164827856229880">"プラス"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>件のファイル"</string>
<string name="search_settings_description" msgid="2675223022992445813">"連絡先の名前"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"この操作を行うアプリが見つかりませんでした。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"前の画面に戻るにはタップしてください"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"今日"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"今日の<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"明日の<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>の<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>の<xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"（無題の予定）"</string>
<string name="date_time_set" msgid="4761419824439606690">"設定"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"クリックして連絡先エディターを展開します。"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"クリックして連絡先エディターを折りたたみます。"</string>
<string name="content_description_directions" msgid="2686791825798189335">"場所までの経路"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"最近のSMS。<xliff:g id="MESSAGE_BODY">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>。<xliff:g id="DATE">%s</xliff:g>。折り返し電話するにはタップしてください。"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"最近のSMS。<xliff:g id="MESSAGE_BODY">%1$s</xliff:g>。<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>。<xliff:g id="DATE">%3$s</xliff:g>。折り返し電話するにはタップしてください。"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"着信"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"発信"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"不在着信"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"最近の通話。<xliff:g id="CALL_TYPE">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>。<xliff:g id="DATE">%s</xliff:g>。折り返し電話するにはタップしてください。"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"最近の通話。<xliff:g id="CALL_TYPE">%1$s</xliff:g>。<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>。<xliff:g id="DATE">%3$s</xliff:g>。折り返し電話するにはタップしてください。"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"あなた: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ハングアウトを使いやすくするには、相手のハングアウトIDをメールアドレス欄または電話番号欄に入力します。"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"その他の項目"</string>
@@ -312,7 +311,6 @@
<item quantity="one">リンクされた連絡先</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g>件のリンクされた連絡先"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g>（<xliff:g id="PHONETIC_NAME">%s</xliff:g>）"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"連絡先をリンク"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"キャンセル"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">（<xliff:g id="COUNT">%d</xliff:g>）</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"この連絡先"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"重複の可能性"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"これらの連絡先は同一人物である可能性があります。リンクして1つの連絡先にまとめることができます。"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"アカウントの写真"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"写真の選択"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"送信元: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>を削除"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>を削除"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g>を削除"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> の写真は選択されていません"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> の写真は選択されています"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"不明なアカウントの写真は選択されていません"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"不明なアカウントの写真が選択されています"</string>
<string name="menu_assistant" msgid="5760693735722052454">"候補"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g>のエクスポートをキャンセルしますか？"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCardインポート/エクスポート取り消し不可"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"不明なエラーです。"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"「<xliff:g id="FILE_NAME">%s</xliff:g>」を開けませんでした: <xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"「<xliff:g id="FILE_NAME">%1$s</xliff:g>」を開けませんでした: <xliff:g id="EXACT_REASON">%2$s</xliff:g>。"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"エクスポータを起動できませんでした: 「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"エクスポートできる連絡先がありません。"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"必要な権限が無効になっています。"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC受信の連絡先"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"エクスポートしますか？"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"キャッシュしています"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>件（<xliff:g id="NAME">%s</xliff:g>）をインポート中"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>件（<xliff:g id="NAME">%3$s</xliff:g>）をインポート中"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf にエクスポート"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"並べ替え"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"名"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"削除"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"省略記号"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> 時間 <xliff:g id="MINUTES_1">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> 分 <xliff:g id="SECONDS">%2$s</xliff:g> 秒"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> 時間 <xliff:g id="MINUTES_1">%2$s</xliff:g> 分 <xliff:g id="SECONDS">%3$s</xliff:g> 秒"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"このショートカットは無効になっています"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"この連絡先は削除されました"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"インポート"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"ネットワークに接続されていません"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"もっと見る"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM カードからインポートしました"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM カードからインポートできませんでした"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM からインポートしています"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 6365c17..299f432 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> კონტაქტი</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> კონტაქტი · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> კონტაქტი · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> კონტაქტი · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> კონტაქტი · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google-იდან"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g>-იდან"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"გადარეკვა"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"„<xliff:g id="EMAIL">%s</xliff:g>“ დაემატოს კონტაქტებს?"</string>
<string name="description_plus_button" msgid="515164827856229880">"პლუსი"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> (სულ <xliff:g id="TOTAL_NUMBER">%s</xliff:g> კონტაქტიდან)"</string>
<string name="search_settings_description" msgid="2675223022992445813">"თქვენი კონტაქტების სახელები"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ამ მოქმედების შესასრულებლად აპი ვერ მოიძებნა."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"დააწკაპუნეთ წინა ეკრანზე დასაბრუნებლად"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"დღეს"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"დღეს <xliff:g id="TIME_INTERVAL">%s</xliff:g>-ზე"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"ხვალ <xliff:g id="TIME_INTERVAL">%s</xliff:g>-ზე"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(უსათაურო მოვლენა)"</string>
<string name="date_time_set" msgid="4761419824439606690">"დაყენება"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"კონტაქტების რედაქტირების გაფართოებისათვის, დააჭირეთ."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"კონტაქტების რედაქტირების შეკუმშვისათვის, დააჭირეთ."</string>
<string name="content_description_directions" msgid="2686791825798189335">"მიმართულებები მდებარეობამდე"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"ბოლო sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. დააწკაპუნეთ საპასუხოდ"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"ბოლო sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. დააწკაპუნეთ საპასუხოდ"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"შემომავალი"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"გამავალი"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"გამოტოვებული"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ბოლო ზარი. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. დააწკაპუნეთ გადასარეკად"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ბოლო ზარი. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. დააწკაპუნეთ გადასარეკად"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"თქვენ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangout უკეთესად იმუშავებს იმ შემთხვევაში, თუ ტელეფონის ან ელფოსტის ველში პიროვნების Hangout-ის ინდენტიფიკატორს შეიყვანთ."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"სხვა ველები"</string>
@@ -312,7 +311,6 @@
<item quantity="one">დაკავშირებული კონტაქტი</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> მიბმული კონტაქტი"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"კონტაქტების მიბმა"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"გაუქმება"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ეს კონტაქტი"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"შესაძლო დუბლიკატები"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ეს კონტაქტები შეიძლება ერთი და იგივე პიროვნება იყოს. შეგიძლიათ მიბმის მეშვეობით მათი ერთ კონტაქტად გაერთიანება."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"თქვენი ანგარიშებიდან"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"აირჩიეთ ფოტო"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>-დან"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"წაიშალოს <xliff:g id="DATA_KIND">%s</xliff:g> (<xliff:g id="DATA_TYPE">%s </xliff:g>)"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"წაიშალოს <xliff:g id="DATA_KIND">%2$s</xliff:g> (<xliff:g id="DATA_TYPE">%1$s </xliff:g>)"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"წაიშალოს <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"ფოტო <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>-დან არ არის მონიშნული"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"ფოტო <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>-დან მონიშნულია"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"ფოტო უცნობი ანგარიშიდან არ არის მონიშნული"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"ფოტო უცნობი ანგარიშიდან მონიშნულია"</string>
<string name="menu_assistant" msgid="5760693735722052454">"შეთავაზებები"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"გსურთ <xliff:g id="FILENAME">%s</xliff:g>-ის ექსპორტის გაუქმება?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard-ის იმპორტი/ექსპორტი ვერ მოხერხდა"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"უცნობი შეცდომა."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"„<xliff:g id="FILE_NAME">%s</xliff:g>“ ვერ გაიხსნა: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"„<xliff:g id="FILE_NAME">%1$s</xliff:g>“ ვერ გაიხსნა: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"ექსპორტერის გაშვება ვერ მოხერხდა: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ექსპორტირებადი კონტაქტი არ არსებობს."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"თქვენ გათიშული გაქვთ მოთხოვნილი ნებართვა."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"კონტაქტი NFC-ით"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"გსურთ კონტაქტების ექსპორტი?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ქეშირება"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"მიმდინარეობს იმპორტი <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"მიმდინარეობს იმპორტი <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"ექსპორტი .vcf ფაილში"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"დალაგება:"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"სახელით"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"წაშლა"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"სამწერტილი"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> წმ."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> წთ. და <xliff:g id="SECONDS">%s</xliff:g> წმ."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> სთ. <xliff:g id="MINUTES_1">%s</xliff:g> წთ. <xliff:g id="SECONDS">%s</xliff:g> წმ."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> წთ. და <xliff:g id="SECONDS">%2$s</xliff:g> წმ."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> სთ. <xliff:g id="MINUTES_1">%2$s</xliff:g> წთ. <xliff:g id="SECONDS">%3$s</xliff:g> წმ."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ეს მალსახმობი გათიშულია"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"კონტაქტი წაშლილია"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"იმპორტი"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"კავშირი არ არის"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"მეტის ჩვენება"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM ბარათის იმპორტი დასრულდა"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM ბარათის იმპორტი ვერ მოხერხდა"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"მიმდინარეობს SIM-ის იმპორტი"</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 84f789a..25bfe1d 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> контакт</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> контакт· <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> контакт· <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> контакт· <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> контакт· <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google есептік жазбасынан"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> есептік жазбасынан"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Қоңырауды қайтару"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" контактілерге қосылсын ба?"</string>
<string name="description_plus_button" msgid="515164827856229880">"қосу"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>, барлық <xliff:g id="TOTAL_NUMBER">%s</xliff:g> контактілерден"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Контактілеріңіздің аттары"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Бұл әрекетті орындайтын ешқандай қолданба табылмады."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Алдыңғы экранға оралу үшін түртіңіз"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Бүгін"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Бүгін, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Ертең, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Атаусыз оқиға)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Орнату"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Контактілер өңдегішті кеңейту үшін басыңыз."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Контактілер өңдегішті тасалау үшін басыңыз."</string>
<string name="content_description_directions" msgid="2686791825798189335">"орынға бағыттар"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"жақындағы sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. жауап беру үшін басыңыз"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"жақындағы sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. жауап беру үшін басыңыз"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"кіріс"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"шығыс"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"өткізіп алған"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"жақындағы қоңырау. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. кері қоңырау шалу үшін басыңыз"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"жақындағы қоңырау. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. кері қоңырау шалу үшін басыңыз"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Сіз: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts қолданбасы электрондық пошта өрісіне немесе телефон өрісіне адамның Hangouts идентификаторын енгізгенде жақсырақ жұмыс істейді."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Тағы"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Байланысты контакт</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> байланыстырылған контакт"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"КОНТАКТІЛЕРДІ БАЙЛАНЫСТЫРУ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"БАС ТАРТУ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Осы контакт"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Ықтимал көшірмелер"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Бұл контактілер бір адам болуы мүмкін. Оларды бір контактіге біріктіруге болады."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Есептік жазбаларыңыздан"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Фотосуретті таңдау"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Кімнен: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> жою"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> жою"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> жою"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ішіндегі фотосуретке құсбелгі қойылмаған"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ішіндегі фотосуретке құсбелгі қойылған"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Белгісіз есептік жазбадан алынған фотосуретке құсбелгі қойылмады"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Белгісіз есептік жазбадан алынған фотосуретке құсбелгі қойылды"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Ұсыныстар"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> экспорттау тоқтатылсын ба?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard импорттау/экспорттау тоқтатылмады"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Белгісіз қате."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" файлын аша алмады: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" файлын аша алмады: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Экспорттаушыны қосу мүмкін болмады: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Экспортталатын контакт жоқ."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Сіз міндетті рұқсатты өшірдіңіз."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC арқ. алынған"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Контактілер экспортталсын ба?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кэштеу"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g>/<xliff:g id="CURRENT_NUMBER">%s</xliff:g> импортталуда: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>/<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> импортталуда: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf файлына экспорттау"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Сұрыптау шарты"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Аты"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Жою"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Көп нүкте"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> сағ <xliff:g id="MINUTES_1">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> мин <xliff:g id="SECONDS">%2$s</xliff:g> сек"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> сағ <xliff:g id="MINUTES_1">%2$s</xliff:g> мин <xliff:g id="SECONDS">%3$s</xliff:g> сек"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Бұл белгіше өшірілген"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Контакт жойылған"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Импорттау"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Байланыс жоқ"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Тағы көрсету"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM картасын импорттау аяқталды"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM картасын импорттау мүмкін болмады"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM картасы импортталуда"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 3dc47d2..1923274 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one">ទំនាក់ទំនង <xliff:g id="COUNT_0">%d</xliff:g></item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other">ទំនាក់ទំនង <xliff:g id="COUNT_2">%d</xliff:g> · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one">ទំនាក់ទំនង <xliff:g id="COUNT_0">%d</xliff:g> · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other">ទំនាក់ទំនង <xliff:g id="COUNT_2">%1$d</xliff:g> · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one">ទំនាក់ទំនង <xliff:g id="COUNT_0">%1$d</xliff:g> · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"ពី Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"ពី <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"ហៅទៅវិញ"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"បញ្ចូល \"<xliff:g id="EMAIL">%s</xliff:g>\" ទៅក្នុងទំនាក់ទំនង?"</string>
<string name="description_plus_button" msgid="515164827856229880">"បូក"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> នៃទំនាក់ទំនង <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"ឈ្មោះនៃទំនាក់ទំនងរបស់អ្នក"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"រកមិនឃើញកម្មវិធីសម្រាប់សកម្មភាពនេះទេ។"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ចុច ដើម្បីត្រឡប់ទៅអេក្រង់មុន"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ថ្ងៃនេះ"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"ថ្ងៃនេះនៅ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"ថ្ងៃស្អែកនៅ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ព្រឹត្តិការណ៍គ្មានចំណងជើង)"</string>
<string name="date_time_set" msgid="4761419824439606690">"កំណត់"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"ចុចដើម្បីពង្រីកកម្មវិធីកែប្រែទំនាក់ទំនង។"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"ចុចដើម្បីបង្រួមកម្មវិធីកែប្រែទំនាក់ទំនង។"</string>
<string name="content_description_directions" msgid="2686791825798189335">"ទិសដៅទៅទីតាំង"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"សារខ្លៗថ្មី។ <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ចុចដើម្បីឆ្លើយតប"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"សារខ្លៗថ្មី។ <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ចុចដើម្បីឆ្លើយតប"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ចូល"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ចេញ"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ខកខានទទួល"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ការហៅថ្មី។ <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ចុចដើម្បីហៅត្រឡប់"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ការហៅថ្មី។ <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ចុចដើម្បីហៅត្រឡប់"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"អ្នក៖ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts ដំណើរការបានយ៉ាងល្អ នៅពេលដែលអ្នកបញ្ចូលអត្តសញ្ញាណ Hangouts របស់បុគ្គលនោះទៅក្នុងប្រអប់អ៊ីម៉ែល ឬប្រអប់លេខទូរស័ព្ទ។"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"ប្រអប់បន្ថែម"</string>
@@ -312,7 +311,6 @@
<item quantity="one">ទំនាក់ទំនងដែលបានតភ្ជាប់</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"ទំនាក់ទំនងដែលបានតភ្ជាប់ <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ភ្ជាប់ទំនាក់ទំនង"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"បោះបង់"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ទំនាក់ទំនងនេះ"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"អាចនឹងស្ទួន"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ទំនាក់ទំនងទាំងនេះប្រហែលជាមនុស្សតែមួយ។ អ្នកអាចតភ្ជាប់ពួកគេជាមួយគ្នាឲ្យទៅជាទំនាក់ទំនងទោលបាន។"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"ពីគណនីរបស់អ្នក"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ជ្រើសរើសរូបថត"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"ពី <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"លុប <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"លុប <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"លុប <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"មិនបានជ្រើសរូបថតពី <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> នោះទេ"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"បានជ្រើសរូបថតពី <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"មិនបានជ្រើសរូបថតពីគណនីមិនស្គាល់ទេ"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"បានជ្រើសរូបថតពីគណនីមិនស្គាល់"</string>
<string name="menu_assistant" msgid="5760693735722052454">"ការណែនាំ"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"បោះបង់ការនាំចេញ <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"មិនអាចបោះបង់ការនាំចេញ/នាំចូល vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"មិនស្គាល់កំហុស។"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"មិនអាចបើក \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g> ។"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"មិនអាចបើក \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g> ។"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"មិនអាចចាប់ផ្ដើមមការនាំចេញ៖ \"<xliff:g id="EXACT_REASON">%s</xliff:g>\" ។"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"មិនមានទំនាក់ទំនងដើម្បីនាំចេញ។"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"អ្នកបានបិទសិទ្ធិអនុញ្ញាតដែលតម្រូវឲ្យមាន។"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"ទំនាក់ទំនងដែលបានទទួលតាម NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"នាំចេញទំនាក់ទំនង?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ការផ្ទុកក្នុងឃ្លាំងសម្ងាត់"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"កំពុងនាំចូល <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>៖ <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"កំពុងនាំចូល <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>៖ <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"នាំចេញទៅឯកសារ .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"តម្រៀបតាម"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"នាមខ្លួន"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"លុប"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"សញ្ញាចុចបី"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> វិនាទី"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> នាទី <xliff:g id="SECONDS">%s</xliff:g> វិនាទី"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ម៉ោង <xliff:g id="MINUTES_1">%s</xliff:g> នាទី <xliff:g id="SECONDS">%s</xliff:g> វិនាទី"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> នាទី <xliff:g id="SECONDS">%2$s</xliff:g> វិនាទី"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ម៉ោង <xliff:g id="MINUTES_1">%2$s</xliff:g> នាទី <xliff:g id="SECONDS">%3$s</xliff:g> វិនាទី"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ផ្លូវកាត់នេះត្រូវបានបិទ"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"ទំនាក់ទំនងត្រូវបានលុបចេញ"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"នាំចូល"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"គ្មានការតភ្ជាប់"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"បង្ហាញជាច្រើន"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"បានបញ្ចប់នាំចូលទំនាក់ទំនងក្នុងស៊ីមកាត"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"មិនអាចនាំចូលទំនាក់ទំនងក្នុងស៊ីមកាត"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"កំពុងនាំចូលទំនាក់ទំនងពី SIM"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f0774e1..191fe6e 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಸಂಪರ್ಕಗಳು</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> ಸಂಪರ್ಕಗಳು · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ಸಂಪರ್ಕಗಳು · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> ಸಂಪರ್ಕಗಳು · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> ಸಂಪರ್ಕಗಳು · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google ನಿಂದ"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g>ಖಾತೆಯಿಂದ"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"ಹಿಂತಿರುಗುವಿಕೆ ಕರೆ"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" ಗೆ ಸಂಪರ್ಕಗಳನ್ನು ಸೇರಿಸುವುದೇ?"</string>
<string name="description_plus_button" msgid="515164827856229880">"ಪ್ಲಸ್"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ರಲ್ಲಿ <xliff:g id="CURRENT_NUMBER">%s</xliff:g> ಸಂಪರ್ಕಗಳು"</string>
<string name="search_settings_description" msgid="2675223022992445813">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಹೆಸರುಗಳು"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ಈ ಕ್ರಿಯೆಯನ್ನು ನಿರ್ವಹಿಸಲು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಕಂಡುಬಂದಿಲ್ಲ."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ಹಿಂದಿನ ಪರದೆಗೆ ಹಿಂತಿರುಗಲು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ಇಂದು"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"<xliff:g id="TIME_INTERVAL">%s</xliff:g> ಕ್ಕೆ ಇಂದು"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"<xliff:g id="TIME_INTERVAL">%s</xliff:g> ಕ್ಕೆ ನಾಳೆ"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ಶೀರ್ಷಿಕೆರಹಿತ ಈವೆಂಟ್)"</string>
<string name="date_time_set" msgid="4761419824439606690">"ಹೊಂದಿಸಿ"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"ಸಂಪರ್ಕ ಸಂಪಾದಕವನ್ನು ವಿಸ್ತರಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"ಸಂಪರ್ಕ ಸಂಪಾದಕವನ್ನು ಕುಗ್ಗಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ."</string>
<string name="content_description_directions" msgid="2686791825798189335">"ಸ್ಥಳಕ್ಕಾಗಿ ದಿಕ್ಕುಗಳು"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"ಇತ್ತೀಚಿನ sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ಪ್ರತಿಕ್ರಿಯಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"ಇತ್ತೀಚಿನ sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ಪ್ರತಿಕ್ರಿಯಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ಒಳಬರುವ"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ಹೊರಹೋಗುವ"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ತಪ್ಪಿಸಿಕೊಂಡ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ಇತ್ತೀಚಿನ ಕರೆ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ಪುನಃ ಕರೆ ಮಾಡಲು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ಇತ್ತೀಚಿನ ಕರೆ. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ಪುನಃ ಕರೆ ಮಾಡಲು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"ನೀವು: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ಇಮೇಲ್ ಕ್ಷೇತ್ರ ಅಥವಾ ಫೋನ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ವ್ಯಕ್ತಿಯ Hangouts ಗುರುತಿಸುವಿಕೆಯನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ Hangouts ಉತ್ತಮವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"ಇನ್ನಷ್ಟು ಫೀಲ್ಡ್ಗಳು"</string>
@@ -312,7 +311,6 @@
<item quantity="other">ಲಿಂಕ್ ಮಾಡಲಾದ ಸಂಪರ್ಕಗಳು (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> ಲಿಂಕ್ ಮಾಡಲಾದ ಸಂಪರ್ಕಗಳು"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ಲಿಂಕ್ ಸಂಪರ್ಕಗಳು"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ರದ್ದುಮಾಡಿ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ಈ ಸಂಪರ್ಕ"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ಸಂಭವನೀಯ ನಕಲಿಗಳು"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ಈ ಸಂಪರ್ಕಗಳು ಅದೇ ವ್ಯಕ್ತಿಯದ್ದಾಗಿರಬಹುದು. ನೀವು ಅವುಗಳನ್ನು ಏಕ ಸಂಪರ್ಕವಾಗಿ ಒಟ್ಟಿಗೆ ಲಿಂಕ್ ಮಾಡಬಹುದು."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"ನಿಮ್ಮ ಖಾತೆಗಳಿಂದ"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ನಿಂದ"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> ಅಳಿಸಿ"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> ಅಳಿಸಿ"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> ಅಳಿಸಿ"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="USER_NAME">%s </xliff:g><xliff:g id="ACCOUNT_TYPE">%s </xliff:g> ಅವರಿಂದ ಫೋಟೋ ಗುರುತಿಸಲಾಗಿಲ್ಲ"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="USER_NAME">%s </xliff:g><xliff:g id="ACCOUNT_TYPE">%s </xliff:g> ಅವರಿಂದ ಫೋಟೋ ಗುರುತಿಸಲಾಗಿದೆ"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"ಅಪರಿಚಿತ ಖಾತೆಯಿಂದ ಫೋಟೋವನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"ಅಪರಿಚಿತ ಖಾತೆಯಿಂದ ಫೋಟೋವನ್ನು ಗುರುತಿಸಲಾಗಿದೆ"</string>
<string name="menu_assistant" msgid="5760693735722052454">"ಸಲಹೆಗಳು"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> ರಫ್ತು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard ಆಮದು/ರಫ್ತು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"ಅಪರಿಚಿತ ದೋಷ."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"ರಫ್ತುದಾರರನ್ನು ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ಯಾವುದೇ ರಫ್ತುಮಾಡಬಹುದಾದ ಸಂಪರ್ಕವಿಲ್ಲ."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"ನೀವು ಅಗತ್ಯವಿರುವ ಅನುಮತಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿರುವಿರಿ."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC ಮೂಲಕ ಸ್ವೀಕರಿಸಲಾದ ಸಂಪರ್ಕ"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"ಸಂಪರ್ಕಗಳನ್ನು ರವಾನಿಸುವುದೇ?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ಸಂಗ್ರಹಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ಫೈಲ್ಗೆ ರಫ್ತು ಮಾಡಿ"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸಿ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ಮೊದಲ ಹೆಸರು"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"ಅಳಿಸಿ"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"ಎಲಿಪ್ಸಿಸ್"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> ಸೆ"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> ನಿಮಿ <xliff:g id="SECONDS">%s</xliff:g> ಸೆ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ಗಂ <xliff:g id="MINUTES_1">%s</xliff:g> ನಿಮಿಷ <xliff:g id="SECONDS">%s</xliff:g> ಸೆ"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> ನಿಮಿ <xliff:g id="SECONDS">%2$s</xliff:g> ಸೆ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ಗಂ <xliff:g id="MINUTES_1">%2$s</xliff:g> ನಿಮಿಷ <xliff:g id="SECONDS">%3$s</xliff:g> ಸೆ"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ಈ ಶಾರ್ಟ್ಕಟ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"ಸಂಪರ್ಕವನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ಆಮದು"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"ಯಾವುದೇ ಸಂಪರ್ಕವಿಲ್ಲ"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"ಸಿಮ್"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"ಇನ್ನಷ್ಟು ತೋರಿಸಿ"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"ಸಿಮ್ ಕಾರ್ಡ್ ಆಮದು ಮುಕ್ತಾಯಗೊಂಡಿದೆ"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"ಸಿಮ್ ಕಾರ್ಡ್ ಆಮದು ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ಸಿಮ್ ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 59c4741..548a7d6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one">연락처 <xliff:g id="COUNT_0">%d</xliff:g>개</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other">연락처 <xliff:g id="COUNT_2">%d</xliff:g>개 · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one">연락처 <xliff:g id="COUNT_0">%d</xliff:g>개 · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other">연락처 <xliff:g id="COUNT_2">%1$d</xliff:g>개 · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one">연락처 <xliff:g id="COUNT_0">%1$d</xliff:g>개 · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google에서 제공"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> 계정 연락처"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"전화 걸기"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\'<xliff:g id="EMAIL">%s</xliff:g>\'을(를) 주소록에 추가하겠습니까?"</string>
<string name="description_plus_button" msgid="515164827856229880">"더하기"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"연락처 <xliff:g id="CURRENT_NUMBER">%s</xliff:g>개(총 <xliff:g id="TOTAL_NUMBER">%s</xliff:g>개) 내보내는 중"</string>
<string name="search_settings_description" msgid="2675223022992445813">"연락처 명단"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"이 작업을 처리하는 앱을 찾을 수 없습니다."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"이전 화면으로 돌아가려면 클릭"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"오늘"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"오늘 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"내일 <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="TIME_INTERVAL">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="TIME_INTERVAL">%2$s</xliff:g>, <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(제목 없는 일정)"</string>
<string name="date_time_set" msgid="4761419824439606690">"설정"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"연락처 편집기를 펼치려면 클릭하세요."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"연락처 편집기를 접으려면 클릭하세요."</string>
<string name="content_description_directions" msgid="2686791825798189335">"길찾기"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"최근 SMS 내역은 다음과 같습니다. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. 답장하려면 클릭하세요."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"최근 SMS 내역은 다음과 같습니다. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. 답장하려면 클릭하세요."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"수신"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"발신"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"부재중"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"최근 통화내역은 다음과 같습니다. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. 연락 온 번호로 다시 전화하려면 클릭하세요."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"최근 통화내역은 다음과 같습니다. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. 연락 온 번호로 다시 전화하려면 클릭하세요."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"내가 보낸 메시지: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"사용자의 행아웃 식별자를 이메일 입력란 또는 휴대전화 입력란에 입력하면 행아웃이 더 잘 작동합니다."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"입력란 더보기"</string>
@@ -312,7 +311,6 @@
<item quantity="one">연결된 연락처</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"연결된 연락처 <xliff:g id="COUNT">%d</xliff:g>개"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g>(<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"연락처 연결"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"취소"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>개)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"이 연락처"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"중복된 것으로 보이는 연락처"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"이 연락처는 같은 사람일 수 있습니다. 이 연락처들을 하나의 연락처로 연결할 수 있습니다."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"내 계정의 프로필 사진"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"사진 선택"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"저장된 계정: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> 삭제"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> 삭제"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> 삭제"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>의 사진 선택 안됨"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>의 사진 선택됨"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"알 수 없는 계정의 사진이 선택되지 않음"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"알 수 없는 계정의 사진이 선택됨"</string>
<string name="menu_assistant" msgid="5760693735722052454">"추천"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> 내보내기를 취소하시겠습니까?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard 가져오기/내보내기를 취소하지 못했습니다."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"알 수 없는 오류입니다."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\'<xliff:g id="FILE_NAME">%s</xliff:g>\'을(를) 열 수 없습니다(이유: <xliff:g id="EXACT_REASON">%s</xliff:g>)."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\'<xliff:g id="FILE_NAME">%1$s</xliff:g>\'을(를) 열 수 없습니다(이유: <xliff:g id="EXACT_REASON">%2$s</xliff:g>)."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"내보내기를 시작하지 못했습니다(이유: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\')."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"내보낼 수 있는 연락처가 없습니다."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"필수 권한을 사용 중지했습니다."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC를 통해 받은 연락처"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"주소록을 내보내시겠습니까?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"캐시"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> 가져오는 중: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> 가져오는 중: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".VCF 파일로 내보내기"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"정렬 기준"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"이름"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"삭제"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"생략 기호"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g>초"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g>분 <xliff:g id="SECONDS">%s</xliff:g>초"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g>시간 <xliff:g id="MINUTES_1">%s</xliff:g>분 <xliff:g id="SECONDS">%s</xliff:g>초"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g>분 <xliff:g id="SECONDS">%2$s</xliff:g>초"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g>시간 <xliff:g id="MINUTES_1">%2$s</xliff:g>분 <xliff:g id="SECONDS">%3$s</xliff:g>초"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"이 바로가기는 사용 중지되었습니다."</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"연락처가 삭제되었습니다."</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"가져오기"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"연결되지 않음"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"더보기"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM 카드 가져오기 완료"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM 카드 가져오기 실패"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM 가져오는 중"</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index f2c2f67..f4fcd51 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> байланыш</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> байланыш · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> байланыш · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> байланыш · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> байланыш · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google каттоо эсебинен"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> каттоо эсбнен"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Кайра чалуу"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Байланыштарга \"<xliff:g id="EMAIL">%s</xliff:g>\" кошосузбу?"</string>
<string name="description_plus_button" msgid="515164827856229880">"кошуу"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> байланыштын ичинен <xliff:g id="CURRENT_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Байланыштарыңыздын аттары"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Бул ишти аткаруучу эч бир колдонмо табылган жок."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Мурунку экранга кайтуу үчүн чыкылдатыңыз"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Бүгүн"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Бүгүн саат <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Эртең саат <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Аталышы жок окуя)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Коюу"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Байланыш түзөткүчүн жайып көрсөтүү үчүн чыкылдатыңыз."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Байланыш түзөткүчүн жыйыштыруу үчүн чыкылдатыңыз."</string>
<string name="content_description_directions" msgid="2686791825798189335">"жайгашуу ордуна багыттоолор"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"акыркы sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. жооп берүү үчүн чыкылдатыңыз"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"акыркы sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. жооп берүү үчүн чыкылдатыңыз"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"келүүчү"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"чыгуучу"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"жооп берилбей калган"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"акыркы чалуу. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. кайра чалуу үчүн чыкылдатыңыз"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"акыркы чалуу. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. кайра чалуу үчүн чыкылдатыңыз"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Сиз: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Кимдир-бирөөнүн Hangouts аныктагычы электрондук почта же телефон талаасына киргизилгенде Hangouts жакшыраак иштейт."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Калган талааларды көрсөтүү"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Бириктирилген байланыш</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> байланыш шилтемеленген"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"БАЙЛАНЫШТАРДЫ ШИЛТЕМЕЛӨӨ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ЖОК"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ушул байланыш"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Булар жупнуска болушу мүмкүн"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Бул байланыштар бир эле адам болушу мүмкүн. Аларды жалгыз байланыш кылып бириктирсеңиз болот."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Каттоо эсептериңизден"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Сүрөт тандаңыз"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> дегенден"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> жок кылуу"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> жок кылуу"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> жок кылуу"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> дегенден сүрөт белгиленген жк"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> дегенден сүрөт белгиленди"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Белгисиз каттоо эсебинен келген сүрөт тандалган жок"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Белгисиз каттоо эсебинен келген сүрөт тандалды"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Сунуштар"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> файлын экспорттоо токтотулсунбу?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard файлдарын импорттоо/экспорттоо токтотулган жок."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Белгисиз ката."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ачылбай жатат: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ачылбай жатат: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Экспорттоо башталбай жатат: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Экспортко жарактуу байланыш жок."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Керектүү уруксатты өчүрүп койгонсуз."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC аркылуу"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Байланыштар өткөрүлүп берилсинби?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кэштөө"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g> өткөрүп алынууда"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g> өткөрүп алынууда"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf файлына өткөрүп берүү"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Төмөнкү боюнча иргөө"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Аты"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Жок кылуу"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Эллипс"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> мүн. <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> с <xliff:g id="MINUTES_1">%s</xliff:g> мүн <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> мүн. <xliff:g id="SECONDS">%2$s</xliff:g> сек"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> с <xliff:g id="MINUTES_1">%2$s</xliff:g> мүн <xliff:g id="SECONDS">%3$s</xliff:g> сек"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Кыска жол өчүрүлдү"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Байланыш алынып салынган"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Өткөрүп алуу"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Байланыш жок"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM-карта"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Дагы көрсөтүү"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM-картадан өткөрүп алуу аяктады"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM-картадан өткөрүп алууда ката кетти"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-картадан өткөрүлүп алынууда"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 4b52822..42a2b77 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ລາຍຊື່ຜູ້ຕິດຕໍ່</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ລາຍຊື່ຜູ້ຕິດຕໍ່ · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ລາຍຊື່ຜູ້ຕິດຕໍ່ · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> ລາຍຊື່ຜູ້ຕິດຕໍ່ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ລາຍຊື່ຜູ້ຕິດຕໍ່ · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"ຈາກ Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"ຈາກ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"ໂທກັບ"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"ເພີ່ມ \"<xliff:g id="EMAIL">%s</xliff:g>\" ໃສ່ລາຍຊື່ຜູ່ຕິດຕໍ່?"</string>
<string name="description_plus_button" msgid="515164827856229880">"ບວກ"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"ລາຍຊື່ຜູ່ຕິດຕໍ່ <xliff:g id="CURRENT_NUMBER">%s</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_NUMBER">%s</xliff:g> ລາຍຊື່"</string>
<string name="search_settings_description" msgid="2675223022992445813">"ຊື່ຂອງລາຍຊື່ຜູ່ຕິດຕໍ່ຂອງທ່ານ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ບໍ່ພົບແອັບຯທີ່ໃຊ້ເພື່ອດຳເນີນການ."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ຄລິກເພື່ອກັບໄປທີ່ໜ້າຈໍກ່ອນໜ້ານີ້"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ມື້ນີ້"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"ມື້ນີ້ໃນເວລາ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"ມື້ອື່ນໃນເວລາ <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ນັດໝາຍບໍ່ມີຊື່)"</string>
<string name="date_time_set" msgid="4761419824439606690">"ຕົກລົງ"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"ຄລິກເພື່ອຂະຫຍາຍເຄື່ອງກວດແກ້ລາຍຊື່ຕິດຕໍ່."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"ຄລິກເພື່ອຫຍໍ້ເຄື່ອງກວດແກ້ລາຍຊື່ຕິດຕໍ່."</string>
<string name="content_description_directions" msgid="2686791825798189335">"ເສັ້ນທາງໄປຫາສະຖານທີ່"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS ຫຼ້າສຸດ. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ຄລິກເພື່ອຕອບກັບ"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS ຫຼ້າສຸດ. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ຄລິກເພື່ອຕອບກັບ"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ສາຍໂທເຂົ້າ"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ສາຍໂທອອກ"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ບໍ່ໄດ້ຮັບ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ການໂທຫຼ້າສຸດ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ຄລິກເພື່ອໂທກັບ"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ການໂທຫຼ້າສຸດ. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ຄລິກເພື່ອໂທກັບ"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"ທ່ານ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts ເຮັດວຽກໄດ້ດີຂຶ້ນ ເມື່ອທ່ານປ້ອນຕົວລະບຸ Hangouts ຂອງບຸກຄົນໃສ່ບ່ອນໃສ່ອີເມວ ຫຼືບ່ອນໃສ່ໂທລະສັບຂອງທ່ານ."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"ຊ່ອງຂໍ້ມູນເພີ່ມເຕີມ"</string>
@@ -312,7 +311,6 @@
<item quantity="one">ລາຍຊື່ຕິດຕໍ່ທີ່ລິ້ງແລ້ວ</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> ລາຍຊື່ຕິດຕໍ່ລິ້ງແລ້ວ"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ລິ້ງລາຍຊື່ຕິດຕໍ່"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ຍົກເລີກ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ລາຍຊື່ຕິດຕໍ່ນີ້"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ເປັນໄປໄດ້ວ່າມີການຊ້ຳກັນ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ລາຍຊື່ຕິດຕໍ່ເຫຼົ່ານີ້ອາດຈະເປັນຄົນດຽວກັນ. ທ່ານສາມາດລິ້ງພວກມັນເຂົ້າກັນເປັນບັນຊີດຽວໄດ້."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"ຈາກບັນຊີຂອງທ່ານ"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ເລືອກຮູບ"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"ຈາກ <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"ລຶບ <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"ລຶບ <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"ລຶບ <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"ຮູບຖ່າຍຈາກ <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>ບໍ່ໄດ້ຮັບການກວດ"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"ຮູບຖ່າຍຈາກ <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>ໄດ້ຮັບການກວດແລ້ວ"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"ບໍ່ໄດ້ໝາຍເອົາຮູບຖ່າຍຈາກບັນຊີທີ່ບໍ່ຮູ້ຈັກແລ້ວ"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"ໝາຍເອົາຮູບຖ່າຍຈາກບັນຊີທີ່ບໍ່ຮູ້ຈັກແລ້ວ"</string>
<string name="menu_assistant" msgid="5760693735722052454">"ຄຳແນະນຳ"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"ຍົກເລີກການສົ່ງອອກ <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"ບໍ່ສາມາດຍົກເລີກການ ນຳເຂົ້າ/ສົ່ງອອກ vCard ໄດ້"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ເຫດຜົນ."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"ບໍ່ສາມາດເປີດ \"<xliff:g id="FILE_NAME">%s</xliff:g>\" ໄດ້: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"ບໍ່ສາມາດເປີດ \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ໄດ້: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"ບໍ່ສາມາດເລີ່ມໂປຣແກຣມສົ່ງອອກໄດ້: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ສາມາດສົ່ງອອກໄດ້."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"ທ່ານປິດການນຳໃຊ້ສິດອະນຸຍາດທີ່ຈຳເປັນໄວ້ແລ້ວ."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ໄດ້ຮັບຜ່ານ NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"ສົ່ງອອກລາຍຊື່ຜູ່ຕິດຕໍ່?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ກຳລັງເກັບຂໍ້ມູນ"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"ກຳລັງນຳເຂົ້າ <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"ກຳລັງນຳເຂົ້າ <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"ສົ່ງອອກຫາໄຟລ໌ .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ຮຽງລຳດັບຕາມ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ຊື່"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"ລຶບ"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"ເຄື່ອງໝາຍສາມຈໍ້າ"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> ວິ"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> ນທ <xliff:g id="SECONDS">%s</xliff:g> ວິ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ຊມ <xliff:g id="MINUTES_1">%s</xliff:g> ນທ <xliff:g id="SECONDS">%s</xliff:g> ວິ"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> ນທ <xliff:g id="SECONDS">%2$s</xliff:g> ວິ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ຊມ <xliff:g id="MINUTES_1">%2$s</xliff:g> ນທ <xliff:g id="SECONDS">%3$s</xliff:g> ວິ"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ທາງລັດນີ້ຖືກປິດການນຳໃຊ້ແລ້ວ"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"ລຶບລາຍຊື່ຜູ້ຕິດຕໍ່ອອກແລ້ວ"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ນຳເຂົ້າ"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"ບໍ່ມີການເຊື່ອມຕໍ່"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"ຊິມ"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"ສະແດງເພີ່ມເຕີມ"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"ນຳເຂົ້າ SIM ສຳເລັດແລ້ວ"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"ບໍ່ສາມາດນຳເຂົ້າ SIM ໄດ້"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ກຳລັງນຳເຂົ້າຈາກ SIM"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e0a1770..d91282a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -87,10 +87,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kontaktų</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> kontaktas <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> kontaktai <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> kontakto <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontaktų <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktas <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktai <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakto <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktų <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Iš „Google“"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Iš <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"Grįžtamasis skambutis"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Pridėti „<xliff:g id="EMAIL">%s</xliff:g>“ prie adresatų?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plius"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> iš <xliff:g id="TOTAL_NUMBER">%s</xliff:g> adresatų"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktų vardai"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nerasta jokių programų šiam veiksmui apdoroti."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Spustelėkite, kad grįžtumėte į ankstesnį ekraną"</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"Šiandien"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Šiandien, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Rytoj, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Įvykis be pavadinimo)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Nustatyti"</string>
<string name="header_im_entry" msgid="3581720979640225615">"TP"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Spustelėkite, kad išskleistumėte kontaktų redagavimo priemonę."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Spustelėkite, kad sutrauktumėte kontaktų redagavimo priemonę."</string>
<string name="content_description_directions" msgid="2686791825798189335">"nuorodos į vietovę"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Neseniai atsiuntė SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Spustelėkite, kad atsakytumėte."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Neseniai atsiuntė SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Spustelėkite, kad atsakytumėte."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"gaunamieji"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"siunčiamieji"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"praleistieji"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Neseniai skambino. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Spustelėkite, kad atskambintumėte."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Neseniai skambino. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Spustelėkite, kad atskambintumėte."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"„Hangout“ veikia geriau įvedus asmens „Hangout“ identifikatorių el. pašto ar telefono numerio lauke."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Daugiau laukų"</string>
@@ -328,7 +327,6 @@
<item quantity="other">Susieti kontaktai (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Susietų kontaktų: <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"SUSIETI KONTAKTUS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ATŠAUKTI"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="many">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g> <xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Šis kontaktas"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Galimos tikslios kopijos"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Šie kontaktai gali būti tas pats asmuo. Galite juos susieti kaip vieną kontaktą."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Iš jūsų paskyrų"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Pasirinkti nuotrauką"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Iš <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Ištrinti <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Ištrinti <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Ištrinti <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Nuotrauka iš <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> nepažymėta"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Nuotrauka iš <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> pažymėta"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Nepažymėta nuotrauka iš nežinomos paskyros"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Pažymėta nuotrauka iš nežinomos paskyros"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Pasiūlymai"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Atšaukti <xliff:g id="FILENAME">%s</xliff:g> eksportavimą?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Nepavyko atš. „vCard“ imp. / eksp."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Nežinoma klaida."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nepavyko atidaryti „<xliff:g id="FILE_NAME">%s</xliff:g>“: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nepavyko atidaryti „<xliff:g id="FILE_NAME">%1$s</xliff:g>“: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nepavyko inicijuoti eksportavimo priemonės: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nėra eksportuojamo kontakto."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Išjungėte būtiną leidimą."</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Gauta per ALR"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksp. kontaktus?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Dedama į talpyklą…"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importuojama <xliff:g id="CURRENT_NUMBER">%s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importuojama <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksportuoti į .vcf failą"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Rūšiuoti pagal"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Vardas"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Ištrinti"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Daugtaškis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sek."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> val. <xliff:g id="MINUTES_1">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min. <xliff:g id="SECONDS">%2$s</xliff:g> sek."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> val. <xliff:g id="MINUTES_1">%2$s</xliff:g> min. <xliff:g id="SECONDS">%3$s</xliff:g> sek."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Šis spartusis klavišas išjungtas"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontaktas pašalintas"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importuoti"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nėra ryšio"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM kort."</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Rodyti daugiau"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM kortelės kontaktai importuoti"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Nepavyko importuoti SIM kortelės kont."</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuojami SIM kortelės kontaktai"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 57697ba..cd4dd95 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -85,9 +85,9 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kontaktpersonas</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="zero"><xliff:g id="COUNT_2">%d</xliff:g> kontaktpersonas (<xliff:g id="ACCOUNT_3">%s</xliff:g>)</item>
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> kontaktpersona (<xliff:g id="ACCOUNT_3">%s</xliff:g>)</item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontaktpersonas (<xliff:g id="ACCOUNT_3">%s</xliff:g>)</item>
+ <item quantity="zero"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktpersonas (<xliff:g id="ACCOUNT_3">%2$s</xliff:g>)</item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktpersona (<xliff:g id="ACCOUNT_3">%2$s</xliff:g>)</item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktpersonas (<xliff:g id="ACCOUNT_3">%2$s</xliff:g>)</item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"No Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"No konta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -169,7 +169,6 @@
<string name="returnCall" msgid="8171961914203617813">"Atzvanīt"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Vai pievienot “<xliff:g id="EMAIL">%s</xliff:g>” kontaktpersonām?"</string>
<string name="description_plus_button" msgid="515164827856229880">"pluss"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> no <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontaktpersonas(-ām)"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktpersonu vārdi"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Netika atrasta neviena lietotne šīs darbības veikšanai."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Noklikšķiniet, lai atgrieztos iepriekšējā ekrānā."</string>
@@ -282,7 +281,7 @@
<string name="today" msgid="8041090779381781781">"Šodien"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Šodien plkst. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Rīt plkst. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Pasākums bez nosaukuma)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Iestatīt"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Tūlītējā ziņojumapmaiņa"</string>
@@ -299,11 +298,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Noklikšķiniet, lai izvērstu kontaktpersonu redaktoru."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Noklikšķiniet, lai sakļautu kontaktpersonu redaktoru."</string>
<string name="content_description_directions" msgid="2686791825798189335">"norādes uz atrašanās vietu"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Nesen saņemta īsziņa. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Noklikšķiniet, lai atbildētu."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Nesen saņemta īsziņa. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Noklikšķiniet, lai atbildētu."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ienākošs"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"izejošs"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"neatbildēts"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Nesen saņemts zvans. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Noklikšķiniet, lai atzvanītu."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Nesen saņemts zvans. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Noklikšķiniet, lai atzvanītu."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Funkcija Hangouts darbojas precīzāk, ja e-pasta vai tālruņa laukā ievadāt personas Hangouts identifikatoru."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Vairāk lauku"</string>
@@ -320,7 +319,6 @@
<item quantity="other">Saistītās kontaktpersonas (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> saistītas kontaktpersonas"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"SAISTĪT KONTAKTPERSONAS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ATCELT"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -338,7 +336,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Šī kontaktpersona"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Iespējamie dublikāti"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Iespējams, šīs kontaktpersonas ir viena un tā pati persona. Varat tās apvienot vienā kontaktpersonā."</string>
@@ -346,10 +343,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"No jūsu kontiem"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Fotoattēla izvēle"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"No: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Dzēst: <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Dzēst: <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Dzēst: <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Fotoattēls no <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> nav atlasīts."</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotoattēls no <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ir atlasīts."</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Nav atzīmēts fotoattēls no nezināma konta"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Atzīmēts fotoattēls no nezināma konta"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Ieteikumi"</string>
@@ -527,7 +522,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Vai atcelt faila <xliff:g id="FILENAME">%s</xliff:g> eksportēšanu?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Nevarēja atcelt vCard f. import./eksp."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Nezināma kļūda."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nevarēja atvērt failu <xliff:g id="FILE_NAME">%s</xliff:g>: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nevarēja atvērt failu <xliff:g id="FILE_NAME">%1$s</xliff:g>: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nevarēja startēt eksportētāju: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nav nevienas eksportējamas kontaktpersonas."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Jūs esat atspējojis obligātu atļauju."</string>
@@ -569,7 +564,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"No NFC saņ. kontaktinf."</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Vai eksp. kontaktp.?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Notiek saglabāšana kešatmiņā"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importē <xliff:g id="CURRENT_NUMBER">%s</xliff:g> no <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importē <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> no <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksportēt .vcf failā"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Kārtot pēc:"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Vārds"</string>
@@ -635,8 +630,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Dzēst"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Daudzpunkte"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Šī saīsne ir atspējota."</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontaktpersona tika noņemta."</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importēt"</string>
@@ -660,4 +655,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nav savienojuma"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Rādīt vairāk"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM kartes importēšana pabeigta"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Nevarēja importēt SIM karti"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Notiek SIM kartes importēšana"</string>
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 375b449..b6239e8 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> контакти</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> контакт · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> контакти · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> контакт · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> контакти · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Од Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Од <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Врати повик"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Додај „<xliff:g id="EMAIL">%s</xliff:g>“ во контакти?"</string>
<string name="description_plus_button" msgid="515164827856229880">"плус"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> од <xliff:g id="TOTAL_NUMBER">%s</xliff:g> контакти"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Имиња на вашите контакти"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Не е пронајдена апликација да се справи со ова дејство."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Кликнете за да се вратите на претходниот екран"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Денес"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Денес во <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Утре во <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Неименуван настан)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Постави"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Кликнете за да го проширите уредникот за контакти."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Кликнете за да го соберете уредникот за контакти."</string>
<string name="content_description_directions" msgid="2686791825798189335">"насоки до локација"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"неодамнешна SMS-порака. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. кликни за да одговориш"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"неодамнешна SMS-порака. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. кликни за да одговориш"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"дојдовен"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"појдовен"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропуштен"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"неодамнешен повик. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. кликни за да повикаш назад"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"неодамнешен повик. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. кликни за да повикаш назад"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Вие: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts работат подобро кога во полето за е-пошта или за телефон ќе го внесете идентификаторот на Hangouts за лицето."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Повеќе полиња"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Поврзани контакти (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> поврзани контакти"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ПОВРЗИ КОНТАКТИ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ОТКАЖИ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Овој контакт"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Можни дупликати"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Овие контакти можеби се на истото лице. Може да ги споите во еден контакт."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Од вашите сметки"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Избери фотографија"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Од <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Избриши <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Избриши <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Избриши <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Фотографијата од <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>не е избрана"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Фотографијата од <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>е избрана"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Не е избрана фотографија од непозната сметка"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Избрана е фотографија од непозната сметка"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Предлози"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Да се откаже извозот на <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Не може да се откаже увоз/извоз на vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Непозната грешка."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"„<xliff:g id="FILE_NAME">%s</xliff:g>“ не можеше да се отвори: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"„<xliff:g id="FILE_NAME">%1$s</xliff:g>“ не можеше да се отвори: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Не можеше да се вклучи извозникот: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Нема контакт на кој може да се изврши извоз."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Оневозможивте потребна дозвола."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Контакт од NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Да се изврши извоз на контакти?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кеширање"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Се врши увоз на <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Се врши увоз на <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Извези во датотеката .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Подредете по"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Име"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Избриши"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Три точки"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> час <xliff:g id="MINUTES_1">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> мин. <xliff:g id="SECONDS">%2$s</xliff:g> сек."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> час <xliff:g id="MINUTES_1">%2$s</xliff:g> мин. <xliff:g id="SECONDS">%3$s</xliff:g> сек."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Кратенкава е оневозможена"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Контактот е отстранет"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Увези"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Нема мрежа"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Прикажи повеќе"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Увезувањето на SIM-картичката заврши"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Не можеше да се увезе SIM-картичка"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Се увезува SIM"</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index b238cc2..44c3d35 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> കോൺടാക്റ്റ്</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> കോൺടാക്റ്റുകൾ · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> കോൺടാക്റ്റ് · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> കോൺടാക്റ്റുകൾ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> കോൺടാക്റ്റ് · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google-ൽ നിന്നുള്ളവ"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> അക്കൗണ്ടിൽ നിന്നുള്ളവ"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"കോളിലേക്ക് മടങ്ങുക"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"കോൺടാക്റ്റുകളിലേക്ക് \"<xliff:g id="EMAIL">%s</xliff:g>\" ചേർക്കണോ?"</string>
<string name="description_plus_button" msgid="515164827856229880">"പ്ലസ്"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%s</xliff:g> കോൺടാക്റ്റുകൾ"</string>
<string name="search_settings_description" msgid="2675223022992445813">"നിങ്ങളുടെ കോൺടാക്റ്റുകളുടെ പേരുകൾ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ഈ പ്രവർത്തനം കൈകാര്യം ചെയ്യാൻ അപ്ലിക്കേഷനുകളൊന്നും കണ്ടെത്തിയില്ല."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"മുമ്പത്തെ സ്ക്രീനിലേക്ക് മടങ്ങാൻ ക്ലിക്കുചെയ്യുക"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ഇന്ന്"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"ഇന്ന് <xliff:g id="TIME_INTERVAL">%s</xliff:g> മണിയ്ക്ക്"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"നാളെ <xliff:g id="TIME_INTERVAL">%s</xliff:g> മണിയ്ക്ക്"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ശീർഷകമില്ലാത്ത ഇവന്റ്)"</string>
<string name="date_time_set" msgid="4761419824439606690">"സജ്ജമാക്കുക"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"കോൺടാക്റ്റ് എഡിറ്റർ വിപുലീകരിക്കാൻ ക്ലിക്കുചെയ്യുക."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"കോൺടാക്റ്റ് എഡിറ്റർ ചുരുക്കാൻ ക്ലിക്കുചെയ്യുക."</string>
<string name="content_description_directions" msgid="2686791825798189335">"ലൊക്കേഷനിലേക്കുള്ള വഴികൾ"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"പുതിയ sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. മറുപടി നൽകാൻ ക്ലിക്കുചെയ്യുക"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"പുതിയ sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. മറുപടി നൽകാൻ ക്ലിക്കുചെയ്യുക"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ഇൻകമിംഗ്"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ഔട്ട്ഗോയിംഗ്"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"മിസ്ഡ് കോളുകൾ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"പുതിയ കോൾ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. തിരികെ വിളിക്കാൻ ക്ലിക്കുചെയ്യുക"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"പുതിയ കോൾ. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. തിരികെ വിളിക്കാൻ ക്ലിക്കുചെയ്യുക"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"നിങ്ങൾ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ഇമെയിൽ ഫീൽഡിലോ ഫോൺ ഫീൽഡിലോ വ്യക്തിയുടെ Hangouts ഐഡന്റിഫയർ നൽകുമ്പോൾ, Hangouts മികച്ചതായി പ്രവർത്തിക്കുന്നു."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"കൂടുതൽ ഫീൽഡുകൾ"</string>
@@ -312,7 +311,6 @@
<item quantity="one">ലിങ്കുചെയ്ത കോൺടാക്റ്റ്</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"ലിങ്കുചെയ്ത <xliff:g id="COUNT">%d</xliff:g> കോൺടാക്റ്റുകൾ"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"കോണ്ടാക്റ്റുകൾ ലിങ്കുചെയ്യൂ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"റദ്ദാക്കുക"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ഈ കോൺടാക്റ്റ്"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"സാധ്യതയുള്ള ഡ്യൂപ്ലിക്കേറ്റുകൾ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ഈ കോൺടാക്റ്റുകൾ, ഒരേ വ്യക്തി ആയേക്കാം, ഒരൊറ്റ കോൺടാക്റ്റായി നിങ്ങൾക്കിവ ലിങ്കുചെയ്യാവുന്നതാണ്."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"നിങ്ങളുടെ അക്കൗണ്ടുകളിൽ നിന്നും"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> എന്നതിൽ നിന്ന്"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> ഇല്ലാതാക്കുക"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> ഇല്ലാതാക്കുക"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> ഇല്ലാതാക്കുക"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> എന്നതിൽ നിന്നുള്ള ഫോട്ടോ ചെക്കുചെയ്തില്ല"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> എന്നതിൽ നിന്നുള്ള ഫോട്ടോ ചെക്കുചെയ്തു"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"തിരിച്ചറിയാനാകാത്ത അക്കൗണ്ടിൽ നിന്നുള്ള ഫോട്ടോ തിരഞ്ഞെടുത്തിട്ടില്ല"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"തിരിച്ചറിയാനാകാത്ത അക്കൗണ്ടിൽ നിന്നുള്ള ഫോട്ടോ തിരഞ്ഞെടുത്തു"</string>
<string name="menu_assistant" msgid="5760693735722052454">"നിര്ദ്ദേശങ്ങള്"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് എക്സ്പോർട്ടുചെയ്യുന്നത് റദ്ദാക്കണോ?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard ഇമ്പോർട്ടുചെയ്യൽ/എക്സ്പോർട്ടുചെയ്യൽ റദ്ദാക്കാനായില്ല"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"അജ്ഞാത പിശക്."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" തുറക്കാനായില്ല: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" തുറക്കാനായില്ല: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"എക്സ്പോർട്ടർ ആരംഭിക്കാനായില്ല: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"എക്സ്പോർട്ടുചെയ്യാനാകുന്ന കോൺടാക്റ്റ് ഒന്നുമില്ല."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"ആവശ്യമായ ഒരു അനുമതി നിങ്ങൾ പ്രവർത്തനരഹിതമാക്കി."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC മുഖേന ലഭിച്ച കോൺടാക്റ്റ്"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"കോൺടാക്റ്റുകൾ എക്സ്പോർട്ടുചെയ്യണോ?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"കാഷെ ചെയ്യൽ"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ഇമ്പോർട്ടുചെയ്യുന്നു: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> ഇമ്പോർട്ടുചെയ്യുന്നു: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ഫയലിലേക്ക് എക്സ്പോർട്ട് ചെയ്യൂ"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ഇപ്രകാരം അടുക്കുക"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ഫസ്റ്റ് നെയിം"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"ഇല്ലാതാക്കുക"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"എല്ലിപ്സിസ്"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> സെ."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> മി <xliff:g id="SECONDS">%s</xliff:g> സെ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> മണിക്കൂർ <xliff:g id="MINUTES_1">%s</xliff:g> മിനിറ്റ് <xliff:g id="SECONDS">%s</xliff:g> സെക്കൻഡ്"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> മി <xliff:g id="SECONDS">%2$s</xliff:g> സെ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> മണിക്കൂർ <xliff:g id="MINUTES_1">%2$s</xliff:g> മിനിറ്റ് <xliff:g id="SECONDS">%3$s</xliff:g> സെക്കൻഡ്"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ഈ കുറുക്കുവഴി പ്രവർത്തനരഹിതമാക്കി"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"കോൺടാക്റ്റ് നീക്കംചെയ്തു"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ഇമ്പോർട്ടുചെയ്യുക"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"കണക്ഷനൊന്നുമില്ല"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"സിം"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"കൂടുതൽ കാണിക്കൂ"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"സിം കാർഡ് ഇമ്പോർട്ടുചെയ്തു"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"സിം കാർഡ് ഇമ്പോർട്ടുചെയ്യാനായില്ല"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 727716b..e0c3920 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> харилцагч</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> харилцагч · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> харилцагч · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> харилцагч · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> харилцагч · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google-с"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g>-с"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Буцааж залгах"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\"-г харилцагчдад нэмэх үү?"</string>
<string name="description_plus_button" msgid="515164827856229880">"нэмэх"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"нийт <xliff:g id="TOTAL_NUMBER">%s</xliff:g> харилцагчдын <xliff:g id="CURRENT_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Таны харилцагчдын нэрс"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Тус үйлдлийг гүйцэтгэх апп олдсонгүй."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Өмнөх дэлгэц рүү буцахын тулд товших"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Өнөөдөр"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Өнөөдөр <xliff:g id="TIME_INTERVAL">%s</xliff:g>-д"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Маргааш <xliff:g id="TIME_INTERVAL">%s</xliff:g>-д"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Гарчиггүй үйл явдал)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Тохируулах"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Харилцагчдын засварлагчийг дэлгэхийг хүсвэл дарна уу."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Харилцагчдын засварлагчийг буулгахыг хүсвэл дарна уу."</string>
<string name="content_description_directions" msgid="2686791825798189335">"байршил руу очих чиглэл"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"саяхны sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. хариу бичихийн тулд товшино уу"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"саяхны sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. хариу бичихийн тулд товшино уу"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ирж байгаа"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"гарах"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"аваагүй"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"саяхны дуудлага. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. буцааж залгахын тулд товшино уу"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"саяхны дуудлага. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. буцааж залгахын тулд товшино уу"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Та: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts апликейшн нь таныг найзуудынхаа мэдээллийг харилцагчийн и-мэйл эсвэл гар утасны талбарт оруулбал илүү сайн ажилладаг."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Нэмэлт талбар"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Холбогдсон харилцагч</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> холбосон харилцагч"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ХАРИЛЦАГЧДЫГ ХОЛБОХ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ЦУЦЛАХ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Энэ харилцагч"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Боломжит хуулбар"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Эдгээр харилцагчийн хаяг нь ижил хүн байж болзошгүй. Та нэг харилцагчийн хаяг болгон холбох боломжтой."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Таны бүртгэлээс"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Зураг сонгох"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Илгээгч: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>-г устгах"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>-г устгах"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g>-г устгах"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>-н зургийг сонгоогүй"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>-н зургийг сонгосон"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Үл мэдэгдэх бүртгэлийн зургийг сонгоогүй"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Үл мэдэгдэх бүртгэлийн зургийг сонгосон"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Санал болголт"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g>-г экспорт хийхийг цуцлах уу?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard импорт/экспорт хийхийг цуцлаж чадсангүй"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Тодорхойгүй алдаа."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\"-г нээж чадсангүй: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"-г нээж чадсангүй: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Экспорт хийгчийг эхлүүлж чадсангүй: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Экспорт хийж болох харилцагч байхгүй."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Та шаардлагатай зөвшөөрлийг идэвхгүй болгосон байна."</string>
@@ -558,7 +553,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC-р хүлээн авсан харилцагч"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Харилцагчдыг экспорт хийх үү?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кеш хийж байна"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Импорт хийж байна <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Импорт хийж байна <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf файл болгож экспортлох"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Эрэмбэлэх"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Өөрийн нэр"</string>
@@ -623,8 +618,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Устгах"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Эллипс"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> цаг <xliff:g id="MINUTES_1">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> мин <xliff:g id="SECONDS">%2$s</xliff:g> сек"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> цаг <xliff:g id="MINUTES_1">%2$s</xliff:g> мин <xliff:g id="SECONDS">%3$s</xliff:g> сек"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Энэ товчилборыг идэвхгүй болгосон"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Харилцагчийг хассан"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Импортлох"</string>
@@ -647,4 +642,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Холболт байхгүй"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Дэлгэрэнгүй үзэх"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM картыг импорт хийж дууссан"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM картыг импорт хийж чадаагүй"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM-г импорт хийж байна"</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 023f8df..7f0eacb 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> संपर्क</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> संपर्क · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google वरील"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> मधील"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"उलट कॉल करा"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"संपर्कांमध्ये \"<xliff:g id="EMAIL">%s</xliff:g>\" जोडायचे?"</string>
<string name="description_plus_button" msgid="515164827856229880">"अधिक"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> पैकी <xliff:g id="CURRENT_NUMBER">%s</xliff:g> संपर्क"</string>
<string name="search_settings_description" msgid="2675223022992445813">"आपल्या संपर्कांची नावे"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ही क्रिया हाताळण्यासाठी कोणताही अॅप आढळला नाही."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"पूर्वीच्या स्क्रीनवर परत येण्यासाठी क्लिक करा"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"आज"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"आज <xliff:g id="TIME_INTERVAL">%s</xliff:g> वाजता"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"उद्या <xliff:g id="TIME_INTERVAL">%s</xliff:g> वाजता"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(अशीर्षकांकित इव्हेंट)"</string>
<string name="date_time_set" msgid="4761419824439606690">"सेट करा"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"संपर्क संपादक विस्तृत करण्यासाठी क्लिक करा."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"संपर्क संपादक संकुचित करण्यासाठी क्लिक करा."</string>
<string name="content_description_directions" msgid="2686791825798189335">"स्थानाचे दिशानिर्देश"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"अलीकडील एसएमएस. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. प्रतिसाद देण्यासाठी क्लिक करा"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"अलीकडील एसएमएस. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. प्रतिसाद देण्यासाठी क्लिक करा"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"येणारे"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"केले जाणारे"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"सुटलेले"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"अलीकडील कॉल. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. परत कॉल करण्यासाठी क्लिक करा"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"अलीकडील कॉल. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. परत कॉल करण्यासाठी क्लिक करा"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"आपण: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"आपण ईमेल फिल्डमध्ये किंवा फोन फिल्डमध्ये एखाद्या व्यक्तीचे Hangouts अभिज्ञापक प्रविष्ट करता तेव्हा Hangouts उत्कृष्ट कार्य करते."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"आणखी फील्ड"</string>
@@ -312,7 +311,6 @@
<item quantity="other">दुवा जोडलेले संपर्क (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> दुवा जोडलेले संपर्क"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"संपर्कांचा दुवा साधा"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"रद्द करा"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"हा संपर्क"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"संभाव्य डुप्लिकेट"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"हे संपर्क म्हणजे कदाचित एकच व्यक्ती असू शकते. आपण त्या सर्वांना एकल दुवा म्हणून एकत्र जोडू शकता."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"आपल्या खात्यांमधून"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"फोटो निवडा"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> कडील"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> हटवा"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> हटवा"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> हटवा"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>कडील फोटो चेक केला नाही"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>कडील फोटो चेक केला"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"अज्ञात खात्यामधील फोटो चेक केला नाही"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"अज्ञात खात्यामधील फोटो चेक केला"</string>
<string name="menu_assistant" msgid="5760693735722052454">"सूचना"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> चे निर्यात रद्द करायचे?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard आयात/निर्यात रद्द करू शकल नाही"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"अज्ञात त्रुटी."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" उघडू शकलो नाही: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" उघडू शकलो नाही: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"निर्यातकर्ता प्रारंभ करू शकला नाही: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"कोणताही निर्यात करण्यायोग्य संपर्क नाही."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"आपण आवश्यक असलेली एक परवानगी अक्षम केली आहे."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC वर संपर्क प्राप्त केला"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"संपर्क निर्यात करायचे?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"कॅशे करीत आहे"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"आयात करत आहे <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"आयात करत आहे <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf फाईलवर निर्यात करा"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"नुसार क्रमवारी लावा"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"नाव"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"हटवा"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"पदलोप"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> सेकंद"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> मि. <xliff:g id="SECONDS">%s</xliff:g>सेकंद"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ता. <xliff:g id="MINUTES_1">%s</xliff:g> मि. <xliff:g id="SECONDS">%s</xliff:g> सेकंद"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> मि. <xliff:g id="SECONDS">%2$s</xliff:g>सेकंद"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ता. <xliff:g id="MINUTES_1">%2$s</xliff:g> मि. <xliff:g id="SECONDS">%3$s</xliff:g> सेकंद"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"हा शॉर्टकट अक्षम केला गेला आहे"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"संपर्क काढला होता"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"आयात करा"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"कोणतेही कनेक्शन नाही"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"सिम"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"अधिक दर्शवा"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"सिम कार्ड आयात करणे समाप्त झाले"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"सिम कार्ड आयार करणेे शक्य झाले नाही"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"सिम आयात करीत आहे"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 3f2969d..caea566 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kenalan</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kenalan · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kenalan · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kenalan · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kenalan · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Daripada Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Daripada <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Balas panggilan"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Tambah \"<xliff:g id="EMAIL">%s</xliff:g>\" kepada kenalan?"</string>
<string name="description_plus_button" msgid="515164827856229880">"tambah"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> daripada <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kenalan"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nama kenalan anda"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Tiada aplikasi ditemui untuk mengendalikan tindakan ini."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik untuk kembali ke skrin sebelumnya"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hari ini"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hari ini pada <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Esok pada <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Acara tidak bertajuk)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Tetapkan"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klik untuk kembangkan editor kenalan."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klik untuk runtuhkan editor kenalan."</string>
<string name="content_description_directions" msgid="2686791825798189335">"arah ke lokasi"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms terbaharu. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik untuk membalas"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms terbaharu. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik untuk membalas"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"masuk"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"keluar"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"tidak dijawab"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"panggilan terbaharu. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik untuk memanggil balik"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"panggilan terbaharu. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik untuk memanggil balik"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Anda: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts berfungsi lebih baik apabila anda memasukkan pengecam Hangouts individu itu ke dalam medan e-mel atau telefon."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Lebih banyak medan"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Kenalan dipautkan</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> kenalan dipaut"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"PAUT KENALAN"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"BATAL"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Kenalan ini"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Pendua berkemungkinan"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Kenalan ini mungkin orang yang sama. Anda boleh memautnya bersama sebagai satu kenalan."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Daripada akaun anda"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Pilih foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Daripada <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Padamkan <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Padamkan <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Padamkan <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto daripada <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>tidak ditandai"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto daripada <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>ditandai"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto daripada akaun yang tidak diketahui tidak ditandai"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto daripada akaun yang tidak diketahui ditandai"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Cadangan"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Batalkan pengeksportan <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Tidak dapat membatalkan import/eksport vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Ralat tidak diketahui."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Tidak dapat membuka \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Tidak dapat membuka \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Tidak boleh memulakan pengeksport: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Tiada kenalan yang boleh dieksport."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Anda telah melumpuhkan kebenaran yang diperlukan."</string>
@@ -558,7 +553,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Knln melalui NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksport kenalan?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Mengcache..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Mengimport <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Mengimport <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksport ke fail .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Isih mengikut"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nama pertama"</string>
@@ -623,8 +618,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Padam"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Elipsis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> saat"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> saat"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> jam <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> saat"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> saat"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> jam <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> saat"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Pintasan ini telah dilumpuhkan"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kenalan telah dialih keluar"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Import"</string>
@@ -647,4 +642,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Tiada sambungan"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Tunjukkan lagi"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Selesai mengimport kad SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Tidak dapat mengimport kad SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Mengimport SIM"</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 3a45f0b..8a79b64 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one">အဆက်အသွယ် <xliff:g id="COUNT_0">%d</xliff:g> ခု</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other">အဆက်အသွယ် <xliff:g id="COUNT_2">%d</xliff:g> ခု · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one">အဆက်အသွယ် <xliff:g id="COUNT_0">%d</xliff:g> ခု · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other">အဆက်အသွယ် <xliff:g id="COUNT_2">%1$d</xliff:g> ခု · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one">အဆက်အသွယ် <xliff:g id="COUNT_0">%1$d</xliff:g> ခု · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google မှ"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> မှ"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"ဖုန်းပြန်ခေါ်ရန်"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" ကို လိပ်စာထဲ ထည့်မလား?"</string>
<string name="description_plus_button" msgid="515164827856229880">"အပေါင်း"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> ၏ <xliff:g id="TOTAL_NUMBER">%s</xliff:g> လိပ်စာ"</string>
<string name="search_settings_description" msgid="2675223022992445813">"အဆက်အသွယ်များ၏နာမည်များ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်ပေးမည့် အက်ပ်မရှိပါ။"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ယခင် မျက်နှာပြင်သို့ ပြန်ရန် ကလစ်ပါ"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ယနေ့"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"ယနေ့ <xliff:g id="TIME_INTERVAL">%s</xliff:g> တွင်"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"နက်ဖြန်<xliff:g id="TIME_INTERVAL">%s</xliff:g>တွင်"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ခေါင်းစဉ်မဲ့ ဖြစ်ရပ်)"</string>
<string name="date_time_set" msgid="4761419824439606690">"လက်ခံရန်"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"အဆက်အသွယ် အယ်ဒီတာအား ချဲ့ရန် ကလစ်နှိပ်ပါ။"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"အဆက်အသွယ် အယ်ဒီတာအား ခေါက်ချရန် ကလစ်နှိပ်ပါ။"</string>
<string name="content_description_directions" msgid="2686791825798189335">"တည်နေရာများသို့ လမ်းညွှန်ချက်"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"မကြာမီက စာတို။ <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. တုံ့ပြန်ရန် ကလစ်ပါ"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"မကြာမီက စာတို။ <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. တုံ့ပြန်ရန် ကလစ်ပါ"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"အဝင်"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"အထွက်"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"လွတ်သွား"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"မကြာမီက ခေါ်ဆိုမှု။ <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ပြန်ခေါ်ရန် ကလစ်ပါ"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"မကြာမီက ခေါ်ဆိုမှု။ <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ပြန်ခေါ်ရန် ကလစ်ပါ"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"သင်: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"အီးမေးအကွက် သို့မဟုတ် ဖုန်းနံပါတ် အကွက်တွင် တစ်ခြားသူ၏ Hangouts အမှတ်သညာအား သင်ရိုက်ထည့်သည့်အခါ Hangouts ပိုမိုလွယ်ကူကောင်းမွန်စွာ အလုပ်လုပ်သည်။"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"နောက်ထပ်အကွက်များ"</string>
@@ -312,7 +311,6 @@
<item quantity="one">လင့်ခ်ချိတ်ထားသောအဆက်အသွယ်</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"ကွင်းဆက်ချိတ်ထားသည့် အကောင့် <xliff:g id="COUNT">%d</xliff:g> ခု"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"အဆက်အသွယ်များ ချိတ်ဆက်ပါ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"မလုပ်တော့"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ဤအဆက်အသွယ်"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ဖြစ်နိုင်သည့် မိတ္တုပွားများ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ယင်းအဆက်အသွယ်များ လူတစ်ဦးတည်း ဖြစ်နိုင်ပါသည်။ ၎င်းတို့ကို တစ်ခုတည်းသော အဆက်အသွယ် အဖြစ် ချိတ်ဆက်ပေးနိုင်ပါသည်။"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"သင့်အကောင့်များမှ"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ဓာတ်ပုံ ရွေးပါ"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> မှ"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> ကိုဖျက်ပါ"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> ကိုဖျက်ပါ"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> ကိုဖျက်ပါ"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>ထံမှ ဓာတ်ပုံကို မစစ်ကြည့်ရသေးပါ"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>ထံမှ ဓာတ်ပုံကို စစ်ကြည့်ပြီးပြီ"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"အမည်မသိအကောင့်မှ ဓာတ်ပုံဓာတ်ပုံ မစစ်ဆေးရသေးပါ"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"အမည်မသိအကောင့်မှ ဓာတ်ပုံ စစ်ဆေးပြီးပါပြီ"</string>
<string name="menu_assistant" msgid="5760693735722052454">"အကြံပြုချက်များ"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> တင်ပို့ခြင်းကို မလုပ်တော့ဘူးလား။"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"လိပ်စာကဒ် တင်သွင်း/ပို့ခြင်း ဖျက်မရပါ"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"မသိရသောအမှားအယွင်း"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ကို ဖွင့်၍မရပါ - <xliff:g id="EXACT_REASON">%s</xliff:g>။"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ကို ဖွင့်၍မရပါ - <xliff:g id="EXACT_REASON">%2$s</xliff:g>။"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"တင်ပို့ရေးစတင်၍ မရပါ - \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"။"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"တင်ပို့နိုင်သောအဆက်အသွယ် မရှိပါ။"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"လိုအပ်သောခွင့်ပြုချက်ကို သင်ပိတ်ထားသည်။"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC မှ အဆက်အသွယ်ရရှိပါသည်။"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"အဆက်အသွယ်များးကို တင်ပို့မလား။"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ယာယီသိမ်းနေသည်"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"တင်သွင်းနေသည် <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> - <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"တင်သွင်းနေသည် <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> - <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ဖိုင်သို့ တင်ပို့ရန်"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"အောက်ပါအတိုင်းစီရန်"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ရှေ့အမည်"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"ဖျက်ရန်"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"အစက်သုံးစက်"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> မိနစ် <xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> နာရီ <xliff:g id="MINUTES_1">%s</xliff:g> မိနစ် <xliff:g id="SECONDS">%s</xliff:g> စက္ကန့်"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> မိနစ် <xliff:g id="SECONDS">%2$s</xliff:g> စက္ကန့်"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> နာရီ <xliff:g id="MINUTES_1">%2$s</xliff:g> မိနစ် <xliff:g id="SECONDS">%3$s</xliff:g> စက္ကန့်"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ဤဖြတ်လမ်းလင့်ခ်ကို ပိတ်ထားပါသည်"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"အဆက်အသွယ်ကို ဖယ်ရှားခဲ့ပါသည်"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"တင်သွင်းရန်"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"ချိတ်ဆက်မှုမရှိပါ"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"ဆင်းမ်ကဒ်"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"နောက်ထပ်ပြရန်"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"ဆင်းမ်ကဒ်ကို တင်သွင်းပြီးပါပြီ"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"ဆင်းမ်ကဒ်ကို တင်သွင်း၍မရပါ"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ဆင်းမ်ကဒ်ကို တင်သွင်းနေသည်"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1f52b9f..e9b9ca0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontakter · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakter · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Fra Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Fra <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Ring tilbake"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Legg til «<xliff:g id="EMAIL">%s</xliff:g>» som kontakt?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plussknapp"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> av <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontakter"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Navn på kontakter"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Det ble ikke funnet noen app som kan håndtere denne handlingen."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klikk for å gå tilbake til den forrige skjermen"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"I dag"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"I dag kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"I morgen kl.<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Aktivitet uten navn)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Angi"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Nettprat"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klikk for å utvide redigeringsvinduet for kontakter"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klikk for å skjule redigeringsvinduet for kontakter"</string>
<string name="content_description_directions" msgid="2686791825798189335">"veibeskrivelse til posisjon"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"nylig tekstmelding. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klikk for å svare"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"nylig tekstmelding. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klikk for å svare"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"innkommende"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"utgående"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"tapte"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"nylig oppringning. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klikk for å ringe tilbake"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"nylig oppringning. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klikk for å ringe tilbake"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Du: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts fungerer bedre når du går inn i personenes Hangouts-identifikatorer i e-postfeltet eller telefonfeltet."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Flere felt"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Sammenknyttet kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> sammenknyttede kontakter"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"KNYTT SAMMEN KONTAKTER"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"AVBRYT"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Denne kontakten"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mulige duplikater"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Disse kontaktene kan være den samme personen. Du kan knytte dem sammen til én enkelt kontakt."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Fra kontoene dine"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Velg bilde"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Fra <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Slett <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Slett <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Slett <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Bilde fra <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> er ikke markert"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Bilde fra <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> er markert"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Det er ikke merket av for noe bilde fra en ukjent konto"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Det er merket av for et bilde fra en ukjent konto"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Forslag"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Vil du avbryte eksporten av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Kunne ikke kansellere imp./eksp. av vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Ukjent feil."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Kan ikke åpne «<xliff:g id="FILE_NAME">%s</xliff:g>»: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Kan ikke åpne «<xliff:g id="FILE_NAME">%1$s</xliff:g>»: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Kunne ikke starte eksporteringen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Du har ikke noen kontakt som kan eksporteres."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Du har slått av en nødvendig tillatelse."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt mottatt per NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksp. kontaktene?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Bufrer"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importerer <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importerer <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksportér til .vcf-fil"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortér etter"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Fornavn"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Slett"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipse"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> t <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> sek"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> t <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> sek"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Denne snarveien er slått av"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakten ble fjernet"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importér"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Ingen tilkobling"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM-kort"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Vis mer"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importen fra SIM-kortet er ferdig"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Kunne ikke importere fra SIM-kortet"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerer fra SIM-kortet"</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index d7c79f4..bbcc0bc 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> सम्पर्क</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> सम्पर्कहरू · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> सम्पर्क · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> सम्पर्कहरू · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> सम्पर्क · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google बाट"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> बाट"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"कल फर्काउनुहोस्"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" लाई सम्पर्कमा थप्ने?"</string>
<string name="description_plus_button" msgid="515164827856229880">"जोड"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>को <xliff:g id="TOTAL_NUMBER">%s</xliff:g> सम्पर्क"</string>
<string name="search_settings_description" msgid="2675223022992445813">"तपाईँका सम्पर्कहरूका नामहरू"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"यो कार्य सम्हाल्न कुनै पनि अनुप्रयोग पाइएन।"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"अघिल्लो पर्दामा फर्कनको लागि क्लिक गर्नुहोस्"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"आज"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"<xliff:g id="TIME_INTERVAL">%s</xliff:g>मा आज"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"<xliff:g id="TIME_INTERVAL">%s</xliff:g>मा भोलि"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(शीर्षकविहीन घटना)"</string>
<string name="date_time_set" msgid="4761419824439606690">"सेट गर्नुहोस्"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"सम्पर्क सम्पादक विस्तार गर्न क्लिक गर्नुहोस्।"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"सम्पर्क सम्पादक समाप्त गर्न क्लिक गर्नुहोस्।"</string>
<string name="content_description_directions" msgid="2686791825798189335">"स्थानको लागि निर्देशनहरू"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"हालैको एसएमएस। <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. प्रतिक्रियाको लागि क्लिक गर्नुहोस्"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"हालैको एसएमएस। <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. प्रतिक्रियाको लागि क्लिक गर्नुहोस्"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"आगमन"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"बहिर्गमन"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"छुटेको"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"हालैको कल। <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. कल फिर्ता गर्न क्लिक गर्नुहोस्"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"हालैको कल। <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. कल फिर्ता गर्न क्लिक गर्नुहोस्"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"तपाईँ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"तपाईंले इमेल क्षेत्र वा फोन क्षेत्रमा व्यक्तिको Hangouts परिचायक प्रविष्ट गर्नु हुँदा Hangouts राम्रो काम गर्दछ।"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"थप क्षेत्रहरू"</string>
@@ -312,7 +311,6 @@
<item quantity="one">लिंक गरिएको सम्पर्क ठेगाना</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> लिंक गरिएका सम्पर्क ठेगानाहरू"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ( <xliff:g id="PHONETIC_NAME">%s</xliff:g> )"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"सम्पर्क ठेगानाहरू लिंक गर्नुहोस्"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"रद्द गर्नुहोस्"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"यो सम्पर्क ठेगाना"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"सम्भावित प्रतिलिपिहरू"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"यी सम्पर्कहरू एउटै व्यक्तिको हुन सक्छ। तपाईँले एउटै सम्पर्कको रूपमा तिनीहरूलाई सँगै लिंक गर्न सक्नुहुन्छ।"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"तपाईंका खाताहरूबाट"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"तस्बिर छान्नुहोस्"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> बाट"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> मेट्नुहोस्"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> मेट्नुहोस्"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> मेट्नुहोस्"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> बाट तस्बिर जाँच गरिएको छैन"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> बाट तस्बिर जाँच गरियो"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"अज्ञात खाताको तस्बिर जाँच गरिएन"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"अज्ञात खाताको तस्बिर जाँच गरियो"</string>
<string name="menu_assistant" msgid="5760693735722052454">"सुझावहरू"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g>को निर्यात रद्द गर्ने?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard आयात/निर्यात रद्द गर्न सकिएन"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"अज्ञात त्रुटि।"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"खोल्न सकेन \" <xliff:g id="FILE_NAME">%s</xliff:g> : \" <xliff:g id="EXACT_REASON">%s</xliff:g> ।"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"खोल्न सकेन \" <xliff:g id="FILE_NAME">%1$s</xliff:g> : \" <xliff:g id="EXACT_REASON">%2$s</xliff:g> ।"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"निर्यातकर्ता: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\" सुरु गर्न सकेन्।"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"कुनै निर्यात गर्न मिल्ने सम्पर्क छैन।"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"तपाईँले आवश्यक अनुमति असक्षम पार्नुभएको छ।"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFCमा सम्पर्क प्राप्त गरियो"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"सम्पर्कहरू निर्यात गर्ने हो?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"केसिङ"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"आयात गर्दै <xliff:g id="CURRENT_NUMBER">%s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%s</xliff:g> : <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"आयात गर्दै <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> : <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf फाइलमा निर्यात गर्ने"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"यस आधारमा क्रमबद्ध गर्नुहोस्"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"पहिलो नाम"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"मेट्नुहोस्"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"पदलोपचिन्ह"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> सेकेन्ड"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> मिनेट <xliff:g id="SECONDS">%s</xliff:g> सेकेन्ड"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> घन्टा <xliff:g id="MINUTES_1">%s</xliff:g> मिनेट <xliff:g id="SECONDS">%s</xliff:g> सेेकेन्ड"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> मिनेट <xliff:g id="SECONDS">%2$s</xliff:g> सेकेन्ड"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> घन्टा <xliff:g id="MINUTES_1">%2$s</xliff:g> मिनेट <xliff:g id="SECONDS">%3$s</xliff:g> सेेकेन्ड"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"यो सर्टकटलाई असक्षम पारिएको छ"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"सम्पर्क हटाइएको थियो"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"आयात गर्नुहोस्"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"जडान छैन"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"थप देखाउनुहोस्"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM कार्ड आयात गर्ने काम सम्पन्न भयो"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM कार्ड आयात गर्न सकिएन"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM आयात गरिँदै"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 53e666d..e89a66a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contacten · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contacten · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contact · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Van Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Van <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Terugbellen"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contactpersonen?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> van <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contacten"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Namen van je contacten"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Er is geen app gevonden om deze actie uit te voeren."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klik om terug te keren naar het vorige scherm"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Vandaag"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Vandaag om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Morgen om <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Naamloze afspraak)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Instellen"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Chat"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klik om contacteditor uit te vouwen."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klik om contacteditor samen te vouwen."</string>
<string name="content_description_directions" msgid="2686791825798189335">"routebeschrijving naar locatie"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"recente sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik om te reageren"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"recente sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik om te reageren"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"binnenkomend"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"uitgaand"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"gemist"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"recente oproep. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik om terug te bellen"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"recente oproep. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. klik om terug te bellen"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Jij: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts werkt beter wanneer je de Hangouts-ID van de betreffende persoon in het veld \'E-mail\' of \'Telefoon\' opgeeft."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Meer velden"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Gelinkt contact</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> gelinkte contacten"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"CONTACTEN LINKEN"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANNULEREN"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Dit contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mogelijke duplicaten"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Deze contacten zijn mogelijk dezelfde persoon. Je kunt ze linken tot één contact."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Vanuit je accounts"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Foto kiezen"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Van <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> verwijderen"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> verwijderen"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> verwijderen"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto van <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> niet aangevinkt"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto van <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> aangevinkt"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto uit onbekend account niet aangevinkt"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto uit onbekend account aangevinkt"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Suggesties"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Export van <xliff:g id="FILENAME">%s</xliff:g> annuleren?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Kan vCard-import/export niet annuleren"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Onbekende fout."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Kan \'<xliff:g id="FILE_NAME">%s</xliff:g>\' niet openen: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Kan \'<xliff:g id="FILE_NAME">%1$s</xliff:g>\' niet openen: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Kan het exportprogramma niet starten: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Er is geen contact dat kan worden geëxporteerd."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Je hebt een vereist recht uitgeschakeld."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contact via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Contacten export.?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"In cachegeheugen opslaan"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importeren <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importeren <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exporteren naar VCF"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sorteren op"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Voornaam"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Verwijderen"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Weglatingsteken"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> u <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sec"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> sec"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> u <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> sec"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Deze snelkoppeling is uitgeschakeld"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Contact is verwijderd"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importeren"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Geen verbinding"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"Simkaart"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Meer weergeven"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importeren van simkaart voltooid"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Kan simkaart niet importeren"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Sim importeren"</string>
</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index e145bcd..24cf640 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਸੰਪਰਕ</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> ਸੰਪਰਕ · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ਸੰਪਰਕ · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> ਸੰਪਰਕ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> ਸੰਪਰਕ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google ਤੋਂ"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> ਤੋਂ"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"ਕਾਲ ਤੇ ਵਾਪਸ ਜਾਓ"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"ਕੀ \"<xliff:g id="EMAIL">%s</xliff:g>\" ਨੂੰ ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"</string>
<string name="description_plus_button" msgid="515164827856229880">"ਪਲਸ"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ਸੰਪਰਕਾਂ ਵਿੱਚੋਂ <xliff:g id="CURRENT_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਦੇ ਨਾਮ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ਇਸ ਕਿਰਿਆ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਕੋਈ ਐਪ ਨਹੀਂ ਮਿਲਿਆ।"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ਪਿਛਲੀ ਸਕ੍ਰੀਨ ਤੇ ਵਾਪਸ ਜਾਣ ਲਈ ਕਲਿਕ ਕਰੋ"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ਅੱਜ"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"ਅੱਜ <xliff:g id="TIME_INTERVAL">%s</xliff:g> ਵਜੇ"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"ਕੱਲ੍ਹ ਨੂੰ <xliff:g id="TIME_INTERVAL">%s</xliff:g> ਵਜੇ"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(ਨਾਮ ਰਹਿਤ ਇਵੈਂਟ)"</string>
<string name="date_time_set" msgid="4761419824439606690">"ਸੈੱਟ ਕਰੋ"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"ਸੰਪਰਕ ਸੰਪਾਦਕ ਦਾ ਵਿਸਤਾਰ ਕਰਨ ਲਈ ਕਲਿਕ ਕਰੋ।"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"ਸੰਪਰਕ ਸੰਪਾਦਕ ਨਸ਼ਟ ਕਰਨ ਲਈ ਕਲਿਕ ਕਰੋ।"</string>
<string name="content_description_directions" msgid="2686791825798189335">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਲਈ ਨਿਰਦੇਸ਼"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"ਹਾਲੀਆ sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>। <xliff:g id="PHONE_NUMBER">%s</xliff:g>। <xliff:g id="DATE">%s</xliff:g>। ਜਵਾਬ ਦੇਣ ਲਈ ਕਲਿਕ ਕਰੋ"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"ਹਾਲੀਆ sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>। <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>। <xliff:g id="DATE">%3$s</xliff:g>। ਜਵਾਬ ਦੇਣ ਲਈ ਕਲਿਕ ਕਰੋ"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ਇਨਕਮਿੰਗ"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"ਆਊਟਗੋਇੰਗ"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ਮਿਸਡ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ਹਾਲੀਆ ਕਾਲ। <xliff:g id="CALL_TYPE">%s</xliff:g>। <xliff:g id="PHONE_NUMBER">%s</xliff:g>। <xliff:g id="DATE">%s</xliff:g>। ਕਾਲ ਬੈਕ ਕਰਨ ਲਈ ਕਲਿਕ ਕਰੋ।"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ਹਾਲੀਆ ਕਾਲ। <xliff:g id="CALL_TYPE">%1$s</xliff:g>। <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>। <xliff:g id="DATE">%3$s</xliff:g>। ਕਾਲ ਬੈਕ ਕਰਨ ਲਈ ਕਲਿਕ ਕਰੋ।"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"ਤੁਸੀਂ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ਜਦੋਂ ਤੁਸੀਂ ਈਮੇਲ ਖੇਤਰ ਜਾਂ ਫੋਨ ਖੇਤਰ ਵਿੱਚ ਵਿਅਕਤੀ ਦਾ ਹੈਂਗਆਊਟਸ ਆਈਡੈਂਟੀਫਾਇਰ ਦਰਜ ਕਰਦੇ ਹੋ ਤਾਂ ਹੈਂਗਆਊਟਸ ਬਿਹਤਰ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"ਹੋਰ ਖੇਤਰ"</string>
@@ -312,7 +311,6 @@
<item quantity="other">ਲਿੰਕ ਕੀਤੇ ਗਏ ਸੰਪਰਕ ( <xliff:g id="COUNT">%d</xliff:g> )</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ਰੱਦ ਕਰੋ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ਇਹ ਸੰਪਰਕ"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ਸੰਭਵ ਡੁਪਲੀਕੇਟ"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ਇਹ ਸੰਪਰਕ ਇਕੋ ਵਿਅਕਤੀ ਦੇ ਹੋ ਸਕਦੇ ਹਨ। ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਇੱਕ ਇੱਕਲੇ ਸੰਪਰਕ ਵੱਜੋਂ ਲਿੰਕ ਕਰ ਸਕਦੇ ਹੋ।"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਤੋਂ"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ਫ਼ੋਟੋ ਚੁਣੋ"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ਵੱਲੋਂ"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> ਹਟਾਓ"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> ਹਟਾਓ"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> ਹਟਾਓ"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ਵੱਲੋਂ ਫ਼ੋਟੋ ਨਹੀਂ ਜਾਂਚੀ ਗਈ"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ਵਲੋਂ ਫ਼ੋਟੋ ਜਾਂਚੀ ਗਈ"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"ਅਗਿਆਤ ਖਾਤੇ ਦੀ ਫ਼ੋਟੋ ਨਹੀਂ ਜਾਂਚੀ ਗਈ"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"ਅਗਿਆਤ ਖਾਤੇ ਦੀ ਫ਼ੋਟੋ ਜਾਂਚੀ ਗਈ"</string>
<string name="menu_assistant" msgid="5760693735722052454">"ਸੁਝਾਅ"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"ਕੀ <xliff:g id="FILENAME">%s</xliff:g> ਦਾ ਨਿਰਯਾਤ ਰੱਦ ਕਰਨਾ ਹੈ?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard ਆਯਾਤ/ਨਿਰਯਾਤ ਰੱਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"ਅਗਿਆਤ ਗੜਬੜ।"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: <xliff:g id="EXACT_REASON">%s</xliff:g>।"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: <xliff:g id="EXACT_REASON">%2$s</xliff:g>।"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"ਨਿਰਯਾਤਕ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"।"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ਕੋਈ ਵੀ ਨਿਰਯਾਤ ਕਰਨ ਯੋਗ ਸੰਪਰਕ ਨਹੀਂ ਹਨ।"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"ਤੁਸੀਂ ਇੱਕ ਲੋੜੀਂਦੀ ਇਜਾਜ਼ਤ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਹੈ।"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"ਸੰਪਰਕ NFC \'ਤੇ ਪ੍ਰਾਪਤ ਹੋਇਆ"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"ਕੀ ਸੰਪਰਕ ਨਿਰਯਾਤ ਕਰਨੇ ਹਨ?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ਕੈਸ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ਆਯਾਤ ਹੋ ਰਿਹਾ ਹੈ: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> ਆਯਾਤ ਹੋ ਰਿਹਾ ਹੈ: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ਫ਼ਾਈਲ ਵਿੱਚ ਨਿਰਯਾਤ ਕਰੋ"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ਨਾਮ ਦਾ ਪਹਿਲਾ ਭਾਗ"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"ਮਿਟਾਓ"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"ਪਦ-ਲੋਪ ਚਿੰਨ੍ਹ"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> ਸਕਿੰਟ"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> ਮਿੰਟ <xliff:g id="SECONDS">%s</xliff:g> ਸਕਿੰਟ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ਘੰਟੇ <xliff:g id="MINUTES_1">%s</xliff:g> ਮਿੰਟ <xliff:g id="SECONDS">%s</xliff:g> ਸਕਿੰਟ"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> ਮਿੰਟ <xliff:g id="SECONDS">%2$s</xliff:g> ਸਕਿੰਟ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ਘੰਟੇ <xliff:g id="MINUTES_1">%2$s</xliff:g> ਮਿੰਟ <xliff:g id="SECONDS">%3$s</xliff:g> ਸਕਿੰਟ"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ਇਹ ਸ਼ਾਰਟਕੱਟ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"ਸੰਪਰਕ ਹਟਾਇਆ ਗਿਆ ਸੀ"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ਆਯਾਤ ਕਰੋ"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"ਕੋਈ ਕਨੈਕਸ਼ਨ ਨਹੀਂ"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"ਹੋਰ ਦਿਖਾਓ"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"ਸਿਮ ਕਾਰਡ ਆਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"ਸਿਮ ਕਾਰਡ ਆਯਾਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"ਸਿਮ ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f6fc647..2767cd4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -87,10 +87,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> kontakty · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> kontaktów · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakty · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktów · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Od Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Od: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"Połączenie zwrotne"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Czy dodać adres „<xliff:g id="EMAIL">%s</xliff:g>” do kontaktów?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"Kontakt <xliff:g id="CURRENT_NUMBER">%s</xliff:g> z <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Imiona i nazwiska oraz nazwy w Twoich kontaktach"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nie znaleziono aplikacji do obsługi tego działania."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknij, by wrócić do poprzedniego ekranu"</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"Dzisiaj"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Dzisiaj: <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Jutro: <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Wydarzenie bez nazwy)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Ustaw"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Komunikator"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kliknij, by rozwinąć edytor kontaktów."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kliknij, by zwinąć edytor kontaktów."</string>
<string name="content_description_directions" msgid="2686791825798189335">"trasa do lokalizacji"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"ostatni SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknij, by odpowiedzieć"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"ostatni SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknij, by odpowiedzieć"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"przychodzące"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"wychodzące"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"nieodebrane"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ostatnie połączenie. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknij, by oddzwonić"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ostatnie połączenie. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknij, by oddzwonić"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ty: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"W przypadku Hangouts lepiej wpisać identyfikator danej osoby w polu adresu e-mail lub telefonu."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Więcej pól"</string>
@@ -328,7 +327,6 @@
<item quantity="one">Kontakt połączony</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Połączone kontakty: <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"POŁĄCZ KONTAKTY"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANULUJ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ten kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Możliwe duplikaty"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Te kontakty mogą dotyczyć tej samej osoby. Możesz je połączyć w jeden kontakt."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Z Twoich kont"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Wybierz zdjęcie"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Z konta <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Usuń <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Usuń <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Usuń <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Zdjęcie z konta <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> – niezaznaczone"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Zdjęcie z konta <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> – zaznaczone"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Nie wybrano zdjęcia z nieznanego konta"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Wybrano zdjęcie z nieznanego konta"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugestie"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Anulować eksport: <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Nie można anulować importu/eksportu vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Nieznany błąd."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nie można otworzyć pliku „<xliff:g id="FILE_NAME">%s</xliff:g>”: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nie można otworzyć pliku „<xliff:g id="FILE_NAME">%1$s</xliff:g>”: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nie można uruchomić programu eksportującego: „<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Brak kontaktów, które można wyeksportować."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Wymagane uprawnienia zostały wyłączone"</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Odebrane przez NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksport kontaktów?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Buforowanie"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importowanie <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importowanie <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksportuj do pliku .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortuj według"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Imię"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Usuń"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Wielokropek"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> godz. <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> godz. <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ten skrót został wyłączony"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt został usunięty"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importuj"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Brak połączenia"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Pokaż więcej"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Zaimportowano kontakty z karty SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Nie udało się zaimportować z karty SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuję kontakty z karty SIM"</string>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 5642a7b..cf82a37 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contatos</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> contato: <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contatos: <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contato: <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contatos: <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Do Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Retornar chamada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Adicionar \"<xliff:g id="EMAIL">%s</xliff:g>\" aos contatos?"</string>
<string name="description_plus_button" msgid="515164827856229880">"mais"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contatos"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos seus contatos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nenhum app foi encontrado para executar esta ação."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Clique para retornar à tela anterior"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hoje"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hoje, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Amanhã, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento sem título)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Definir"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Mensagem instantânea"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Clique para expandir o editor de contatos."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Clique para recolher o editor de contatos."</string>
<string name="content_description_directions" msgid="2686791825798189335">"rotas até o local"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para responder"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. clique para responder"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrada"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"saída"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para retornar a chamada"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. clique para retornar a chamada"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Você: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"O Hangouts funciona melhor quando você insere o identificador do Hangouts da pessoa no campo de e-mail ou de telefone."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Mais campos"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Contatos vinculados (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contatos vinculados"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"VINCULAR CONTATOS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCELAR"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Este contato"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possíveis cópias"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Talvez esses contatos sejam a mesma pessoa. É possível vinculá-los como um único contato."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Das suas contas"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Escolher foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"De <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Excluir <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Excluir <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Excluir <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>não marcada"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>marcada"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto de conta desconhecida não verificada"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto de conta desconhecida verificada"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugestões"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Cancelar exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Não foi poss. canc. imp./export. vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Erro desconhecido."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Não foi possível iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Não há contato exportáveis."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Você desativou uma permissão obrigatória."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contato via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportar contatos?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Armazenando em cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportar p/ arquivo .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Classificar por"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nome"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Excluir"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Reticências"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Este atalho foi desativado"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"O contato foi removido"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importar"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Sem conexão"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostrar mais"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"A importação do cartão SIM foi concluída"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Não foi possível importar do cartão SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 342f800..c60da71 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Da Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Devolver chamada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Adicionar \"<xliff:g id="EMAIL">%s</xliff:g>\" aos contactos?"</string>
<string name="description_plus_button" msgid="515164827856229880">"mais"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contactos"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos contactos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Não foram encontradas aplicações para executar esta ação"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Clique para regressar ao ecrã anterior"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hoje"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hoje, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Amanhã, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento sem nome)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Definir"</string>
<string name="header_im_entry" msgid="3581720979640225615">"MI"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Clique para expandir o editor de contactos."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Clique para reduzir o editor de contactos."</string>
<string name="content_description_directions" msgid="2686791825798189335">"direções para a localização"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para responder"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. clique para responder"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"recebida"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"efetuada"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"não atendida"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para ligar de volta"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. clique para ligar de volta"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"O utilizador: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"O Hangouts funciona melhor quando introduz o identificador do Hangouts da pessoa no campo do email ou no campo do telefone."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Mais campos"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Contacto ligado</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contactos ligados"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ASSOCIAR CONTACTOS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCELAR"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Este contacto"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possíveis duplicados"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Estes contactos podem ser da mesma pessoa. Pode associá-los num único contacto."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Das suas contas"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Escolher foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"De <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Eliminar <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Eliminar <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Eliminar <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> não marcada"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> marcada"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto de conta desconhecida desmarcada"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto de conta desconhecida marcada"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugestões"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Cancelar a exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Imposs. cancel. import./export. do vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Erro desconhecido."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Não foi possível iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Não existe um contacto exportável."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Desativou uma autorização obrigatória."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contacto recebido através de NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportar contactos?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"A colocar em cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"A importar <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"A importar <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportar p/ ficheiro .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Ordenar por"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nome próprio"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Eliminar"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Reticências"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> seg"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> seg"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> seg"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> seg"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Este atalho foi desativado"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"O contacto foi removido"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importar"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Sem ligação"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostrar mais"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importação do cartão SIM concluída"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Não foi possível importar o cartão SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"A importar SIM…"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5642a7b..cf82a37 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contatos</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> contato: <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> contatos: <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contato: <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contatos: <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Do Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Retornar chamada"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Adicionar \"<xliff:g id="EMAIL">%s</xliff:g>\" aos contatos?"</string>
<string name="description_plus_button" msgid="515164827856229880">"mais"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> de <xliff:g id="TOTAL_NUMBER">%s</xliff:g> contatos"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Nomes dos seus contatos"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nenhum app foi encontrado para executar esta ação."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Clique para retornar à tela anterior"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hoje"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hoje, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Amanhã, às <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Evento sem título)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Definir"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Mensagem instantânea"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Clique para expandir o editor de contatos."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Clique para recolher o editor de contatos."</string>
<string name="content_description_directions" msgid="2686791825798189335">"rotas até o local"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para responder"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. clique para responder"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrada"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"saída"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para retornar a chamada"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. clique para retornar a chamada"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Você: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"O Hangouts funciona melhor quando você insere o identificador do Hangouts da pessoa no campo de e-mail ou de telefone."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Mais campos"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Contatos vinculados (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> contatos vinculados"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"VINCULAR CONTATOS"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"CANCELAR"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Este contato"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Possíveis cópias"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Talvez esses contatos sejam a mesma pessoa. É possível vinculá-los como um único contato."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Das suas contas"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Escolher foto"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"De <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Excluir <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Excluir <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Excluir <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>não marcada"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Foto de <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>marcada"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Foto de conta desconhecida não verificada"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Foto de conta desconhecida verificada"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugestões"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Cancelar exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Não foi poss. canc. imp./export. vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Erro desconhecido."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Não foi possível abrir \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Não foi possível iniciar o exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Não há contato exportáveis."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Você desativou uma permissão obrigatória."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Contato via NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportar contatos?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Armazenando em cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportar p/ arquivo .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Classificar por"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Nome"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Excluir"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Reticências"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Este atalho foi desativado"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"O contato foi removido"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importar"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Sem conexão"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Mostrar mais"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"A importação do cartão SIM foi concluída"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Não foi possível importar do cartão SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importando do cartão SIM"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3fe7473..824a89f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -85,9 +85,9 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> persoană de contact</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> persoane de contact · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de persoane de contact · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> persoană de contact · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> persoane de contact · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> de persoane de contact · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> persoană de contact · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Din Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Din <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -169,7 +169,6 @@
<string name="returnCall" msgid="8171961914203617813">"Apelați înapoi"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Adăugați „<xliff:g id="EMAIL">%s</xliff:g>” în agendă?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> din <xliff:g id="TOTAL_NUMBER">%s</xliff:g> (de) persoane din agendă"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Numele persoanelor din agenda dvs."</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nu s-a găsit o aplicație care să gestioneze această acțiune."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Dați clic pentru a reveni la ecranul anterior"</string>
@@ -282,7 +281,7 @@
<string name="today" msgid="8041090779381781781">"Astăzi"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Astăzi, la <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Mâine, la <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Eveniment fără titlu)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Setați"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -299,11 +298,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Dați clic pentru a extinde editorul persoanei de contact."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Dați clic pentru a restrânge editorul persoanei de contact."</string>
<string name="content_description_directions" msgid="2686791825798189335">"indicații de orientare către locație"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recent. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. dați clic pentru a răspunde"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recent. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. dați clic pentru a răspunde"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"primit"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"efectuat"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"pierdut"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"apel recent. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. dați clic pentru a apela"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"apel recent. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. dați clic pentru a apela"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Dvs.: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funcționează mai bine când introduceți identificatorul Hangouts al persoanei în câmpul pentru adresa de e-mail sau în câmpul pentru numărul de telefon."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Mai multe câmpuri"</string>
@@ -320,7 +319,6 @@
<item quantity="one">Persoană de contact asociată</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> (de) persoane de contact asociate"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ASOCIAȚI PERSOANELE DE CONTACT"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANULAȚI"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -338,7 +336,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Această persoană de contact"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Dubluri posibile"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Este posibil ca aceste persoane de contact să fie una și aceeași persoană. Le puteți asocia ca o singură persoană de contact."</string>
@@ -346,10 +343,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Din conturile dvs."</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Alegeți o fotografie"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Din contul <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Ștergeți <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Ștergeți <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Ștergeți <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Fotografia din <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> nu e selectată"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotografia din <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> e selectată"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Fotografie neselectată dintr-un cont necunoscut"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Fotografie selectată dintr-un cont necunoscut"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugestii"</string>
@@ -527,7 +522,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Anulați exportul fișierului <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Anulare import/export vCard nereușită"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Eroare necunoscută."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nu s-a putut deschide fișierul „<xliff:g id="FILE_NAME">%s</xliff:g>”: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nu s-a putut deschide fișierul „<xliff:g id="FILE_NAME">%1$s</xliff:g>”: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nu s-a putut iniţializa instrumentul de export: „<xliff:g id="EXACT_REASON">%s</xliff:g>”"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nicio persoană de contact exportabilă."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Ați dezactivat o permisiune necesară."</string>
@@ -569,7 +564,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Cont.prim.pr.NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportați Agenda?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Se stochează în cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Se importă <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Se importă <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportați ca fișier .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortați după"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Prenume"</string>
@@ -635,8 +630,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Ștergeți"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Puncte de suspensie"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sec."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sec."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h. <xliff:g id="MINUTES_1">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sec."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min. <xliff:g id="SECONDS">%2$s</xliff:g> sec."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h. <xliff:g id="MINUTES_1">%2$s</xliff:g> min. <xliff:g id="SECONDS">%3$s</xliff:g> sec."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Această comandă rapidă a fost dezactivată."</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Persoana de contact a fost ștearsă."</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importați"</string>
@@ -660,4 +655,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nicio conexiune"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Afișați mai mult"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importarea cardului SIM s-a terminat."</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Cardul SIM nu a fost importat."</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Se importă cardul SIM"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 284df48..925da35 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -87,10 +87,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> контакта</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> контакт · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> контактов · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> контакт · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> контактов · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Из Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Из аккаунта <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"Перезвонить"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Добавить в контакты <xliff:g id="EMAIL">%s</xliff:g>?"</string>
<string name="description_plus_button" msgid="515164827856229880">"плюс"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"Контакт <xliff:g id="CURRENT_NUMBER">%s</xliff:g> из <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Имена контактов"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Действие не поддерживается ни в одном приложении."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Нажмите, чтобы вернуться на предыдущую страницу"</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"Сегодня"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Сегодня, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Завтра, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(событие без названия)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Установить"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Чат"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Нажмите, чтобы развернуть редактор контактов."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Нажмите, чтобы свернуть редактор контактов."</string>
<string name="content_description_directions" msgid="2686791825798189335">"Маршруты"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Недавнее SMS-сообщение. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Нажмите, чтобы ответить."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Недавнее SMS-сообщение. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Нажмите, чтобы ответить."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"входящий"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"исходящий"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропущенный"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Недавний вызов. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Нажмите, чтобы перезвонить."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Недавний вызов. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Нажмите, чтобы перезвонить."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Вы: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Чтобы обеспечить надежную работу Hangouts, указывайте вместо адреса электронной почты или номера телефона идентификатор пользователя в Hangouts."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Показать другие поля"</string>
@@ -328,7 +327,6 @@
<item quantity="other">Связанные контакты (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Связанных контактов: <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"СВЯЗАТЬ КОНТАКТЫ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ОТМЕНА"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="many">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g> <xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Этот контакт"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Повторяющиеся контакты"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Возможно, эти контакты относятся к одному человеку. Объедините их."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Из ваших аккаунтов"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Выбор фото"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Из <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Удалить данные. <xliff:g id="DATA_TYPE">%s </xliff:g> <xliff:g id="DATA_KIND">%s</xliff:g>."</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Удалить данные. <xliff:g id="DATA_TYPE">%1$s </xliff:g> <xliff:g id="DATA_KIND">%2$s</xliff:g>."</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Удалить <xliff:g id="DATA_KIND">%s</xliff:g>."</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Фото из аккаунта <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> не выбрано"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Фото из аккаунта <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> выбрано"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Выбор фото из неизвестного аккаунта отменен"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Выбрано фото из неизвестного аккаунта"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Предложения"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Отменить экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Не удалось отменить импорт/экспорт vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Неизвестная ошибка"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Не удалось открыть файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\". Причина: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Не удалось открыть файл \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\". Причина: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Не удалось запустить функцию экспорта. Причина: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Нет контактов для экспорта."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Отсутствует необходимое разрешение."</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Получено по NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Экспорт контактов"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кеширование"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Импорт <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Импорт <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Экспортировать в VCF-файл"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Сортировка"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Имя"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Удалить"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Многоточие"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> сек."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ч. <xliff:g id="MINUTES_1">%s</xliff:g> мин. <xliff:g id="SECONDS">%s</xliff:g> сек."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> мин. <xliff:g id="SECONDS">%2$s</xliff:g> сек."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ч. <xliff:g id="MINUTES_1">%2$s</xliff:g> мин. <xliff:g id="SECONDS">%3$s</xliff:g> сек."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Этот ярлык неактивен"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Контакт удален"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Импортировать"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Нет соединения"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM-карта"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Показать ещё"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Импорт контактов с SIM-карты завершен"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Ошибка при импорте контактов с SIM-карты"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Импорт контактов с SIM-карты…"</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 703f7a7..1360c65 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other">සම්බන්ධතා <xliff:g id="COUNT_1">%d</xliff:g></item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> සම්බන්ධතා · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> සම්බන්ධතා · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> සම්බන්ධතා · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> සම්බන්ධතා · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google වෙතින්"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> වෙතින්"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"ඇමතුම නැවත ලබා දෙන්න"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"සම්බන්ධතා වලට \"<xliff:g id="EMAIL">%s</xliff:g>\" එක් කරන්නද?"</string>
<string name="description_plus_button" msgid="515164827856229880">"ධන"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"සම්බන්ධතා <xliff:g id="TOTAL_NUMBER">%s</xliff:g> කින් <xliff:g id="CURRENT_NUMBER">%s</xliff:g> ක්"</string>
<string name="search_settings_description" msgid="2675223022992445813">"ඔබගේ සම්බන්ධතා වල නම්"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"මෙම ක්රියාව හැසිරවීමට යෙදුමක් සොයාගත්තේ නැත"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"පෙර තිරයට යෑම ආපසු යෑම ක්ලික් කරන්න"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"අද"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"අද <xliff:g id="TIME_INTERVAL">%s</xliff:g> ට"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"හෙට <xliff:g id="TIME_INTERVAL">%s</xliff:g> ට"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(නම් නොකළ සිදුවීම)"</string>
<string name="date_time_set" msgid="4761419824439606690">"සකසන්න"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"සම්බන්ධ සංස්කාරකය දිගහරින්න ක්ලික් කරන්න."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"සම්බන්ධ සංස්කාරකය හකුලන්න ක්ලික් කරන්න."</string>
<string name="content_description_directions" msgid="2686791825798189335">"ස්ථානයට දිශාවන්"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"මෑත SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. පිළිතුරු සැපයීමට ක්ලික් කරන්න"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"මෑත SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. පිළිතුරු සැපයීමට ක්ලික් කරන්න"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ඇතුළට එන"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"පිටතට යන"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"හමු නොවී යන ලදි"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"මෑත අමන්තුම්. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ආපසු ඇමතිමට ක්ලික් කරන්න"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"මෑත අමන්තුම්. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ආපසු ඇමතිමට ක්ලික් කරන්න"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"ඔබ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ඔබ පුද්ගලයාගේ Hangouts හඳුන්වනය ඊ-තැපැල් හෝ දුරකථන ක්ෂේත්රයට ඇතුළත් කළ විටHangouts වඩා හොඳින් ක්රියා කරයි."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"තව ක්ෂේත්ර"</string>
@@ -312,7 +311,6 @@
<item quantity="other">සබැඳි සම්බන්ධතා (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"සබැඳි කළ සම්බන්ධතා <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"සම්බන්ධතා සබැඳි කරන්න"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"අවලංගු කරන්න"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"මෙම සම්බන්ධතාව"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"විය හැකි අනුපිටපත්"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"මෙම සම්බන්ධතා එකම පුද්ගලයා විය හැකිය. ඔබට ඒවා තනි සම්බන්ධතාවක් ලෙස සබැඳි කළ හැකිය."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"ඔබගේ ගිණුම් වෙතින්"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ඡායාරූපය තෝරන්න"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> වෙතින්"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> මැකීම"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> මැකීම"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> මැකීම"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>වෙතින් ඡායාරූපය පරීක්ෂා කරන ලදී"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> වෙතින් ඡායාරූපය පරීක්ෂා කරන ලදී"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"නොදන්නා ගිණුම වෙතින් වන ඡායාරූපය ලකුණු නොකරන ලදී"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"නොදන්නා ගිණුම වෙතින් වන ඡායාරූපය ලකුණු කරන ලදී"</string>
<string name="menu_assistant" msgid="5760693735722052454">"යෝජනා"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම අවලංගු කරන්නද?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard ආයාත/නිර්යාත කිරීම අවලංගු කළ නොහැක"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"නොදන්නා දෝෂය."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" විවෘත කිරීමට නොහැක: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" විවෘත කිරීමට නොහැක: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"නිර්යාතකරු පටන් ගැනීමට නොහැක: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"නිර්යාත කළ හැකි සම්බන්ධතාවයක් නොමැත."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"ඔබ අවශ්ය අවසරයක් අබල කර ඇත."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC හරහා සම්බන්ධතාව ලැබුණි"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"සම්බන්ධතා නිර්යාත කරන්නද?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"හැඹිලි ගත කරමින්"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g> ආයාත කරමින්"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g> ආයාත කරමින්"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ගොනුවට නිර්යාත කරන්න"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"මේ අනුව අනුපිළිවෙලට සකසන්න"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"පළමු නම"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"මකන්න"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"ලෝපය"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"තත් <xliff:g id="SECONDS">%s</xliff:g>"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"මිනි <xliff:g id="MINUTES">%s</xliff:g> තත් <xliff:g id="SECONDS">%s</xliff:g>"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"පැය <xliff:g id="MINUTES_0">%s</xliff:g> මිනි <xliff:g id="MINUTES_1">%s</xliff:g> තත් <xliff:g id="SECONDS">%s</xliff:g>"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"මිනි <xliff:g id="MINUTES">%1$s</xliff:g> තත් <xliff:g id="SECONDS">%2$s</xliff:g>"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"පැය <xliff:g id="MINUTES_0">%1$s</xliff:g> මිනි <xliff:g id="MINUTES_1">%2$s</xliff:g> තත් <xliff:g id="SECONDS">%3$s</xliff:g>"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"මෙම කෙටිමග අබල කර ඇත"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"සම්බන්ධතාව ඉවත් කරන ලදී"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"ආයාත කරන්න"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"සම්බන්ධතාව නැත"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"තව පෙන්වන්න"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM කාඩ්පත ආයාත කිරීම අවසන්ය"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM කාඩ්පත ආයාත කිරීමට නොහැකි විය"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM ආයාත කරමින්"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 632510e..ef758ee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -87,10 +87,10 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> kontakty · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontaktov · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakty · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktu · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontaktov · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Z Googlu"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Z účtu <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"Zavolať späť"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Chcete pridať „<xliff:g id="EMAIL">%s</xliff:g>“ medzi kontakty?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> z <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontaktov"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Mená vašich kontaktov"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aplikácia potrebná na spracovanie tejto akcie sa nenašla."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknutím na tlačidlo sa vrátite na predchádzajúcu obrazovku."</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"Dnes"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Dnes o <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Zajtra o <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Udalosť bez názvu)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Nastaviť"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Čet"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kliknutím rozbalíte editor kontaktov."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kliknutím zbalíte editor kontaktov."</string>
<string name="content_description_directions" msgid="2686791825798189335">"trasa do miesta"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"nedávna správa sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknutím na ňu odpoviete"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"nedávna správa sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknutím na ňu odpoviete"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"prichádzajúci"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"odchádzajúci"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"zmeškaný"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"nedávny hovor. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknutím zavoláte späť"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"nedávny hovor. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknutím zavoláte späť"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Vy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Služba Hangouts funguje lepšie, keď do poľa pre e-mailovú adresu alebo telefón zadáte identifikátor osoby v službe Hangouts."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Ďalšie polia"</string>
@@ -328,7 +327,6 @@
<item quantity="one">Prepojený kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Prepojené kontakty: <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"PREPOJIŤ KONTAKTY"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ZRUŠIŤ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Tento kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Možné duplikáty"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Tieto kontakty môžu patriť jednej osobe. Môžete ich prepojiť do jedného kontaktu."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Z vašich účtov"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Výber fotky"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Z účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Odstrániť položku <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Odstrániť položku <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Odstrániť položku <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Fotka účtu <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> nie je začiarknutá"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotka z účtu <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> je začiarknutá"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Fotka z neznámeho účtu nebola začiarknutá"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Fotka z neznámeho účtu bola začiarknutá"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Návrhy"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Zrušiť export vizitky <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Import či export vizitky sa nepodarilo zrušiť"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Neznáma chyba."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Súbor „<xliff:g id="FILE_NAME">%s</xliff:g>“ sa nepodarilo otvoriť: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Súbor „<xliff:g id="FILE_NAME">%1$s</xliff:g>“ sa nepodarilo otvoriť: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Nástroj na export sa nepodarilo spustiť: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nedá sa exportovať žiadny kontakt."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Zakázali ste požadované povolenie."</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt cez NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportovať kontakty?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Ukladanie do vyrovnávacej pamäte..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Import: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Import: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportovať do súboru .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Zoradiť podľa"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Meno"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Odstrániť"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Tri bodky"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Tento odkaz bol deaktivovaný"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt bol odstránený"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importovať"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Žiadne pripojenie"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM karta"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Zobraziť viac"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Import SIM karty bol dokončený"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM kartu sa nepodarilo importovať"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importuje sa SIM karta"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index df7bb99..ba33667 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -87,10 +87,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> stikov</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> stik · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="two"><xliff:g id="COUNT_2">%d</xliff:g> stika · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> stiki · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> stikov · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> stik · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="two"><xliff:g id="COUNT_2">%1$d</xliff:g> stika · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> stiki · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> stikov · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Iz Google računa"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Iz računa za <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"Povratni klic"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Želite »<xliff:g id="EMAIL">%s</xliff:g>« dodati stikom?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> od <xliff:g id="TOTAL_NUMBER">%s</xliff:g> stikov"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Imena stikov"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Aplikacije za obravnavo tega dejanja ni mogoče najti."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliknite za vrnitev na prejšnji zaslon"</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"Danes"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Danes ob <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Jutri ob <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Neimenovani dogodek)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Nastavi"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Takojšnje sporočanje"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kliknite, če želite razširiti urejevalnik stikov."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kliknite, če želite strniti urejevalnik stikov."</string>
<string name="content_description_directions" msgid="2686791825798189335">"navodila do mesta"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"nedavni sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknite, če želite odgovoriti"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"nedavni sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknite, če želite odgovoriti"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"Dohodni"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"Odhodni"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"Zgrešeni"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"nedavni klic. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknite, če želite poklicati nazaj"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"nedavni klic. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliknite, če želite poklicati nazaj"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Pogovori Hangouts delujejo bolje, če v polje za e-pošto ali polje za telefon vnesete identifikator osebe za pogovore Hangouts."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Več polj"</string>
@@ -328,7 +327,6 @@
<item quantity="other">Povezani stiki (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Povezani stiki (<xliff:g id="COUNT">%d</xliff:g>)"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"POVEŽI STIKE"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"PREKLIČI"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="few">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g> <xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ta stik"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Morebitni dvojniki"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Ti stiki so morda ena in ista oseba. Lahko jih združite v en stik."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Iz vaših računov"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Izbira fotografije"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Od: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Izbriši <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Izbriši <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Izbriši <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Fotografija iz <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> ni označena"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotografija iz <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> je označena"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Fotografija iz neznanega računa ni izbrana"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Fotografija iz neznanega računa je izbrana"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Predlogi"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Želite preklicati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Uvoza/izvoza vCard ni mogoče preklicati"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Neznana napaka."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Datoteke »<xliff:g id="FILE_NAME">%s</xliff:g>« ni bilo mogoče odpreti: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Datoteke »<xliff:g id="FILE_NAME">%1$s</xliff:g>« ni bilo mogoče odpreti: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Funkcije za izvoz ni bilo mogoče zagnati: »<xliff:g id="EXACT_REASON">%s</xliff:g>«"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Ni stikov za izvoz."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Onemogočili ste zahtevano dovoljenje."</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Stik prejet prek NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Želite izvoz. stike?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Predpomnjenje"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Uvažanje <xliff:g id="CURRENT_NUMBER">%s</xliff:g>(<xliff:g id="TOTAL_NUMBER">%s</xliff:g>:<xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Uvažanje <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>(<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>:<xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Izvozi v datoteko .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Razvrsti glede na"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Ime"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Izbriši"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Tri pike"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> s"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> h <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> s"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ta bližnjica je onemogočena"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Stik je bil odstranjen"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Uvozi"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Ni povezave"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"Kart. SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Pokaži več"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Uvoz kartice SIM je končan"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Kartice SIM ni bilo mogoče uvoziti"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Uvažanje kartice SIM"</string>
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 90f4bd1..5461ce2 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontakte · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakte · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Nga Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Nga <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Ktheji telefonatën"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Të shtohet \"<xliff:g id="EMAIL">%s</xliff:g>\" te kontaktet?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> nga gjithsej <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontakte"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Emrat e kontakteve të tua"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nuk u gjet asnjë aplikacion për të menaxhuar këtë veprim"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Kliko për t\'u kthyer tek ekrani i mëparshëm"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Sot"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Sot në <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Nesër në <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Ngjarje e patitulluar)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Cakto"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kliko për ta zgjeruar redaktorin e kontaktit."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kliko për ta palosur redaktorin e kontaktit."</string>
<string name="content_description_directions" msgid="2686791825798189335">"drejtime për te vendndodhja"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms-ja e fundit. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliko për t\'u përgjigjur"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms-ja e fundit. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliko për t\'u përgjigjur"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"hyrëse"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"dalëse"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"të humbura"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"telefonata e fundit. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliko për të ri-telefonuar"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"telefonata e fundit. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. kliko për të ri-telefonuar"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ti: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Shërbimi \"Hangouts\" funksionon më mirë kur fut identifikuesin e personit në fushën e mail-it ose në fushën e telefonit."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Fusha të tjera"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Kontakt i lidhur</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> kontakte të lidhura"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LIDH KONTAKTET"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ANULO"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ky kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Dublikatat e mundshme"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Këto kontakte mund të jenë i njëjti person. Mund t\'i lidhësh së bashku si një kontakt të vetëm."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Nga llogaritë e tua"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Zgjidh fotografinë"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Nga <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Fshi <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Fshi <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Fshi <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Nuk është shënuar fotografia nga <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Është shënuar fotografia nga <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Nuk është zgjedhur fotografi nga llogari e panjohur"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Është zgjedhur fotografi nga llogari e panjohur"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Sugjerime"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Të anulohet eksportimi i <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Importi/eksporti i vCard nuk u anulua"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Gabim i panjohur."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nuk mund të hapej \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Nuk mund të hapej \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Eksportuesi nuk mund të nisej: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nuk ka asnjë kontakt që mund të eksportohet."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Ke çaktivizuar një leje e cila është të detyrueshme."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt nëpërmjet NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Të eksportohen kontaktet?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Po ruan memorien e përkohshme"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Po importon <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Po importon <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Eksporto në skedar .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Rendit sipas"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Emri"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Fshi"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Elipsë"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sekonda"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> minuta <xliff:g id="SECONDS">%s</xliff:g> sekonda"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> orë <xliff:g id="MINUTES_1">%s</xliff:g> minuta <xliff:g id="SECONDS">%s</xliff:g> sekonda"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> minuta <xliff:g id="SECONDS">%2$s</xliff:g> sekonda"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> orë <xliff:g id="MINUTES_1">%2$s</xliff:g> minuta <xliff:g id="SECONDS">%3$s</xliff:g> sekonda"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Kjo shkurtore u çaktivizua"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakti u hoq"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importo"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Nuk ka lidhje"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Shfaq më shumë"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Importimi i kartës SIM përfundoi"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Karta SIM nuk mund të importohej"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Karta SIM po importohet"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 26ced0b..4e41c72 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -85,9 +85,9 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> контаката</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> контакт · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> контаката · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> контакт · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> контакта · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> контаката · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Са Google-а"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Са <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -169,7 +169,6 @@
<string name="returnCall" msgid="8171961914203617813">"Узврати позив"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Желите ли да додате имејл адресу „<xliff:g id="EMAIL">%s</xliff:g>“ у контакте?"</string>
<string name="description_plus_button" msgid="515164827856229880">"плус"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> од <xliff:g id="TOTAL_NUMBER">%s</xliff:g> контак(а)та"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Имена контаката"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Није пронађена ниједна апликација која би могла да изврши ову радњу."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Кликните да бисте се вратили на претходни екран"</string>
@@ -282,7 +281,7 @@
<string name="today" msgid="8041090779381781781">"Данас"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Данас у <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Сутра у <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Ненасловљени догађај)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Подеси"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Размена тренутних порука"</string>
@@ -299,11 +298,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Кликните да бисте проширили уређивач контаката."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Кликните да бисте скупили уређивач контаката."</string>
<string name="content_description_directions" msgid="2686791825798189335">"упутства до локације"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Недавни SMS. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Кликните за одговор"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Недавни SMS. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Кликните за одговор"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"долазни"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"одлазни"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропуштени"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Недавни позив. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Кликните за повратни позив"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Недавни позив. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Кликните за повратни позив"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ви: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts ради боље кад унесете Hangouts идентификатор особе у поље за имејл адресу или број телефона."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Још поља"</string>
@@ -320,7 +319,6 @@
<item quantity="other">Обједињени контакти (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Обједињених контаката: <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ОБЈЕДИНИ КОНТАКТЕ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ОТКАЖИ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -338,7 +336,6 @@
<item quantity="few">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Овај контакт"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Могући дупликати"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Изгледа да су ови контакти иста особа. Можете да их обједините у један контакт."</string>
@@ -346,10 +343,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Са ваших налога"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Изаберите слику"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Са <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Избриши <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Избриши <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Избриши <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Слика са <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> налога <xliff:g id="USER_NAME">%s </xliff:g> није означена"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Слика са <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> налога <xliff:g id="USER_NAME">%s </xliff:g> је означена"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Слика са непознатог налога није означена"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Слика са непознатог налога је означена"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Предлози"</string>
@@ -527,7 +522,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Желите ли да откажете извоз датотеке <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Није могуће отказати vCard увоз/извоз"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Непозната грешка."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Није могуће отворити датотеку „<xliff:g id="FILE_NAME">%s</xliff:g>“: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Није могуће отворити датотеку „<xliff:g id="FILE_NAME">%1$s</xliff:g>“: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Није могуће покренути програм за извоз: „<xliff:g id="EXACT_REASON">%s</xliff:g>“"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Нема контаката за извоз."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Онемогућили сте обавезну дозволу."</string>
@@ -569,7 +564,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Контакт преко NFC-а"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Желите ли да извезете контакте?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кеширање..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Увоз <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Увоз <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Извези у .vcf датотеку"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Сортирај према"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Име"</string>
@@ -635,8 +630,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Избришите"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Три тачке"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> с <xliff:g id="MINUTES_1">%s</xliff:g> мин <xliff:g id="SECONDS">%s</xliff:g> сек"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> мин <xliff:g id="SECONDS">%2$s</xliff:g> сек"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> с <xliff:g id="MINUTES_1">%2$s</xliff:g> мин <xliff:g id="SECONDS">%3$s</xliff:g> сек"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ова пречица је онемогућена"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Контакт је уклоњен"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Увeзи"</string>
@@ -660,4 +655,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Веза није успостављена"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Прикажи више"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Увоз са SIM картице је завршен"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Увоз са SIM картице није успео"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Увози се са SIM-а"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a29fcee..d698eba 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kontakter · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakter · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Från Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Från: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Ring upp"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Vill du lägga till <xliff:g id="EMAIL">%s</xliff:g> i Kontakter?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> av <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontakter"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Dina kontakters namn"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ingen app som kan hantera åtgärden hittades."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Klicka om du vill återvända till föregående skärm"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"I dag"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"I dag kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"I morgon kl. <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(händelse utan titel)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Ange"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Chatt"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Klicka om du vill expandera kontaktredigeraren."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Klicka om du vill komprimera kontaktredigeraren."</string>
<string name="content_description_directions" msgid="2686791825798189335">"vägbeskrivning till plats"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Klicka om du vill svara"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Klicka om du vill svara"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"inkommande"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"utgående"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"missade"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"samtal. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Klicka om du vill ringa upp"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"samtal. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Klicka om du vill ringa upp"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Du: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts fungerar bättre när du anger personens identifierare i Hangouts i e-postfältet eller mobilfältet."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Fler fält"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Länkad kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> länkade kontakter"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LÄNKA KONTAKTER"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"AVBRYT"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Den här kontakten"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Möjlig dubblett"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Dessa kontakter avser möjligen samma person. Du kan länka samman dem till en enda kontakt."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Från dina konton"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Välj bild"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Från <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Radera <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Radera <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Radera <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Fotot från <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> har inte markerats"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotot från <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> har markerats"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Ett foto från ett okänt konto har inte markerats"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Ett foto från ett okänt konto har markerats"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Förslag"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Vill du avbryta exporten av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Det gick inte att avbryta importen/exporten av vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Okänt fel."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Det gick inte att öppna <xliff:g id="FILE_NAME">%s</xliff:g>: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Det gick inte att öppna <xliff:g id="FILE_NAME">%1$s</xliff:g>: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Det gick inte att starta exportverktyget: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Det finns ingen kontakt att exportera."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Du har inaktiverat en behörighet som krävs."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Mott. v. NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportera kontakter?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Cachelagrar ..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Importerar <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Importerar <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Exportera till VCF-fil"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sortera efter"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Förnamn"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Radera"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellips"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sek"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> tim <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> min <xliff:g id="SECONDS">%2$s</xliff:g> sek"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> tim <xliff:g id="MINUTES_1">%2$s</xliff:g> min <xliff:g id="SECONDS">%3$s</xliff:g> sek"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Den här genväg är inaktiverad"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt borttagen"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Importera"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Ingen anslutning"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Visa fler"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Import av SIM-kort slutförd"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Det gick inte att importera SIM-kort"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Importerar SIM"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7a42b2f..cabc59c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one">Anwani <xliff:g id="COUNT_0">%d</xliff:g></item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other">Anwani <xliff:g id="COUNT_2">%d</xliff:g> · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one">Anwani <xliff:g id="COUNT_0">%d</xliff:g> · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other">Anwani <xliff:g id="COUNT_2">%1$d</xliff:g> · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one">Anwani <xliff:g id="COUNT_0">%1$d</xliff:g> · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Kutoka Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Kutoka <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Mpigie"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Ongeza \"<xliff:g id="EMAIL">%s</xliff:g>\" kwa anwani?"</string>
<string name="description_plus_button" msgid="515164827856229880">"jumlisha"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> ya anwani <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Majina ya anwani zako"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Hakuna programu iliyopatikana ya kushughulikia tendo hili."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Bofya ili urudi kwenye skrini iliyotangulia"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Leo"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Leo saa <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Kesho saa <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Tukio lisilokuwa na kichwa)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Weka"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Ujumbe wa Papo Hapo"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Bofya ili upanue kihariri cha anwani."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Bofya ili ukunje kihariri cha anwani."</string>
<string name="content_description_directions" msgid="2686791825798189335">"maelekezo ya kwenda mahali"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms ya hivi majuzi. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. bofya ili ujibu"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms ya hivi majuzi. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. bofya ili ujibu"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"zinazoingia"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"zinazotoka"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ulizokosa kupokea"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"simu ya hivi karibuni. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. bofya ili upige simu"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"simu ya hivi karibuni. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. bofya ili upige simu"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Wewe: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangout hufanya kazi vizuri zaidi unapoweka nambari ya mtu ya utambulisho wa Hangout katika sehemu ya anwani ya barua pepe au sehemu ya nambari ya simu."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Sehemu zingine"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Anwani iliyounganishwa</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Anwani <xliff:g id="COUNT">%d</xliff:g> zilizounganishwa"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g>(<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"UNGANISHA ANWANI"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"GHAIRI"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Anwani hii"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Anwani zinazoweza kurudufishwa"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Anwani hizi zinaweza kuwa za mtu mmoja. Unaweza kuziunganisha zote kuwa anwani moja."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Kutoka akaunti zako"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Chagua picha"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Kutoka kwa <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Futa <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Futa <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Futa <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Picha kutoka <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> haijateuliwa"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Picha kutoka <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> imeteuliwa"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Picha kutoka akaunti isiyojulikana haijateuliwa"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Picha kutoka akaunti isiyojulikana imeteuliwa"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Mapendekezo"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Ghairi kuhamishwa kwa <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Haikuweza kughairi kuingiza/kuhamisha vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Hitilafu isiyojulikana."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Haikuweza kufungua \"{<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Haikuweza kufungua \"{<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Haikuweza kuanzisha kihamishaji: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Hakuna anwani inayoweza kuhamishwa."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Umeondoa idhini inayohitajika."</string>
@@ -558,7 +553,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Anwani imepokewa kupitia NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Hamisha anwani?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Inaakibisha..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Inaingiza <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Inaingiza <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Tuma kwenye faili ya .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Panga kwa"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Jina la kwanza"</string>
@@ -623,8 +618,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Futa"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Alama ya Dukuduku"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"Sekunde <xliff:g id="SECONDS">%s</xliff:g>"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"Dakika <xliff:g id="MINUTES">%s</xliff:g> sekunde <xliff:g id="SECONDS">%s</xliff:g>"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"Saa <xliff:g id="MINUTES_0">%s</xliff:g> dakika <xliff:g id="MINUTES_1">%s</xliff:g> sekunde <xliff:g id="SECONDS">%s</xliff:g>"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"Dakika <xliff:g id="MINUTES">%1$s</xliff:g> sekunde <xliff:g id="SECONDS">%2$s</xliff:g>"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"Saa <xliff:g id="MINUTES_0">%1$s</xliff:g> dakika <xliff:g id="MINUTES_1">%2$s</xliff:g> sekunde <xliff:g id="SECONDS">%3$s</xliff:g>"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Njia hii ya mkato imezimwa"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Anwani imeondolewa"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Leta"</string>
@@ -647,4 +642,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Hakuna muunganisho"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Onyesha zingine"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Imemaliza kuleta anwani za SIM kadi"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Imeshindwa kuleta anwani za SIM kadi"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Anwani zilizo kwenye SIM kadi zinaletwa"</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index f187213..382831e 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> தொடர்பு</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> தொடர்புகள் · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> தொடர்பு · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> தொடர்புகள் · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> தொடர்பு · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google கணக்கிலிருந்து"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> இலிருந்து"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"திரும்பி அழை"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" ஐத் தொடர்புகளில் சேர்க்கவா?"</string>
<string name="description_plus_button" msgid="515164827856229880">"சேர்"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> தொடர்புகளில் <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"உங்கள் தொடர்புகளின் பெயர்கள்"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"இந்தச் செயலைச் செய்வதற்கான பயன்பாடு எதுவுமில்லை."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"முந்தைய திரைக்குச் செல்ல கிளிக் செய்க"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"இன்று"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"இன்று <xliff:g id="TIME_INTERVAL">%s</xliff:g> மணிக்கு"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"நாளை <xliff:g id="TIME_INTERVAL">%s</xliff:g> மணிக்கு"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(பெயரிடப்படாத நிகழ்வு)"</string>
<string name="date_time_set" msgid="4761419824439606690">"அமை"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"தொடர்பு திருத்தியை விரிக்க, கிளிக் செய்க."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"தொடர்பு திருத்தியைச் சுருக்க, கிளிக் செய்க."</string>
<string name="content_description_directions" msgid="2686791825798189335">"இடத்தை நோக்கிய திசைகள்"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"சமீபத்திய sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. பதிலளிக்க, கிளிக் செய்க"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"சமீபத்திய sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. பதிலளிக்க, கிளிக் செய்க"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"உள்வரும் அழைப்பு"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"வெளிச்செல்லும் அழைப்பு"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"தவறிய அழைப்பு"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"சமீபத்திய அழைப்பு. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. திரும்ப அழைக்க, கிளிக் செய்க"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"சமீபத்திய அழைப்பு. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. திரும்ப அழைக்க, கிளிக் செய்க"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"நீங்கள்: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"பிறரின் Hangouts அடையாளத்தை மின்னஞ்சல் அல்லது ஃபோன் புலத்தில் உள்ளிடும் போது, Hangouts இன்னும் சிறப்பாகச் செயல்படும்."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"மேலும் புலங்கள்"</string>
@@ -312,7 +311,6 @@
<item quantity="one">இணைத்த தொடர்பு</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> இணைக்கப்பட்ட தொடர்புகள்"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"தொடர்புகளை இணை"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ரத்துசெய்"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"இந்தத் தொடர்பு"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"சாத்தியமுள்ள நகல்கள்"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"இவை ஒரே பயனருடையதாக இருக்கக்கூடும். அவற்றை ஒரே தொடர்பில் இணைக்கலாம்."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"உங்கள் கணக்குகளில் இருந்து"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"படத்தைத் தேர்வுசெய்க"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> இலிருந்து"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>ஐ நீக்கு"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>ஐ நீக்கு"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g>ஐ நீக்கு"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> வழங்கிய படம் தேர்ந்தெடுக்கப்படவில்லை"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> வழங்கிய படம் தேர்ந்தெடுக்கப்பட்டது"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"அறியப்படாத கணக்கிலிருந்து படம் தேர்ந்தெடுக்கப்படவில்லை"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"அறியப்படாத கணக்கிலிருந்து படம் தேர்ந்தெடுக்கப்பட்டது"</string>
<string name="menu_assistant" msgid="5760693735722052454">"பரிந்துரைகள்"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> இன் ஏற்றுமதியை ரத்துசெய்யவா?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard இன் இறக்குமதி/ஏற்றுமதியை ரத்துசெய்ய முடியவில்லை"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"தெரியாத பிழை."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ஐத் திறக்க முடியவில்லை: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" ஐத் திறக்க முடியவில்லை: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"ஏற்றுமதியைத் தொடங்க முடியவில்லை: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ஏற்றுமதி செய்யக்கூடிய தொடர்பு இல்லை."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"தேவைப்படும் அனுமதியை முடக்கியுள்ளீர்கள்."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC வழியாக தொடர்பு பெறப்பட்டது"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"தொடர்புகளை ஏற்றுமதி செய்யவா?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"தற்காலிகமாகச் சேமித்தல்"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> ஐ இறக்குமதி செய்கிறது: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> ஐ இறக்குமதி செய்கிறது: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf கோப்பிற்கு ஏற்று"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"இதன்படி வரிசைப்படுத்து:"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"பெயரின் முற்பகுதி"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"நீக்கும்"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"முப்புள்ளி"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> வி"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> நி <xliff:g id="SECONDS">%s</xliff:g> வி"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ம <xliff:g id="MINUTES_1">%s</xliff:g> நி <xliff:g id="SECONDS">%s</xliff:g> வி"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> நி <xliff:g id="SECONDS">%2$s</xliff:g> வி"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ம <xliff:g id="MINUTES_1">%2$s</xliff:g> நி <xliff:g id="SECONDS">%3$s</xliff:g> வி"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"இந்தக் குறுக்குவழி முடக்கப்பட்டது"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"தொடர்பு அகற்றப்பட்டது"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"இறக்கு"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"இணைப்பு இல்லை"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"சிம்"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"மேலும் காட்டு"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"சிம் கார்டு இறக்கப்பட்டது"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"சிம் கார்டை இறக்க முடியவில்லை"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"சிம் கார்டை இறக்குகிறது"</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 81903a3..0d5c61e 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> పరిచయం</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> పరిచయాలు · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> పరిచయం · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> పరిచయాలు · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> పరిచయం · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google అందించినవి"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> అందించినవి"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"కాల్ను తిరిగి చేయి"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\"ని పరిచయాలకు జోడించాలా?"</string>
<string name="description_plus_button" msgid="515164827856229880">"ప్లస్"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g> పరిచయాల్లో <xliff:g id="CURRENT_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"మీ పరిచయాల యొక్క పేర్లు"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ఈ చర్యను నిర్వహించడానికి అనువర్తనం ఏదీ కనుగొనబడలేదు."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"మునుపటి స్క్రీన్కి తిరిగి రావడానికి క్లిక్ చేయండి"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ఈ రోజు"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"ఈ రోజు <xliff:g id="TIME_INTERVAL">%s</xliff:g>కి"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"రేపు <xliff:g id="TIME_INTERVAL">%s</xliff:g>కి"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(శీర్షిక లేని ఈవెంట్)"</string>
<string name="date_time_set" msgid="4761419824439606690">"సెట్ చేయి"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"పరిచయ ఎడిటర్ని విస్తరింపజేయడానికి క్లిక్ చేయండి."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"పరిచయ ఎడిటర్ని కుదించడానికి క్లిక్ చేయండి."</string>
<string name="content_description_directions" msgid="2686791825798189335">"స్థానానికి వెళ్లడానికి దిశలు"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"ఇటీవలి sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ప్రతిస్పందించడానికి క్లిక్ చేయండి"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"ఇటీవలి sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. ప్రతిస్పందించడానికి క్లిక్ చేయండి"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"ఇన్కమింగ్"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"అవుట్గోయింగ్"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"మిస్డ్"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ఇటీవలి కాల్. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. తిరిగి కాల్ చేయడానికి క్లిక్ చేయండి"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ఇటీవలి కాల్. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. తిరిగి కాల్ చేయడానికి క్లిక్ చేయండి"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"మీరు: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"మీరు ఇమెయిల్ ఫీల్డ్ లేదా ఫోన్ ఫీల్డ్లో వ్యక్తి యొక్క Hangouts ఐడెంటిఫైయర్ని నమోదు చేసినప్పుడు Hangouts ఉత్తమంగా పని చేస్తాయి."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"మరిన్ని ఫీల్డ్లు"</string>
@@ -312,7 +311,6 @@
<item quantity="one">లింక్ చేయబడిన పరిచయం</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> లింక్ చేయబడిన పరిచయాలు"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"పరిచయాలను లింక్ చేయి"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"రద్దు చేయి"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"ఈ పరిచయం"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"సంభావ్య నకిలీలు"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"ఈ పరిచయాలు ఒకే వ్యక్తికి సంబంధించినవి అయ్యి ఉండవచ్చు. మీరు వాటిని ఒకే పరిచయంగా లింక్ చేయవచ్చు."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"మీ ఖాతాల నుండి"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"ఫోటోను ఎంచుకోండి"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> నుండి"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>ని తొలగిస్తుంది"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>ని తొలగిస్తుంది"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g>ని తొలగిస్తుంది"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>లోని ఫోటో ఎంచుకోబడలేదు"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>లోని ఫోటో ఎంచుకోబడింది"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"తెలియని ఖాతా నుండి అందించబడిన ఫోటో ఎంచుకోబడలేదు"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"తెలియని ఖాతా నుండి అందించబడిన ఫోటో ఎంచుకోబడింది"</string>
<string name="menu_assistant" msgid="5760693735722052454">"సూచనలు"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> యొక్క ఎగుమతిని రద్దు చేయాలా?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard దిగుమతి/ఎగుమతిని రద్దు చేయడం సాధ్యపడలేదు"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"తెలియని లోపం."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\"ని తెరవడం సాధ్యపడలేదు: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"ని తెరవడం సాధ్యపడలేదు: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"ఎక్స్పోర్టర్ను ప్రారంభించడం సాధ్యపడలేదు: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ఎగమతి చేయగల పరిచయం లేదు."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"మీరు అవసరమైన అనుమతిని నిలిపివేసారు."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"పరిచయం NFC ద్వారా స్వీకరించబడింది"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"పరిచయాలను ఎగుమతి చేయాలా?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"కాష్ చేస్తోంది"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="TOTAL_NUMBER">%s</xliff:g>లో <xliff:g id="CURRENT_NUMBER">%s</xliff:g> దిగుమతి చేయబడుతోంది: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>లో <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> దిగుమతి చేయబడుతోంది: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf ఫైల్కు ఎగుమతి చేయి"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ఇలా క్రమబద్ధీకరించు"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"మొదటి పేరు"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"తొలగిస్తుంది"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"అధ్యాహారం"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> సెక"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> నిమి <xliff:g id="SECONDS">%s</xliff:g> సెక"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> గం <xliff:g id="MINUTES_1">%s</xliff:g> నిమి <xliff:g id="SECONDS">%s</xliff:g> సెక"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> నిమి <xliff:g id="SECONDS">%2$s</xliff:g> సెక"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> గం <xliff:g id="MINUTES_1">%2$s</xliff:g> నిమి <xliff:g id="SECONDS">%3$s</xliff:g> సెక"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ఈ సత్వరమార్గం నిలిపివేయబడింది"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"పరిచయం తీసివేయబడింది"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"దిగుమతి చేయి"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"కనెక్షన్ లేదు"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"మరిన్ని చూపుతుంది"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM కార్డ్ దిగుమతి ముగిసింది"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM కార్డ్ను దిగుమతి చేయడం సాధ్యపడలేదు"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIMను దిగుమతి చేస్తోంది"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 19c0d32..8749002 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one">รายชื่อติดต่อ <xliff:g id="COUNT_0">%d</xliff:g> ราย</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other">รายชื่อติดต่อ <xliff:g id="COUNT_2">%d</xliff:g> ราย · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one">รายชื่อติดต่อ <xliff:g id="COUNT_0">%d</xliff:g> ราย · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other">รายชื่อติดต่อ <xliff:g id="COUNT_2">%1$d</xliff:g> ราย · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one">รายชื่อติดต่อ <xliff:g id="COUNT_0">%1$d</xliff:g> ราย · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"จาก Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"จาก <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"โทรกลับ"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"เพิ่ม \"<xliff:g id="EMAIL">%s</xliff:g>\" ในสมุดโทรศัพท์หรือไม่"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"รายชื่อในสมุดโทรศัพท์ <xliff:g id="CURRENT_NUMBER">%s</xliff:g> จาก <xliff:g id="TOTAL_NUMBER">%s</xliff:g> รายการ"</string>
<string name="search_settings_description" msgid="2675223022992445813">"ชื่อของรายชื่อในสมุดโทรศัพท์ของคุณ"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"ไม่พบแอปพลิเคชันสำหรับการทำงานนี้"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"คลิกเพื่อกลับไปยังหน้าจอก่อนหน้า"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"วันนี้"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"วันนี้เวลา <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"พรุ่งนี้เวลา <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g> <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(กิจกรรมไม่มีชื่อ)"</string>
<string name="date_time_set" msgid="4761419824439606690">"ตั้งค่า"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"คลิกเพื่อขยายตัวแก้ไขรายชื่อติดต่อ"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"คลิกเพื่อยุบตัวแก้ไขรายชื่อติดต่อ"</string>
<string name="content_description_directions" msgid="2686791825798189335">"เส้นทางไปยังสถานที่"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS ล่าสุด <xliff:g id="MESSAGE_BODY">%s</xliff:g> <xliff:g id="PHONE_NUMBER">%s</xliff:g> <xliff:g id="DATE">%s</xliff:g> คลิกเพื่อตอบกลับ"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"SMS ล่าสุด <xliff:g id="MESSAGE_BODY">%1$s</xliff:g> <xliff:g id="PHONE_NUMBER">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g> คลิกเพื่อตอบกลับ"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"สายโทรเข้า"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"สายโทรออก"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ไม่ได้รับ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"โทรล่าสุด <xliff:g id="CALL_TYPE">%s</xliff:g> <xliff:g id="PHONE_NUMBER">%s</xliff:g> <xliff:g id="DATE">%s</xliff:g> คลิกเพื่อโทรกลับ"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"โทรล่าสุด <xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="PHONE_NUMBER">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g> คลิกเพื่อโทรกลับ"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"คุณ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"แฮงเอาท์ทำงานได้ดียิ่งขึ้นเมื่อคุณป้อนตัวระบุแฮงเอาท์ของบุคคลที่ต้องการลงในช่องอีเมลหรือช่องโทรศัพท์"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"ช่องอื่นๆ"</string>
@@ -312,7 +311,6 @@
<item quantity="one">รายชื่อติดต่อที่ลิงก์</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"รายชื่อติดต่อที่ลิงก์ <xliff:g id="COUNT">%d</xliff:g> รายการ"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ลิงก์รายชื่อติดต่อ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ยกเลิก"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"รายชื่อติดต่อนี้"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"อาจซ้ำกับรายการอื่น"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"รายชื่อติดต่อเหล่านี้อาจเป็นบุคคลเดียวกัน คุณสามารถลิงก์รายชื่อติดต่อดังกล่าวเป็นรายชื่อติดต่อเดียว"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"จากบัญชีของคุณ"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"เลือกรูปภาพ"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"จาก <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"ลบ<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"ลบ<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"ลบ <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"ไม่ได้เลือกรูปภาพจาก <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"เลือกรูปภาพจาก <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"รูปภาพนี้ไม่ได้เลือกจากบัญชีที่ไม่รู้จัก"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"รูปภาพนี้เลือกจากบัญชีที่ไม่รู้จัก"</string>
<string name="menu_assistant" msgid="5760693735722052454">"คำแนะนำ"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"ยกเลิกการส่งออก <xliff:g id="FILENAME">%s</xliff:g> หรือไม่"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"ไม่สามารถยกเลิกการนำเข้า/ส่งออก vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"ข้อผิดพลาดที่ไม่รู้จัก"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"ไม่สามารถเปิด \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"ไม่สามารถเปิด \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"เริ่มใช้งานโปรแกรมส่งออกไม่ได้: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"ไม่มีรายชื่อติดต่อที่สามารถส่งออกได้"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"คุณปิดใช้สิทธิ์ที่จำเป็นแล้ว"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"ผู้ติดต่อทาง NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"ส่งออกรายชื่อติดต่อ"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"กำลังแคช"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"กำลังนำเข้า <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"กำลังนำเข้า <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"ส่งออกเป็นไฟล์ .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"จัดเรียงตาม"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"ชื่อ"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"ลบ"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"จุดไข่ปลา"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> นาที <xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ชั่วโมง <xliff:g id="MINUTES_1">%s</xliff:g> นาที <xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> นาที <xliff:g id="SECONDS">%2$s</xliff:g> วินาที"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ชั่วโมง <xliff:g id="MINUTES_1">%2$s</xliff:g> นาที <xliff:g id="SECONDS">%3$s</xliff:g> วินาที"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"ทางลัดนี้ถูกปิดใช้งาน"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"รายชื่อติดต่อถูกนำออก"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"นำเข้า"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"ไม่มีการเชื่อมต่อ"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"ซิม"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"แสดงเพิ่มเติม"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"นำเข้าจากซิมการ์ดเสร็จแล้ว"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"นำเข้าจากซิมการ์ดไม่สำเร็จ"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"กำลังนำเข้าจากซิมการ์ด"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4307a5b..c96199c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na contact</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> contact · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> na contact · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contact · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> na contact · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Mula sa Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Mula sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Pabalik na tawag"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Idagdag ang \"<xliff:g id="EMAIL">%s</xliff:g>\" sa mga contact?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> ng <xliff:g id="TOTAL_NUMBER">%s</xliff:g> (na) contact"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Mga pangalan ng iyong mga contact"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Walang natagpuang app na mangangasiwa sa pagkilos na ito."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"I-click upang bumalik sa nakaraang screen"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Ngayon"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Ngayong <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Bukas nang <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Kaganapang walang pamagat)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Itakda"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"I-click upang palawakin ang contact editor."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"I-click upang i-collapse ang contact editor."</string>
<string name="content_description_directions" msgid="2686791825798189335">"mga direksyon sa lokasyon"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"kamakailang sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. mag-click upang tumugon"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"kamakailang sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. mag-click upang tumugon"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"incoming"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"papalabas"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"hindi nasagot"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"kamakailang tawag. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. mag-click upang tumawag"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"kamakailang tawag. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. mag-click upang tumawag"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ikaw: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Gagana nang mas maayos ang Hangouts kapag inilagay mo ang identifier sa Hangouts ng isang tao sa field ng email o sa field ng telepono."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Higit pang mga field"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Mga naka-link na contact (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> (na) naka-link na contact"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"I-LINK ANG MGA CONTACT"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"KANSELAHIN"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Ang contact na ito"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Mga posibleng duplicate"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Maaaring iisang tao ang mga contact na ito. Maaari mong i-link ang mga ito sa isa\'t isa bilang iisang contact."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Mula sa iyong mga account"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Pumili ng larawan"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Mula kay <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"I-delete ang <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"I-delete ang <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"I-delete ang <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Hindi napili ang larawan sa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Napili na ang larawan mula sa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Hindi nilagyan ng check ang larawan mula sa isang hindi kilalang account"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Nalagyan na ng check ang larawan mula sa isang hindi kilalang account"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Mga Suhestyon"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Kanselahin ang pag-export ng <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Di makansela pag-import/pag-export vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Hindi kilalang error."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Hindi mabuksan ang \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Hindi mabuksan ang \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Hindi masimulan ang exporter: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Walang maaaring i-export na contact."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Na-disable mo ang isang kinakailangang pahintulot."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Natanggap ang contact sa NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"I-export ang mga contact?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Nagka-cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Nag-i-import <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Nag-i-import <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"I-export sa .vcf file"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Pagbukud-bukurin ayon sa"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Pangalan"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"I-delete"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Ellipsis"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> (na) seg"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> (na) min <xliff:g id="SECONDS">%s</xliff:g> (na) seg"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> (na) oras <xliff:g id="MINUTES_1">%s</xliff:g> (na) min <xliff:g id="SECONDS">%s</xliff:g> (na) seg"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> (na) min <xliff:g id="SECONDS">%2$s</xliff:g> (na) seg"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> (na) oras <xliff:g id="MINUTES_1">%2$s</xliff:g> (na) min <xliff:g id="SECONDS">%3$s</xliff:g> (na) seg"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Na-disable ang shortcut na ito"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Inalis ang contact"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"I-import"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Walang koneksyon"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Magpakita ng higit pa"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Tapos nang i-import ang SIM card"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Hindi ma-import ang SIM card"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ini-import ang SIM"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index dbc9871..99f5b26 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kişi</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> kişi · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kişi · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kişi · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kişi · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google\'dan"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> hesabından"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Geri ara"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" adresi kişilere eklensin mi?"</string>
<string name="description_plus_button" msgid="515164827856229880">"artı"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"Toplam <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kişiden <xliff:g id="CURRENT_NUMBER">%s</xliff:g> kişi"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Kişilerinizin adları"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Bu işlemi gerçekleştirecek uygulama bulunamadı."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Önceki ekrana dönmek için tıklayın"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Bugün"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Bugün şu saatler arasında: <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Yarın şu saatler arasında: <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Başlıksız etkinlik)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Ayarla"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kişi düzenleyiciyi genişletmek için tıklayın."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kişi düzenleyiciyi daraltmak için tıklayın."</string>
<string name="content_description_directions" msgid="2686791825798189335">"konum için yol tarifi"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"son gelen sms. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. yanıtlamak için dokunun"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"son gelen sms. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. yanıtlamak için dokunun"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"gelen"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"giden"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"cevapsız"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"son gelen çağrı. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. geri aramak için dokunun"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"son gelen çağrı. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. geri aramak için dokunun"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Kişinin Hangouts tanımlayıcısını e-posta veya telefon alanına girdiğinizde Hangouts daha iyi çalışır."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Diğer alanlar"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Bağlı kişi</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Bağlı <xliff:g id="COUNT">%d</xliff:g> kişi"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"KİŞİLERİ BAĞLA"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"İPTAL"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Bu kişi"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Olası kopyalar"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Bu kişiler aynı kişi olabilir. Tek bir kişi olarak birleştirecek şekilde bağlantı oluşturabilirsiniz."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Hesaplarınızdan"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Fotoğraf seçin"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> adlı hesaptan"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Sil: <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Sil: <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Sil: <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Fotoğraf: <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> işaretlenmedi"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotoğraf: <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> işaretlendi"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Bilinmeyen hesaptan fotoğraf işaretlenmedi"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Bilinmeyen hesaptan fotoğraf işaretlendi"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Öneriler"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> dosyasının dışa aktarılması iptal edilsin mi?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"İçe/dışa aktrma işlmi iptl edilemedi"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Bilinmeyen hata."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" açılamadı: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" açılamadı: <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Dışa aktarıcı başlatılamadı: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Dışa verilebilecek kişi yok."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Gerekli bir izni devre dışı bıraktınız."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kişi NFC ile alındı"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kişileri dışa aktar?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Önbelleğe alınıyor"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"İçe aktarılıyor <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"İçe aktarılıyor <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf dosyasına aktar"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sıralama ölçütü"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Ad"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Sil"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Üç nokta"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> sn."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> dk. <xliff:g id="SECONDS">%s</xliff:g> sn."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> sa. <xliff:g id="MINUTES_1">%s</xliff:g> dk. <xliff:g id="SECONDS">%s</xliff:g> sn."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> dk. <xliff:g id="SECONDS">%2$s</xliff:g> sn."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> sa. <xliff:g id="MINUTES_1">%2$s</xliff:g> dk. <xliff:g id="SECONDS">%3$s</xliff:g> sn."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Bu kısayol devre dışı bırakıldı"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kişi kaldırıldı"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"İçe aktar"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Bağlantı yok"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Diğer seçenekler gösterilir"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM kartın içe aktarılması tamamlandı"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM kart içe aktarılamadı"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM kişileri içe aktarılıyor"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7ad9fc1..f492de8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -87,10 +87,10 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> контакта</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> контакт (<xliff:g id="ACCOUNT_3">%s</xliff:g>)</item>
- <item quantity="few"><xliff:g id="COUNT_2">%d</xliff:g> контакти (<xliff:g id="ACCOUNT_3">%s</xliff:g>)</item>
- <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> контактів (<xliff:g id="ACCOUNT_3">%s</xliff:g>)</item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> контакта (<xliff:g id="ACCOUNT_3">%s</xliff:g>)</item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> контакт (<xliff:g id="ACCOUNT_3">%2$s</xliff:g>)</item>
+ <item quantity="few"><xliff:g id="COUNT_2">%1$d</xliff:g> контакти (<xliff:g id="ACCOUNT_3">%2$s</xliff:g>)</item>
+ <item quantity="many"><xliff:g id="COUNT_2">%1$d</xliff:g> контактів (<xliff:g id="ACCOUNT_3">%2$s</xliff:g>)</item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> контакта (<xliff:g id="ACCOUNT_3">%2$s</xliff:g>)</item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Від Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"З обл. запису <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -175,7 +175,6 @@
<string name="returnCall" msgid="8171961914203617813">"Зворот. виклик"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Додати в контакти <xliff:g id="EMAIL">%s</xliff:g>?"</string>
<string name="description_plus_button" msgid="515164827856229880">"плюс"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> із <xliff:g id="TOTAL_NUMBER">%s</xliff:g> контактів"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Імена ваших контактів"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Не знайдено програму для обробки цієї дії."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Натисніть, щоб повернутися на попередній екран"</string>
@@ -289,7 +288,7 @@
<string name="today" msgid="8041090779381781781">"Сьогодні"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Сьогодні о <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Завтра о <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Подія без назви)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Установити"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Чат"</string>
@@ -306,11 +305,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Натисніть, щоб розгорнути редактор контактів."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Натисніть, щоб згорнути редактор контактів."</string>
<string name="content_description_directions" msgid="2686791825798189335">"маршрути до місця"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Останнє SMS-повідомлення: <xliff:g id="MESSAGE_BODY">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Натисніть, щоб відповісти"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Останнє SMS-повідомлення: <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>, <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>. Натисніть, щоб відповісти"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"вхідні дзвінки"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"вихідні дзвінки"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропущені дзвінки"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Останній дзвінок: <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Натисніть, щоб зателефонувати"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Останній дзвінок: <xliff:g id="CALL_TYPE">%1$s</xliff:g>, <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>, <xliff:g id="DATE">%3$s</xliff:g>. Натисніть, щоб зателефонувати"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Ви: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Щоб сервіс Hangouts працював краще, введіть свій ідентифікатор Hangouts у поле \"Електронна адреса\" або \"Телефон\"."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Більше полів"</string>
@@ -328,7 +327,6 @@
<item quantity="other">Об’єднані контакти (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"Об’єднаних контактів: <xliff:g id="COUNT">%d</xliff:g>"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"ОБ’ЄДНАТИ КОНТАКТИ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"СКАСУВАТИ"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -349,7 +347,6 @@
<item quantity="many">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Цей контакт"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Можливі копії"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Ці контакти можуть стосуватися однієї людини. Ви можете об’єднати їх."</string>
@@ -357,10 +354,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"З ваших облікових записів"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Вибрати фотографію"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"З облікового запису <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Видалити <xliff:g id="DATA_TYPE">%s </xliff:g> <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Видалити <xliff:g id="DATA_TYPE">%1$s </xliff:g> <xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Видалити <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Фото з <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> не вибрано"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Фото з <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> вибрано"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Фото з невідомого облікового запису не вибрано"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Фото з невідомого облікового запису вибрано"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Пропозиції"</string>
@@ -540,7 +535,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Скасувати експорт файлу <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Не вдалося скасув. імпорт/експорт vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Невідома помилка."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Не вдалося відкрити файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Не вдалося відкрити файл \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Не вдалося запустити експортер: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Немає контакту, який можна експортувати."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Ви вимкнули обов’язковий дозвіл."</string>
@@ -582,7 +577,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Конт., отрим.через NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Експортув. контакти?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кешування"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Імпорт <xliff:g id="CURRENT_NUMBER">%s</xliff:g> з <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Імпорт <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> з <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Експортувати у файл .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Параметри сортування"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Ім’я"</string>
@@ -649,8 +644,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Видалити"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Три крапки"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> с"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> год <xliff:g id="MINUTES_1">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> хв <xliff:g id="SECONDS">%2$s</xliff:g> с"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> год <xliff:g id="MINUTES_1">%2$s</xliff:g> хв <xliff:g id="SECONDS">%3$s</xliff:g> с"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ярлик вимкнено"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Контакт вилучено"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Імпортувати"</string>
@@ -675,4 +670,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Немає з’єднання"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM-карта"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Показати більше"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM-карту імпортовано"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Не вдалось імпортувати SIM-карту"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Імпорт SIM-карти"</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 7e4e0b0..0f56cc0 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> رابطہ</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> رابطے ۔ <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> رابطہ ۔ <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> رابطے ۔ <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> رابطہ ۔ <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google سے"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> سے"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"کال لوٹائیں"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"\"<xliff:g id="EMAIL">%s</xliff:g>\" کو رابطوں میں شامل کریں؟"</string>
<string name="description_plus_button" msgid="515164827856229880">"پلس"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> از <xliff:g id="TOTAL_NUMBER">%s</xliff:g> رابطے"</string>
<string name="search_settings_description" msgid="2675223022992445813">"آپ کے رابطوں کے نام"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"اس کارروائی کو نمٹانے کیلئے کوئی ایپ نہیں ملا۔"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"سابقہ اسکرین پر واپس جانے کیلئے کلک کریں"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"ﺁﺝ"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"آج بوقت <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"کل بوقت <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(بلا عنوان ایونٹ)"</string>
<string name="date_time_set" msgid="4761419824439606690">"سیٹ کریں"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"رابطہ ایڈیٹر پھیلانے کیلئے کلک کریں۔"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"رابطہ ایڈیٹر سکیڑنے کیلئے کلک کریں۔"</string>
<string name="content_description_directions" msgid="2686791825798189335">"مقام کیلئے ڈائریکشنز"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"حالیہ sms۔ <xliff:g id="MESSAGE_BODY">%s</xliff:g>۔ <xliff:g id="PHONE_NUMBER">%s</xliff:g>۔ <xliff:g id="DATE">%s</xliff:g>۔ جواب دینے کیلئے کلک کریں"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"حالیہ sms۔ <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>۔ <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>۔ <xliff:g id="DATE">%3$s</xliff:g>۔ جواب دینے کیلئے کلک کریں"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"اِن کمنگ"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"آؤٹ گوئنگ"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"چھوٹی ہوئی"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"حالیہ کال۔ <xliff:g id="CALL_TYPE">%s</xliff:g>۔ <xliff:g id="PHONE_NUMBER">%s</xliff:g>۔ <xliff:g id="DATE">%s</xliff:g>۔ واپسی کال کرنے کیلئے کلک کریں"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"حالیہ کال۔ <xliff:g id="CALL_TYPE">%1$s</xliff:g>۔ <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>۔ <xliff:g id="DATE">%3$s</xliff:g>۔ واپسی کال کرنے کیلئے کلک کریں"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"آپ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"جب آپ کسی شخص کا Hangouts شناخت کنندہ ای میل فیلڈ یا فون فیلڈ میں داخل کرتے ہیں تو Hangouts بہتر کام کرتا ہے۔"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"مزید فیلڈز"</string>
@@ -312,7 +311,6 @@
<item quantity="one">لنک کردہ رابطہ</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> لنک کردہ رابطے"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"رابطے لنک کریں"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"منسوخ کریں"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"یہ رابطہ"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"ممکنہ ڈپلیکیٹس"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"یہ رابطے ایک ہی شخص کے ہو سکتے ہیں۔ آپ انہیں ایک رابطے کے طور پر آپس میں لنک کر سکتے ہیں۔"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"آپ کے اکاؤنٹس سے"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"تصویر چنیں"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> سے"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g> حذف کریں"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g> حذف کریں"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g> حذف کریں"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> کی تصویر چیک نہیں ہوئی"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> کی تصویر چیک ہو گئی"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"نامعلوم اکاؤنٹ سے تصویر نشان زد نہیں ہے"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"نامعلوم اکاؤنٹ سے تصویر نشان زد ہے"</string>
<string name="menu_assistant" msgid="5760693735722052454">"تجاویز"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> کی برآمد منسوخ کریں؟"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard کی درآمد/برآمد کو منسوخ نہیں کرسکا"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"نامعلوم خرابی۔"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" کو نہیں کھول سکا: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"۔"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" کو نہیں کھول سکا: \"<xliff:g id="EXACT_REASON">%2$s</xliff:g>\"۔"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"برآمد کنندہ شروع نہیں ہو سکا: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"۔"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"کوئی قابل برآمد رابطہ نہیں ہے۔"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"آپ نے ایک درکار اجازت غیر فعال کر دی ہے۔"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC پر موصولہ رابطہ"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"رابطے برآمد کریں؟"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"ذخیرہ کر رہا ہے"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g> درآمد کر رہا ہے"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g> درآمد کر رہا ہے"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">".vcf فائل میں برآمد کریں"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"ترتیب دیں بہ لحاظ"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"پہلا نام"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"حذف کریں"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"ایلپسیس"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> سیکنڈ"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> منٹ <xliff:g id="SECONDS">%s</xliff:g> سیکنڈ"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> گھنٹے <xliff:g id="MINUTES_1">%s</xliff:g> منٹ <xliff:g id="SECONDS">%s</xliff:g> سیکنڈ"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> منٹ <xliff:g id="SECONDS">%2$s</xliff:g> سیکنڈ"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> گھنٹے <xliff:g id="MINUTES_1">%2$s</xliff:g> منٹ <xliff:g id="SECONDS">%3$s</xliff:g> سیکنڈ"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"یہ شارٹ کٹ غیر فعال کر دیا گیا ہے"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"رابطہ ہٹا دیا گیا"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"درآمد کریں"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"کوئی کنکشن نہیں ہے"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"مزید دکھائیں"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM کارڈ کی درآمد مکمل ہو گئی"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM کارڈ درآمد نہیں ہو سکا"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"SIM درآمد ہو رہی ہے"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 8f3390e..531fe03 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta kontakt</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> ta kontakt · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta kontakt · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> ta kontakt · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta kontakt · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Google kontaktlari"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"<xliff:g id="ACCOUNT">%s</xliff:g> hisobidan"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Telefon qilish"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"“<xliff:g id="EMAIL">%s</xliff:g>” kontaktlarga qo‘shilsinmi?"</string>
<string name="description_plus_button" msgid="515164827856229880">"plyus"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> ta kontakt, jami: <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Kontaktlaringiz ismi"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ushbu amalni bajarish uchun ilova topilmadi."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Avvalgi ekranga qaytish uchun bosing"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Bugun"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Bugun <xliff:g id="TIME_INTERVAL">%s</xliff:g> da"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Ertaga <xliff:g id="TIME_INTERVAL">%s</xliff:g> da"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Nomsiz tadbir)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Saqlash"</string>
<string name="header_im_entry" msgid="3581720979640225615">"Tezkor xabar (IM)"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Kontaktni tahrirlash oynasini ochish uchun bosing."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Kontaktni tahrirlash oynasini yopish uchun bosing."</string>
<string name="content_description_directions" msgid="2686791825798189335">"manzilga yo\'nalishlar"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"Yaqindagi SMS xabar. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Javob berish uchun bosing."</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"Yaqindagi SMS xabar. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Javob berish uchun bosing."</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"kiruvchi"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"chiquvchi"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"javobsiz"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"Yaqindagi chaqiruv. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Qaytarib qilish uchun bosing."</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"Yaqindagi chaqiruv. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. Qaytarib qilish uchun bosing."</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts yanada yaxshi ishlashi uchun e-pochta yoki telefon raqami maydoniga foydalanuvchining Hangouts identifikatorini kiriting."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Boshqa maydonlarni ko‘rsatish"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Bog‘langan kontakt</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> ta kontakt bog‘langan"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"KONTAKTLARNI BOG‘LASH"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"BEKOR QILISH"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Shu kontakt"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Takroriy kontaktlar"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Bu kontaktlar bitta odamga tegishli bo‘lishi mumkin. Ularni bitta kontaktga birlashtiring."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Hisoblaringizdan olingan"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Surat tanlash"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> tomonidan"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>ni o‘chirish"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>ni o‘chirish"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"<xliff:g id="DATA_KIND">%s</xliff:g>ni o‘chirish"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> hisobi rasmi belgilanmagan"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> hisobi rasmi belgilangan"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Noma’lum hisobdan rasm tanlash bekor qilindi"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Noma’lum hisobdan rasm tanlandi"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Tavsiyalar"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"<xliff:g id="FILENAME">%s</xliff:g> faylini eksport qilish bekor qilinsinmi?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCard faylini import/eksport qilishni bekor qilib bo‘lmadi."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Noma’lum xato."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"<xliff:g id="FILE_NAME">%s</xliff:g> faylini ochib bo‘lmadi. Sababi: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"<xliff:g id="FILE_NAME">%1$s</xliff:g> faylini ochib bo‘lmadi. Sababi: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Eksport qilish funksiyasini ishga tushirib bo‘lmaydi. Sababi: “<xliff:g id="EXACT_REASON">%s</xliff:g>”."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Eksport qilish kontaktlar yo‘q."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Kerakli ruxsat o‘chirib qo‘yilgan."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"NFC orq. olindi"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kontaktlar eksport qilinsinmi?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Keshga yuklanmoqda"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Import qilinmoqda: <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> – <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Import qilinmoqda: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> – <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"VCF faylga eksport qilish"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Saralash tartibi"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Ismi"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"O‘chirib tashlash"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Uch nuqta"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> son."</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> daq. <xliff:g id="SECONDS">%s</xliff:g> son."</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> soat <xliff:g id="MINUTES_1">%s</xliff:g> daq. <xliff:g id="SECONDS">%s</xliff:g> son."</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> daq. <xliff:g id="SECONDS">%2$s</xliff:g> son."</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> soat <xliff:g id="MINUTES_1">%2$s</xliff:g> daq. <xliff:g id="SECONDS">%3$s</xliff:g> son."</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Bu yorliq o‘chirib tashlandi"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt olib tashlandi"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Import qilish"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Aloqa yo‘q"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM karta"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Yana"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Kontaktlar SIM kartadan import qilindi"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"SIM kartadan import qilib bo‘lmadi"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Kontakt. SIM kartadan import qilinmoqda…"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d9edc91..f945607 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> liên hệ</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> liên hệ · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> liên hệ · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> liên hệ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> liên hệ · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Từ Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Từ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Gọi lại"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Thêm \"<xliff:g id="EMAIL">%s</xliff:g>\" vào danh bạ?"</string>
<string name="description_plus_button" msgid="515164827856229880">"cộng"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> trong tổng số <xliff:g id="TOTAL_NUMBER">%s</xliff:g> liên hệ"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Tên danh bạ của bạn"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Không tìm thấy ứng dụng nào để xử lý tác vụ này."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Nhấp để quay lại màn hình trước đó"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Hôm nay"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Hôm nay lúc <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Ngày mai lúc <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Sự kiện không có tiêu đề)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Đặt"</string>
<string name="header_im_entry" msgid="3581720979640225615">"IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Nhấp để mở rộng trình chỉnh sửa liên hệ."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Nhấp để thu gọn trình chỉnh sửa liên hệ."</string>
<string name="content_description_directions" msgid="2686791825798189335">"chỉ đường tới địa điểm"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"sms gần đây. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. nhấp để trả lời"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms gần đây. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. nhấp để trả lời"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"cuộc gọi đến"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"cuộc gọi đi"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"cuộc gọi bị nhỡ"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"cuộc gọi gần đây. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. nhấp để gọi lại"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"cuộc gọi gần đây. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. nhấp để gọi lại"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Bạn: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts hoạt động tốt hơn khi bạn nhập số nhận dạng Hangouts của người đó vào trường email hoặc trường điện thoại."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Trường khác"</string>
@@ -312,7 +311,6 @@
<item quantity="one">Liên hệ được liên kết</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> liên hệ đã liên kết"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"LIÊN KẾT LIÊN HỆ"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"HỦY"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Liên hệ này"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Có thể trùng lặp"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Các liên hệ này có thể là cùng một người. Bạn có thể liên kết chúng với nhau thành một liên hệ duy nhất."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Từ các tài khoản của bạn"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Chọn ảnh"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Từ <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Xóa <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Xóa <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Xóa <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Ảnh từ <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>không được chọn"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Ảnh từ <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>được chọn"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Chưa chọn ảnh từ tài khoản không xác định"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Đã chọn ảnh từ tài khoản không xác định"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Đề xuất"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Hủy yêu cầu xuất <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Không thể nhập/xuất vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Lỗi không xác định."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Không thể mở \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Không thể mở \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Không thể chạy trình xuất: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Không thể xuất địa chỉ liên hệ nào."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Bạn đã tắt quyền được yêu cầu."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"L.h nhận qua NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Xuất danh bạ?"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Đang lưu vào bộ nhớ cache"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Đang nhập <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Đang nhập <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Xuất sang tệp .vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Sắp xếp theo"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Tên"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Xóa"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Dấu ba chấm"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> giây"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> phút <xliff:g id="SECONDS">%s</xliff:g> giây"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> giờ <xliff:g id="MINUTES_1">%s</xliff:g> phút <xliff:g id="SECONDS">%s</xliff:g> giây"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> phút <xliff:g id="SECONDS">%2$s</xliff:g> giây"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> giờ <xliff:g id="MINUTES_1">%2$s</xliff:g> phút <xliff:g id="SECONDS">%3$s</xliff:g> giây"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Phím tắt này đã bị vô hiệu hóa"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Liên hệ đã bị xóa"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Nhập"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Không có kết nối"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Hiển thị thêm"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Đã nhập xong thẻ SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Không thể nhập thẻ SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Đang nhập SIM"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 25b915a..aa57d32 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 位联系人</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> 位联系人 · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 位联系人 · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> 位联系人 · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 位联系人 · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"来自 Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"来自 <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"回拨"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"将“<xliff:g id="EMAIL">%s</xliff:g>”添加到通讯录？"</string>
<string name="description_plus_button" msgid="515164827856229880">"添加"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 个联系人（共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 个）"</string>
<string name="search_settings_description" msgid="2675223022992445813">"联系人姓名"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"未找到可处理此操作的应用。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"点击即可返回上一屏幕"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"今天"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"今天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"明天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>，<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>，<xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"（未命名的活动）"</string>
<string name="date_time_set" msgid="4761419824439606690">"设置"</string>
<string name="header_im_entry" msgid="3581720979640225615">"聊天工具"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"点按即可展开联系人编辑器。"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"点按即可收起联系人编辑器。"</string>
<string name="content_description_directions" msgid="2686791825798189335">"到特定地点的路线"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"近期短信：<xliff:g id="MESSAGE_BODY">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>，<xliff:g id="DATE">%s</xliff:g>。点按可回复。"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"近期短信：<xliff:g id="MESSAGE_BODY">%1$s</xliff:g>。<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>，<xliff:g id="DATE">%3$s</xliff:g>。点按可回复。"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"来电"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"外拨电话"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接电话"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"近期通话：<xliff:g id="CALL_TYPE">%s</xliff:g>，<xliff:g id="PHONE_NUMBER">%s</xliff:g>，<xliff:g id="DATE">%s</xliff:g>。点按可回拨。"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"近期通话：<xliff:g id="CALL_TYPE">%1$s</xliff:g>，<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>，<xliff:g id="DATE">%3$s</xliff:g>。点按可回拨。"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"请将联系人的环聊帐号信息输入到电子邮件地址字段或电话号码字段，以便获得更佳的环聊使用体验。"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"更多字段"</string>
@@ -312,7 +311,6 @@
<item quantity="one">已关联的联系人</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> 位已关联的联系人"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"关联联系人"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"取消"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g> <xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"此联系人"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"可能重复的联系人"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"这些联系人可能是同一个人。您可以将它们关联在一起，以合并成一个联系人。"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"来自您的帐号"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"选择照片"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"来源：<xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"删除<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"删除<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"删除<xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"未选中来自 <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> 的照片"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"已选中来自 <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g> 的照片"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"未选中来自未知帐号的照片"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"已选中来自未知帐号的照片"</string>
<string name="menu_assistant" msgid="5760693735722052454">"建议"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"要取消导出 <xliff:g id="FILENAME">%s</xliff:g> 吗？"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"无法取消导入/导出 vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"未知错误。"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"无法打开“<xliff:g id="FILE_NAME">%s</xliff:g>”：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"无法打开“<xliff:g id="FILE_NAME">%1$s</xliff:g>”：<xliff:g id="EXACT_REASON">%2$s</xliff:g>。"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"无法启动导出程序：“<xliff:g id="EXACT_REASON">%s</xliff:g>”。"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"没有可导出的联系人。"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"您已停用一项必需权限。"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"已通过 NFC 收到联系人信息"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"要导出联系人吗？"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"正在缓存..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"正在导入第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 个（共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 个）联系人：<xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"正在导入第 <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> 个（共 <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> 个）联系人：<xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"导出为 .vcf 文件"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"排序方式"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"名字"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"删除"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"省略号"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> 分钟 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> 小时 <xliff:g id="MINUTES_1">%s</xliff:g> 分钟 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> 分钟 <xliff:g id="SECONDS">%2$s</xliff:g> 秒"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> 小时 <xliff:g id="MINUTES_1">%2$s</xliff:g> 分钟 <xliff:g id="SECONDS">%3$s</xliff:g> 秒"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"此快捷方式已失效"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"联系人已被移除"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"导入"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"无网络连接"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM 卡"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"显示更多"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"已导入 SIM 卡联系人"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"无法导入 SIM 卡联系人"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在导入 SIM 卡联系人"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c0190c9..6d0fc54 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 位聯絡人</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"來自 Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"來自「<xliff:g id="ACCOUNT">%s</xliff:g>」"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"回覆來電"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"要將「<xliff:g id="EMAIL">%s</xliff:g>」加到通訊錄嗎？"</string>
<string name="description_plus_button" msgid="515164827856229880">"加號"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 位聯絡人，共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 位"</string>
<string name="search_settings_description" msgid="2675223022992445813">"您的聯絡人姓名"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"找不到可以處理這個操作的應用程式。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"按一下即可返回上一個畫面"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"今天"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"今天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"明天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g><xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(未命名活動)"</string>
<string name="date_time_set" msgid="4761419824439606690">"設定"</string>
<string name="header_im_entry" msgid="3581720979640225615">"即時通訊"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"按一下以展開聯絡人編輯器。"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"按一下以收合聯絡人編輯器。"</string>
<string name="content_description_directions" msgid="2686791825798189335">"規劃前往特定地點的路線"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"最近短訊 (<xliff:g id="MESSAGE_BODY">%s</xliff:g>、<xliff:g id="PHONE_NUMBER">%s</xliff:g>、<xliff:g id="DATE">%s</xliff:g>)。按一下即可回覆"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"最近短訊 (<xliff:g id="MESSAGE_BODY">%1$s</xliff:g>、<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>、<xliff:g id="DATE">%3$s</xliff:g>)。按一下即可回覆"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"來電"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"致電"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接來電"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"最近通話 (<xliff:g id="CALL_TYPE">%s</xliff:g>、<xliff:g id="PHONE_NUMBER">%s</xliff:g>、<xliff:g id="DATE">%s</xliff:g>)。按一下即可回電"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"最近通話 (<xliff:g id="CALL_TYPE">%1$s</xliff:g>、<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>、<xliff:g id="DATE">%3$s</xliff:g>)。按一下即可回電"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"當您在電郵欄或手機欄中輸入個人的 Hangouts 識別碼時，Hangouts 會提供更卓越的服務。"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"更多欄位"</string>
@@ -312,7 +311,6 @@
<item quantity="one">已連結的聯絡人</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> 個已連結的聯絡人"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"連結聯絡人"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"取消"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"這個聯絡人"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"可能重複"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"這些聯絡人可能是同一個人，您可連結兩者成為單一聯絡人。"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"來自您的帳戶"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"選擇相片"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"來自 <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"刪除<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"刪除<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"刪除<xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"未選擇 <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> 的相片"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"已選擇 <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> 的相片"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"未勾選不明帳戶中的相片"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"已勾選不明帳戶中的相片"</string>
<string name="menu_assistant" msgid="5760693735722052454">"建議"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"要取消匯出「<xliff:g id="FILENAME">%s</xliff:g>」的操作嗎？"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"無法取消匯入/匯出 vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"不明錯誤。"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"無法開啟「<xliff:g id="FILE_NAME">%s</xliff:g>」：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"無法開啟「<xliff:g id="FILE_NAME">%1$s</xliff:g>」：<xliff:g id="EXACT_REASON">%2$s</xliff:g>。"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"無法啟動匯出程式：「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"沒有聯絡人資料可以匯出。"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"您已停用所需權限。"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"已透過 NFC 收到聯絡人資訊"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"要匯出聯絡人資料嗎？"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"快取中"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"正在匯入第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 個：<xliff:g id="NAME">%s</xliff:g>，共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 個"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"正在匯入第 <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> 個：<xliff:g id="NAME">%3$s</xliff:g>，共 <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> 個"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"匯出至 .vcf 檔案"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"排序方式"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"名字"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"刪除"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"省略號"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> 分鐘 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> 小時 <xliff:g id="MINUTES_1">%s</xliff:g> 分 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> 分鐘 <xliff:g id="SECONDS">%2$s</xliff:g> 秒"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> 小時 <xliff:g id="MINUTES_1">%2$s</xliff:g> 分 <xliff:g id="SECONDS">%3$s</xliff:g> 秒"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"已停用此捷徑"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"聯絡人已移除"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"匯入"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"沒有網絡連線"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"顯示更多"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM 卡匯入完成"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"無法匯入 SIM 卡"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6b621e8..1faf223 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -83,8 +83,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 位聯絡人</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_1">%s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 位聯絡人 · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"來自 Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"來自 <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"回電"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"要將「<xliff:g id="EMAIL">%s</xliff:g>」加到通訊錄嗎？"</string>
<string name="description_plus_button" msgid="515164827856229880">"加號"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 位聯絡人，共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 位"</string>
<string name="search_settings_description" msgid="2675223022992445813">"您的聯絡人姓名"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"找不到可以處理這個動作的應用程式。"</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"按一下即可返回上一個畫面"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"今天"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"今天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"明天<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g><xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(未命名活動)"</string>
<string name="date_time_set" msgid="4761419824439606690">"設定"</string>
<string name="header_im_entry" msgid="3581720979640225615">"即時訊息"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"按一下即可展開聯絡人編輯器。"</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"按一下即可收合聯絡人編輯器。"</string>
<string name="content_description_directions" msgid="2686791825798189335">"規劃前往特定地點的路線"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"近期簡訊。<xliff:g id="MESSAGE_BODY">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>。<xliff:g id="DATE">%s</xliff:g>。按一下即可回覆"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"近期簡訊。<xliff:g id="MESSAGE_BODY">%1$s</xliff:g>。<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>。<xliff:g id="DATE">%3$s</xliff:g>。按一下即可回覆"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"來電"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"撥出通話"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接來電"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"近期通話。<xliff:g id="CALL_TYPE">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>。<xliff:g id="DATE">%s</xliff:g>。按一下即可回電"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"近期通話。<xliff:g id="CALL_TYPE">%1$s</xliff:g>。<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>。<xliff:g id="DATE">%3$s</xliff:g>。按一下即可回電"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"您：<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"如果您在電子郵件欄位或電話欄位中輸入聯絡人的 Hangouts 識別碼，可讓 Hangouts 的運作效能更佳。"</string>
<string name="editor_more_fields" msgid="3630987771304393421">"更多欄位"</string>
@@ -312,7 +311,6 @@
<item quantity="one">已連結的聯絡人</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> 位已連結的聯絡人"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"連結聯絡人"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"取消"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="one"></item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g> <xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"這位聯絡人"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"可能重複的聯絡人"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"這些聯絡人可能是同一人。您可以將這些聯絡人連結合併成單筆聯絡人資料。"</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"來自您的帳戶"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"選擇相片"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"來自<xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"刪除<xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"刪除<xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"刪除<xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"未勾選 <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> 的相片"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"已勾選 <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> <xliff:g id="USER_NAME">%s </xliff:g> 的相片"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"未勾選不明帳戶中的相片"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"已勾選不明帳戶中的相片"</string>
<string name="menu_assistant" msgid="5760693735722052454">"建議"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"確定要取消匯出 <xliff:g id="FILENAME">%s</xliff:g>？"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"無法取消匯入/匯出 vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"不明錯誤。"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"無法開啟「<xliff:g id="FILE_NAME">%s</xliff:g>」：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"無法開啟「<xliff:g id="FILE_NAME">%1$s</xliff:g>」：<xliff:g id="EXACT_REASON">%2$s</xliff:g>。"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"無法啟動匯出程式：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"沒有可匯出的聯絡人。"</string>
<string name="missing_required_permission" msgid="5865884842972833120">"必要權限已停用。"</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"已透過 NFC 收到聯絡人資訊"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"確定要匯出聯絡人？"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"快取中"</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"正在匯入第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 筆資料：<xliff:g id="NAME">%s</xliff:g>，共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 筆資料"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"正在匯入第 <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> 筆資料：<xliff:g id="NAME">%3$s</xliff:g>，共 <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> 筆資料"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"匯出成 .vcf 檔案"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"排序依據"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"名字"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"刪除"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"省略符號"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> 分鐘 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> 小時 <xliff:g id="MINUTES_1">%s</xliff:g> 分鐘 <xliff:g id="SECONDS">%s</xliff:g> 秒"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> 分鐘 <xliff:g id="SECONDS">%2$s</xliff:g> 秒"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> 小時 <xliff:g id="MINUTES_1">%2$s</xliff:g> 分鐘 <xliff:g id="SECONDS">%3$s</xliff:g> 秒"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"這個捷徑已停用"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"這位聯絡人已移除"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"匯入"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"沒有網路連線"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"SIM 卡"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"顯示更多"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"SIM 卡資料匯入完成"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"無法匯入 SIM 卡資料"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"正在匯入 SIM 卡資料"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1ec8357..370996b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -83,8 +83,8 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> oxhumana nabo</item>
</plurals>
<plurals name="contacts_count_with_account" formatted="false" msgid="7402583111980220575">
- <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> oxhumana nabo · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> oxhumana nabo · <xliff:g id="ACCOUNT_3">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> oxhumana nabo · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> oxhumana nabo · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
</plurals>
<string name="title_from_google" msgid="4664084747121207202">"Kusukela ku-Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"Kusuka ku-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -163,7 +163,6 @@
<string name="returnCall" msgid="8171961914203617813">"Buyisela ikholi"</string>
<string name="add_contact_dlg_message_fmt" msgid="7986472669444326576">"Faka \"<xliff:g id="EMAIL">%s</xliff:g>\" kothintana nabo?"</string>
<string name="description_plus_button" msgid="515164827856229880">"kuhlanganise"</string>
- <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> kothintana nabo abangu-<xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="search_settings_description" msgid="2675223022992445813">"Amagama othintana nabo"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Ayikho uhlelo lokusebenza etholakele ukubhekana nalengxenye."</string>
<string name="quickcontact_transparent_view_description" msgid="987959416759562455">"Chofoza ukuze ubuyele kusikrini sangaphambilini"</string>
@@ -275,7 +274,7 @@
<string name="today" msgid="8041090779381781781">"Namhlanje"</string>
<string name="today_at_time_fmt" msgid="605665249491030460">"Namhlanje ngo-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
<string name="tomorrow_at_time_fmt" msgid="4856497969617819421">"Kusasa ngo-<xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
- <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="TIME_INTERVAL">%s</xliff:g>"</string>
+ <string name="date_time_fmt" msgid="5053178726906863812">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME_INTERVAL">%2$s</xliff:g>"</string>
<string name="untitled_event" msgid="3484859385405939366">"(Umcimbi ongenasihloko)"</string>
<string name="date_time_set" msgid="4761419824439606690">"Setha"</string>
<string name="header_im_entry" msgid="3581720979640225615">"I-IM"</string>
@@ -292,11 +291,11 @@
<string name="content_description_expand_editor" msgid="1111381475901897470">"Chofoza ukuze unwebe isihleli soxhumana naye."</string>
<string name="content_description_collapse_editor" msgid="7598061318022977825">"Chofoza ukuze ugoqe isihleli soxhumana naye."</string>
<string name="content_description_directions" msgid="2686791825798189335">"izikhombisi-ndlela eziya endaweni"</string>
- <string name="content_description_recent_sms" msgid="1666389577263317445">"i-sms yakamuva. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. chofoza ukuze uphendule"</string>
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"i-sms yakamuva. <xliff:g id="MESSAGE_BODY">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. chofoza ukuze uphendule"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"angenayo"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"aphumayo"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"akuphuthele"</string>
- <string name="content_description_recent_call" msgid="5183800406316723676">"ikholi yakamuva. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. chofoza ukuze uphinde ushaye"</string>
+ <string name="content_description_recent_call" msgid="5183800406316723676">"ikholi yakamuva. <xliff:g id="CALL_TYPE">%1$s</xliff:g>. <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>. <xliff:g id="DATE">%3$s</xliff:g>. chofoza ukuze uphinde ushaye"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Wena: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
<string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"I-Hangouts isebenza kangcono uma ufaka isikhombi somuntu se-Hangouts kunkambu ye-imeyili noma kunkambu yefoni."</string>
<string name="editor_more_fields" msgid="3630987771304393421">"Izinkambu eziningi"</string>
@@ -312,7 +311,6 @@
<item quantity="other">Oxhumana nabo abaxhunyiwe (<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
<string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> oxhumana nabo abaxhunyiwe"</string>
- <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
<string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"XHUMANISA AMA-AKHAWUNTI"</string>
<string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"KHANSELA"</string>
<plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
@@ -327,7 +325,6 @@
<item quantity="one">(<xliff:g id="COUNT">%d</xliff:g>)</item>
<item quantity="other">(<xliff:g id="COUNT">%d</xliff:g>)</item>
</plurals>
- <string name="quickcontact_suggestion_account_type" msgid="5878263654735376962">"<xliff:g id="ACCOUNT_TYPE_0">%s</xliff:g><xliff:g id="ACCOUNT_TYPE_NUMBER">%s</xliff:g>"</string>
<string name="suggestion_card_this_contact_title" msgid="3039457405374454914">"Lo oxhumana naye"</string>
<string name="suggestion_card_duplicates_title" msgid="9107788743178980902">"Izimpinda ezingenzeka"</string>
<string name="suggestion_card_help_message" msgid="4474061044387181093">"Laba oxhumana nabo kungaba umuntu ofanayo. Ungabaxhumanisa ndawonye njengoxhumana naye oyedwa."</string>
@@ -335,10 +332,8 @@
<string name="from_your_accounts" msgid="1746293107836889912">"Kusuka kuma-akhawunti wakho"</string>
<string name="photo_picker_title" msgid="5272832995550042801">"Khetha isithombe"</string>
<string name="contact_from_account_name" msgid="2078526819634079406">"Kusuka ku-<xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
- <string name="editor_delete_view_description" msgid="8583095381562991959">"Susa <xliff:g id="DATA_TYPE">%s </xliff:g><xliff:g id="DATA_KIND">%s</xliff:g>"</string>
+ <string name="editor_delete_view_description" msgid="8583095381562991959">"Susa <xliff:g id="DATA_TYPE">%1$s </xliff:g><xliff:g id="DATA_KIND">%2$s</xliff:g>"</string>
<string name="editor_delete_view_description_short" msgid="7335518371270844912">"Susa <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
- <string name="photo_view_description_not_checked" msgid="8876314195990885177">"Isithombe kusuka ku-<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>asimakiwe"</string>
- <string name="photo_view_description_checked" msgid="3906597168607472795">"Isithombe kusuka ku-<xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>simakiwe"</string>
<string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Isithombe esivela ku-akhawunti engaziwa asithikhiwe"</string>
<string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Isithombe esivela ku-akhawunti engaziwa sithikhiwe"</string>
<string name="menu_assistant" msgid="5760693735722052454">"Iziphakamiso"</string>
@@ -514,7 +509,7 @@
<string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Misa ukulandwa kwe <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Yehlulekile ukukhansela ukungenisa/thekelisa i-vCard"</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Iphutha elingaziwa"</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Ayikwazi ukuvula \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Ayikwazi ukuvula \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\": <xliff:g id="EXACT_REASON">%2$s</xliff:g>"</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Ayikwazanga ukuqalisa isithekelisi: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Abekho othintana nabo abathumelekayo."</string>
<string name="missing_required_permission" msgid="5865884842972833120">"Ukhubaze imvume edingekayo."</string>
@@ -556,7 +551,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Othintana naye utholakale nge-NFC"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Thekelisa othintana nabo"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Ukulondoloza isikhashana..."</string>
- <string name="progress_notifier_message" msgid="2311011466908220528">"Ingenisa <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="progress_notifier_message" msgid="2311011466908220528">"Ingenisa <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
<string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Thumela kufayela le-.vcf"</string>
<string name="display_options_sort_list_by" msgid="7028809117272018712">"Hlunga nge-"</string>
<string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Igama"</string>
@@ -621,8 +616,8 @@
<string name="description_delete_contact" msgid="53835657343783663">"Susa"</string>
<string name="description_no_name_header" msgid="8884991311595943271">"Isiyingi"</string>
<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> isekhondi"</string>
- <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%s</xliff:g> iminithi <xliff:g id="SECONDS">%s</xliff:g> isekhondi"</string>
- <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ihora <xliff:g id="MINUTES_1">%s</xliff:g> iminithi <xliff:g id="SECONDS">%s</xliff:g> isekhondi"</string>
+ <string name="callDurationMinuteFormat" msgid="4647095486747447674">"<xliff:g id="MINUTES">%1$s</xliff:g> iminithi <xliff:g id="SECONDS">%2$s</xliff:g> isekhondi"</string>
+ <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%1$s</xliff:g> ihora <xliff:g id="MINUTES_1">%2$s</xliff:g> iminithi <xliff:g id="SECONDS">%3$s</xliff:g> isekhondi"</string>
<string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Lesi sinqamuleli sikhutshaziwe"</string>
<string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Oxhumana naye ususiwe"</string>
<string name="sim_import_button_text" msgid="4270841592496619317">"Ngenisa"</string>
@@ -645,4 +640,7 @@
<string name="connection_error_message" msgid="7046408921529247089">"Akukho ukuxhumana"</string>
<string name="single_sim_display_label" msgid="6985770499439371497">"I-SIM"</string>
<string name="show_more_content_description" msgid="4277410425912984722">"Bonisa okuningi"</string>
+ <string name="importing_sim_finished_title" msgid="5196369441294050721">"Iqedile ukungenisa ikhadi le-SIM"</string>
+ <string name="importing_sim_failed_title" msgid="3864137973400578707">"Ayikwazanga ukungenisa ikhadi le-SIM"</string>
+ <string name="importing_sim_in_progress_title" msgid="3638299581276676109">"Ingenisa i-SIM"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d381e53..13edf1e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -209,8 +209,8 @@
<!-- List header indicating the number of contacts and account name in the list [CHAR LIMIT=30] -->
<plurals name="contacts_count_with_account">
- <item quantity="one"><xliff:g id="count">%d</xliff:g> contact · <xliff:g id="account">%s</xliff:g></item>
- <item quantity="other"><xliff:g id="count">%d</xliff:g> contacts · <xliff:g id="account">%s</xliff:g></item>
+ <item quantity="one"><xliff:g id="count">%1$d</xliff:g> contact · <xliff:g id="account">%2$s</xliff:g></item>
+ <item quantity="other"><xliff:g id="count">%1$d</xliff:g> contacts · <xliff:g id="account">%2$s</xliff:g></item>
</plurals>
<!-- Activity title indicating contacts are from a Google account [CHAR LIMIT=30] -->
@@ -438,9 +438,6 @@
-->
<string name="description_plus_button">plus</string>
- <!-- Message in progress bar while exporting contact list to a file "(current number) of (total number) contacts" The order of "current number" and "total number" cannot be changed (like "total: (total number), current: (current number)")-->
- <string name="exporting_contact_list_progress"><xliff:g id="current_number">%s</xliff:g> of <xliff:g id="total_number">%s</xliff:g> contacts</string>
-
<!-- The string used to describe Contacts as a searchable item within system search settings. -->
<string name="search_settings_description">Names of your contacts</string>
@@ -798,7 +795,7 @@
<string name="tomorrow_at_time_fmt">"Tomorrow at <xliff:g id="time_interval">%s</xliff:g>"</string>
<!-- Format string for a date and time description. For ex:
"April 19, 2012, 3:00pm - 4:00pm" [CHAR LIMIT=NONE] -->
- <string name="date_time_fmt">"<xliff:g id="date">%s</xliff:g>, <xliff:g id="time_interval">%s</xliff:g>"</string>
+ <string name="date_time_fmt">"<xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>"</string>
<!-- Title for untitled calendar interactions [CHAR LIMIT=40] -->
<string name="untitled_event">(Untitled event)</string>
@@ -837,7 +834,7 @@
<string name="content_description_directions">directions to location</string>
<!-- Content description for recent sms interaction [CHAR LIMIT=NONE] -->
- <string name="content_description_recent_sms">recent sms. <xliff:g id="message_body">%s</xliff:g>. <xliff:g id="phone_number">%s</xliff:g>. <xliff:g id="date">%s</xliff:g>. click to respond</string>
+ <string name="content_description_recent_sms">recent sms. <xliff:g id="message_body">%1$s</xliff:g>. <xliff:g id="phone_number">%2$s</xliff:g>. <xliff:g id="date">%3$s</xliff:g>. click to respond</string>
<!-- Header for the Relation entry [CHAR LIMIT=NONE] -->
<string name="content_description_recent_call_type_incoming">incoming</string>
@@ -847,7 +844,7 @@
<string name="content_description_recent_call_type_missed">missed</string>
<!-- Content description for recent sms interaction [CHAR LIMIT=NONE] -->
- <string name="content_description_recent_call">recent call. <xliff:g id="call_type">%s</xliff:g>. <xliff:g id="phone_number">%s</xliff:g>. <xliff:g id="date">%s</xliff:g>. click to call back</string>
+ <string name="content_description_recent_call">recent call. <xliff:g id="call_type">%1$s</xliff:g>. <xliff:g id="phone_number">%2$s</xliff:g>. <xliff:g id="date">%3$s</xliff:g>. click to call back</string>
<!-- Prefix for messages that you sent [CHAR LIMIT=40] -->
<string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string>
@@ -888,9 +885,6 @@
<!-- Number of linked contacts of the current contact, only shown when there are more than 2 linked contacts (plural only!!!) [CHAR LIMIT=60] -->
<string name="quickcontact_contacts_number"><xliff:g id="count">%d</xliff:g> linked contacts</string>
- <!-- Quick contact display name with phonetic name -->
- <string name="quick_contact_display_name_with_phonetic"><xliff:g id="display_name">%s</xliff:g> (<xliff:g id="phonetic_name">%s</xliff:g>)</string>
-
<!-- Button used in quick contact suggestion card to link selected contacts. [CHAR LIMIT=30]-->
<string name="quickcontact_suggestion_link_button">LINK CONTACTS</string>
@@ -915,9 +909,6 @@
<item quantity="other">(<xliff:g id="count">%d</xliff:g>)</item>
</plurals>
- <!-- Account type with number in quick contact suggestion card [CHAR LIMIT=30]-->
- <string name="quickcontact_suggestion_account_type"><xliff:g id="account_type">%s</xliff:g><xliff:g id="account_type_number">%s</xliff:g></string>
-
<!-- "This contact" title showing in suggestion card in Quick contact. [CHAR LIMIT=30]-->
<string name="suggestion_card_this_contact_title">This contact</string>
@@ -941,20 +932,12 @@
<!-- Content description of delete button to the right of each section in editor, including
data type. For example: Delete Home Phone, Delete Work Email, etc [CHAR LIMIT=30]-->
- <string name="editor_delete_view_description">Delete <xliff:g id="data_type">%s </xliff:g><xliff:g id="data_kind">%s</xliff:g></string>
+ <string name="editor_delete_view_description">Delete <xliff:g id="data_type">%1$s </xliff:g><xliff:g id="data_kind">%2$s</xliff:g></string>
<!-- Content description of delete button to the right of each section in editor, without data
type. For example: Delete Website, Delete SIP, etc [CHAR LIMIT=30]-->
<string name="editor_delete_view_description_short">Delete <xliff:g id="data_kind">%s</xliff:g></string>
- <!-- Content description of photo in photo picker indicating a photo from a specific account is *not* selected.
- For example: Photo from Google abc@gmail.com not checked. [CHAR LIMIT=60]-->
- <string name="photo_view_description_not_checked">Photo from <xliff:g id="account_type">%s </xliff:g><xliff:g id="user_name">%s </xliff:g>not checked</string>
-
- <!-- Content description of photo in photo picker indicating a photo from a specific account is selected.
- For example: Photo from Google abc@gmail.com checked. [CHAR LIMIT=60]-->
- <string name="photo_view_description_checked">Photo from <xliff:g id="account_type">%s </xliff:g><xliff:g id="user_name">%s </xliff:g>checked</string>
-
<!-- Content description of photo in photo picker indicating a photo from unknown account is *not* selected.-->
<string name="photo_view_description_not_checked_no_info">Photo from unknown account not checked</string>
@@ -1462,7 +1445,7 @@
<!-- The failed reason shown when vCard importer/exporter could not open the file
specified by a user. The file name should be in the message. [CHAR LIMIT=NONE] -->
- <string name="fail_reason_could_not_open_file">Couldn\'t open \"<xliff:g id="file_name">%s</xliff:g>\": <xliff:g id="exact_reason">%s</xliff:g>.</string>
+ <string name="fail_reason_could_not_open_file">Couldn\'t open \"<xliff:g id="file_name">%1$s</xliff:g>\": <xliff:g id="exact_reason">%2$s</xliff:g>.</string>
<!-- The failed reason shown when contacts exporter fails to be initialized.
Some exact reason must follow this. [CHAR LIMIT=NONE]-->
@@ -1626,7 +1609,7 @@
Second argument is the total number of contacts.
Third argument is the name of a contact which is being read.
[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>
+ <string name="progress_notifier_message">Importing <xliff:g id="current_number">%1$s</xliff:g>/<xliff:g id="total_number">%2$s</xliff:g>: <xliff:g id="name" example="Joe Due">%3$s</xliff:g></string>
<!-- Action that exports all contacts to a user selected destination. [CHAR LIMIT=25] -->
<string name="export_to_vcf_file" product="default">Export to .vcf file</string>
@@ -1849,10 +1832,10 @@
<string name="callDurationSecondFormat"><xliff:g id="seconds">%s</xliff:g> sec</string>
<!-- Formatted call duration displayed in recent card in QuickContact, for duration less than 1 hour -->
- <string name="callDurationMinuteFormat"><xliff:g id="minutes">%s</xliff:g> min <xliff:g id="seconds">%s</xliff:g> sec</string>
+ <string name="callDurationMinuteFormat"><xliff:g id="minutes">%1$s</xliff:g> min <xliff:g id="seconds">%2$s</xliff:g> sec</string>
<!-- Formatted call duration displayed in recent card in QuickContact, for duration more than 1 hour -->
- <string name="callDurationHourFormat"><xliff:g id="minutes">%s</xliff:g> hr <xliff:g id="minutes">%s</xliff:g> min <xliff:g id="seconds">%s</xliff:g> sec</string>
+ <string name="callDurationHourFormat"><xliff:g id="minutes">%1$s</xliff:g> hr <xliff:g id="minutes">%2$s</xliff:g> min <xliff:g id="seconds">%3$s</xliff:g> sec</string>
<!-- Toast shown when a dynamic shortcut is tapped after being disabled because the experiment was turned off on the device -->
<string name="dynamic_shortcut_disabled_message">This shortcut has been disabled</string>
@@ -1921,4 +1904,13 @@
[CHAR LIMIT=NONE] -->
<string name="show_more_content_description">Show more</string>
+ <!-- The notification title shown when importing a SIM card finishes [CHAR LIMIT=40] -->
+ <string name="importing_sim_finished_title">Finished importing SIM card</string>
+
+ <!-- Notification title shown when importing SIM contacts failed [CHAR LIMIT=40] -->
+ <string name="importing_sim_failed_title">Couldn\'t import SIM card</string>
+
+ <!-- The notification title shown while SIM contacts are being imported [CHAR LIMIT=40] -->
+ <string name="importing_sim_in_progress_title">Importing SIM</string>
+
</resources>
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index bf7e871..ca9365c 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -26,7 +26,7 @@
android:title="@string/settings_accounts">
</Preference>
- <com.android.contacts.common.preference.DefaultAccountPreference
+ <com.android.contacts.preference.DefaultAccountPreference
android:icon="@null"
android:key="defaultAccount"
android:title="@string/default_editor_account"
@@ -37,13 +37,13 @@
android:key="customContactsFilter"
android:title="@string/menu_contacts_filter"/>
- <com.android.contacts.common.preference.SortOrderPreference
+ <com.android.contacts.preference.SortOrderPreference
android:icon="@null"
android:key="sortOrder"
android:title="@string/display_options_sort_list_by"
android:dialogTitle="@string/display_options_sort_list_by" />
- <com.android.contacts.common.preference.DisplayOrderPreference
+ <com.android.contacts.preference.DisplayOrderPreference
android:icon="@null"
android:key="displayOrder"
android:title="@string/display_options_view_names_as"
diff --git a/src-bind/com/android/contactsbind/ObjectFactory.java b/src-bind/com/android/contactsbind/ObjectFactory.java
index 6697ebc..c9ec3dc 100644
--- a/src-bind/com/android/contactsbind/ObjectFactory.java
+++ b/src-bind/com/android/contactsbind/ObjectFactory.java
@@ -13,8 +13,8 @@
*/
package com.android.contactsbind;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
import android.app.Fragment;
import android.content.Context;
diff --git a/src/com/android/contacts/AppCompatContactsActivity.java b/src/com/android/contacts/AppCompatContactsActivity.java
index 7654b27..e4a24e9 100644
--- a/src/com/android/contacts/AppCompatContactsActivity.java
+++ b/src/com/android/contacts/AppCompatContactsActivity.java
@@ -26,7 +26,7 @@
import android.view.View;
import com.android.contacts.common.activity.AppCompatTransactionSafeActivity;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.testing.InjectedServices;
/**
* A common superclass for Contacts activities that handles application-wide services, copied from
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 6c44a42..2aba4c0 100755
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -16,8 +16,6 @@
package com.android.contacts;
-import static android.Manifest.permission.WRITE_CONTACTS;
-
import android.app.Activity;
import android.app.IntentService;
import android.content.ContentProviderOperation;
@@ -49,30 +47,26 @@
import android.provider.ContactsContract.RawContactsEntity;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.os.ResultReceiver;
-import android.telephony.SubscriptionInfo;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import com.android.contacts.activities.ContactEditorActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.database.ContactUpdateUtils;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.CPOWrapper;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.database.ContactUpdateUtils;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.CPOWrapper;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
+import com.android.contacts.util.PermissionsUtil;
import com.android.contacts.compat.PinnedPositionsCompat;
import com.android.contacts.util.ContactPhotoUtils;
import com.android.contactsbind.FeedbackHelper;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -82,6 +76,8 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import static android.Manifest.permission.WRITE_CONTACTS;
+
/**
* A service responsible for saving changes to the content provider.
*/
@@ -149,16 +145,11 @@
public static final String EXTRA_UNDO_ACTION = "undoAction";
public static final String EXTRA_UNDO_DATA = "undoData";
- public static final String ACTION_IMPORT_FROM_SIM = "importFromSim";
- public static final String EXTRA_SIM_CONTACTS = "simContacts";
- public static final String EXTRA_SIM_SUBSCRIPTION_ID = "simSubscriptionId";
-
// For debugging and testing what happens when requests are queued up.
public static final String ACTION_SLEEP = "sleep";
public static final String EXTRA_SLEEP_DURATION = "sleepDuration";
public static final String BROADCAST_GROUP_DELETED = "groupDeleted";
- public static final String BROADCAST_SIM_IMPORT_COMPLETE = "simImportComplete";
public static final String BROADCAST_LINK_COMPLETE = "linkComplete";
public static final String BROADCAST_UNLINK_COMPLETE = "unlinkComplete";
@@ -166,7 +157,6 @@
public static final String EXTRA_RESULT_CODE = "resultCode";
public static final String EXTRA_RESULT_COUNT = "count";
- public static final String EXTRA_OPERATION_REQUESTED_AT_TIME = "requestedTime";
public static final int CP2_ERROR = 0;
public static final int CONTACTS_LINKED = 1;
@@ -361,8 +351,6 @@
setRingtone(intent);
} else if (ACTION_UNDO.equals(action)) {
undo(intent);
- } else if (ACTION_IMPORT_FROM_SIM.equals(action)) {
- importFromSim(intent);
} else if (ACTION_SLEEP.equals(action)) {
sleepForDebugging(intent);
}
@@ -1752,58 +1740,6 @@
}
/**
- * Returns an intent that can be used to import the contacts into targetAccount.
- *
- * @param context context to use for creating the intent
- * @param subscriptionId the subscriptionId of the SIM card that is being imported. See
- * {@link SubscriptionInfo#getSubscriptionId()}. Upon completion the
- * SIM for that subscription ID will be marked as imported
- * @param contacts the contacts to import
- * @param targetAccount the account import the contacts into
- */
- public static Intent createImportFromSimIntent(Context context, int subscriptionId,
- ArrayList<SimContact> contacts, AccountWithDataSet targetAccount) {
- return new Intent(context, ContactSaveService.class)
- .setAction(ACTION_IMPORT_FROM_SIM)
- .putExtra(EXTRA_SIM_CONTACTS, contacts)
- .putExtra(EXTRA_SIM_SUBSCRIPTION_ID, subscriptionId)
- .putExtra(EXTRA_ACCOUNT, targetAccount);
- }
-
- private void importFromSim(Intent intent) {
- final Intent result = new Intent(BROADCAST_SIM_IMPORT_COMPLETE)
- .putExtra(EXTRA_OPERATION_REQUESTED_AT_TIME, System.currentTimeMillis());
- final int subscriptionId = intent.getIntExtra(EXTRA_SIM_SUBSCRIPTION_ID,
- SimCard.NO_SUBSCRIPTION_ID);
- try {
- final AccountWithDataSet targetAccount = intent.getParcelableExtra(EXTRA_ACCOUNT);
- final ArrayList<SimContact> contacts =
- intent.getParcelableArrayListExtra(EXTRA_SIM_CONTACTS);
- mSimContactDao.importContacts(contacts, targetAccount);
-
- // Update the imported state of the SIM card that was imported
- final SimCard sim = mSimContactDao.getSimBySubscriptionId(subscriptionId);
- if (sim != null) {
- mSimContactDao.persistSimState(sim.withImportedState(true));
- }
-
- // notify success
- LocalBroadcastManager.getInstance(this).sendBroadcast(result
- .putExtra(EXTRA_RESULT_COUNT, contacts.size())
- .putExtra(EXTRA_RESULT_CODE, RESULT_SUCCESS)
- .putExtra(EXTRA_SIM_SUBSCRIPTION_ID, subscriptionId));
- if (Log.isLoggable(TAG, Log.DEBUG)) {
- Log.d(TAG, "importFromSim completed successfully");
- }
- } catch (RemoteException|OperationApplicationException e) {
- FeedbackHelper.sendFeedback(this, TAG, "Failed to import contacts from SIM card", e);
- LocalBroadcastManager.getInstance(this).sendBroadcast(result
- .putExtra(EXTRA_RESULT_CODE, RESULT_FAILURE)
- .putExtra(EXTRA_SIM_SUBSCRIPTION_ID, subscriptionId));
- }
- }
-
- /**
* Returns an intent that can start this service and cause it to sleep for the specified time.
*
* This exists purely for debugging and manual testing. Since this service uses a single thread
diff --git a/src/com/android/contacts/ContactsActivity.java b/src/com/android/contacts/ContactsActivity.java
index 82d1f98..73f07f7 100644
--- a/src/com/android/contacts/ContactsActivity.java
+++ b/src/com/android/contacts/ContactsActivity.java
@@ -26,7 +26,7 @@
import android.view.View;
import com.android.contacts.common.activity.TransactionSafeActivity;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.testing.InjectedServices;
/**
* A common superclass for Contacts activities that handles application-wide services.
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 6fa9df1..1507ace 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -29,8 +29,8 @@
import android.provider.ContactsContract.Contacts;
import android.util.Log;
-import com.android.contacts.common.testing.InjectedServices;
-import com.android.contacts.common.util.Constants;
+import com.android.contacts.testing.InjectedServices;
+import com.android.contacts.util.Constants;
import com.android.contactsbind.analytics.AnalyticsUtil;
import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index b6dbe9d..87812aa 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -48,20 +48,20 @@
import com.android.contacts.activities.ActionBarAdapter;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.list.AccountFilterActivity;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferenceActivity;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.list.AccountFilterActivity;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferenceActivity;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils;
+import com.android.contacts.util.ViewUtil;
import com.android.contacts.editor.ContactEditorFragment;
import com.android.contacts.editor.SelectAccountDialogFragment;
import com.android.contacts.group.GroupListItem;
diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index 49cc722..b860310 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -50,10 +50,10 @@
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.Experiments;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.util.BitmapUtil;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.util.BitmapUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.PermissionsUtil;
import com.android.contactsbind.experiments.Flags;
import java.io.IOException;
diff --git a/src/com/android/contacts/NonPhoneActivity.java b/src/com/android/contacts/NonPhoneActivity.java
index 05c556b..875ac53 100644
--- a/src/com/android/contacts/NonPhoneActivity.java
+++ b/src/com/android/contacts/NonPhoneActivity.java
@@ -17,7 +17,7 @@
package com.android.contacts;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/contacts/SimImportFragment.java b/src/com/android/contacts/SimImportFragment.java
index b512599..05f74c4 100644
--- a/src/com/android/contacts/SimImportFragment.java
+++ b/src/com/android/contacts/SimImportFragment.java
@@ -39,13 +39,13 @@
import android.widget.ListView;
import android.widget.TextView;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
import com.android.contacts.editor.AccountHeaderPresenter;
import java.util.ArrayList;
@@ -281,10 +281,8 @@
importableContacts.add(mAdapter.getItem(checked.keyAt(i)));
}
}
- ContactSaveService.startService(getContext(), ContactSaveService
- .createImportFromSimIntent(getContext(), mSubscriptionId,
- importableContacts,
- mAccountHeaderPresenter.getCurrentAccount()));
+ SimImportService.startImport(getContext(), mSubscriptionId, importableContacts,
+ mAccountHeaderPresenter.getCurrentAccount());
}
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
diff --git a/src/com/android/contacts/SimImportService.java b/src/com/android/contacts/SimImportService.java
new file mode 100644
index 0000000..70e1d43
--- /dev/null
+++ b/src/com/android/contacts/SimImportService.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.OperationApplicationException;
+import android.os.AsyncTask;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.content.LocalBroadcastManager;
+import android.util.TimingLogger;
+
+import com.android.contacts.activities.PeopleActivity;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contactsbind.FeedbackHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Imports {@link SimContact}s from a background thread
+ */
+public class SimImportService extends Service {
+
+ private static final String TAG = "SimImportService";
+
+ /**
+ * Wrapper around the service state for testability
+ */
+ public interface StatusProvider {
+
+ /**
+ * Returns whether there is any imports still pending
+ *
+ * <p>This should be called from the UI thread</p>
+ */
+ boolean isRunning();
+
+ /**
+ * Returns whether an import for sim has been requested
+ *
+ * <p>This should be called from the UI thread</p>
+ */
+ boolean isImporting(SimCard sim);
+ }
+
+ public static final String EXTRA_ACCOUNT = "account";
+ public static final String EXTRA_SIM_CONTACTS = "simContacts";
+ public static final String EXTRA_SIM_SUBSCRIPTION_ID = "simSubscriptionId";
+ public static final String EXTRA_RESULT_CODE = "resultCode";
+ public static final String EXTRA_RESULT_COUNT = "count";
+ public static final String EXTRA_OPERATION_REQUESTED_AT_TIME = "requestedTime";
+
+ public static final String BROADCAST_SERVICE_STATE_CHANGED =
+ SimImportService.class.getName() + "#serviceStateChanged";
+ public static final String BROADCAST_SIM_IMPORT_COMPLETE =
+ SimImportService.class.getName() + "#simImportComplete";
+
+ public static final int RESULT_UNKNOWN = 0;
+ public static final int RESULT_SUCCESS = 1;
+ public static final int RESULT_FAILURE = 2;
+
+ // VCardService uses jobIds for it's notifications which count up from 0 so we just use a
+ // bigger number to prevent overlap.
+ private static final int NOTIFICATION_ID = 100;
+
+ private ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+
+ // Keeps track of current tasks. This is only modified from the UI thread.
+ private static List<ImportTask> sPending = new ArrayList<>();
+
+ private static StatusProvider sStatusProvider = new StatusProvider() {
+ @Override
+ public boolean isRunning() {
+ return !sPending.isEmpty();
+ }
+
+ @Override
+ public boolean isImporting(SimCard sim) {
+ return SimImportService.isImporting(sim);
+ }
+ };
+
+ /**
+ * Returns whether an import for sim has been requested
+ *
+ * <p>This should be called from the UI thread</p>
+ */
+ private static boolean isImporting(SimCard sim) {
+ for (ImportTask task : sPending) {
+ if (task.getSim().equals(sim)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static StatusProvider getStatusProvider() {
+ return sStatusProvider;
+ }
+
+ /**
+ * Starts an import of the contacts from the sim into the target account
+ *
+ * @param context context to use for starting the service
+ * @param subscriptionId the subscriptionId of the SIM card that is being imported. See
+ * {@link android.telephony.SubscriptionInfo#getSubscriptionId()}.
+ * Upon completion the SIM for that subscription ID will be marked as
+ * imported
+ * @param contacts the contacts to import
+ * @param targetAccount the account import the contacts into
+ */
+ public static void startImport(Context context, int subscriptionId,
+ ArrayList<SimContact> contacts, AccountWithDataSet targetAccount) {
+ context.startService(new Intent(context, SimImportService.class)
+ .putExtra(EXTRA_SIM_CONTACTS, contacts)
+ .putExtra(EXTRA_SIM_SUBSCRIPTION_ID, subscriptionId)
+ .putExtra(EXTRA_ACCOUNT, targetAccount));
+ }
+
+
+ @Nullable
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, final int startId) {
+ final ImportTask task = createTaskForIntent(intent, startId);
+ if (task == null) {
+ new StopTask(this, startId).executeOnExecutor(mExecutor);
+ return START_NOT_STICKY;
+ }
+ sPending.add(task);
+ task.executeOnExecutor(mExecutor);
+ notifyStateChanged();
+ return START_REDELIVER_INTENT;
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ mExecutor.shutdown();
+ }
+
+ private ImportTask createTaskForIntent(Intent intent, int startId) {
+ final AccountWithDataSet targetAccount = intent.getParcelableExtra(EXTRA_ACCOUNT);
+ final ArrayList<SimContact> contacts =
+ intent.getParcelableArrayListExtra(EXTRA_SIM_CONTACTS);
+
+ final int subscriptionId = intent.getIntExtra(EXTRA_SIM_SUBSCRIPTION_ID,
+ SimCard.NO_SUBSCRIPTION_ID);
+ final SimContactDao dao = SimContactDao.create(this);
+ final SimCard sim = dao.getSimBySubscriptionId(subscriptionId);
+ if (sim != null) {
+ return new ImportTask(sim, contacts, targetAccount, dao, startId);
+ } else {
+ return null;
+ }
+ }
+
+ private Notification getCompletedNotification() {
+ final Intent intent = new Intent(this, PeopleActivity.class);
+ final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+ builder.setOngoing(false)
+ .setAutoCancel(true)
+ .setContentTitle(this.getString(R.string.importing_sim_finished_title))
+ .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
+ .setSmallIcon(R.drawable.ic_check_mark)
+ .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
+ return builder.build();
+ }
+
+ private Notification getFailedNotification() {
+ final Intent intent = new Intent(this, PeopleActivity.class);
+ final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+ builder.setOngoing(false)
+ .setAutoCancel(true)
+ .setContentTitle(this.getString(R.string.importing_sim_failed_title))
+ .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
+ .setSmallIcon(R.drawable.ic_check_mark)
+ .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
+ return builder.build();
+ }
+
+ private Notification getImportingNotification() {
+ final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+ final String description = getString(R.string.importing_sim_in_progress_title);
+ builder.setOngoing(true)
+ .setProgress(/* current */ 0, /* max */ 100, /* indeterminate */ true)
+ .setContentTitle(description)
+ .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
+ .setSmallIcon(android.R.drawable.stat_sys_download);
+ return builder.build();
+ }
+
+ private void notifyStateChanged() {
+ LocalBroadcastManager.getInstance(this).sendBroadcast(
+ new Intent(BROADCAST_SERVICE_STATE_CHANGED));
+ }
+
+ // Schedule a task that calls stopSelf when it completes. This is used to ensure that the
+ // calls to stopSelf occur in the correct order (because this service uses a single thread
+ // executor this won't run until all work that was requested before it has finished)
+ private static class StopTask extends AsyncTask<Void, Void, Void> {
+ private Service mHost;
+ private final int mStartId;
+
+ private StopTask(Service host, int startId) {
+ mHost = host;
+ mStartId = startId;
+ }
+
+ @Override
+ protected Void doInBackground(Void... params) {
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ super.onPostExecute(aVoid);
+ mHost.stopSelf(mStartId);
+ }
+ }
+
+ private class ImportTask extends AsyncTask<Void, Void, Boolean> {
+ private final SimCard mSim;
+ private final List<SimContact> mContacts;
+ private final AccountWithDataSet mTargetAccount;
+ private final SimContactDao mDao;
+ private final NotificationManager mNotificationManager;
+ private final int mStartId;
+ private final long mStartTime;
+
+ public ImportTask(SimCard sim, List<SimContact> contacts, AccountWithDataSet targetAccount,
+ SimContactDao dao, int startId) {
+ mSim = sim;
+ mContacts = contacts;
+ mTargetAccount = targetAccount;
+ mDao = dao;
+ mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+ mStartId = startId;
+ mStartTime = System.currentTimeMillis();
+ }
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+ startForeground(NOTIFICATION_ID, getImportingNotification());
+ }
+
+ @Override
+ protected Boolean doInBackground(Void... params) {
+ final TimingLogger timer = new TimingLogger(TAG, "import");
+ try {
+ // Just import them all at once.
+ // Experimented with using smaller batches (e.g. 25 and 50) so that percentage
+ // progress could be displayed however this slowed down the import by over a factor
+ // of 2. If the batch size is over a 100 then most cases will only require a single
+ // batch so we don't even worry about displaying accurate progress
+ mDao.importContacts(mContacts, mTargetAccount);
+ mDao.persistSimState(mSim.withImportedState(true));
+ timer.addSplit("done");
+ timer.dumpToLog();
+ } catch (RemoteException|OperationApplicationException e) {
+ FeedbackHelper.sendFeedback(SimImportService.this, TAG,
+ "Failed to import contacts from SIM card", e);
+ return false;
+ }
+ return true;
+ }
+
+ public SimCard getSim() {
+ return mSim;
+ }
+
+ @Override
+ protected void onPostExecute(Boolean success) {
+ super.onPostExecute(success);
+ stopSelf(mStartId);
+
+ Intent result;
+ final Notification notification;
+ if (success) {
+ result = new Intent(BROADCAST_SIM_IMPORT_COMPLETE)
+ .putExtra(EXTRA_RESULT_CODE, RESULT_SUCCESS)
+ .putExtra(EXTRA_RESULT_COUNT, mContacts.size())
+ .putExtra(EXTRA_OPERATION_REQUESTED_AT_TIME, mStartTime)
+ .putExtra(EXTRA_SIM_SUBSCRIPTION_ID, mSim.getSubscriptionId());
+
+ notification = getCompletedNotification();
+ } else {
+ result = new Intent(BROADCAST_SIM_IMPORT_COMPLETE)
+ .putExtra(EXTRA_RESULT_CODE, RESULT_FAILURE)
+ .putExtra(EXTRA_OPERATION_REQUESTED_AT_TIME, mStartTime)
+ .putExtra(EXTRA_SIM_SUBSCRIPTION_ID, mSim.getSubscriptionId());
+
+ notification = getFailedNotification();
+ }
+ LocalBroadcastManager.getInstance(SimImportService.this).sendBroadcast(result);
+
+ sPending.remove(this);
+
+ // Only notify of completion if all the import requests have finished. We're using
+ // the same notification for imports so in the rare case that a user has started
+ // multiple imports the notification won't go away until all of them complete.
+ if (sPending.isEmpty()) {
+ stopForeground(false);
+ mNotificationManager.notify(NOTIFICATION_ID, notification);
+ }
+ notifyStateChanged();
+ }
+ }
+}
diff --git a/src/com/android/contacts/SplitAggregateView.java b/src/com/android/contacts/SplitAggregateView.java
index 2281ec6..5c822ba 100644
--- a/src/com/android/contacts/SplitAggregateView.java
+++ b/src/com/android/contacts/SplitAggregateView.java
@@ -35,8 +35,8 @@
import android.widget.ListView;
import android.widget.TextView;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/com/android/contacts/TypePrecedence.java b/src/com/android/contacts/TypePrecedence.java
index 0a193b5..53b8343 100644
--- a/src/com/android/contacts/TypePrecedence.java
+++ b/src/com/android/contacts/TypePrecedence.java
@@ -23,7 +23,7 @@
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.RawContactModifier;
/**
* This class contains utility functions for determining the precedence of
diff --git a/src/com/android/contacts/ViewNotificationService.java b/src/com/android/contacts/ViewNotificationService.java
index 0f2922a..3bc5ed2 100644
--- a/src/com/android/contacts/ViewNotificationService.java
+++ b/src/com/android/contacts/ViewNotificationService.java
@@ -23,8 +23,8 @@
import android.os.IBinder;
import android.util.Log;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
/**
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index c91f608..fac6813 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -46,8 +46,8 @@
import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.R;
import com.android.contacts.activities.ActionBarAdapter.Listener.Action;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.util.MaterialColorMapUtils;
import com.android.contacts.list.ContactsRequest;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/activities/AttachPhotoActivity.java b/src/com/android/contacts/activities/AttachPhotoActivity.java
index 096349c..049c277 100644
--- a/src/com/android/contacts/activities/AttachPhotoActivity.java
+++ b/src/com/android/contacts/activities/AttachPhotoActivity.java
@@ -41,15 +41,15 @@
import com.android.contacts.ContactsActivity;
import com.android.contacts.R;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contacts.editor.ContactEditorUtils;
import com.android.contacts.util.ContactPhotoUtils;
diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index 3027707..50e11f3 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -32,11 +32,11 @@
import com.android.contacts.R;
import com.android.contacts.editor.ContactEditorUtils;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.util.ImplicitIntentsUtil;
import java.util.List;
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 4298d7c..c58189a 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -33,8 +33,8 @@
import com.android.contacts.DynamicShortcuts;
import com.android.contacts.R;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contacts.detail.PhotoSelectionHandler;
import com.android.contacts.editor.ContactEditorFragment;
import com.android.contacts.editor.EditorIntents;
diff --git a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
index 0c60203..ac2c257 100644
--- a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
@@ -17,11 +17,11 @@
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.logging.EditorEvent;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.logging.EditorEvent;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
import com.android.contacts.editor.ContactEditorFragment;
import com.android.contacts.editor.EditorIntents;
import com.android.contacts.editor.PickRawContactDialogFragment;
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index cbf6a69..252b616 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -37,13 +37,13 @@
import com.android.contacts.AppCompatContactsActivity;
import com.android.contacts.R;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
-import com.android.contacts.common.list.PhoneNumberPickerFragment;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.list.ContactEntryListFragment;
+import com.android.contacts.list.DirectoryListLoader;
+import com.android.contacts.list.OnPhoneNumberPickerActionListener;
+import com.android.contacts.list.PhoneNumberPickerFragment;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ViewUtil;
import com.android.contacts.editor.EditorIntents;
import com.android.contacts.list.ContactPickerFragment;
import com.android.contacts.list.ContactsIntentResolver;
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index c3308b5..11a3823 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -53,21 +53,20 @@
import com.android.contacts.ContactSaveService;
import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.R;
-import com.android.contacts.common.Experiments;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController.ContactListFilterListener;
-import com.android.contacts.common.list.ProviderStatusWatcher;
-import com.android.contacts.common.list.ProviderStatusWatcher.ProviderStatusListener;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.Constants;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.widget.FloatingActionButtonController;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController.ContactListFilterListener;
+import com.android.contacts.list.ProviderStatusWatcher;
+import com.android.contacts.list.ProviderStatusWatcher.ProviderStatusListener;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.Constants;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.widget.FloatingActionButtonController;
import com.android.contacts.group.GroupMembersFragment;
import com.android.contacts.group.GroupMetaData;
import com.android.contacts.group.GroupUtil;
@@ -78,7 +77,6 @@
import com.android.contacts.util.SyncUtil;
import com.android.contactsbind.FeatureHighlightHelper;
import com.android.contactsbind.ObjectFactory;
-import com.android.contactsbind.experiments.Flags;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java
index 6a516ad..b21db28 100755
--- a/src/com/android/contacts/activities/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java
@@ -38,7 +38,7 @@
import com.android.contacts.ContactsActivity;
import com.android.contacts.R;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contacts.util.NotifyingAsyncQueryHandler;
/**
diff --git a/src/com/android/contacts/activities/SimImportActivity.java b/src/com/android/contacts/activities/SimImportActivity.java
index 391cd8b..2dff45b 100644
--- a/src/com/android/contacts/activities/SimImportActivity.java
+++ b/src/com/android/contacts/activities/SimImportActivity.java
@@ -22,7 +22,7 @@
import com.android.contacts.AppCompatContactsActivity;
import com.android.contacts.R;
import com.android.contacts.SimImportFragment;
-import com.android.contacts.common.model.SimCard;
+import com.android.contacts.model.SimCard;
/**
* Host activity for SimImportFragment
diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index acfad52..e2041b1 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -16,10 +16,10 @@
package com.android.contacts.common;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneAccountSdkCompat;
-import com.android.contacts.common.util.PermissionsUtil;
-import com.android.contacts.common.util.PhoneNumberHelper;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneAccountSdkCompat;
+import com.android.contacts.util.PermissionsUtil;
+import com.android.contacts.util.PhoneNumberHelper;
import com.android.contactsbind.FeedbackHelper;
import com.android.phone.common.PhoneConstants;
diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index b9b4bcc..29f0b3d 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -55,11 +55,11 @@
import android.view.ViewGroup;
import android.widget.ImageView;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.util.BitmapUtil;
-import com.android.contacts.common.util.PermissionsUtil;
-import com.android.contacts.common.util.TrafficStatsTags;
-import com.android.contacts.common.util.UriUtils;
+import com.android.contacts.lettertiles.LetterTileDrawable;
+import com.android.contacts.util.BitmapUtil;
+import com.android.contacts.util.PermissionsUtil;
+import com.android.contacts.util.TrafficStatsTags;
+import com.android.contacts.util.UriUtils;
import com.android.contactsbind.util.UserAgentGenerator;
import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/common/ContactsUtils.java b/src/com/android/contacts/common/ContactsUtils.java
index 0f8031c..feb86a2 100644
--- a/src/com/android/contacts/common/ContactsUtils.java
+++ b/src/com/android/contacts/common/ContactsUtils.java
@@ -27,11 +27,11 @@
import android.text.TextUtils;
import android.util.Pair;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.ImDataItem;
-import com.android.contacts.common.compat.ContactsCompat;
-import com.android.contacts.common.compat.DirectoryCompat;
-import com.android.contacts.common.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.ImDataItem;
+import com.android.contacts.compat.ContactsCompat;
+import com.android.contacts.compat.DirectoryCompat;
+import com.android.contacts.model.AccountTypeManager;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/src/com/android/contacts/common/GeoUtil.java b/src/com/android/contacts/common/GeoUtil.java
index cd0139b..7809e79 100644
--- a/src/com/android/contacts/common/GeoUtil.java
+++ b/src/com/android/contacts/common/GeoUtil.java
@@ -19,7 +19,7 @@
import android.app.Application;
import android.content.Context;
-import com.android.contacts.common.location.CountryDetector;
+import com.android.contacts.location.CountryDetector;
import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;
import com.google.i18n.phonenumbers.NumberParseException;
diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index 9b9f800..45c454d 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -29,7 +29,7 @@
import android.view.View;
import android.widget.TextView;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.account.AccountType;
/**
* Shared static contact utility methods.
diff --git a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
index ef591a5..cfe7a0b 100644
--- a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
+++ b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
@@ -16,8 +16,8 @@
package com.android.contacts.common.activity;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.util.PermissionsUtil;
import android.app.Activity;
import android.content.Context;
diff --git a/src/com/android/contacts/common/util/SchedulingUtils.java b/src/com/android/contacts/common/util/SchedulingUtils.java
deleted file mode 100644
index 1dfa153..0000000
--- a/src/com/android/contacts/common/util/SchedulingUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.util;
-
-import android.view.View;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.ViewTreeObserver.OnPreDrawListener;
-
-/** Static methods that are useful for scheduling actions to occur at a later time. */
-public class SchedulingUtils {
-
-
- /** Runs a piece of code after the next layout run */
- public static void doAfterLayout(final View view, final Runnable runnable) {
- final OnGlobalLayoutListener listener = new OnGlobalLayoutListener() {
- @Override
- public void onGlobalLayout() {
- // Layout pass done, unregister for further events
- view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
- runnable.run();
- }
- };
- view.getViewTreeObserver().addOnGlobalLayoutListener(listener);
- }
-
- /** Runs a piece of code just before the next draw, after layout and measurement */
- public static void doOnPreDraw(final View view, final boolean drawNextFrame,
- final Runnable runnable) {
- final OnPreDrawListener listener = new OnPreDrawListener() {
- @Override
- public boolean onPreDraw() {
- view.getViewTreeObserver().removeOnPreDrawListener(this);
- runnable.run();
- return drawNextFrame;
- }
- };
- view.getViewTreeObserver().addOnPreDrawListener(listener);
- }
-}
diff --git a/src/com/android/contacts/common/compat/CallSdkCompat.java b/src/com/android/contacts/compat/CallSdkCompat.java
similarity index 97%
rename from src/com/android/contacts/common/compat/CallSdkCompat.java
rename to src/com/android/contacts/compat/CallSdkCompat.java
index fd06d85..d8fbc9a 100644
--- a/src/com/android/contacts/common/compat/CallSdkCompat.java
+++ b/src/com/android/contacts/compat/CallSdkCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.telecom.Call;
diff --git a/src/com/android/contacts/common/compat/CallableCompat.java b/src/com/android/contacts/compat/CallableCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/CallableCompat.java
rename to src/com/android/contacts/compat/CallableCompat.java
index d25d4be..2529aed 100644
--- a/src/com/android/contacts/common/compat/CallableCompat.java
+++ b/src/com/android/contacts/compat/CallableCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Callable;
diff --git a/src/com/android/contacts/common/compat/CompatUtils.java b/src/com/android/contacts/compat/CompatUtils.java
similarity index 98%
rename from src/com/android/contacts/common/compat/CompatUtils.java
rename to src/com/android/contacts/compat/CompatUtils.java
index a394093..30ad9b8 100644
--- a/src/com/android/contacts/common/compat/CompatUtils.java
+++ b/src/com/android/contacts/compat/CompatUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.os.Build;
import android.os.Build.VERSION;
@@ -21,7 +21,7 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.contacts.common.model.CPOWrapper;
+import com.android.contacts.model.CPOWrapper;
import java.lang.reflect.InvocationTargetException;
diff --git a/src/com/android/contacts/common/compat/ContactsCompat.java b/src/com/android/contacts/compat/ContactsCompat.java
similarity index 97%
rename from src/com/android/contacts/common/compat/ContactsCompat.java
rename to src/com/android/contacts/compat/ContactsCompat.java
index 5a5e46a..9db152d 100644
--- a/src/com/android/contacts/common/compat/ContactsCompat.java
+++ b/src/com/android/contacts/compat/ContactsCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.net.Uri;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/compat/DirectoryCompat.java b/src/com/android/contacts/compat/DirectoryCompat.java
similarity index 95%
rename from src/com/android/contacts/common/compat/DirectoryCompat.java
rename to src/com/android/contacts/compat/DirectoryCompat.java
index 682e14c..afb32da 100644
--- a/src/com/android/contacts/common/compat/DirectoryCompat.java
+++ b/src/com/android/contacts/compat/DirectoryCompat.java
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.net.Uri;
-import android.provider.ContactsContract;
import android.provider.ContactsContract.Directory;
import com.android.contacts.common.ContactsUtils;
diff --git a/src/com/android/contacts/common/compat/DirectorySdkCompat.java b/src/com/android/contacts/compat/DirectorySdkCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/DirectorySdkCompat.java
rename to src/com/android/contacts/compat/DirectorySdkCompat.java
index b919466..32b918c 100644
--- a/src/com/android/contacts/common/compat/DirectorySdkCompat.java
+++ b/src/com/android/contacts/compat/DirectorySdkCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.net.Uri;
import android.provider.ContactsContract.Directory;
diff --git a/src/com/android/contacts/compat/EdgeEffectCompat.java b/src/com/android/contacts/compat/EdgeEffectCompat.java
index 92999a0..b93ff90 100644
--- a/src/com/android/contacts/compat/EdgeEffectCompat.java
+++ b/src/com/android/contacts/compat/EdgeEffectCompat.java
@@ -17,7 +17,6 @@
package com.android.contacts.compat;
import android.widget.EdgeEffect;
-import com.android.contacts.common.compat.CompatUtils;
/**
* Compatibility class for {@link android.widget.EdgeEffect}
diff --git a/src/com/android/contacts/common/compat/EventCompat.java b/src/com/android/contacts/compat/EventCompat.java
similarity index 97%
rename from src/com/android/contacts/common/compat/EventCompat.java
rename to src/com/android/contacts/compat/EventCompat.java
index f37aeff..2ce8148 100644
--- a/src/com/android/contacts/common/compat/EventCompat.java
+++ b/src/com/android/contacts/compat/EventCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.content.res.Resources;
import android.provider.ContactsContract.CommonDataKinds.BaseTypes;
diff --git a/src/com/android/contacts/common/compat/MultiWindowCompat.java b/src/com/android/contacts/compat/MultiWindowCompat.java
similarity index 95%
rename from src/com/android/contacts/common/compat/MultiWindowCompat.java
rename to src/com/android/contacts/compat/MultiWindowCompat.java
index 6641279..61af516 100644
--- a/src/com/android/contacts/common/compat/MultiWindowCompat.java
+++ b/src/com/android/contacts/compat/MultiWindowCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.app.Activity;
diff --git a/src/com/android/contacts/common/compat/PhoneAccountCompat.java b/src/com/android/contacts/compat/PhoneAccountCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/PhoneAccountCompat.java
rename to src/com/android/contacts/compat/PhoneAccountCompat.java
index 00f4211..5c396f5 100644
--- a/src/com/android/contacts/common/compat/PhoneAccountCompat.java
+++ b/src/com/android/contacts/compat/PhoneAccountCompat.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.content.Context;
import android.graphics.drawable.Drawable;
diff --git a/src/com/android/contacts/common/compat/PhoneAccountSdkCompat.java b/src/com/android/contacts/compat/PhoneAccountSdkCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/PhoneAccountSdkCompat.java
rename to src/com/android/contacts/compat/PhoneAccountSdkCompat.java
index 5cbf617..cb150c0 100644
--- a/src/com/android/contacts/common/compat/PhoneAccountSdkCompat.java
+++ b/src/com/android/contacts/compat/PhoneAccountSdkCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.os.Bundle;
import android.telecom.PhoneAccount;
diff --git a/src/com/android/contacts/common/compat/PhoneCompat.java b/src/com/android/contacts/compat/PhoneCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/PhoneCompat.java
rename to src/com/android/contacts/compat/PhoneCompat.java
index 5277761..a23e8b3 100644
--- a/src/com/android/contacts/common/compat/PhoneCompat.java
+++ b/src/com/android/contacts/compat/PhoneCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Phone;
diff --git a/src/com/android/contacts/common/compat/PhoneLookupSdkCompat.java b/src/com/android/contacts/compat/PhoneLookupSdkCompat.java
similarity index 94%
rename from src/com/android/contacts/common/compat/PhoneLookupSdkCompat.java
rename to src/com/android/contacts/compat/PhoneLookupSdkCompat.java
index 0c0a898..770216f 100644
--- a/src/com/android/contacts/common/compat/PhoneLookupSdkCompat.java
+++ b/src/com/android/contacts/compat/PhoneLookupSdkCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/compat/PhoneNumberFormattingTextWatcherCompat.java b/src/com/android/contacts/compat/PhoneNumberFormattingTextWatcherCompat.java
similarity index 95%
rename from src/com/android/contacts/common/compat/PhoneNumberFormattingTextWatcherCompat.java
rename to src/com/android/contacts/compat/PhoneNumberFormattingTextWatcherCompat.java
index 42b604e..46d727e 100644
--- a/src/com/android/contacts/common/compat/PhoneNumberFormattingTextWatcherCompat.java
+++ b/src/com/android/contacts/compat/PhoneNumberFormattingTextWatcherCompat.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.telephony.PhoneNumberFormattingTextWatcher;
diff --git a/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java b/src/com/android/contacts/compat/PhoneNumberUtilsCompat.java
similarity index 99%
rename from src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
rename to src/com/android/contacts/compat/PhoneNumberUtilsCompat.java
index 9a8fa41..8d5d0db 100644
--- a/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
+++ b/src/com/android/contacts/compat/PhoneNumberUtilsCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
diff --git a/src/com/android/contacts/compat/PinnedPositionsCompat.java b/src/com/android/contacts/compat/PinnedPositionsCompat.java
index 044ef20..59a48e3 100644
--- a/src/com/android/contacts/compat/PinnedPositionsCompat.java
+++ b/src/com/android/contacts/compat/PinnedPositionsCompat.java
@@ -20,8 +20,6 @@
import android.provider.ContactsContract;
import android.provider.ContactsContract.PinnedPositions;
-import com.android.contacts.common.compat.CompatUtils;
-
/**
* Compatibility class for {@link android.provider.ContactsContract.PinnedPositions}
*/
diff --git a/src/com/android/contacts/common/compat/ProviderStatusCompat.java b/src/com/android/contacts/compat/ProviderStatusCompat.java
similarity index 92%
rename from src/com/android/contacts/common/compat/ProviderStatusCompat.java
rename to src/com/android/contacts/compat/ProviderStatusCompat.java
index 84338de..35d514e 100644
--- a/src/com/android/contacts/common/compat/ProviderStatusCompat.java
+++ b/src/com/android/contacts/compat/ProviderStatusCompat.java
@@ -15,14 +15,10 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
-import android.os.Build;
import android.provider.ContactsContract.ProviderStatus;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.SdkVersionOverride;
-
/**
* This class contains constants from the pre-M version of ContactsContract.ProviderStatus class
* and also the mappings between pre-M constants and M constants for compatibility purpose,
diff --git a/src/com/android/contacts/common/compat/SdkVersionOverride.java b/src/com/android/contacts/compat/SdkVersionOverride.java
similarity index 96%
rename from src/com/android/contacts/common/compat/SdkVersionOverride.java
rename to src/com/android/contacts/compat/SdkVersionOverride.java
index ebde623..5f50fef 100644
--- a/src/com/android/contacts/common/compat/SdkVersionOverride.java
+++ b/src/com/android/contacts/compat/SdkVersionOverride.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.os.Build.VERSION;
diff --git a/src/com/android/contacts/common/compat/TelecomManagerUtil.java b/src/com/android/contacts/compat/TelecomManagerUtil.java
similarity index 95%
rename from src/com/android/contacts/common/compat/TelecomManagerUtil.java
rename to src/com/android/contacts/compat/TelecomManagerUtil.java
index 30c541c..b6a030a 100644
--- a/src/com/android/contacts/common/compat/TelecomManagerUtil.java
+++ b/src/com/android/contacts/compat/TelecomManagerUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.content.Intent;
import android.telecom.TelecomManager;
diff --git a/src/com/android/contacts/common/compat/TelephonyManagerCompat.java b/src/com/android/contacts/compat/TelephonyManagerCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/TelephonyManagerCompat.java
rename to src/com/android/contacts/compat/TelephonyManagerCompat.java
index ec7907f..07523b1 100644
--- a/src/com/android/contacts/common/compat/TelephonyManagerCompat.java
+++ b/src/com/android/contacts/compat/TelephonyManagerCompat.java
@@ -14,15 +14,13 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.net.Uri;
import android.support.annotation.Nullable;
import android.telecom.PhoneAccountHandle;
import android.telephony.TelephonyManager;
-import com.android.contacts.common.ContactsUtils;
-
public class TelephonyManagerCompat {
public static final String TELEPHONY_MANAGER_CLASS = "android.telephony.TelephonyManager";
diff --git a/src/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java b/src/com/android/contacts/compat/TelephonyManagerSdkCompat.java
similarity index 96%
rename from src/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java
rename to src/com/android/contacts/compat/TelephonyManagerSdkCompat.java
index acabfdf..dec486b 100644
--- a/src/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java
+++ b/src/com/android/contacts/compat/TelephonyManagerSdkCompat.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.net.Uri;
import android.telecom.PhoneAccountHandle;
diff --git a/src/com/android/contacts/common/compat/TelephonyThreadsCompat.java b/src/com/android/contacts/compat/TelephonyThreadsCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/TelephonyThreadsCompat.java
rename to src/com/android/contacts/compat/TelephonyThreadsCompat.java
index d9642c7..545e185 100644
--- a/src/com/android/contacts/common/compat/TelephonyThreadsCompat.java
+++ b/src/com/android/contacts/compat/TelephonyThreadsCompat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.content.ContentResolver;
import android.content.Context;
diff --git a/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/src/com/android/contacts/compat/telecom/TelecomManagerCompat.java
similarity index 98%
rename from src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
rename to src/com/android/contacts/compat/telecom/TelecomManagerCompat.java
index 6292b7f..fbbc589 100644
--- a/src/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
+++ b/src/com/android/contacts/compat/telecom/TelecomManagerCompat.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.compat.telecom;
+package com.android.contacts.compat.telecom;
import android.app.Activity;
import android.content.Intent;
-import android.content.Context;
import android.net.Uri;
import android.support.annotation.Nullable;
import android.telecom.PhoneAccount;
@@ -27,9 +26,8 @@
import android.telephony.TelephonyManager;
import android.text.TextUtils;
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/common/database/ContactUpdateUtils.java b/src/com/android/contacts/database/ContactUpdateUtils.java
similarity index 96%
rename from src/com/android/contacts/common/database/ContactUpdateUtils.java
rename to src/com/android/contacts/database/ContactUpdateUtils.java
index 1bd08aa..2333688 100644
--- a/src/com/android/contacts/common/database/ContactUpdateUtils.java
+++ b/src/com/android/contacts/database/ContactUpdateUtils.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.database;
+package com.android.contacts.database;
import android.content.ContentUris;
import android.content.ContentValues;
diff --git a/src/com/android/contacts/common/database/EmptyCursor.java b/src/com/android/contacts/database/EmptyCursor.java
similarity index 97%
rename from src/com/android/contacts/common/database/EmptyCursor.java
rename to src/com/android/contacts/database/EmptyCursor.java
index ad00eff..a6c1760 100644
--- a/src/com/android/contacts/common/database/EmptyCursor.java
+++ b/src/com/android/contacts/database/EmptyCursor.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.database;
+package com.android.contacts.database;
import android.database.AbstractCursor;
import android.database.CursorIndexOutOfBoundsException;
diff --git a/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java b/src/com/android/contacts/database/NoNullCursorAsyncQueryHandler.java
similarity index 97%
rename from src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java
rename to src/com/android/contacts/database/NoNullCursorAsyncQueryHandler.java
index aefc0fd..a7ff261 100644
--- a/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandler.java
+++ b/src/com/android/contacts/database/NoNullCursorAsyncQueryHandler.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.database;
+package com.android.contacts.database;
import android.content.AsyncQueryHandler;
import android.content.ContentResolver;
diff --git a/src/com/android/contacts/database/SimContactDao.java b/src/com/android/contacts/database/SimContactDao.java
new file mode 100644
index 0000000..7b0bf60
--- /dev/null
+++ b/src/com/android/contacts/database/SimContactDao.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts.database;
+
+import android.content.ContentProviderResult;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.os.RemoteException;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.google.common.base.Function;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Provides data access methods for loading contacts from a SIM card and and migrating these
+ * SIM contacts to a CP2 account.
+ */
+public abstract class SimContactDao {
+
+ // Set to true for manual testing on an emulator or phone without a SIM card
+ // DO NOT SUBMIT if set to true
+ private static final boolean USE_FAKE_INSTANCE = false;
+
+ public static final Function<Context, SimContactDao> DEFAULT_FACTORY =
+ new Function<Context, SimContactDao>() {
+ @Override
+ public SimContactDao apply(Context context) {
+ return USE_FAKE_INSTANCE ?
+ createDebugInstance(context) :
+ new SimContactDaoImpl(context);
+ }
+ };
+ private static Function<? super Context, SimContactDao> sInstanceFactory = DEFAULT_FACTORY;
+
+ private static SimContactDao createDebugInstance(Context context) {
+ return new SimContactDaoImpl.DebugImpl(context)
+ .addSimCard(new SimCard("fake-sim-id1", 1, "Fake Carrier",
+ "Card 1", "15095550101", "us").withContacts(
+ new SimContact(1, "Sim One", "15095550111", null),
+ new SimContact(2, "Sim Two", "15095550112", null),
+ new SimContact(3, "Sim Three", "15095550113", null),
+ new SimContact(4, "Sim Four", "15095550114", null),
+ new SimContact(5, "411 & more", "411", null)
+ ))
+ .addSimCard(new SimCard("fake-sim-id2", 2, "Carrier Two",
+ "Card 2", "15095550102", "us").withContacts(
+ new SimContact(1, "John Sim", "15095550121", null),
+ new SimContact(2, "Bob Sim", "15095550122", null),
+ new SimContact(3, "Mary Sim", "15095550123", null),
+ new SimContact(4, "Alice Sim", "15095550124", null),
+ new SimContact(5, "Sim Duplicate", "15095550121", null)
+ ));
+ }
+
+ public static synchronized SimContactDao create(Context context) {
+ return sInstanceFactory.apply(context);
+ }
+
+ /**
+ * Sets the factory function used by {@link SimContactDao#create}
+ */
+ @VisibleForTesting
+ public static synchronized void setFactoryForTest(
+ Function<? super Context, SimContactDao> factory) {
+ sInstanceFactory = factory;
+ }
+
+ public abstract boolean canReadSimContacts();
+
+ public abstract List<SimCard> getSimCards();
+
+ public abstract ArrayList<SimContact> loadContactsForSim(SimCard sim);
+
+ public abstract ContentProviderResult[] importContacts(List<SimContact> contacts,
+ AccountWithDataSet targetAccount)
+ throws RemoteException, OperationApplicationException;
+
+ public abstract void persistSimStates(List<SimCard> simCards);
+
+ public abstract SimCard getSimBySubscriptionId(int subscriptionId);
+
+ public abstract Map<AccountWithDataSet, Set<SimContact>> findAccountsOfExistingSimContacts(
+ List<SimContact> contacts);
+
+ public void persistSimState(SimCard sim) {
+ persistSimStates(Collections.singletonList(sim));
+ }
+}
diff --git a/src/com/android/contacts/common/database/SimContactDao.java b/src/com/android/contacts/database/SimContactDaoImpl.java
similarity index 85%
rename from src/com/android/contacts/common/database/SimContactDao.java
rename to src/com/android/contacts/database/SimContactDaoImpl.java
index b5b6626..1a0b2ea 100644
--- a/src/com/android/contacts/common/database/SimContactDao.java
+++ b/src/com/android/contacts/database/SimContactDaoImpl.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.database;
+package com.android.contacts.database;
import android.annotation.TargetApi;
import android.content.ContentProviderOperation;
@@ -42,11 +42,11 @@
import android.util.SparseArray;
import com.android.contacts.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.PermissionsUtil;
import com.android.contacts.util.SharedPreferenceUtil;
import com.google.common.base.Joiner;
@@ -54,7 +54,6 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -63,7 +62,7 @@
* Provides data access methods for loading contacts from a SIM card and and migrating these
* SIM contacts to a CP2 account.
*/
-public class SimContactDao {
+public class SimContactDaoImpl extends SimContactDao {
private static final String TAG = "SimContactDao";
// Maximum number of SIM contacts to import in a single ContentResolver.applyBatch call.
@@ -76,10 +75,6 @@
// query parameter limit.
static final int QUERY_MAX_BATCH_SIZE = 100;
- // Set to true for manual testing on an emulator or phone without a SIM card
- // DO NOT SUBMIT if set to true
- private static final boolean USE_FAKE_INSTANCE = false;
-
@VisibleForTesting
public static final Uri ICC_CONTENT_URI = Uri.parse("content://icc/adn");
@@ -92,17 +87,17 @@
private final ContentResolver mResolver;
private final TelephonyManager mTelephonyManager;
- private SimContactDao(Context context) {
+ public SimContactDaoImpl(Context context) {
mContext = context;
mResolver = context.getContentResolver();
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
}
-
public Context getContext() {
return mContext;
}
+ @Override
public boolean canReadSimContacts() {
// Require SIM_STATE_READY because the TelephonyManager methods related to SIM require
// this state
@@ -110,6 +105,7 @@
mTelephonyManager.getSimState() == TelephonyManager.SIM_STATE_READY;
}
+ @Override
public List<SimCard> getSimCards() {
if (!canReadSimContacts()) {
return Collections.emptyList();
@@ -121,14 +117,7 @@
return SharedPreferenceUtil.restoreSimStates(mContext, sims);
}
- public List<SimCard> getSimCardsWithContacts() {
- final List<SimCard> result = new ArrayList<>();
- for (SimCard sim : getSimCards()) {
- result.add(sim.withContacts(loadContactsForSim(sim)));
- }
- return result;
- }
-
+ @Override
public ArrayList<SimContact> loadContactsForSim(SimCard sim) {
if (sim.hasValidSubscriptionId()) {
return loadSimContacts(sim.getSubscriptionId());
@@ -147,6 +136,7 @@
return loadFrom(ICC_CONTENT_URI);
}
+ @Override
public ContentProviderResult[] importContacts(List<SimContact> contacts,
AccountWithDataSet targetAccount)
throws RemoteException, OperationApplicationException {
@@ -166,14 +156,12 @@
SharedPreferenceUtil.persistSimStates(mContext, Collections.singletonList(sim));
}
+ @Override
public void persistSimStates(List<SimCard> simCards) {
SharedPreferenceUtil.persistSimStates(mContext, simCards);
}
- public SimCard getFirstSimCard() {
- return getSimBySubscriptionId(SimCard.NO_SUBSCRIPTION_ID);
- }
-
+ @Override
public SimCard getSimBySubscriptionId(int subscriptionId) {
final List<SimCard> sims = SharedPreferenceUtil.restoreSimStates(mContext, getSimCards());
if (subscriptionId == SimCard.NO_SUBSCRIPTION_ID && !sims.isEmpty()) {
@@ -246,6 +234,7 @@
}
}
+
private ContentProviderResult[] importBatch(List<SimContact> contacts,
AccountWithDataSet targetAccount)
throws RemoteException, OperationApplicationException {
@@ -303,7 +292,10 @@
final String emails = cursor.getString(colEmails);
final SimContact contact = new SimContact(id, name, number, parseEmails(emails));
- result.add(contact);
+ // Only include contact if it has some useful data
+ if (contact.hasName() || contact.hasPhone() || contact.hasEmails()) {
+ result.add(contact);
+ }
}
return result;
}
@@ -391,7 +383,7 @@
}
private String[] parseEmails(String emails) {
- return emails != null ? emails.split(",") : null;
+ return !TextUtils.isEmpty(emails) ? emails.split(",") : null;
}
private boolean hasTelephony() {
@@ -403,32 +395,9 @@
PermissionsUtil.hasPhonePermissions(mContext);
}
- public static SimContactDao create(Context context) {
- if (USE_FAKE_INSTANCE) {
- return new DebugImpl(context)
- .addSimCard(new SimCard("fake-sim-id1", 1, "Fake Carrier",
- "Card 1", "15095550101", "us").withContacts(
- new SimContact(1, "Sim One", "15095550111", null),
- new SimContact(2, "Sim Two", "15095550112", null),
- new SimContact(3, "Sim Three", "15095550113", null),
- new SimContact(4, "Sim Four", "15095550114", null),
- new SimContact(5, "411 & more", "411", null)
- ))
- .addSimCard(new SimCard("fake-sim-id2", 2, "Carrier Two",
- "Card 2", "15095550102", "us").withContacts(
- new SimContact(1, "John Sim", "15095550121", null),
- new SimContact(2, "Bob Sim", "15095550122", null),
- new SimContact(3, "Mary Sim", "15095550123", null),
- new SimContact(4, "Alice Sim", "15095550124", null),
- new SimContact(5, "Sim Duplicate", "15095550121", null)
- ));
- }
- return new SimContactDao(context);
- }
-
// TODO remove this class and the USE_FAKE_INSTANCE flag once this code is not under
// active development or anytime after 3/1/2017
- public static class DebugImpl extends SimContactDao {
+ public static class DebugImpl extends SimContactDaoImpl {
private List<SimCard> mSimCards = new ArrayList<>();
private SparseArray<SimCard> mCardsBySubscription = new SparseArray<>();
@@ -449,13 +418,8 @@
}
@Override
- public ArrayList<SimContact> loadSimContacts() {
- return new ArrayList<>(mSimCards.get(0).getContacts());
- }
-
- @Override
- public ArrayList<SimContact> loadSimContacts(int subscriptionId) {
- return new ArrayList<>(mCardsBySubscription.get(subscriptionId).getContacts());
+ public ArrayList<SimContact> loadContactsForSim(SimCard card) {
+ return new ArrayList<>(card.getContacts());
}
@Override
diff --git a/src/com/android/contacts/datepicker/DatePickerDialog.java b/src/com/android/contacts/datepicker/DatePickerDialog.java
index 1ae1e61..ea66da1 100644
--- a/src/com/android/contacts/datepicker/DatePickerDialog.java
+++ b/src/com/android/contacts/datepicker/DatePickerDialog.java
@@ -28,7 +28,7 @@
import android.view.View;
import com.android.contacts.R;
-import com.android.contacts.common.util.DateUtils;
+import com.android.contacts.util.DateUtils;
import com.android.contacts.datepicker.DatePicker.OnDateChangedListener;
import java.text.DateFormat;
diff --git a/src/com/android/contacts/detail/ContactDisplayUtils.java b/src/com/android/contacts/detail/ContactDisplayUtils.java
index 85e6026..2d04555 100644
--- a/src/com/android/contacts/detail/ContactDisplayUtils.java
+++ b/src/com/android/contacts/detail/ContactDisplayUtils.java
@@ -19,11 +19,11 @@
import com.google.common.collect.Iterables;
import com.android.contacts.R;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.OrganizationDataItem;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.OrganizationDataItem;
+import com.android.contacts.preference.ContactsPreferences;
import com.android.contacts.util.MoreMath;
import android.content.Context;
diff --git a/src/com/android/contacts/detail/PhotoSelectionHandler.java b/src/com/android/contacts/detail/PhotoSelectionHandler.java
index d2e5763..0d6e2c5 100644
--- a/src/com/android/contacts/detail/PhotoSelectionHandler.java
+++ b/src/com/android/contacts/detail/PhotoSelectionHandler.java
@@ -38,12 +38,12 @@
import com.android.contacts.R;
import com.android.contacts.editor.PhotoActionPopup;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.RawContactDeltaList;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.RawContactDeltaList;
import com.android.contacts.util.ContactPhotoUtils;
import com.android.contacts.util.UiClosables;
diff --git a/src/com/android/contacts/common/dialog/CallSubjectDialog.java b/src/com/android/contacts/dialog/CallSubjectDialog.java
similarity index 98%
rename from src/com/android/contacts/common/dialog/CallSubjectDialog.java
rename to src/com/android/contacts/dialog/CallSubjectDialog.java
index a17c4fc..b1a77de 100644
--- a/src/com/android/contacts/common/dialog/CallSubjectDialog.java
+++ b/src/com/android/contacts/dialog/CallSubjectDialog.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.dialog;
+package com.android.contacts.dialog;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -47,10 +47,10 @@
import com.android.contacts.common.CallUtil;
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneAccountSdkCompat;
-import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
-import com.android.contacts.common.util.UriUtils;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneAccountSdkCompat;
+import com.android.contacts.compat.telecom.TelecomManagerCompat;
+import com.android.contacts.util.UriUtils;
import com.android.phone.common.animation.AnimUtils;
import java.nio.charset.Charset;
diff --git a/src/com/android/contacts/common/dialog/ClearFrequentsDialog.java b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
similarity index 96%
rename from src/com/android/contacts/common/dialog/ClearFrequentsDialog.java
rename to src/com/android/contacts/dialog/ClearFrequentsDialog.java
index 2fab3e1..70d766a 100644
--- a/src/com/android/contacts/common/dialog/ClearFrequentsDialog.java
+++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.dialog;
+package com.android.contacts.dialog;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -29,7 +29,7 @@
import android.provider.ContactsContract;
import com.android.contacts.common.R;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.util.PermissionsUtil;
/**
* Dialog that clears the frequently contacted list after confirming with the user.
diff --git a/src/com/android/contacts/common/dialog/IndeterminateProgressDialog.java b/src/com/android/contacts/dialog/IndeterminateProgressDialog.java
similarity index 99%
rename from src/com/android/contacts/common/dialog/IndeterminateProgressDialog.java
rename to src/com/android/contacts/dialog/IndeterminateProgressDialog.java
index 2fe059f..21cd4bb 100644
--- a/src/com/android/contacts/common/dialog/IndeterminateProgressDialog.java
+++ b/src/com/android/contacts/dialog/IndeterminateProgressDialog.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.dialog;
+package com.android.contacts.dialog;
import android.app.Dialog;
import android.app.DialogFragment;
diff --git a/src/com/android/contacts/editor/AccountHeaderPresenter.java b/src/com/android/contacts/editor/AccountHeaderPresenter.java
index 61a440f..c94dcd4 100644
--- a/src/com/android/contacts/editor/AccountHeaderPresenter.java
+++ b/src/com/android/contacts/editor/AccountHeaderPresenter.java
@@ -26,11 +26,11 @@
import android.widget.TextView;
import com.android.contacts.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
import com.android.contacts.util.UiClosables;
import java.util.List;
diff --git a/src/com/android/contacts/editor/AggregationSuggestionEngine.java b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
index 42776ff..aafcc96 100644
--- a/src/com/android/contacts/editor/AggregationSuggestionEngine.java
+++ b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
@@ -38,8 +38,8 @@
import android.provider.ContactsContract.RawContacts;
import android.text.TextUtils;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contacts.compat.AggregationSuggestionsCompat;
import com.google.common.base.MoreObjects;
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 1a1295b..c01f815 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -64,21 +64,21 @@
import com.android.contacts.activities.ContactEditorActivity.ContactEditor;
import com.android.contacts.activities.ContactSelectionActivity;
import com.android.contacts.common.Experiments;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils;
import com.android.contacts.editor.AggregationSuggestionEngine.Suggestion;
import com.android.contacts.group.GroupUtil;
import com.android.contacts.list.UiIntentActions;
diff --git a/src/com/android/contacts/editor/ContactEditorUtils.java b/src/com/android/contacts/editor/ContactEditorUtils.java
index 5b80b04..41e4cac 100644
--- a/src/com/android/contacts/editor/ContactEditorUtils.java
+++ b/src/com/android/contacts/editor/ContactEditorUtils.java
@@ -26,10 +26,10 @@
import android.provider.ContactsContract;
import android.text.TextUtils;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
diff --git a/src/com/android/contacts/editor/Editor.java b/src/com/android/contacts/editor/Editor.java
index d5c8589..711fbc0 100644
--- a/src/com/android/contacts/editor/Editor.java
+++ b/src/com/android/contacts/editor/Editor.java
@@ -18,9 +18,9 @@
import android.provider.ContactsContract.Data;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
/**
* Generic definition of something that edits a {@link Data} row through an
diff --git a/src/com/android/contacts/editor/EditorIntents.java b/src/com/android/contacts/editor/EditorIntents.java
index b867b31..91648d0 100644
--- a/src/com/android/contacts/editor/EditorIntents.java
+++ b/src/com/android/contacts/editor/EditorIntents.java
@@ -25,8 +25,8 @@
import com.android.contacts.activities.ContactEditorActivity;
import com.android.contacts.activities.ContactEditorSpringBoardActivity;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index 83c59df..f7a4f36 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -43,10 +43,10 @@
import com.android.contacts.common.ContactPhotoManager.DefaultImageProvider;
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.model.account.AccountDisplayInfo;
import com.android.contacts.util.ContactPhotoUtils;
import com.android.contacts.widget.QuickContactImageView;
import com.google.common.collect.Maps;
@@ -56,7 +56,7 @@
import static android.provider.ContactsContract.CommonDataKinds.GroupMembership;
import static android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import static com.android.contacts.common.util.MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors;
+import static com.android.contacts.util.MaterialColorMapUtils.getDefaultPrimaryAndSecondaryColors;
/**
* Utility methods for creating contact editor.
diff --git a/src/com/android/contacts/editor/EventFieldEditorView.java b/src/com/android/contacts/editor/EventFieldEditorView.java
index 8afcc0a..4c29330 100644
--- a/src/com/android/contacts/editor/EventFieldEditorView.java
+++ b/src/com/android/contacts/editor/EventFieldEditorView.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.content.res.Resources;
import android.os.Bundle;
-import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Event;
import android.text.TextUtils;
import android.util.AttributeSet;
@@ -31,13 +30,13 @@
import com.android.contacts.datepicker.DatePicker;
import com.android.contacts.datepicker.DatePickerDialog;
import com.android.contacts.datepicker.DatePickerDialog.OnDateSetListener;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.account.AccountType.EventEditType;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
-import com.android.contacts.common.util.DateUtils;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.account.AccountType.EventEditType;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
+import com.android.contacts.util.DateUtils;
import java.text.ParsePosition;
import java.util.Calendar;
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index a2bd2e9..cf51a05 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -39,12 +39,12 @@
import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.DataKind;
import com.android.contacts.group.GroupNameEditDialogFragment;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.RawContactModifier;
import com.android.contacts.util.UiClosables;
import com.google.common.base.Objects;
diff --git a/src/com/android/contacts/editor/KindSectionData.java b/src/com/android/contacts/editor/KindSectionData.java
index 03aa667..8ebae0a 100644
--- a/src/com/android/contacts/editor/KindSectionData.java
+++ b/src/com/android/contacts/editor/KindSectionData.java
@@ -18,11 +18,11 @@
import android.text.TextUtils;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.dataitem.DataKind;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
index 125a307..02eae11 100644
--- a/src/com/android/contacts/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -31,11 +31,11 @@
import android.widget.TextView;
import com.android.contacts.R;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.dataitem.DataKind;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 8b29b7e..9612874 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -46,11 +46,11 @@
import com.android.contacts.R;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.dataitem.DataKind;
import com.android.contacts.util.DialogManager;
import com.android.contacts.util.DialogManager.DialogShowingView;
diff --git a/src/com/android/contacts/editor/PhoneticNameEditorView.java b/src/com/android/contacts/editor/PhoneticNameEditorView.java
index 1c6f6a1..c96548c 100644
--- a/src/com/android/contacts/editor/PhoneticNameEditorView.java
+++ b/src/com/android/contacts/editor/PhoneticNameEditorView.java
@@ -22,11 +22,11 @@
import android.util.AttributeSet;
import com.android.contacts.R;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.util.NameConverter;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.util.NameConverter;
/**
* A dedicated editor for phonetic name. It is similar to {@link StructuredNameEditorView}.
diff --git a/src/com/android/contacts/editor/PhotoEditorView.java b/src/com/android/contacts/editor/PhotoEditorView.java
index 1e727df..b4042a5 100644
--- a/src/com/android/contacts/editor/PhotoEditorView.java
+++ b/src/com/android/contacts/editor/PhotoEditorView.java
@@ -31,8 +31,8 @@
import com.android.contacts.R;
import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
import com.android.contacts.util.SchedulingUtils;
import com.android.contacts.widget.QuickContactImageView;
diff --git a/src/com/android/contacts/editor/PickRawContactDialogFragment.java b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
index 6d6d4d6..6da7202 100644
--- a/src/com/android/contacts/editor/PickRawContactDialogFragment.java
+++ b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
@@ -19,15 +19,15 @@
import com.android.contacts.R;
import com.android.contacts.activities.ContactSelectionActivity;
import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.logging.EditorEvent;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.logging.EditorEvent;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.preference.ContactsPreferences;
import com.android.contacts.editor.PickRawContactLoader.RawContact;
import com.android.contacts.editor.PickRawContactLoader.RawContactsMetadata;
import com.android.contacts.list.UiIntentActions;
diff --git a/src/com/android/contacts/editor/PickRawContactLoader.java b/src/com/android/contacts/editor/PickRawContactLoader.java
index 08bd02f..bc4fd87 100644
--- a/src/com/android/contacts/editor/PickRawContactLoader.java
+++ b/src/com/android/contacts/editor/PickRawContactLoader.java
@@ -13,8 +13,8 @@
import android.provider.ContactsContract.Profile;
import android.provider.ContactsContract.RawContacts;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/com/android/contacts/editor/RawContactDeltaComparator.java b/src/com/android/contacts/editor/RawContactDeltaComparator.java
index 1a00c9d..b65f9da 100644
--- a/src/com/android/contacts/editor/RawContactDeltaComparator.java
+++ b/src/com/android/contacts/editor/RawContactDeltaComparator.java
@@ -16,10 +16,10 @@
package com.android.contacts.editor;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.GoogleAccountType;
import android.content.Context;
import android.provider.ContactsContract.RawContacts;
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 3c142d6..43b7755 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -52,20 +52,20 @@
import com.android.contacts.R;
import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.CustomDataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.AccountsListAdapter;
-import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.CustomDataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.MaterialColorMapUtils;
import com.android.contacts.util.UiClosables;
import java.io.FileNotFoundException;
diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
index 4335239..2067f9f 100644
--- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -27,9 +27,9 @@
import android.widget.TextView;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
/**
* Shows a dialog asking the user which account to chose.
diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java
index 5aca809..0ede939 100644
--- a/src/com/android/contacts/editor/StructuredNameEditorView.java
+++ b/src/com/android/contacts/editor/StructuredNameEditorView.java
@@ -24,12 +24,12 @@
import android.util.AttributeSet;
import com.android.contacts.R;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.util.NameConverter;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.util.NameConverter;
/**
* A dedicated editor for structured name.
diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java
index 6fd03bf..e3a7d3d 100644
--- a/src/com/android/contacts/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/editor/TextFieldsEditorView.java
@@ -41,12 +41,12 @@
import com.android.contacts.R;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.PhoneNumberFormatter;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.PhoneNumberFormatter;
/**
* Simple editor that handles labels and any {@link EditField} defined for the
diff --git a/src/com/android/contacts/editor/ViewIdGenerator.java b/src/com/android/contacts/editor/ViewIdGenerator.java
index ad99bf8..c4ba31c 100644
--- a/src/com/android/contacts/editor/ViewIdGenerator.java
+++ b/src/com/android/contacts/editor/ViewIdGenerator.java
@@ -20,9 +20,9 @@
import android.os.Parcel;
import android.os.Parcelable;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.dataitem.DataKind;
/**
* A class that provides unique view ids for {@link ContentEditorView},
diff --git a/src/com/android/contacts/common/extensions/ExtendedPhoneDirectoriesManager.java b/src/com/android/contacts/extensions/ExtendedPhoneDirectoriesManager.java
similarity index 73%
rename from src/com/android/contacts/common/extensions/ExtendedPhoneDirectoriesManager.java
rename to src/com/android/contacts/extensions/ExtendedPhoneDirectoriesManager.java
index eb25934..2ee0eae 100644
--- a/src/com/android/contacts/common/extensions/ExtendedPhoneDirectoriesManager.java
+++ b/src/com/android/contacts/extensions/ExtendedPhoneDirectoriesManager.java
@@ -1,20 +1,20 @@
// Copyright 2013 Google Inc. All Rights Reserved.
-package com.android.contacts.common.extensions;
+package com.android.contacts.extensions;
import android.content.Context;
-import com.android.contacts.common.list.DirectoryPartition;
+import com.android.contacts.list.DirectoryPartition;
import java.util.List;
/**
* An interface for adding extended phone directories to
- * {@link com.android.contacts.common.list.PhoneNumberListAdapter}.
+ * {@link com.android.contacts.list.PhoneNumberListAdapter}.
* An app that wishes to add custom phone directories should implement this class and advertise it
* in assets/contacts_extensions.properties. {@link ExtensionsFactory} will load the implementation
* and the extended directories will be added by
- * {@link com.android.contacts.common.list.PhoneNumberListAdapter}.
+ * {@link com.android.contacts.list.PhoneNumberListAdapter}.
*/
public interface ExtendedPhoneDirectoriesManager {
diff --git a/src/com/android/contacts/common/extensions/ExtensionsFactory.java b/src/com/android/contacts/extensions/ExtensionsFactory.java
similarity index 98%
rename from src/com/android/contacts/common/extensions/ExtensionsFactory.java
rename to src/com/android/contacts/extensions/ExtensionsFactory.java
index d52429e..33f9510 100644
--- a/src/com/android/contacts/common/extensions/ExtensionsFactory.java
+++ b/src/com/android/contacts/extensions/ExtensionsFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.extensions;
+package com.android.contacts.extensions;
import android.content.Context;
import android.util.Log;
diff --git a/src/com/android/contacts/common/format/FormatUtils.java b/src/com/android/contacts/format/FormatUtils.java
similarity index 98%
rename from src/com/android/contacts/common/format/FormatUtils.java
rename to src/com/android/contacts/format/FormatUtils.java
index 376ff13..c82e0d7 100644
--- a/src/com/android/contacts/common/format/FormatUtils.java
+++ b/src/com/android/contacts/format/FormatUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.format;
+package com.android.contacts.format;
import android.database.CharArrayBuffer;
import android.graphics.Typeface;
diff --git a/src/com/android/contacts/common/format/TextHighlighter.java b/src/com/android/contacts/format/TextHighlighter.java
similarity index 94%
rename from src/com/android/contacts/common/format/TextHighlighter.java
rename to src/com/android/contacts/format/TextHighlighter.java
index 496dcda..38c5c2d 100644
--- a/src/com/android/contacts/common/format/TextHighlighter.java
+++ b/src/com/android/contacts/format/TextHighlighter.java
@@ -14,17 +14,13 @@
* limitations under the License.
*/
-package com.android.contacts.common.format;
+package com.android.contacts.format;
-import android.graphics.Typeface;
import android.text.SpannableString;
import android.text.style.CharacterStyle;
-import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.widget.TextView;
-import com.google.common.base.Preconditions;
-
/**
* Highlights the text in a text field.
*/
diff --git a/src/com/android/contacts/group/GroupMembersAdapter.java b/src/com/android/contacts/group/GroupMembersAdapter.java
index c501984..bd50842 100644
--- a/src/com/android/contacts/group/GroupMembersAdapter.java
+++ b/src/com/android/contacts/group/GroupMembersAdapter.java
@@ -27,11 +27,10 @@
import android.view.View;
import android.view.ViewGroup;
-import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.R;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.list.ContactListItemView;
+import com.android.contacts.list.MultiSelectEntryContactListAdapter;
+import com.android.contacts.preference.ContactsPreferences;
/** Group members cursor adapter. */
public class GroupMembersAdapter extends MultiSelectEntryContactListAdapter {
diff --git a/src/com/android/contacts/group/GroupMembersFragment.java b/src/com/android/contacts/group/GroupMembersFragment.java
index 44bda74..18c086f 100644
--- a/src/com/android/contacts/group/GroupMembersFragment.java
+++ b/src/com/android/contacts/group/GroupMembersFragment.java
@@ -50,14 +50,14 @@
import com.android.contacts.R;
import com.android.contacts.activities.ActionBarAdapter;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.list.ContactsSectionIndexer;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter.DeleteContactListener;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.logging.ListEvent.ListType;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.ScreenEvent;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.list.ContactsSectionIndexer;
+import com.android.contacts.list.MultiSelectEntryContactListAdapter.DeleteContactListener;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.logging.ListEvent.ListType;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.ScreenEvent;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contacts.group.GroupMembersAdapter.GroupMembersQuery;
import com.android.contacts.interactions.GroupDeletionDialogFragment;
import com.android.contacts.list.ContactsRequest;
diff --git a/src/com/android/contacts/group/GroupMetaData.java b/src/com/android/contacts/group/GroupMetaData.java
index d9c0c27..4a8cb0f 100644
--- a/src/com/android/contacts/group/GroupMetaData.java
+++ b/src/com/android/contacts/group/GroupMetaData.java
@@ -25,8 +25,8 @@
import android.text.TextUtils;
import com.android.contacts.GroupMetaDataLoader;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
import com.google.common.base.MoreObjects;
diff --git a/src/com/android/contacts/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
index da76c68..a1eed97 100644
--- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java
+++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java
@@ -41,7 +41,7 @@
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.google.common.base.Strings;
import java.util.Collections;
diff --git a/src/com/android/contacts/group/GroupUtil.java b/src/com/android/contacts/group/GroupUtil.java
index 3b79546..f577eab 100644
--- a/src/com/android/contacts/group/GroupUtil.java
+++ b/src/com/android/contacts/group/GroupUtil.java
@@ -31,8 +31,8 @@
import com.android.contacts.GroupListLoader;
import com.android.contacts.activities.ContactSelectionActivity;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.list.ContactsSectionIndexer;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.list.ContactsSectionIndexer;
+import com.android.contacts.model.account.GoogleAccountType;
import com.android.contacts.list.UiIntentActions;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/interactions/AccountFiltersFragment.java b/src/com/android/contacts/interactions/AccountFiltersFragment.java
index 8d92327..e1d882e 100644
--- a/src/com/android/contacts/interactions/AccountFiltersFragment.java
+++ b/src/com/android/contacts/interactions/AccountFiltersFragment.java
@@ -21,8 +21,8 @@
import android.content.Loader;
import android.os.Bundle;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.util.AccountFilterUtil;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.util.AccountFilterUtil;
import java.util.List;
diff --git a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
index 4813866..977e869 100644
--- a/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CalendarInteractionsLoader.java
@@ -2,7 +2,7 @@
import com.google.common.base.Preconditions;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.util.PermissionsUtil;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/com/android/contacts/interactions/CallLogInteraction.java b/src/com/android/contacts/interactions/CallLogInteraction.java
index e207b29..40bd78e 100644
--- a/src/com/android/contacts/interactions/CallLogInteraction.java
+++ b/src/com/android/contacts/interactions/CallLogInteraction.java
@@ -17,9 +17,9 @@
import com.android.contacts.R;
import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.util.BitmapUtil;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.util.BitmapUtil;
+import com.android.contacts.util.ContactDisplayUtils;
import android.content.ContentValues;
import android.content.Context;
diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index 020d581..9c87a8e 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -28,8 +28,8 @@
import com.google.common.annotations.VisibleForTesting;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.util.PermissionsUtil;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.util.PermissionsUtil;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 9b3d0f8..91ad93f 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -38,10 +38,10 @@
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index a649f2b..3d55619 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -16,14 +16,14 @@
package com.android.contacts.interactions;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.ContactDisplayUtils;
import com.google.common.collect.Sets;
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java
similarity index 96%
rename from src/com/android/contacts/common/interactions/ExportDialogFragment.java
rename to src/com/android/contacts/interactions/ExportDialogFragment.java
index 3925833..772bc21 100644
--- a/src/com/android/contacts/common/interactions/ExportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ExportDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.interactions;
+package com.android.contacts.interactions;
import android.app.Activity;
import android.app.AlertDialog;
@@ -39,10 +39,10 @@
import android.widget.Toast;
import com.android.contacts.common.R;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.vcard.ExportVCardActivity;
-import com.android.contacts.common.vcard.ShareVCardActivity;
-import com.android.contacts.common.vcard.VCardCommonArguments;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.vcard.ExportVCardActivity;
+import com.android.contacts.vcard.ShareVCardActivity;
+import com.android.contacts.vcard.VCardCommonArguments;
/**
* An dialog invoked to import/export contacts.
diff --git a/src/com/android/contacts/common/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
similarity index 94%
rename from src/com/android/contacts/common/interactions/ImportDialogFragment.java
rename to src/com/android/contacts/interactions/ImportDialogFragment.java
index 1b2c98d..ff9300a 100644
--- a/src/com/android/contacts/common/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.interactions;
+package com.android.contacts.interactions;
import android.app.Activity;
import android.app.AlertDialog;
@@ -34,18 +34,17 @@
import android.widget.ArrayAdapter;
import android.widget.TextView;
-import com.android.contacts.SimImportFragment;
import com.android.contacts.activities.SimImportActivity;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.SimCard;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountSelectionUtil;
-import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountSelectionUtil;
+import com.android.contacts.util.AccountsListAdapter.AccountListFilter;
import com.android.contacts.editor.SelectAccountDialogFragment;
import java.util.List;
diff --git a/src/com/android/contacts/interactions/SmsInteraction.java b/src/com/android/contacts/interactions/SmsInteraction.java
index ba0070c..a18c6f1 100644
--- a/src/com/android/contacts/interactions/SmsInteraction.java
+++ b/src/com/android/contacts/interactions/SmsInteraction.java
@@ -16,7 +16,7 @@
package com.android.contacts.interactions;
import com.android.contacts.R;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.util.ContactDisplayUtils;
import android.content.ContentValues;
import android.content.Context;
diff --git a/src/com/android/contacts/interactions/SmsInteractionsLoader.java b/src/com/android/contacts/interactions/SmsInteractionsLoader.java
index 5c7d5e3..1de7ca3 100644
--- a/src/com/android/contacts/interactions/SmsInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/SmsInteractionsLoader.java
@@ -24,7 +24,7 @@
import android.provider.Telephony;
import android.util.Log;
-import com.android.contacts.common.compat.TelephonyThreadsCompat;
+import com.android.contacts.compat.TelephonyThreadsCompat;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/com/android/contacts/common/interactions/TouchPointManager.java b/src/com/android/contacts/interactions/TouchPointManager.java
similarity index 95%
rename from src/com/android/contacts/common/interactions/TouchPointManager.java
rename to src/com/android/contacts/interactions/TouchPointManager.java
index 4c38e22..67387e5 100644
--- a/src/com/android/contacts/common/interactions/TouchPointManager.java
+++ b/src/com/android/contacts/interactions/TouchPointManager.java
@@ -1,4 +1,4 @@
-package com.android.contacts.common.interactions;
+package com.android.contacts.interactions;
import android.graphics.Point;
diff --git a/src/com/android/contacts/common/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
similarity index 99%
rename from src/com/android/contacts/common/lettertiles/LetterTileDrawable.java
rename to src/com/android/contacts/lettertiles/LetterTileDrawable.java
index d1f1811..8f47d63 100644
--- a/src/com/android/contacts/common/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.lettertiles;
+package com.android.contacts.lettertiles;
import android.content.res.Resources;
import android.content.res.TypedArray;
diff --git a/src/com/android/contacts/common/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java
similarity index 98%
rename from src/com/android/contacts/common/list/AccountFilterActivity.java
rename to src/com/android/contacts/list/AccountFilterActivity.java
index 3908d18..1d42968 100644
--- a/src/com/android/contacts/common/list/AccountFilterActivity.java
+++ b/src/com/android/contacts/list/AccountFilterActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.app.ActionBar;
import android.app.Activity;
@@ -30,7 +30,7 @@
import android.widget.ListView;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
+import com.android.contacts.model.AccountTypeManager;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/AutoScrollListView.java b/src/com/android/contacts/list/AutoScrollListView.java
similarity index 98%
rename from src/com/android/contacts/common/list/AutoScrollListView.java
rename to src/com/android/contacts/list/AutoScrollListView.java
index d0070b5..f3bc7a2 100644
--- a/src/com/android/contacts/common/list/AutoScrollListView.java
+++ b/src/com/android/contacts/list/AutoScrollListView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.os.Build;
diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index bf4f891..8a6e081 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -35,12 +35,7 @@
import android.util.Log;
import com.android.common.widget.CompositeCursorAdapter.Partition;
-import com.android.contacts.common.list.AutoScrollListView;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.DirectoryPartition;
-import com.android.contacts.common.logging.ListEvent.ListType;
-import com.android.contacts.common.util.ContactLoaderUtils;
+import com.android.contacts.util.ContactLoaderUtils;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/ContactEntry.java b/src/com/android/contacts/list/ContactEntry.java
similarity index 94%
rename from src/com/android/contacts/common/list/ContactEntry.java
rename to src/com/android/contacts/list/ContactEntry.java
index a29a8d8..18a44ca 100644
--- a/src/com/android/contacts/common/list/ContactEntry.java
+++ b/src/com/android/contacts/list/ContactEntry.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.provider.ContactsContract.PinnedPositions;
import android.text.TextUtils;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
/**
* Class to hold contact information
diff --git a/src/com/android/contacts/common/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactEntryListAdapter.java
rename to src/com/android/contacts/list/ContactEntryListAdapter.java
index 0d20d6e..6615d3a 100644
--- a/src/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.content.CursorLoader;
@@ -38,9 +38,9 @@
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.DirectoryCompat;
-import com.android.contacts.common.util.SearchUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.DirectoryCompat;
+import com.android.contacts.util.SearchUtil;
import java.util.HashSet;
diff --git a/src/com/android/contacts/common/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
similarity index 99%
rename from src/com/android/contacts/common/list/ContactEntryListFragment.java
rename to src/com/android/contacts/list/ContactEntryListFragment.java
index 387b303..0b12be6 100644
--- a/src/com/android/contacts/common/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.app.Activity;
import android.app.Fragment;
@@ -48,9 +48,9 @@
import com.android.common.widget.CompositeCursorAdapter.Partition;
import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.logging.ListEvent.ActionType;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.logging.ListEvent.ActionType;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.preference.ContactsPreferences;
import java.util.Locale;
diff --git a/src/com/android/contacts/common/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactListAdapter.java
rename to src/com/android/contacts/list/ContactListAdapter.java
index 6294f47..f6a5c70 100644
--- a/src/com/android/contacts/common/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.database.Cursor;
@@ -29,8 +29,8 @@
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.ContactsCompat;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.compat.ContactsCompat;
+import com.android.contacts.preference.ContactsPreferences;
import java.util.HashSet;
import java.util.Set;
diff --git a/src/com/android/contacts/common/list/ContactListFilter.java b/src/com/android/contacts/list/ContactListFilter.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactListFilter.java
rename to src/com/android/contacts/list/ContactListFilter.java
index 5b7472d..850683c 100644
--- a/src/com/android/contacts/common/list/ContactListFilter.java
+++ b/src/com/android/contacts/list/ContactListFilter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.accounts.Account;
import android.content.SharedPreferences;
@@ -25,9 +25,9 @@
import android.provider.ContactsContract.RawContacts;
import android.text.TextUtils;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/ContactListFilterController.java b/src/com/android/contacts/list/ContactListFilterController.java
similarity index 96%
rename from src/com/android/contacts/common/list/ContactListFilterController.java
rename to src/com/android/contacts/list/ContactListFilterController.java
index 4d3d6ad..3a4596d 100644
--- a/src/com/android/contacts/common/list/ContactListFilterController.java
+++ b/src/com/android/contacts/list/ContactListFilterController.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/ContactListFilterView.java b/src/com/android/contacts/list/ContactListFilterView.java
similarity index 96%
rename from src/com/android/contacts/common/list/ContactListFilterView.java
rename to src/com/android/contacts/list/ContactListFilterView.java
index 76e43aa..2378d2f 100644
--- a/src/com/android/contacts/common/list/ContactListFilterView.java
+++ b/src/com/android/contacts/list/ContactListFilterView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.text.TextUtils;
@@ -27,8 +27,8 @@
import android.widget.TextView;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
/**
* Contact list filter parameters.
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
similarity index 99%
rename from src/com/android/contacts/common/list/ContactListItemView.java
rename to src/com/android/contacts/list/ContactListItemView.java
index d20c6e8..e2834c2 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.content.res.ColorStateList;
@@ -54,12 +54,12 @@
import com.android.contacts.common.ContactPresenceIconUtil;
import com.android.contacts.common.ContactStatusUtil;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.format.TextHighlighter;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.util.SearchUtil;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.format.TextHighlighter;
+import com.android.contacts.util.ContactDisplayUtils;
+import com.android.contacts.util.SearchUtil;
+import com.android.contacts.util.ViewUtil;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactListPinnedHeaderView.java
rename to src/com/android/contacts/list/ContactListPinnedHeaderView.java
index c208bef..25aa1d6 100644
--- a/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java
+++ b/src/com/android/contacts/list/ContactListPinnedHeaderView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.content.res.TypedArray;
diff --git a/src/com/android/contacts/list/ContactPickerFragment.java b/src/com/android/contacts/list/ContactPickerFragment.java
index 4e81389..064e5b3 100644
--- a/src/com/android/contacts/list/ContactPickerFragment.java
+++ b/src/com/android/contacts/list/ContactPickerFragment.java
@@ -24,13 +24,7 @@
import android.widget.AdapterView;
import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.list.ShortcutIntentBuilder;
-import com.android.contacts.common.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
+import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
/**
* Fragment for the contact list used for browsing contacts (as compared to
diff --git a/src/com/android/contacts/common/list/ContactTileAdapter.java b/src/com/android/contacts/list/ContactTileAdapter.java
similarity index 99%
rename from src/com/android/contacts/common/list/ContactTileAdapter.java
rename to src/com/android/contacts/list/ContactTileAdapter.java
index 6ce4efb..ebf62d1 100644
--- a/src/com/android/contacts/common/list/ContactTileAdapter.java
+++ b/src/com/android/contacts/list/ContactTileAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.ContentUris;
import android.content.Context;
@@ -34,7 +34,7 @@
import com.android.contacts.common.ContactTileLoaderFactory;
import com.android.contacts.common.MoreContactUtils;
import com.android.contacts.common.R;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/common/list/ContactTileFrequentView.java b/src/com/android/contacts/list/ContactTileFrequentView.java
similarity index 83%
rename from src/com/android/contacts/common/list/ContactTileFrequentView.java
rename to src/com/android/contacts/list/ContactTileFrequentView.java
index 7dcd0a1..41a972f 100644
--- a/src/com/android/contacts/common/list/ContactTileFrequentView.java
+++ b/src/com/android/contacts/list/ContactTileFrequentView.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.util.AttributeSet;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
/**
- * A {@link com.android.contacts.common.list.ContactTileView} that is used for most frequently contacted in the People app
+ * A {@link com.android.contacts.list.ContactTileView} that is used for most frequently contacted in the People app
*/
public class ContactTileFrequentView extends ContactTileView {
public ContactTileFrequentView(Context context, AttributeSet attrs) {
diff --git a/src/com/android/contacts/common/list/ContactTilePhoneFrequentView.java b/src/com/android/contacts/list/ContactTilePhoneFrequentView.java
similarity index 93%
rename from src/com/android/contacts/common/list/ContactTilePhoneFrequentView.java
rename to src/com/android/contacts/list/ContactTilePhoneFrequentView.java
index aec93ab..a88cf99 100644
--- a/src/com/android/contacts/common/list/ContactTilePhoneFrequentView.java
+++ b/src/com/android/contacts/list/ContactTilePhoneFrequentView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.text.TextUtils;
@@ -21,10 +21,10 @@
import android.view.View;
import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
/**
- * A dark version of the {@link com.android.contacts.common.list.ContactTileView} that is used in Dialtacts
+ * A dark version of the {@link com.android.contacts.list.ContactTileView} that is used in Dialtacts
* for frequently called contacts. Slightly different behavior from superclass...
* when you tap it, you want to call the frequently-called number for the
* contact, even if that is not the default number for that contact.
diff --git a/src/com/android/contacts/common/list/ContactTileStarredView.java b/src/com/android/contacts/list/ContactTileStarredView.java
similarity index 93%
rename from src/com/android/contacts/common/list/ContactTileStarredView.java
rename to src/com/android/contacts/list/ContactTileStarredView.java
index 59ef81e..2ee3460 100644
--- a/src/com/android/contacts/common/list/ContactTileStarredView.java
+++ b/src/com/android/contacts/list/ContactTileStarredView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
@@ -24,7 +24,7 @@
/**
* A {@link ContactTileStarredView} displays the contact's picture overlayed with their name
* in a square. The actual dimensions are set by
- * {@link com.android.contacts.common.list.ContactTileAdapter.ContactTileRow}.
+ * {@link com.android.contacts.list.ContactTileAdapter.ContactTileRow}.
*/
public class ContactTileStarredView extends ContactTileView {
diff --git a/src/com/android/contacts/common/list/ContactTileView.java b/src/com/android/contacts/list/ContactTileView.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactTileView.java
rename to src/com/android/contacts/list/ContactTileView.java
index 172d720..770d38e 100644
--- a/src/com/android/contacts/common/list/ContactTileView.java
+++ b/src/com/android/contacts/list/ContactTileView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.graphics.Rect;
@@ -89,7 +89,7 @@
/**
* Populates the data members to be displayed from the
- * fields in {@link com.android.contacts.common.list.ContactEntry}
+ * fields in {@link com.android.contacts.list.ContactEntry}
*/
public void loadFromContact(ContactEntry entry) {
diff --git a/src/com/android/contacts/list/ContactsIntentResolver.java b/src/com/android/contacts/list/ContactsIntentResolver.java
index b110605..6c40f94 100644
--- a/src/com/android/contacts/list/ContactsIntentResolver.java
+++ b/src/com/android/contacts/list/ContactsIntentResolver.java
@@ -34,7 +34,7 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contacts.group.GroupUtil;
/**
diff --git a/src/com/android/contacts/list/ContactsRequest.java b/src/com/android/contacts/list/ContactsRequest.java
index 70ce80d..f581b0a 100644
--- a/src/com/android/contacts/list/ContactsRequest.java
+++ b/src/com/android/contacts/list/ContactsRequest.java
@@ -18,7 +18,7 @@
import android.net.Uri;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/common/list/ContactsSectionIndexer.java b/src/com/android/contacts/list/ContactsSectionIndexer.java
similarity index 98%
rename from src/com/android/contacts/common/list/ContactsSectionIndexer.java
rename to src/com/android/contacts/list/ContactsSectionIndexer.java
index 031380d..9d20bfe 100644
--- a/src/com/android/contacts/common/list/ContactsSectionIndexer.java
+++ b/src/com/android/contacts/list/ContactsSectionIndexer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.text.TextUtils;
import android.widget.SectionIndexer;
diff --git a/src/com/android/contacts/list/ContactsUnavailableFragment.java b/src/com/android/contacts/list/ContactsUnavailableFragment.java
index dd9cbab..76f3935 100644
--- a/src/com/android/contacts/list/ContactsUnavailableFragment.java
+++ b/src/com/android/contacts/list/ContactsUnavailableFragment.java
@@ -21,7 +21,6 @@
import android.content.res.Configuration;
import android.graphics.PorterDuff;
import android.os.Bundle;
-import android.provider.ContactsContract.ProviderStatus;
import android.support.v4.content.ContextCompat;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -35,9 +34,9 @@
import android.widget.TextView;
import com.android.contacts.R;
-import com.android.contacts.common.compat.ProviderStatusCompat;
-import com.android.contacts.common.interactions.ImportDialogFragment;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.compat.ProviderStatusCompat;
+import com.android.contacts.interactions.ImportDialogFragment;
+import com.android.contacts.util.ImplicitIntentsUtil;
/**
* Fragment shown when contacts are unavailable. It contains provider status
diff --git a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
similarity index 98%
rename from src/com/android/contacts/common/list/CustomContactListFilterActivity.java
rename to src/com/android/contacts/list/CustomContactListFilterActivity.java
index 157d0a8..67c664d 100644
--- a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.app.ActionBar;
import android.app.Activity;
@@ -56,17 +56,17 @@
import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
import android.widget.TextView;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.util.EmptyService;
-import com.android.contacts.common.util.LocalizedNameResolver;
-import com.android.contacts.common.util.WeakAsyncTask;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.util.EmptyService;
+import com.android.contacts.util.LocalizedNameResolver;
+import com.android.contacts.util.WeakAsyncTask;
import com.google.common.collect.Lists;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index f7ae30d..c3d19fb 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -59,22 +59,14 @@
import com.android.contacts.activities.ActionBarAdapter;
import com.android.contacts.activities.PeopleActivity;
import com.android.contacts.common.Experiments;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.DefaultContactListAdapter;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.list.FavoritesAndContactsLoader;
-import com.android.contacts.common.logging.ListEvent;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.ScreenEvent;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.logging.ListEvent;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.ScreenEvent;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contacts.interactions.ContactDeletionInteraction;
import com.android.contacts.interactions.ContactMultiDeletionInteraction;
import com.android.contacts.interactions.ContactMultiDeletionInteraction.MultiContactDeleteListener;
diff --git a/src/com/android/contacts/common/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
similarity index 97%
rename from src/com/android/contacts/common/list/DefaultContactListAdapter.java
rename to src/com/android/contacts/list/DefaultContactListAdapter.java
index 5827930..bc76331 100644
--- a/src/com/android/contacts/common/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/list/DefaultContactListAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.ContentUris;
import android.content.Context;
@@ -31,11 +31,9 @@
import android.text.TextUtils;
import android.view.View;
-import com.android.contacts.common.Experiments;
-import com.android.contacts.common.compat.ContactsCompat;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contactsbind.experiments.Flags;
+import com.android.contacts.compat.ContactsCompat;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/DirectoryListLoader.java b/src/com/android/contacts/list/DirectoryListLoader.java
similarity index 97%
rename from src/com/android/contacts/common/list/DirectoryListLoader.java
rename to src/com/android/contacts/list/DirectoryListLoader.java
index 13d0f92..d8ab256 100644
--- a/src/com/android/contacts/common/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/list/DirectoryListLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.AsyncTaskLoader;
import android.content.Context;
@@ -23,14 +23,12 @@
import android.database.MatrixCursor;
import android.net.Uri;
import android.os.Handler;
-import android.provider.ContactsContract;
import android.provider.ContactsContract.Directory;
import android.text.TextUtils;
import android.util.Log;
-import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.DirectoryCompat;
+import com.android.contacts.compat.DirectoryCompat;
/**
* A specialized loader for the list of directories, see {@link Directory}.
diff --git a/src/com/android/contacts/common/list/DirectoryPartition.java b/src/com/android/contacts/list/DirectoryPartition.java
similarity index 97%
rename from src/com/android/contacts/common/list/DirectoryPartition.java
rename to src/com/android/contacts/list/DirectoryPartition.java
index ca0dc11..bf0456b 100644
--- a/src/com/android/contacts/common/list/DirectoryPartition.java
+++ b/src/com/android/contacts/list/DirectoryPartition.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.provider.ContactsContract.Directory;
@@ -117,7 +117,7 @@
/**
* Max number of results for this directory. Defaults to {@link #RESULT_LIMIT_DEFAULT} which
* implies using the adapter's
- * {@link com.android.contacts.common.list.ContactListAdapter#getDirectoryResultLimit()}
+ * {@link com.android.contacts.list.ContactListAdapter#getDirectoryResultLimit()}
*/
public int getResultLimit() {
return mResultLimit;
diff --git a/src/com/android/contacts/list/EmailAddressListAdapter.java b/src/com/android/contacts/list/EmailAddressListAdapter.java
index d19f960..65505ba 100644
--- a/src/com/android/contacts/list/EmailAddressListAdapter.java
+++ b/src/com/android/contacts/list/EmailAddressListAdapter.java
@@ -29,9 +29,7 @@
import android.view.ViewGroup;
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
/**
* A cursor adapter for the {@link Email#CONTENT_TYPE} content type.
diff --git a/src/com/android/contacts/list/EmailAddressPickerFragment.java b/src/com/android/contacts/list/EmailAddressPickerFragment.java
index f89f743..7dcc766 100644
--- a/src/com/android/contacts/list/EmailAddressPickerFragment.java
+++ b/src/com/android/contacts/list/EmailAddressPickerFragment.java
@@ -21,9 +21,6 @@
import android.view.ViewGroup;
import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.DirectoryListLoader;
/**
* Fragment containing an email list for picking.
diff --git a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
index 46df4ae..08822d1 100644
--- a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
+++ b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
@@ -23,7 +23,6 @@
import android.os.Bundle;
import com.android.contacts.R;
-import com.android.contacts.common.list.ContactListFilter;
/**
* Confirmation dialog for turning global auto-sync setting on.
diff --git a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java b/src/com/android/contacts/list/FavoritesAndContactsLoader.java
similarity index 98%
rename from src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
rename to src/com/android/contacts/list/FavoritesAndContactsLoader.java
index 25dd711..54e5f3f 100644
--- a/src/com/android/contacts/common/list/FavoritesAndContactsLoader.java
+++ b/src/com/android/contacts/list/FavoritesAndContactsLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.content.CursorLoader;
diff --git a/src/com/android/contacts/list/GroupMemberPickerFragment.java b/src/com/android/contacts/list/GroupMemberPickerFragment.java
index a7e37d7..83184ec 100644
--- a/src/com/android/contacts/list/GroupMemberPickerFragment.java
+++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java
@@ -31,11 +31,8 @@
import com.android.contacts.activities.ContactSelectionActivity;
import com.android.contacts.common.R;
-import com.android.contacts.common.list.ContactListAdapter.ContactQuery;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactsSectionIndexer;
-import com.android.contacts.common.list.DefaultContactListAdapter;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.list.ContactListAdapter.ContactQuery;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contacts.group.GroupUtil;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/HeaderEntryContactListAdapter.java b/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
index 9822b79..1ecba14 100644
--- a/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
+++ b/src/com/android/contacts/list/HeaderEntryContactListAdapter.java
@@ -16,8 +16,6 @@
package com.android.contacts.list;
import com.android.contacts.R;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.DefaultContactListAdapter;
import android.content.Context;
import android.database.Cursor;
diff --git a/src/com/android/contacts/common/list/IndexerListAdapter.java b/src/com/android/contacts/list/IndexerListAdapter.java
similarity index 99%
rename from src/com/android/contacts/common/list/IndexerListAdapter.java
rename to src/com/android/contacts/list/IndexerListAdapter.java
index 032bb53..b4ac2b4 100644
--- a/src/com/android/contacts/common/list/IndexerListAdapter.java
+++ b/src/com/android/contacts/list/IndexerListAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.view.View;
diff --git a/src/com/android/contacts/list/JoinContactListAdapter.java b/src/com/android/contacts/list/JoinContactListAdapter.java
index f08fcbb..82da6f7 100644
--- a/src/com/android/contacts/list/JoinContactListAdapter.java
+++ b/src/com/android/contacts/list/JoinContactListAdapter.java
@@ -31,10 +31,7 @@
import android.widget.TextView;
import com.android.contacts.R;
-import com.android.contacts.common.list.ContactListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.DirectoryListLoader;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
public class JoinContactListAdapter extends ContactListAdapter {
diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index d827eb5..853323b 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -32,9 +32,7 @@
import android.widget.TextView;
import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.logging.ListEvent;
+import com.android.contacts.logging.ListEvent;
import com.android.contacts.list.JoinContactLoader.JoinContactLoaderResult;
/**
diff --git a/src/com/android/contacts/list/LegacyContactListAdapter.java b/src/com/android/contacts/list/LegacyContactListAdapter.java
index 837991b..a2f98de 100644
--- a/src/com/android/contacts/list/LegacyContactListAdapter.java
+++ b/src/com/android/contacts/list/LegacyContactListAdapter.java
@@ -24,9 +24,6 @@
import android.view.View;
import android.view.ViewGroup;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-
/**
* A cursor adapter for the People.CONTENT_TYPE content type.
*/
diff --git a/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java b/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
index b5c96df..63df215 100644
--- a/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
@@ -26,9 +26,6 @@
import android.view.View;
import android.view.ViewGroup;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-
/**
* A cursor adapter for the Phones.CONTENT_TYPE content type.
*/
diff --git a/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java b/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
index 5b6e11f..10d189c 100644
--- a/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/LegacyPhoneNumberPickerFragment.java
@@ -19,10 +19,6 @@
import android.net.Uri;
import android.util.Log;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.PhoneNumberPickerFragment;
-
/**
* Version of PhoneNumberPickerFragment used specifically for legacy support.
*/
diff --git a/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java b/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
index 4c598cd..c3fa57d 100644
--- a/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
@@ -26,9 +26,6 @@
import android.view.View;
import android.view.ViewGroup;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-
/**
* A cursor adapter for the ContactMethods.CONTENT_TYPE content type.
*/
diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
index 7a6a64a..265ee2a 100644
--- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
@@ -35,16 +35,14 @@
import com.android.contacts.R;
import com.android.contacts.activities.ActionBarAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter.SelectedContactsListener;
-import com.android.contacts.common.logging.ListEvent.ActionType;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.SearchState;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.list.MultiSelectEntryContactListAdapter.SelectedContactsListener;
+import com.android.contacts.logging.ListEvent.ActionType;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.SearchState;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
import com.android.contacts.group.GroupMembersFragment;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
index 7f4bb4b..cbea3bc 100644
--- a/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
@@ -29,10 +29,7 @@
import android.provider.ContactsContract.CommonDataKinds.Email;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
import com.android.contacts.group.GroupUtil;
/** Email addresses multi-select cursor adapter. */
diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
index 64489a0..7651f3a 100644
--- a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java
@@ -26,7 +26,7 @@
import android.view.ViewGroup;
import com.android.contacts.R;
-import com.android.contacts.common.logging.ListEvent;
+import com.android.contacts.logging.ListEvent;
import com.android.contacts.group.GroupUtil;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/MultiSelectEntryContactListAdapter.java b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
similarity index 99%
rename from src/com/android/contacts/common/list/MultiSelectEntryContactListAdapter.java
rename to src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
index efba9ca..fe493b6 100644
--- a/src/com/android/contacts/common/list/MultiSelectEntryContactListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.database.Cursor;
diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
index 6bf6d5e..2df2e73 100644
--- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
@@ -29,10 +29,7 @@
import android.provider.ContactsContract.CommonDataKinds.Phone;
-import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
import com.android.contacts.group.GroupUtil;
/** Phone Numbers multi-select cursor adapter. */
diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
index 96a1de6..4484303 100644
--- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java
@@ -26,7 +26,7 @@
import android.view.ViewGroup;
import com.android.contacts.R;
-import com.android.contacts.common.logging.ListEvent;
+import com.android.contacts.logging.ListEvent;
import com.android.contacts.group.GroupUtil;
import java.util.List;
diff --git a/src/com/android/contacts/common/list/OnPhoneNumberPickerActionListener.java b/src/com/android/contacts/list/OnPhoneNumberPickerActionListener.java
similarity index 97%
rename from src/com/android/contacts/common/list/OnPhoneNumberPickerActionListener.java
rename to src/com/android/contacts/list/OnPhoneNumberPickerActionListener.java
index fe23054..616562c 100644
--- a/src/com/android/contacts/common/list/OnPhoneNumberPickerActionListener.java
+++ b/src/com/android/contacts/list/OnPhoneNumberPickerActionListener.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.app.ActionBar;
import android.content.Intent;
diff --git a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java b/src/com/android/contacts/list/PhoneNumberListAdapter.java
similarity index 97%
rename from src/com/android/contacts/common/list/PhoneNumberListAdapter.java
rename to src/com/android/contacts/list/PhoneNumberListAdapter.java
index 348cac2..0f46f92 100644
--- a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/PhoneNumberListAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.ContentUris;
import android.content.Context;
@@ -38,14 +38,14 @@
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.GeoUtil;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CallableCompat;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.DirectoryCompat;
-import com.android.contacts.common.compat.PhoneCompat;
-import com.android.contacts.common.extensions.ExtendedPhoneDirectoriesManager;
-import com.android.contacts.common.extensions.ExtensionsFactory;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.Constants;
+import com.android.contacts.compat.CallableCompat;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.DirectoryCompat;
+import com.android.contacts.compat.PhoneCompat;
+import com.android.contacts.extensions.ExtendedPhoneDirectoriesManager;
+import com.android.contacts.extensions.ExtensionsFactory;
+import com.android.contacts.preference.ContactsPreferences;
+import com.android.contacts.util.Constants;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
similarity index 98%
rename from src/com/android/contacts/common/list/PhoneNumberPickerFragment.java
rename to src/com/android/contacts/list/PhoneNumberPickerFragment.java
index bbbd794..e0d9e22 100644
--- a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Intent;
import android.content.Loader;
@@ -28,7 +28,7 @@
import android.view.ViewGroup;
import com.android.contacts.common.R;
-import com.android.contacts.common.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
+import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
/**
* Fragment containing a phone number list for picking.
diff --git a/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java b/src/com/android/contacts/list/PinnedHeaderListAdapter.java
similarity index 98%
rename from src/com/android/contacts/common/list/PinnedHeaderListAdapter.java
rename to src/com/android/contacts/list/PinnedHeaderListAdapter.java
index 72f3f19..6a76421 100644
--- a/src/com/android/contacts/common/list/PinnedHeaderListAdapter.java
+++ b/src/com/android/contacts/list/PinnedHeaderListAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.view.View;
diff --git a/src/com/android/contacts/common/list/PinnedHeaderListView.java b/src/com/android/contacts/list/PinnedHeaderListView.java
similarity index 99%
rename from src/com/android/contacts/common/list/PinnedHeaderListView.java
rename to src/com/android/contacts/list/PinnedHeaderListView.java
index b68ff1f..01895c7 100644
--- a/src/com/android/contacts/common/list/PinnedHeaderListView.java
+++ b/src/com/android/contacts/list/PinnedHeaderListView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.content.Context;
import android.graphics.Canvas;
@@ -30,7 +30,7 @@
import android.widget.ListAdapter;
import android.widget.TextView;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
/**
* A ListView that maintains a header pinned at the top of the list. The
diff --git a/src/com/android/contacts/list/PostalAddressListAdapter.java b/src/com/android/contacts/list/PostalAddressListAdapter.java
index 951a933..387369b 100644
--- a/src/com/android/contacts/list/PostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/PostalAddressListAdapter.java
@@ -28,9 +28,7 @@
import android.view.ViewGroup;
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
/**
* A cursor adapter for the {@link StructuredPostal#CONTENT_TYPE} content type.
diff --git a/src/com/android/contacts/list/PostalAddressPickerFragment.java b/src/com/android/contacts/list/PostalAddressPickerFragment.java
index c64e173..c2aacee 100644
--- a/src/com/android/contacts/list/PostalAddressPickerFragment.java
+++ b/src/com/android/contacts/list/PostalAddressPickerFragment.java
@@ -21,9 +21,6 @@
import android.view.ViewGroup;
import com.android.contacts.R;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.DirectoryListLoader;
/**
* Fragment containing a postal address list for picking.
diff --git a/src/com/android/contacts/common/list/ProviderStatusWatcher.java b/src/com/android/contacts/list/ProviderStatusWatcher.java
similarity index 98%
rename from src/com/android/contacts/common/list/ProviderStatusWatcher.java
rename to src/com/android/contacts/list/ProviderStatusWatcher.java
index af36db3..86afb44 100644
--- a/src/com/android/contacts/common/list/ProviderStatusWatcher.java
+++ b/src/com/android/contacts/list/ProviderStatusWatcher.java
@@ -13,9 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
-import android.content.ContentValues;
import android.content.Context;
import android.database.ContentObserver;
import android.database.Cursor;
@@ -25,7 +24,7 @@
import android.provider.ContactsContract.ProviderStatus;
import android.util.Log;
-import com.android.contacts.common.compat.ProviderStatusCompat;
+import com.android.contacts.compat.ProviderStatusCompat;
import com.android.contactsbind.FeedbackHelper;
diff --git a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java b/src/com/android/contacts/list/ShortcutIntentBuilder.java
similarity index 98%
rename from src/com/android/contacts/common/list/ShortcutIntentBuilder.java
rename to src/com/android/contacts/list/ShortcutIntentBuilder.java
index e230996..57f6228 100644
--- a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/list/ShortcutIntentBuilder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.app.ActivityManager;
import android.content.ContentResolver;
@@ -31,7 +31,6 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
-import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.Contacts;
@@ -47,7 +46,7 @@
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.R;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
/**
* Constructs shortcut intents.
diff --git a/src/com/android/contacts/common/location/CountryDetector.java b/src/com/android/contacts/location/CountryDetector.java
similarity index 98%
rename from src/com/android/contacts/common/location/CountryDetector.java
rename to src/com/android/contacts/location/CountryDetector.java
index bceadc4..9d08fc0 100644
--- a/src/com/android/contacts/common/location/CountryDetector.java
+++ b/src/com/android/contacts/location/CountryDetector.java
@@ -1,9 +1,8 @@
-package com.android.contacts.common.location;
+package com.android.contacts.location;
import android.content.Context;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
-import android.util.Log;
import java.util.Locale;
diff --git a/src/com/android/contacts/common/logging/EditorEvent.java b/src/com/android/contacts/logging/EditorEvent.java
similarity index 96%
rename from src/com/android/contacts/common/logging/EditorEvent.java
rename to src/com/android/contacts/logging/EditorEvent.java
index e5b42f8..48308ac 100644
--- a/src/com/android/contacts/common/logging/EditorEvent.java
+++ b/src/com/android/contacts/logging/EditorEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
import com.google.common.base.MoreObjects;
diff --git a/src/com/android/contacts/common/logging/ListEvent.java b/src/com/android/contacts/logging/ListEvent.java
similarity index 98%
rename from src/com/android/contacts/common/logging/ListEvent.java
rename to src/com/android/contacts/logging/ListEvent.java
index 47979bf..50da98f 100644
--- a/src/com/android/contacts/common/logging/ListEvent.java
+++ b/src/com/android/contacts/logging/ListEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
import com.google.common.base.MoreObjects;
diff --git a/src/com/android/contacts/common/logging/Logger.java b/src/com/android/contacts/logging/Logger.java
similarity index 97%
rename from src/com/android/contacts/common/logging/Logger.java
rename to src/com/android/contacts/logging/Logger.java
index cb75ca9..366c19b 100644
--- a/src/com/android/contacts/common/logging/Logger.java
+++ b/src/com/android/contacts/logging/Logger.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
import android.app.Activity;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
import com.android.contactsbind.ObjectFactory;
/**
diff --git a/src/com/android/contacts/common/logging/QuickContactEvent.java b/src/com/android/contacts/logging/QuickContactEvent.java
similarity index 98%
rename from src/com/android/contacts/common/logging/QuickContactEvent.java
rename to src/com/android/contacts/logging/QuickContactEvent.java
index f19646f..05d7308 100644
--- a/src/com/android/contacts/common/logging/QuickContactEvent.java
+++ b/src/com/android/contacts/logging/QuickContactEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
import com.google.common.base.MoreObjects;
diff --git a/src/com/android/contacts/common/logging/ScreenEvent.java b/src/com/android/contacts/logging/ScreenEvent.java
similarity index 96%
rename from src/com/android/contacts/common/logging/ScreenEvent.java
rename to src/com/android/contacts/logging/ScreenEvent.java
index 6af020b..9edcbc7 100644
--- a/src/com/android/contacts/common/logging/ScreenEvent.java
+++ b/src/com/android/contacts/logging/ScreenEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
/**
* Stores constants identifying individual screens/dialogs/fragments in the application, and also
diff --git a/src/com/android/contacts/common/logging/SearchState.java b/src/com/android/contacts/logging/SearchState.java
similarity index 98%
rename from src/com/android/contacts/common/logging/SearchState.java
rename to src/com/android/contacts/logging/SearchState.java
index d1224b4..8b1872d 100644
--- a/src/com/android/contacts/common/logging/SearchState.java
+++ b/src/com/android/contacts/logging/SearchState.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.logging;
+package com.android.contacts.logging;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/src/com/android/contacts/common/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
similarity index 97%
rename from src/com/android/contacts/common/model/AccountTypeManager.java
rename to src/com/android/contacts/model/AccountTypeManager.java
index f4cb428..3687752 100644
--- a/src/com/android/contacts/common/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.accounts.Account;
import android.accounts.AccountManager;
@@ -47,18 +47,18 @@
import com.android.contacts.R;
import com.android.contacts.common.Experiments;
import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountTypeWithDataSet;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.ExchangeAccountType;
-import com.android.contacts.common.model.account.ExternalAccountType;
-import com.android.contacts.common.model.account.FallbackAccountType;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.model.account.SamsungAccountType;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.Constants;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountTypeWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.ExchangeAccountType;
+import com.android.contacts.model.account.ExternalAccountType;
+import com.android.contacts.model.account.FallbackAccountType;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.model.account.SamsungAccountType;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.Constants;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
import com.android.contactsbind.ObjectFactory;
import com.android.contactsbind.experiments.Flags;
import com.google.common.annotations.VisibleForTesting;
@@ -82,7 +82,7 @@
import javax.annotation.Nullable;
-import static com.android.contacts.common.util.DeviceLocalAccountTypeFactory.Util.isLocalAccountType;
+import static com.android.contacts.util.DeviceLocalAccountTypeFactory.Util.isLocalAccountType;
/**
* Singleton holder for all parsed {@link AccountType} available on the
diff --git a/src/com/android/contacts/common/model/BuilderWrapper.java b/src/com/android/contacts/model/BuilderWrapper.java
similarity index 97%
rename from src/com/android/contacts/common/model/BuilderWrapper.java
rename to src/com/android/contacts/model/BuilderWrapper.java
index 325c3df..4a96c36 100644
--- a/src/com/android/contacts/common/model/BuilderWrapper.java
+++ b/src/com/android/contacts/model/BuilderWrapper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProviderOperation.Builder;
diff --git a/src/com/android/contacts/common/model/CPOWrapper.java b/src/com/android/contacts/model/CPOWrapper.java
similarity index 96%
rename from src/com/android/contacts/common/model/CPOWrapper.java
rename to src/com/android/contacts/model/CPOWrapper.java
index 4124df8..12e00dd 100644
--- a/src/com/android/contacts/common/model/CPOWrapper.java
+++ b/src/com/android/contacts/model/CPOWrapper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProviderOperation;
diff --git a/src/com/android/contacts/common/model/Contact.java b/src/com/android/contacts/model/Contact.java
similarity index 98%
rename from src/com/android/contacts/common/model/Contact.java
rename to src/com/android/contacts/model/Contact.java
index 586f80a..e1805e1 100644
--- a/src/com/android/contacts/common/model/Contact.java
+++ b/src/com/android/contacts/model/Contact.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentValues;
import android.content.Context;
@@ -24,9 +24,9 @@
import android.provider.ContactsContract.Directory;
import android.provider.ContactsContract.DisplayNameSources;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.SimAccountType;
-import com.android.contacts.common.util.DataStatus;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.SimAccountType;
+import com.android.contacts.util.DataStatus;
import com.android.contacts.group.GroupMetaData;
import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/common/model/ContactLoader.java b/src/com/android/contacts/model/ContactLoader.java
similarity index 98%
rename from src/com/android/contacts/common/model/ContactLoader.java
rename to src/com/android/contacts/model/ContactLoader.java
index 2cafc1f..e4695e6 100644
--- a/src/com/android/contacts/common/model/ContactLoader.java
+++ b/src/com/android/contacts/model/ContactLoader.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.AsyncTaskLoader;
import android.content.ContentResolver;
@@ -40,16 +40,16 @@
import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountTypeWithDataSet;
-import com.android.contacts.common.util.Constants;
-import com.android.contacts.common.util.ContactLoaderUtils;
-import com.android.contacts.common.util.DataStatus;
-import com.android.contacts.common.util.UriUtils;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.PhotoDataItem;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountTypeWithDataSet;
+import com.android.contacts.util.Constants;
+import com.android.contacts.util.ContactLoaderUtils;
+import com.android.contacts.util.DataStatus;
+import com.android.contacts.util.UriUtils;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.PhotoDataItem;
import com.android.contacts.group.GroupMetaData;
import com.google.common.collect.ImmutableList;
diff --git a/src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocator.java b/src/com/android/contacts/model/Cp2DeviceLocalAccountLocator.java
similarity index 96%
rename from src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocator.java
rename to src/com/android/contacts/model/Cp2DeviceLocalAccountLocator.java
index 64f7c03..afd7917 100644
--- a/src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocator.java
+++ b/src/com/android/contacts/model/Cp2DeviceLocalAccountLocator.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.accounts.AccountManager;
import android.content.ContentResolver;
@@ -22,8 +22,8 @@
import android.provider.ContactsContract;
import android.support.annotation.VisibleForTesting;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/src/com/android/contacts/common/model/DeviceLocalAccountLocator.java b/src/com/android/contacts/model/DeviceLocalAccountLocator.java
similarity index 94%
rename from src/com/android/contacts/common/model/DeviceLocalAccountLocator.java
rename to src/com/android/contacts/model/DeviceLocalAccountLocator.java
index 17f5f5e..03da03b 100644
--- a/src/com/android/contacts/common/model/DeviceLocalAccountLocator.java
+++ b/src/com/android/contacts/model/DeviceLocalAccountLocator.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.Context;
import com.android.contacts.common.Experiments;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contactsbind.ObjectFactory;
import com.android.contactsbind.experiments.Flags;
diff --git a/src/com/android/contacts/common/model/RawContact.java b/src/com/android/contacts/model/RawContact.java
similarity index 97%
rename from src/com/android/contacts/common/model/RawContact.java
rename to src/com/android/contacts/model/RawContact.java
index 3d8db85..6192093 100644
--- a/src/com/android/contacts/common/model/RawContact.java
+++ b/src/com/android/contacts/model/RawContact.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentValues;
import android.content.Context;
@@ -26,10 +26,9 @@
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.RawContacts;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.dataitem.DataItem;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.dataitem.DataItem;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/model/RawContactDelta.java b/src/com/android/contacts/model/RawContactDelta.java
similarity index 98%
rename from src/com/android/contacts/common/model/RawContactDelta.java
rename to src/com/android/contacts/model/RawContactDelta.java
index afa4a13..b7d0665 100644
--- a/src/com/android/contacts/common/model/RawContactDelta.java
+++ b/src/com/android/contacts/model/RawContactDelta.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProviderOperation;
import android.content.ContentProviderOperation.Builder;
@@ -29,9 +29,9 @@
import android.provider.ContactsContract.RawContacts;
import android.util.Log;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
diff --git a/src/com/android/contacts/common/model/RawContactDeltaList.java b/src/com/android/contacts/model/RawContactDeltaList.java
similarity index 99%
rename from src/com/android/contacts/common/model/RawContactDeltaList.java
rename to src/com/android/contacts/model/RawContactDeltaList.java
index 2f281ef..de007d2 100644
--- a/src/com/android/contacts/common/model/RawContactDeltaList.java
+++ b/src/com/android/contacts/model/RawContactDeltaList.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProviderOperation;
import android.content.ContentProviderOperation.Builder;
@@ -30,7 +30,7 @@
import android.provider.ContactsContract.RawContacts;
import android.util.Log;
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/model/RawContactModifier.java b/src/com/android/contacts/model/RawContactModifier.java
similarity index 98%
rename from src/com/android/contacts/common/model/RawContactModifier.java
rename to src/com/android/contacts/model/RawContactModifier.java
index b24f877..a67b018 100644
--- a/src/com/android/contacts/common/model/RawContactModifier.java
+++ b/src/com/android/contacts/model/RawContactModifier.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentValues;
import android.content.Context;
@@ -47,17 +47,17 @@
import android.util.SparseIntArray;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.account.AccountType.EventEditType;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.util.CommonDateUtils;
-import com.android.contacts.common.util.DateUtils;
-import com.android.contacts.common.util.NameConverter;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.account.AccountType.EventEditType;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.util.CommonDateUtils;
+import com.android.contacts.util.DateUtils;
+import com.android.contacts.util.NameConverter;
import java.text.ParsePosition;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/common/model/SimCard.java b/src/com/android/contacts/model/SimCard.java
similarity index 92%
rename from src/com/android/contacts/common/model/SimCard.java
rename to src/com/android/contacts/model/SimCard.java
index 7b13096..2105ac7 100644
--- a/src/com/android/contacts/common/model/SimCard.java
+++ b/src/com/android/contacts/model/SimCard.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.os.Build;
import android.support.annotation.RequiresApi;
@@ -221,6 +221,20 @@
return result;
}
+ @Override
+ public String toString() {
+ return "SimCard{" +
+ "mSimId='" + mSimId + '\'' +
+ ", mSubscriptionId=" + mSubscriptionId +
+ ", mCarrierName=" + mCarrierName +
+ ", mDisplayName=" + mDisplayName +
+ ", mPhoneNumber='" + mPhoneNumber + '\'' +
+ ", mCountryCode='" + mCountryCode + '\'' +
+ ", mDismissed=" + mDismissed +
+ ", mImported=" + mImported +
+ ", mContacts=" + mContacts +
+ '}';
+ }
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
public static SimCard create(SubscriptionInfo info) {
diff --git a/src/com/android/contacts/common/model/SimContact.java b/src/com/android/contacts/model/SimContact.java
similarity index 95%
rename from src/com/android/contacts/common/model/SimContact.java
rename to src/com/android/contacts/model/SimContact.java
index 2d26029..56c696f 100644
--- a/src/com/android/contacts/common/model/SimContact.java
+++ b/src/com/android/contacts/model/SimContact.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProviderOperation;
import android.database.MatrixCursor;
@@ -24,8 +24,9 @@
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.text.TextUtils;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Ordering;
@@ -45,6 +46,10 @@
private final String mPhone;
private final String[] mEmails;
+ public SimContact(long id, String name, String phone) {
+ this(id, name, phone, null);
+ }
+
public SimContact(long id, String name, String phone, String[] emails) {
mId = id;
mName = name;
@@ -52,6 +57,10 @@
mEmails = emails;
}
+ public SimContact(SimContact other) {
+ this(other.mId, other.mName, other.mPhone, other.mEmails);
+ }
+
public long getId() {
return mId;
}
@@ -112,7 +121,7 @@
}
public boolean hasName() {
- return mName != null;
+ return !TextUtils.isEmpty(mName);
}
public boolean hasPhone() {
diff --git a/src/com/android/contacts/common/model/ValuesDelta.java b/src/com/android/contacts/model/ValuesDelta.java
similarity index 98%
rename from src/com/android/contacts/common/model/ValuesDelta.java
rename to src/com/android/contacts/model/ValuesDelta.java
index d6e08a8..120c205 100644
--- a/src/com/android/contacts/common/model/ValuesDelta.java
+++ b/src/com/android/contacts/model/ValuesDelta.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProviderOperation;
import android.content.ContentValues;
@@ -23,10 +23,8 @@
import android.os.Parcelable;
import android.provider.BaseColumns;
import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.text.TextUtils;
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
import com.google.common.collect.Sets;
diff --git a/src/com/android/contacts/common/model/account/AccountDisplayInfo.java b/src/com/android/contacts/model/account/AccountDisplayInfo.java
similarity index 98%
rename from src/com/android/contacts/common/model/account/AccountDisplayInfo.java
rename to src/com/android/contacts/model/account/AccountDisplayInfo.java
index f68fdd5..fe0c570 100644
--- a/src/com/android/contacts/common/model/account/AccountDisplayInfo.java
+++ b/src/com/android/contacts/model/account/AccountDisplayInfo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.Context;
import android.graphics.drawable.Drawable;
diff --git a/src/com/android/contacts/common/model/account/AccountDisplayInfoFactory.java b/src/com/android/contacts/model/account/AccountDisplayInfoFactory.java
similarity index 94%
rename from src/com/android/contacts/common/model/account/AccountDisplayInfoFactory.java
rename to src/com/android/contacts/model/account/AccountDisplayInfoFactory.java
index aad1689..759eede 100644
--- a/src/com/android/contacts/common/model/account/AccountDisplayInfoFactory.java
+++ b/src/com/android/contacts/model/account/AccountDisplayInfoFactory.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.Context;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
import com.android.contactsbind.ObjectFactory;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/common/model/account/AccountType.java b/src/com/android/contacts/model/account/AccountType.java
similarity index 99%
rename from src/com/android/contacts/common/model/account/AccountType.java
rename to src/com/android/contacts/model/account/AccountType.java
index 80fb4aa..d727e0c 100644
--- a/src/com/android/contacts/common/model/account/AccountType.java
+++ b/src/com/android/contacts/model/account/AccountType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.accounts.AuthenticatorDescription;
import android.content.ContentValues;
@@ -29,7 +29,7 @@
import android.widget.EditText;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
diff --git a/src/com/android/contacts/common/model/account/AccountTypeWithDataSet.java b/src/com/android/contacts/model/account/AccountTypeWithDataSet.java
similarity index 98%
rename from src/com/android/contacts/common/model/account/AccountTypeWithDataSet.java
rename to src/com/android/contacts/model/account/AccountTypeWithDataSet.java
index f6bcf24..ab0a891 100644
--- a/src/com/android/contacts/common/model/account/AccountTypeWithDataSet.java
+++ b/src/com/android/contacts/model/account/AccountTypeWithDataSet.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.Context;
import android.database.Cursor;
diff --git a/src/com/android/contacts/common/model/account/AccountWithDataSet.java b/src/com/android/contacts/model/account/AccountWithDataSet.java
similarity index 91%
rename from src/com/android/contacts/common/model/account/AccountWithDataSet.java
rename to src/com/android/contacts/model/account/AccountWithDataSet.java
index 3ee0aab..24a91be 100644
--- a/src/com/android/contacts/common/model/account/AccountWithDataSet.java
+++ b/src/com/android/contacts/model/account/AccountWithDataSet.java
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.accounts.Account;
+import android.content.ContentProviderOperation;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
@@ -27,8 +28,8 @@
import android.provider.ContactsContract.RawContacts;
import android.text.TextUtils;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.preference.ContactsPreferences;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
@@ -191,6 +192,20 @@
}
/**
+ * Returns a {@link ContentProviderOperation} that will create a RawContact in this account
+ */
+ public ContentProviderOperation newRawContactOperation() {
+ final ContentProviderOperation.Builder builder =
+ ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
+ .withValue(RawContacts.ACCOUNT_NAME, name)
+ .withValue(RawContacts.ACCOUNT_TYPE, type);
+ if (dataSet != null) {
+ builder.withValue(RawContacts.DATA_SET, dataSet);
+ }
+ return builder.build();
+ }
+
+ /**
* Unpack a string created by {@link #stringify}.
*
* @throws IllegalArgumentException if it's an invalid string.
diff --git a/src/com/android/contacts/common/model/account/BaseAccountType.java b/src/com/android/contacts/model/account/BaseAccountType.java
similarity index 99%
rename from src/com/android/contacts/common/model/account/BaseAccountType.java
rename to src/com/android/contacts/model/account/BaseAccountType.java
index 400b0e9..0e7469e 100644
--- a/src/com/android/contacts/common/model/account/BaseAccountType.java
+++ b/src/com/android/contacts/model/account/BaseAccountType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.ContentValues;
import android.content.Context;
@@ -40,10 +40,10 @@
import android.view.inputmethod.EditorInfo;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.CustomDataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
-import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.contacts.model.dataitem.CustomDataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
+import com.android.contacts.util.ContactDisplayUtils;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
diff --git a/src/com/android/contacts/common/model/account/DeviceLocalAccountType.java b/src/com/android/contacts/model/account/DeviceLocalAccountType.java
similarity index 95%
rename from src/com/android/contacts/common/model/account/DeviceLocalAccountType.java
rename to src/com/android/contacts/model/account/DeviceLocalAccountType.java
index 31452e6..3941cf7 100644
--- a/src/com/android/contacts/common/model/account/DeviceLocalAccountType.java
+++ b/src/com/android/contacts/model/account/DeviceLocalAccountType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.Context;
diff --git a/src/com/android/contacts/common/model/account/ExchangeAccountType.java b/src/com/android/contacts/model/account/ExchangeAccountType.java
similarity index 98%
rename from src/com/android/contacts/common/model/account/ExchangeAccountType.java
rename to src/com/android/contacts/model/account/ExchangeAccountType.java
index 4106c6d..91a9d7d 100644
--- a/src/com/android/contacts/common/model/account/ExchangeAccountType.java
+++ b/src/com/android/contacts/model/account/ExchangeAccountType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.ContentValues;
import android.content.Context;
@@ -29,11 +29,10 @@
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
-import android.util.Log;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
import com.android.contactsbind.FeedbackHelper;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/model/account/ExternalAccountType.java b/src/com/android/contacts/model/account/ExternalAccountType.java
similarity index 99%
rename from src/com/android/contacts/common/model/account/ExternalAccountType.java
rename to src/com/android/contacts/model/account/ExternalAccountType.java
index 5c5a26a..c385d44 100644
--- a/src/com/android/contacts/common/model/account/ExternalAccountType.java
+++ b/src/com/android/contacts/model/account/ExternalAccountType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.Context;
import android.content.Intent;
@@ -34,7 +34,7 @@
import android.util.Xml;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
import com.android.contactsbind.FeedbackHelper;
import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/common/model/account/FallbackAccountType.java b/src/com/android/contacts/model/account/FallbackAccountType.java
similarity index 95%
rename from src/com/android/contacts/common/model/account/FallbackAccountType.java
rename to src/com/android/contacts/model/account/FallbackAccountType.java
index 39f767d..c3f25de 100644
--- a/src/com/android/contacts/common/model/account/FallbackAccountType.java
+++ b/src/com/android/contacts/model/account/FallbackAccountType.java
@@ -14,14 +14,13 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.accounts.AuthenticatorDescription;
import android.content.Context;
-import android.util.Log;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
import com.android.contactsbind.FeedbackHelper;
public class FallbackAccountType extends BaseAccountType {
diff --git a/src/com/android/contacts/common/model/account/GoogleAccountType.java b/src/com/android/contacts/model/account/GoogleAccountType.java
similarity index 97%
rename from src/com/android/contacts/common/model/account/GoogleAccountType.java
rename to src/com/android/contacts/model/account/GoogleAccountType.java
index 9e089f7..2bc02e7 100644
--- a/src/com/android/contacts/common/model/account/GoogleAccountType.java
+++ b/src/com/android/contacts/model/account/GoogleAccountType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.ContentValues;
import android.content.Context;
@@ -22,11 +22,10 @@
import android.provider.ContactsContract.CommonDataKinds.Event;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.Relation;
-import android.util.Log;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
import com.android.contactsbind.FeedbackHelper;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/model/account/SamsungAccountType.java b/src/com/android/contacts/model/account/SamsungAccountType.java
similarity index 97%
rename from src/com/android/contacts/common/model/account/SamsungAccountType.java
rename to src/com/android/contacts/model/account/SamsungAccountType.java
index efb4400..c5f9c86 100644
--- a/src/com/android/contacts/common/model/account/SamsungAccountType.java
+++ b/src/com/android/contacts/model/account/SamsungAccountType.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import com.google.common.collect.Lists;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.util.CommonDateUtils;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.util.CommonDateUtils;
import com.android.contactsbind.FeedbackHelper;
import android.content.ContentValues;
@@ -30,7 +30,6 @@
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.Relation;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import android.util.Log;
import java.util.Locale;
diff --git a/src/com/android/contacts/common/model/account/SimAccountType.java b/src/com/android/contacts/model/account/SimAccountType.java
similarity index 97%
rename from src/com/android/contacts/common/model/account/SimAccountType.java
rename to src/com/android/contacts/model/account/SimAccountType.java
index cecc9c7..afcccd5 100644
--- a/src/com/android/contacts/common/model/account/SimAccountType.java
+++ b/src/com/android/contacts/model/account/SimAccountType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.accounts.AuthenticatorDescription;
import android.content.Context;
@@ -21,7 +21,7 @@
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/model/dataitem/CustomDataItem.java b/src/com/android/contacts/model/dataitem/CustomDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/CustomDataItem.java
rename to src/com/android/contacts/model/dataitem/CustomDataItem.java
index 589d88e..5be812b 100644
--- a/src/com/android/contacts/common/model/dataitem/CustomDataItem.java
+++ b/src/com/android/contacts/model/dataitem/CustomDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract.Data;
diff --git a/src/com/android/contacts/common/model/dataitem/DataItem.java b/src/com/android/contacts/model/dataitem/DataItem.java
similarity index 98%
rename from src/com/android/contacts/common/model/dataitem/DataItem.java
rename to src/com/android/contacts/model/dataitem/DataItem.java
index 44ceeda..782b54e 100644
--- a/src/com/android/contacts/common/model/dataitem/DataItem.java
+++ b/src/com/android/contacts/model/dataitem/DataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.content.Context;
@@ -38,7 +38,7 @@
import com.android.contacts.common.Collapser;
import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.model.RawContactModifier;
+import com.android.contacts.model.RawContactModifier;
/**
* This is the base class for data items, which represents a row from the Data table.
diff --git a/src/com/android/contacts/common/model/dataitem/DataKind.java b/src/com/android/contacts/model/dataitem/DataKind.java
similarity index 94%
rename from src/com/android/contacts/common/model/dataitem/DataKind.java
rename to src/com/android/contacts/model/dataitem/DataKind.java
index 98ad40a..a13539a 100644
--- a/src/com/android/contacts/common/model/dataitem/DataKind.java
+++ b/src/com/android/contacts/model/dataitem/DataKind.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.content.Context;
import android.provider.ContactsContract.Data;
-import com.android.contacts.common.model.account.AccountType.EditField;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.account.AccountType.StringInflater;
+import com.android.contacts.model.account.AccountType.EditField;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.account.AccountType.StringInflater;
import com.google.common.collect.Iterators;
import java.text.SimpleDateFormat;
diff --git a/src/com/android/contacts/common/model/dataitem/EmailDataItem.java b/src/com/android/contacts/model/dataitem/EmailDataItem.java
similarity index 96%
rename from src/com/android/contacts/common/model/dataitem/EmailDataItem.java
rename to src/com/android/contacts/model/dataitem/EmailDataItem.java
index 23efb01..77ad126 100644
--- a/src/com/android/contacts/common/model/dataitem/EmailDataItem.java
+++ b/src/com/android/contacts/model/dataitem/EmailDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/EventDataItem.java b/src/com/android/contacts/model/dataitem/EventDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/EventDataItem.java
rename to src/com/android/contacts/model/dataitem/EventDataItem.java
index 5096fea..ad61dae 100644
--- a/src/com/android/contacts/common/model/dataitem/EventDataItem.java
+++ b/src/com/android/contacts/model/dataitem/EventDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.content.Context;
diff --git a/src/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java b/src/com/android/contacts/model/dataitem/GroupMembershipDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java
rename to src/com/android/contacts/model/dataitem/GroupMembershipDataItem.java
index 41f19e6..00558d0 100644
--- a/src/com/android/contacts/common/model/dataitem/GroupMembershipDataItem.java
+++ b/src/com/android/contacts/model/dataitem/GroupMembershipDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/IdentityDataItem.java b/src/com/android/contacts/model/dataitem/IdentityDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/IdentityDataItem.java
rename to src/com/android/contacts/model/dataitem/IdentityDataItem.java
index 29e9a40..045867a 100644
--- a/src/com/android/contacts/common/model/dataitem/IdentityDataItem.java
+++ b/src/com/android/contacts/model/dataitem/IdentityDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/ImDataItem.java b/src/com/android/contacts/model/dataitem/ImDataItem.java
similarity index 98%
rename from src/com/android/contacts/common/model/dataitem/ImDataItem.java
rename to src/com/android/contacts/model/dataitem/ImDataItem.java
index f89e5c6..a0e087c 100644
--- a/src/com/android/contacts/common/model/dataitem/ImDataItem.java
+++ b/src/com/android/contacts/model/dataitem/ImDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.content.Context;
diff --git a/src/com/android/contacts/common/model/dataitem/NicknameDataItem.java b/src/com/android/contacts/model/dataitem/NicknameDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/NicknameDataItem.java
rename to src/com/android/contacts/model/dataitem/NicknameDataItem.java
index e7f9d4a..2d44751 100644
--- a/src/com/android/contacts/common/model/dataitem/NicknameDataItem.java
+++ b/src/com/android/contacts/model/dataitem/NicknameDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/NoteDataItem.java b/src/com/android/contacts/model/dataitem/NoteDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/NoteDataItem.java
rename to src/com/android/contacts/model/dataitem/NoteDataItem.java
index 3d71167..9a572cb 100644
--- a/src/com/android/contacts/common/model/dataitem/NoteDataItem.java
+++ b/src/com/android/contacts/model/dataitem/NoteDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/OrganizationDataItem.java b/src/com/android/contacts/model/dataitem/OrganizationDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/OrganizationDataItem.java
rename to src/com/android/contacts/model/dataitem/OrganizationDataItem.java
index 37cd852..8c2a0c8 100644
--- a/src/com/android/contacts/common/model/dataitem/OrganizationDataItem.java
+++ b/src/com/android/contacts/model/dataitem/OrganizationDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/PhoneDataItem.java b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
similarity index 93%
rename from src/com/android/contacts/common/model/dataitem/PhoneDataItem.java
rename to src/com/android/contacts/model/dataitem/PhoneDataItem.java
index d6aa2a9..8d6cf8e 100644
--- a/src/com/android/contacts/common/model/dataitem/PhoneDataItem.java
+++ b/src/com/android/contacts/model/dataitem/PhoneDataItem.java
@@ -14,15 +14,14 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.content.Context;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Phone;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
/**
* Represents a phone data item, wrapping the columns in
diff --git a/src/com/android/contacts/common/model/dataitem/PhotoDataItem.java b/src/com/android/contacts/model/dataitem/PhotoDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/PhotoDataItem.java
rename to src/com/android/contacts/model/dataitem/PhotoDataItem.java
index a61218b..2ba13fb 100644
--- a/src/com/android/contacts/common/model/dataitem/PhotoDataItem.java
+++ b/src/com/android/contacts/model/dataitem/PhotoDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/RelationDataItem.java b/src/com/android/contacts/model/dataitem/RelationDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/RelationDataItem.java
rename to src/com/android/contacts/model/dataitem/RelationDataItem.java
index 9e883fe..e08ba4e 100644
--- a/src/com/android/contacts/common/model/dataitem/RelationDataItem.java
+++ b/src/com/android/contacts/model/dataitem/RelationDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.content.Context;
diff --git a/src/com/android/contacts/common/model/dataitem/SipAddressDataItem.java b/src/com/android/contacts/model/dataitem/SipAddressDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/SipAddressDataItem.java
rename to src/com/android/contacts/model/dataitem/SipAddressDataItem.java
index ec704fc..45ebeee 100644
--- a/src/com/android/contacts/common/model/dataitem/SipAddressDataItem.java
+++ b/src/com/android/contacts/model/dataitem/SipAddressDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java b/src/com/android/contacts/model/dataitem/StructuredNameDataItem.java
similarity index 98%
rename from src/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java
rename to src/com/android/contacts/model/dataitem/StructuredNameDataItem.java
index 4d463da..4b69163 100644
--- a/src/com/android/contacts/common/model/dataitem/StructuredNameDataItem.java
+++ b/src/com/android/contacts/model/dataitem/StructuredNameDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java b/src/com/android/contacts/model/dataitem/StructuredPostalDataItem.java
similarity index 97%
rename from src/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java
rename to src/com/android/contacts/model/dataitem/StructuredPostalDataItem.java
index 6cfc0c1..cf46c07 100644
--- a/src/com/android/contacts/common/model/dataitem/StructuredPostalDataItem.java
+++ b/src/com/android/contacts/model/dataitem/StructuredPostalDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/model/dataitem/WebsiteDataItem.java b/src/com/android/contacts/model/dataitem/WebsiteDataItem.java
similarity index 95%
rename from src/com/android/contacts/common/model/dataitem/WebsiteDataItem.java
rename to src/com/android/contacts/model/dataitem/WebsiteDataItem.java
index 0939421..4439be7 100644
--- a/src/com/android/contacts/common/model/dataitem/WebsiteDataItem.java
+++ b/src/com/android/contacts/model/dataitem/WebsiteDataItem.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
similarity index 98%
rename from src/com/android/contacts/common/preference/AboutPreferenceFragment.java
rename to src/com/android/contacts/preference/AboutPreferenceFragment.java
index d8426ba..9ba026e 100644
--- a/src/com/android/contacts/common/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.content.ActivityNotFoundException;
import android.content.Context;
diff --git a/src/com/android/contacts/common/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
similarity index 93%
rename from src/com/android/contacts/common/preference/ContactsPreferenceActivity.java
rename to src/com/android/contacts/preference/ContactsPreferenceActivity.java
index 4bdb12f..4d412be 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.content.res.Configuration;
import android.database.Cursor;
@@ -34,12 +34,12 @@
import android.view.ViewGroup;
import com.android.contacts.common.R;
-import com.android.contacts.common.interactions.ImportDialogFragment;
-import com.android.contacts.common.list.ProviderStatusWatcher;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.DisplayOptionsPreferenceFragment.ProfileListener;
-import com.android.contacts.common.preference.DisplayOptionsPreferenceFragment.ProfileQuery;
-import com.android.contacts.common.util.AccountSelectionUtil;
+import com.android.contacts.interactions.ImportDialogFragment;
+import com.android.contacts.list.ProviderStatusWatcher;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileListener;
+import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileQuery;
+import com.android.contacts.util.AccountSelectionUtil;
import com.android.contacts.editor.SelectAccountDialogFragment;
/**
diff --git a/src/com/android/contacts/common/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java
similarity index 98%
rename from src/com/android/contacts/common/preference/ContactsPreferences.java
rename to src/com/android/contacts/preference/ContactsPreferences.java
index ac7b0e0..f18aedf 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/preference/ContactsPreferences.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.content.Context;
import android.content.SharedPreferences;
@@ -30,7 +30,7 @@
import android.text.TextUtils;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import java.util.List;
diff --git a/src/com/android/contacts/common/preference/DefaultAccountPreference.java b/src/com/android/contacts/preference/DefaultAccountPreference.java
similarity index 91%
rename from src/com/android/contacts/common/preference/DefaultAccountPreference.java
rename to src/com/android/contacts/preference/DefaultAccountPreference.java
index 0fcc8cb..fc23e13 100644
--- a/src/com/android/contacts/common/preference/DefaultAccountPreference.java
+++ b/src/com/android/contacts/preference/DefaultAccountPreference.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.app.AlertDialog;
import android.content.Context;
@@ -23,10 +23,10 @@
import android.util.AttributeSet;
import android.view.View;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountsListAdapter;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountsListAdapter;
public class DefaultAccountPreference extends DialogPreference {
private ContactsPreferences mPreferences;
diff --git a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
similarity index 92%
rename from src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
rename to src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
index e2782f8..37bb8dd 100644
--- a/src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java
+++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.app.Activity;
import android.app.LoaderManager;
@@ -43,20 +43,20 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
-import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
+import com.android.contacts.SimImportService;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.TelecomManagerUtil;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
-import com.android.contacts.common.interactions.ExportDialogFragment;
-import com.android.contacts.common.interactions.ImportDialogFragment;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.compat.TelecomManagerUtil;
+import com.android.contacts.compat.TelephonyManagerCompat;
+import com.android.contacts.interactions.ExportDialogFragment;
+import com.android.contacts.interactions.ImportDialogFragment;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contactsbind.HelpUtils;
import java.util.List;
@@ -192,7 +192,7 @@
mSaveServiceListener = new SaveServiceResultListener();
LocalBroadcastManager.getInstance(getActivity()).registerReceiver(
mSaveServiceListener,
- new IntentFilter(ContactSaveService.BROADCAST_SIM_IMPORT_COMPLETE));
+ new IntentFilter(SimImportService.BROADCAST_SIM_IMPORT_COMPLETE));
}
@Override
@@ -401,20 +401,20 @@
public void onReceive(Context context, Intent intent) {
final long now = System.currentTimeMillis();
final long opStart = intent.getLongExtra(
- ContactSaveService.EXTRA_OPERATION_REQUESTED_AT_TIME, now);
+ SimImportService.EXTRA_OPERATION_REQUESTED_AT_TIME, now);
// If it's been over 30 seconds the user is likely in a different context so suppress
// the toast message.
if (now - opStart > 30*1000) return;
- final int code = intent.getIntExtra(ContactSaveService.EXTRA_RESULT_CODE,
- ContactSaveService.RESULT_UNKNOWN);
- final int count = intent.getIntExtra(ContactSaveService.EXTRA_RESULT_COUNT, -1);
- if (code == ContactSaveService.RESULT_SUCCESS && count > 0) {
+ final int code = intent.getIntExtra(SimImportService.EXTRA_RESULT_CODE,
+ SimImportService.RESULT_UNKNOWN);
+ final int count = intent.getIntExtra(SimImportService.EXTRA_RESULT_COUNT, -1);
+ if (code == SimImportService.RESULT_SUCCESS && count > 0) {
Snackbar.make(mRootView, getResources().getQuantityString(
R.plurals.sim_import_success_toast_fmt, count, count),
Snackbar.LENGTH_LONG).show();
- } else if (code == ContactSaveService.RESULT_FAILURE) {
+ } else if (code == SimImportService.RESULT_FAILURE) {
Snackbar.make(mRootView, R.string.sim_import_failed_toast,
Snackbar.LENGTH_LONG).show();
}
diff --git a/src/com/android/contacts/common/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
similarity index 94%
rename from src/com/android/contacts/common/preference/DisplayOrderPreference.java
rename to src/com/android/contacts/preference/DisplayOrderPreference.java
index 6a182c5..f8a70ab 100644
--- a/src/com/android/contacts/common/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -14,16 +14,14 @@
* limitations under the License.
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.app.AlertDialog.Builder;
import android.content.Context;
import android.preference.ListPreference;
-import android.provider.ContactsContract;
import android.util.AttributeSet;
import com.android.contacts.common.R;
-import com.android.contacts.common.preference.ContactsPreferences;
/**
* Custom preference: view-name-as (first name first or last name first).
diff --git a/src/com/android/contacts/common/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
similarity index 95%
rename from src/com/android/contacts/common/preference/SortOrderPreference.java
rename to src/com/android/contacts/preference/SortOrderPreference.java
index dfd9550..c38eee3 100644
--- a/src/com/android/contacts/common/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.app.AlertDialog.Builder;
import android.content.Context;
@@ -22,7 +22,6 @@
import android.util.AttributeSet;
import com.android.contacts.common.R;
-import com.android.contacts.common.preference.ContactsPreferences;
/**
* Custom preference: sort-by.
diff --git a/src/com/android/contacts/quickcontact/DataAction.java b/src/com/android/contacts/quickcontact/DataAction.java
index 5a49c77..3f95e08 100644
--- a/src/com/android/contacts/quickcontact/DataAction.java
+++ b/src/com/android/contacts/quickcontact/DataAction.java
@@ -33,15 +33,15 @@
import com.android.contacts.common.CallUtil;
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.EmailDataItem;
-import com.android.contacts.common.model.dataitem.ImDataItem;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.SipAddressDataItem;
-import com.android.contacts.common.model.dataitem.StructuredPostalDataItem;
-import com.android.contacts.common.model.dataitem.WebsiteDataItem;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.EmailDataItem;
+import com.android.contacts.model.dataitem.ImDataItem;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.SipAddressDataItem;
+import com.android.contacts.model.dataitem.StructuredPostalDataItem;
+import com.android.contacts.model.dataitem.WebsiteDataItem;
import com.android.contacts.quickcontact.WebAddress.ParseException;
import com.android.contacts.util.PhoneCapabilityTester;
import com.android.contacts.util.StructuredPostalUtils;
diff --git a/src/com/android/contacts/quickcontact/DirectoryContactUtil.java b/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
index c4969cc..117ef1f 100644
--- a/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
+++ b/src/com/android/contacts/quickcontact/DirectoryContactUtil.java
@@ -18,8 +18,8 @@
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.account.AccountWithDataSet;
import android.content.ContentValues;
import android.content.Context;
diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index d7efaf4..49da4c8 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -47,12 +47,11 @@
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.android.contacts.R;
-import com.android.contacts.common.dialog.CallSubjectDialog;
+import com.android.contacts.dialog.CallSubjectDialog;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/quickcontact/InvisibleContactUtil.java b/src/com/android/contacts/quickcontact/InvisibleContactUtil.java
index b31c07b..d10e1fe 100644
--- a/src/com/android/contacts/quickcontact/InvisibleContactUtil.java
+++ b/src/com/android/contacts/quickcontact/InvisibleContactUtil.java
@@ -6,17 +6,17 @@
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
import com.android.contacts.ContactSaveService;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.GroupMembershipDataItem;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.GroupMembershipDataItem;
import com.android.contacts.group.GroupMetaData;
import com.google.common.collect.Iterables;
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index fcd0a50..b0c0493 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -109,46 +109,46 @@
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.activity.RequestDesiredPermissionsActivity;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.compat.EventCompat;
-import com.android.contacts.common.compat.MultiWindowCompat;
-import com.android.contacts.common.dialog.CallSubjectDialog;
-import com.android.contacts.common.interactions.TouchPointManager;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.list.ShortcutIntentBuilder;
-import com.android.contacts.common.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
-import com.android.contacts.common.logging.Logger;
-import com.android.contacts.common.logging.QuickContactEvent.ActionType;
-import com.android.contacts.common.logging.QuickContactEvent.CardType;
-import com.android.contacts.common.logging.QuickContactEvent.ContactType;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.Contact;
-import com.android.contacts.common.model.ContactLoader;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.dataitem.CustomDataItem;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.model.dataitem.EmailDataItem;
-import com.android.contacts.common.model.dataitem.EventDataItem;
-import com.android.contacts.common.model.dataitem.ImDataItem;
-import com.android.contacts.common.model.dataitem.NicknameDataItem;
-import com.android.contacts.common.model.dataitem.NoteDataItem;
-import com.android.contacts.common.model.dataitem.OrganizationDataItem;
-import com.android.contacts.common.model.dataitem.PhoneDataItem;
-import com.android.contacts.common.model.dataitem.RelationDataItem;
-import com.android.contacts.common.model.dataitem.SipAddressDataItem;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
-import com.android.contacts.common.model.dataitem.StructuredPostalDataItem;
-import com.android.contacts.common.model.dataitem.WebsiteDataItem;
-import com.android.contacts.common.util.DateUtils;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
-import com.android.contacts.common.util.MaterialColorMapUtils;
-import com.android.contacts.common.util.MaterialColorMapUtils.MaterialPalette;
-import com.android.contacts.common.util.PermissionsUtil;
-import com.android.contacts.common.util.UriUtils;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.compat.EventCompat;
+import com.android.contacts.compat.MultiWindowCompat;
+import com.android.contacts.dialog.CallSubjectDialog;
+import com.android.contacts.interactions.TouchPointManager;
+import com.android.contacts.lettertiles.LetterTileDrawable;
+import com.android.contacts.list.ShortcutIntentBuilder;
+import com.android.contacts.list.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
+import com.android.contacts.logging.Logger;
+import com.android.contacts.logging.QuickContactEvent.ActionType;
+import com.android.contacts.logging.QuickContactEvent.CardType;
+import com.android.contacts.logging.QuickContactEvent.ContactType;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.Contact;
+import com.android.contacts.model.ContactLoader;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.dataitem.CustomDataItem;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.EmailDataItem;
+import com.android.contacts.model.dataitem.EventDataItem;
+import com.android.contacts.model.dataitem.ImDataItem;
+import com.android.contacts.model.dataitem.NicknameDataItem;
+import com.android.contacts.model.dataitem.NoteDataItem;
+import com.android.contacts.model.dataitem.OrganizationDataItem;
+import com.android.contacts.model.dataitem.PhoneDataItem;
+import com.android.contacts.model.dataitem.RelationDataItem;
+import com.android.contacts.model.dataitem.SipAddressDataItem;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.model.dataitem.StructuredPostalDataItem;
+import com.android.contacts.model.dataitem.WebsiteDataItem;
+import com.android.contacts.util.DateUtils;
+import com.android.contacts.util.ImplicitIntentsUtil;
+import com.android.contacts.util.MaterialColorMapUtils;
+import com.android.contacts.util.MaterialColorMapUtils.MaterialPalette;
+import com.android.contacts.util.PermissionsUtil;
+import com.android.contacts.util.UriUtils;
+import com.android.contacts.util.ViewUtil;
import com.android.contacts.detail.ContactDisplayUtils;
import com.android.contacts.editor.ContactEditorFragment;
import com.android.contacts.editor.EditorIntents;
@@ -1723,7 +1723,7 @@
}
}
primaryContentDescription.append(header);
- phoneContentDescription = com.android.contacts.common.util.ContactDisplayUtils
+ phoneContentDescription = com.android.contacts.util.ContactDisplayUtils
.getTelephoneTtsSpannable(primaryContentDescription.toString(), header);
icon = res.getDrawable(R.drawable.ic_phone_24dp);
iconResourceId = R.drawable.ic_phone_24dp;
@@ -1737,7 +1737,7 @@
alternateIcon = res.getDrawable(R.drawable.ic_message_24dp_mirrored);
alternateContentDescription.append(res.getString(R.string.sms_custom, header));
- smsContentDescription = com.android.contacts.common.util.ContactDisplayUtils
+ smsContentDescription = com.android.contacts.util.ContactDisplayUtils
.getTelephoneTtsSpannable(alternateContentDescription.toString(), header);
int videoCapability = CallUtil.getVideoCallingAvailability(context);
diff --git a/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java b/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java
index dae10af..b3cbc48 100644
--- a/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java
+++ b/src/com/android/contacts/quickcontact/QuickContactBroadcastReceiver.java
@@ -16,7 +16,7 @@
package com.android.contacts.quickcontact;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
import android.content.BroadcastReceiver;
import android.content.Context;
diff --git a/src/com/android/contacts/common/testing/InjectedServices.java b/src/com/android/contacts/testing/InjectedServices.java
similarity index 94%
rename from src/com/android/contacts/common/testing/InjectedServices.java
rename to src/com/android/contacts/testing/InjectedServices.java
index 3b90676..3822dd6 100644
--- a/src/com/android/contacts/common/testing/InjectedServices.java
+++ b/src/com/android/contacts/testing/InjectedServices.java
@@ -14,12 +14,11 @@
* limitations under the License.
*/
-package com.android.contacts.common.testing;
+package com.android.contacts.testing;
import android.content.ContentResolver;
import android.content.SharedPreferences;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Maps;
import java.util.HashMap;
diff --git a/src/com/android/contacts/common/util/AccountFilterUtil.java b/src/com/android/contacts/util/AccountFilterUtil.java
similarity index 93%
rename from src/com/android/contacts/common/util/AccountFilterUtil.java
rename to src/com/android/contacts/util/AccountFilterUtil.java
index 96c5113..0c36f5e 100644
--- a/src/com/android/contacts/common/util/AccountFilterUtil.java
+++ b/src/com/android/contacts/util/AccountFilterUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.accounts.Account;
import android.app.Activity;
@@ -32,15 +32,15 @@
import com.android.contacts.R;
import com.android.contacts.activities.ContactEditorActivity;
-import com.android.contacts.common.list.AccountFilterActivity;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.ContactListFilterController;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.list.AccountFilterActivity;
+import com.android.contacts.list.ContactListFilter;
+import com.android.contacts.list.ContactListFilterController;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
import com.android.contactsbind.ObjectFactory;
import com.google.common.collect.Lists;
diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
similarity index 96%
rename from src/com/android/contacts/common/util/AccountSelectionUtil.java
rename to src/com/android/contacts/util/AccountSelectionUtil.java
index 9fca64d..5fefd86 100644
--- a/src/com/android/contacts/common/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.app.Activity;
import android.app.AlertDialog;
@@ -33,10 +33,10 @@
import android.widget.TextView;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.vcard.ImportVCardActivity;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.vcard.ImportVCardActivity;
import java.util.List;
diff --git a/src/com/android/contacts/common/util/AccountsListAdapter.java b/src/com/android/contacts/util/AccountsListAdapter.java
similarity index 93%
rename from src/com/android/contacts/common/util/AccountsListAdapter.java
rename to src/com/android/contacts/util/AccountsListAdapter.java
index a437929..cda4d4b 100644
--- a/src/com/android/contacts/common/util/AccountsListAdapter.java
+++ b/src/com/android/contacts/util/AccountsListAdapter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.Context;
import android.view.LayoutInflater;
@@ -24,11 +24,11 @@
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/contacts/common/util/BitmapUtil.java b/src/com/android/contacts/util/BitmapUtil.java
similarity index 99%
rename from src/com/android/contacts/common/util/BitmapUtil.java
rename to src/com/android/contacts/util/BitmapUtil.java
index 5cd856e..a4e3096 100644
--- a/src/com/android/contacts/common/util/BitmapUtil.java
+++ b/src/com/android/contacts/util/BitmapUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
diff --git a/src/com/android/contacts/common/util/CommonDateUtils.java b/src/com/android/contacts/util/CommonDateUtils.java
similarity index 96%
rename from src/com/android/contacts/common/util/CommonDateUtils.java
rename to src/com/android/contacts/util/CommonDateUtils.java
index bba910a..6be6302 100644
--- a/src/com/android/contacts/common/util/CommonDateUtils.java
+++ b/src/com/android/contacts/util/CommonDateUtils.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import java.text.SimpleDateFormat;
import java.util.Locale;
diff --git a/src/com/android/contacts/common/util/Constants.java b/src/com/android/contacts/util/Constants.java
similarity index 95%
rename from src/com/android/contacts/common/util/Constants.java
rename to src/com/android/contacts/util/Constants.java
index c0d6755..e4ca027 100644
--- a/src/com/android/contacts/common/util/Constants.java
+++ b/src/com/android/contacts/util/Constants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
public class Constants {
diff --git a/src/com/android/contacts/common/util/ContactDisplayUtils.java b/src/com/android/contacts/util/ContactDisplayUtils.java
similarity index 98%
rename from src/com/android/contacts/common/util/ContactDisplayUtils.java
rename to src/com/android/contacts/util/ContactDisplayUtils.java
index 0a50748..f61a257 100644
--- a/src/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/src/com/android/contacts/util/ContactDisplayUtils.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import static android.provider.ContactsContract.CommonDataKinds.Phone;
@@ -31,8 +31,8 @@
import android.util.Patterns;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.preference.ContactsPreferences;
/**
* Methods for handling various contact data labels.
diff --git a/src/com/android/contacts/common/util/ContactLoaderUtils.java b/src/com/android/contacts/util/ContactLoaderUtils.java
similarity index 98%
rename from src/com/android/contacts/common/util/ContactLoaderUtils.java
rename to src/com/android/contacts/util/ContactLoaderUtils.java
index 0ec8887..91c683f 100644
--- a/src/com/android/contacts/common/util/ContactLoaderUtils.java
+++ b/src/com/android/contacts/util/ContactLoaderUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.ContentResolver;
import android.content.ContentUris;
diff --git a/src/com/android/contacts/common/util/DataStatus.java b/src/com/android/contacts/util/DataStatus.java
similarity index 98%
rename from src/com/android/contacts/common/util/DataStatus.java
rename to src/com/android/contacts/util/DataStatus.java
index 76f11b6..ff3c7d3 100644
--- a/src/com/android/contacts/common/util/DataStatus.java
+++ b/src/com/android/contacts/util/DataStatus.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.Context;
import android.content.pm.PackageManager;
diff --git a/src/com/android/contacts/common/util/DateUtils.java b/src/com/android/contacts/util/DateUtils.java
similarity index 99%
rename from src/com/android/contacts/common/util/DateUtils.java
rename to src/com/android/contacts/util/DateUtils.java
index 097230c..c460782 100644
--- a/src/com/android/contacts/common/util/DateUtils.java
+++ b/src/com/android/contacts/util/DateUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.Context;
import android.text.format.DateFormat;
diff --git a/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java b/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java
similarity index 90%
rename from src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
rename to src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java
index 040a6b4..59ee7e5 100644
--- a/src/com/android/contacts/common/util/DeviceLocalAccountTypeFactory.java
+++ b/src/com/android/contacts/util/DeviceLocalAccountTypeFactory.java
@@ -13,14 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.Context;
import android.support.annotation.IntDef;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.DeviceLocalAccountType;
-import com.android.contacts.common.model.account.FallbackAccountType;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.DeviceLocalAccountType;
import java.lang.annotation.Retention;
diff --git a/src/com/android/contacts/common/util/EmptyService.java b/src/com/android/contacts/util/EmptyService.java
similarity index 95%
rename from src/com/android/contacts/common/util/EmptyService.java
rename to src/com/android/contacts/util/EmptyService.java
index c5c3608..2e6a159 100644
--- a/src/com/android/contacts/common/util/EmptyService.java
+++ b/src/com/android/contacts/util/EmptyService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.app.Service;
import android.content.Intent;
diff --git a/src/com/android/contacts/util/ImageViewDrawableSetter.java b/src/com/android/contacts/util/ImageViewDrawableSetter.java
index 6147c39..07b7a79 100644
--- a/src/com/android/contacts/util/ImageViewDrawableSetter.java
+++ b/src/com/android/contacts/util/ImageViewDrawableSetter.java
@@ -28,8 +28,8 @@
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.model.Contact;
+import com.android.contacts.lettertiles.LetterTileDrawable;
+import com.android.contacts.model.Contact;
import java.util.Arrays;
diff --git a/src/com/android/contacts/common/util/ImplicitIntentsUtil.java b/src/com/android/contacts/util/ImplicitIntentsUtil.java
similarity index 97%
rename from src/com/android/contacts/common/util/ImplicitIntentsUtil.java
rename to src/com/android/contacts/util/ImplicitIntentsUtil.java
index d30f495..171bbd6 100644
--- a/src/com/android/contacts/common/util/ImplicitIntentsUtil.java
+++ b/src/com/android/contacts/util/ImplicitIntentsUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.app.Activity;
import android.content.Context;
@@ -29,15 +29,15 @@
import android.text.TextUtils;
import com.android.contacts.common.Experiments;
-import com.android.contacts.common.logging.ScreenEvent.ScreenType;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.logging.ScreenEvent.ScreenType;
+import com.android.contacts.model.account.GoogleAccountType;
import com.android.contacts.quickcontact.QuickContactActivity;
import com.android.contactsbind.ObjectFactory;
import com.android.contactsbind.experiments.Flags;
import java.util.List;
-import static com.android.contacts.common.list.ShortcutIntentBuilder.INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION;
+import static com.android.contacts.list.ShortcutIntentBuilder.INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION;
/**
* Utility for forcing intents to be started inside the current app. This is useful for avoiding
diff --git a/src/com/android/contacts/common/util/LocalizedNameResolver.java b/src/com/android/contacts/util/LocalizedNameResolver.java
similarity index 97%
rename from src/com/android/contacts/common/util/LocalizedNameResolver.java
rename to src/com/android/contacts/util/LocalizedNameResolver.java
index 92104c4..73f07ad 100644
--- a/src/com/android/contacts/common/util/LocalizedNameResolver.java
+++ b/src/com/android/contacts/util/LocalizedNameResolver.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
@@ -26,11 +26,10 @@
import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
import android.util.AttributeSet;
-import android.util.Log;
import android.util.Xml;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.account.ExternalAccountType;
+import com.android.contacts.model.account.ExternalAccountType;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/src/com/android/contacts/common/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java
similarity index 99%
rename from src/com/android/contacts/common/util/MaterialColorMapUtils.java
rename to src/com/android/contacts/util/MaterialColorMapUtils.java
index 50d8f0f..f940885 100644
--- a/src/com/android/contacts/common/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.R;
diff --git a/src/com/android/contacts/common/util/NameConverter.java b/src/com/android/contacts/util/NameConverter.java
similarity index 97%
rename from src/com/android/contacts/common/util/NameConverter.java
rename to src/com/android/contacts/util/NameConverter.java
index 227a0ec..2d9f6fd 100644
--- a/src/com/android/contacts/common/util/NameConverter.java
+++ b/src/com/android/contacts/util/NameConverter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.ContentValues;
@@ -25,7 +25,7 @@
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.text.TextUtils;
-import com.android.contacts.common.model.dataitem.StructuredNameDataItem;
+import com.android.contacts.model.dataitem.StructuredNameDataItem;
/**
* Utility class for converting between a display name and structured name (and vice-versa), via
diff --git a/src/com/android/contacts/common/util/PermissionsUtil.java b/src/com/android/contacts/util/PermissionsUtil.java
similarity index 98%
rename from src/com/android/contacts/common/util/PermissionsUtil.java
rename to src/com/android/contacts/util/PermissionsUtil.java
index 37c1762..c56b13e 100644
--- a/src/com/android/contacts/common/util/PermissionsUtil.java
+++ b/src/com/android/contacts/util/PermissionsUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.Manifest.permission;
import android.app.AppOpsManager;
diff --git a/src/com/android/contacts/util/PhoneCapabilityTester.java b/src/com/android/contacts/util/PhoneCapabilityTester.java
index d1373f4..5e628be 100644
--- a/src/com/android/contacts/util/PhoneCapabilityTester.java
+++ b/src/com/android/contacts/util/PhoneCapabilityTester.java
@@ -28,7 +28,7 @@
import android.telephony.TelephonyManager;
import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.compat.TelephonyManagerCompat;
+import com.android.contacts.compat.TelephonyManagerCompat;
import java.util.List;
diff --git a/src/com/android/contacts/common/util/PhoneNumberFormatter.java b/src/com/android/contacts/util/PhoneNumberFormatter.java
similarity index 96%
rename from src/com/android/contacts/common/util/PhoneNumberFormatter.java
rename to src/com/android/contacts/util/PhoneNumberFormatter.java
index bbf9785..2a7058c 100644
--- a/src/com/android/contacts/common/util/PhoneNumberFormatter.java
+++ b/src/com/android/contacts/util/PhoneNumberFormatter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.Context;
import android.os.AsyncTask;
@@ -22,7 +22,7 @@
import android.widget.TextView;
import com.android.contacts.common.GeoUtil;
-import com.android.contacts.common.compat.PhoneNumberFormattingTextWatcherCompat;
+import com.android.contacts.compat.PhoneNumberFormattingTextWatcherCompat;
public final class PhoneNumberFormatter {
private PhoneNumberFormatter() {}
diff --git a/src/com/android/contacts/common/util/PhoneNumberHelper.java b/src/com/android/contacts/util/PhoneNumberHelper.java
similarity index 96%
rename from src/com/android/contacts/common/util/PhoneNumberHelper.java
rename to src/com/android/contacts/util/PhoneNumberHelper.java
index 794b6dd..d05bcd6 100644
--- a/src/com/android/contacts/common/util/PhoneNumberHelper.java
+++ b/src/com/android/contacts/util/PhoneNumberHelper.java
@@ -13,11 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
-import android.content.Context;
import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
import android.util.Log;
import com.google.i18n.phonenumbers.NumberParseException;
@@ -25,8 +23,6 @@
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
import com.google.i18n.phonenumbers.ShortNumberInfo;
-import java.util.Locale;
-
/**
* This class wraps several PhoneNumberUtil calls and TelephonyManager calls. Some of them are
* the same as the ones in the framework's code base. We can remove those once they are part of
diff --git a/src/com/android/contacts/util/SchedulingUtils.java b/src/com/android/contacts/util/SchedulingUtils.java
index fbb2458..f851339 100644
--- a/src/com/android/contacts/util/SchedulingUtils.java
+++ b/src/com/android/contacts/util/SchedulingUtils.java
@@ -17,7 +17,6 @@
package com.android.contacts.util;
import android.view.View;
-import android.view.ViewTreeObserver.OnDrawListener;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.view.ViewTreeObserver.OnPreDrawListener;
diff --git a/src/com/android/contacts/common/util/SearchUtil.java b/src/com/android/contacts/util/SearchUtil.java
similarity index 99%
rename from src/com/android/contacts/common/util/SearchUtil.java
rename to src/com/android/contacts/util/SearchUtil.java
index ed41d6c..d80fc53 100644
--- a/src/com/android/contacts/common/util/SearchUtil.java
+++ b/src/com/android/contacts/util/SearchUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import com.google.common.annotations.VisibleForTesting;
diff --git a/src/com/android/contacts/util/SharedPreferenceUtil.java b/src/com/android/contacts/util/SharedPreferenceUtil.java
index 3d138fb..ada7a57 100644
--- a/src/com/android/contacts/util/SharedPreferenceUtil.java
+++ b/src/com/android/contacts/util/SharedPreferenceUtil.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.SharedPreferences;
-import com.android.contacts.common.model.SimCard;
+import com.android.contacts.model.SimCard;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/src/com/android/contacts/common/util/StopWatch.java b/src/com/android/contacts/util/StopWatch.java
similarity index 98%
rename from src/com/android/contacts/common/util/StopWatch.java
rename to src/com/android/contacts/util/StopWatch.java
index 581d6ee..c53f346 100644
--- a/src/com/android/contacts/common/util/StopWatch.java
+++ b/src/com/android/contacts/util/StopWatch.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.util.Log;
diff --git a/src/com/android/contacts/util/SyncUtil.java b/src/com/android/contacts/util/SyncUtil.java
index 34e6e8c..0d6c494 100644
--- a/src/com/android/contacts/util/SyncUtil.java
+++ b/src/com/android/contacts/util/SyncUtil.java
@@ -22,9 +22,7 @@
import android.net.NetworkInfo;
import android.provider.ContactsContract;
-import com.android.contacts.common.model.account.GoogleAccountType;
-
-import java.util.List;
+import com.android.contacts.model.account.GoogleAccountType;
/**
* Utilities related to sync.
diff --git a/src/com/android/contacts/common/util/TelephonyManagerUtils.java b/src/com/android/contacts/util/TelephonyManagerUtils.java
similarity index 95%
rename from src/com/android/contacts/common/util/TelephonyManagerUtils.java
rename to src/com/android/contacts/util/TelephonyManagerUtils.java
index 7c322ca..ef1544c 100644
--- a/src/com/android/contacts/common/util/TelephonyManagerUtils.java
+++ b/src/com/android/contacts/util/TelephonyManagerUtils.java
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.Context;
-import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
-import android.text.TextUtils;
import android.util.Log;
import java.util.Locale;
diff --git a/src/com/android/contacts/common/util/TrafficStatsTags.java b/src/com/android/contacts/util/TrafficStatsTags.java
similarity index 94%
rename from src/com/android/contacts/common/util/TrafficStatsTags.java
rename to src/com/android/contacts/util/TrafficStatsTags.java
index 78faa94..617aa4d 100644
--- a/src/com/android/contacts/common/util/TrafficStatsTags.java
+++ b/src/com/android/contacts/util/TrafficStatsTags.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
public class TrafficStatsTags {
public static final int CONTACT_PHOTO_DOWNLOAD_TAG = 0x0001;
diff --git a/src/com/android/contacts/common/util/UriUtils.java b/src/com/android/contacts/util/UriUtils.java
similarity index 98%
rename from src/com/android/contacts/common/util/UriUtils.java
rename to src/com/android/contacts/util/UriUtils.java
index 41ef62f..419304f 100644
--- a/src/com/android/contacts/common/util/UriUtils.java
+++ b/src/com/android/contacts/util/UriUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.net.Uri;
import android.provider.ContactsContract;
diff --git a/src/com/android/contacts/common/util/ViewUtil.java b/src/com/android/contacts/util/ViewUtil.java
similarity index 97%
rename from src/com/android/contacts/common/util/ViewUtil.java
rename to src/com/android/contacts/util/ViewUtil.java
index 895b757..0ced727 100644
--- a/src/com/android/contacts/common/util/ViewUtil.java
+++ b/src/com/android/contacts/util/ViewUtil.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.content.res.Resources;
import android.graphics.Outline;
@@ -24,7 +24,7 @@
import android.widget.ListView;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
/**
* Provides static functions to work with views
diff --git a/src/com/android/contacts/common/util/WeakAsyncTask.java b/src/com/android/contacts/util/WeakAsyncTask.java
similarity index 97%
rename from src/com/android/contacts/common/util/WeakAsyncTask.java
rename to src/com/android/contacts/util/WeakAsyncTask.java
index f46e514..f60cfd7 100644
--- a/src/com/android/contacts/common/util/WeakAsyncTask.java
+++ b/src/com/android/contacts/util/WeakAsyncTask.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.os.AsyncTask;
diff --git a/src/com/android/contacts/common/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/CancelActivity.java
rename to src/com/android/contacts/vcard/CancelActivity.java
index 8e393e1..6354944 100644
--- a/src/com/android/contacts/common/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/vcard/CancelRequest.java b/src/com/android/contacts/vcard/CancelRequest.java
similarity index 95%
rename from src/com/android/contacts/common/vcard/CancelRequest.java
rename to src/com/android/contacts/vcard/CancelRequest.java
index a5eb4aa..0b4baee 100644
--- a/src/com/android/contacts/common/vcard/CancelRequest.java
+++ b/src/com/android/contacts/vcard/CancelRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
/**
* Class representing one request for canceling vCard import/export.
diff --git a/src/com/android/contacts/common/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/ExportProcessor.java
rename to src/com/android/contacts/vcard/ExportProcessor.java
index 48420da..27a7601 100644
--- a/src/com/android/contacts/common/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Notification;
import android.app.NotificationManager;
diff --git a/src/com/android/contacts/common/vcard/ExportRequest.java b/src/com/android/contacts/vcard/ExportRequest.java
similarity index 95%
rename from src/com/android/contacts/common/vcard/ExportRequest.java
rename to src/com/android/contacts/vcard/ExportRequest.java
index e05a32c..65e395e 100644
--- a/src/com/android/contacts/common/vcard/ExportRequest.java
+++ b/src/com/android/contacts/vcard/ExportRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.net.Uri;
diff --git a/src/com/android/contacts/common/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/ExportVCardActivity.java
rename to src/com/android/contacts/vcard/ExportVCardActivity.java
index 18de505..a6c96ea 100644
--- a/src/com/android/contacts/common/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/vcard/ImportProcessor.java b/src/com/android/contacts/vcard/ImportProcessor.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/ImportProcessor.java
rename to src/com/android/contacts/vcard/ImportProcessor.java
index 36836c6..d6483b8 100644
--- a/src/com/android/contacts/common/vcard/ImportProcessor.java
+++ b/src/com/android/contacts/vcard/ImportProcessor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.accounts.Account;
import android.content.ContentResolver;
diff --git a/src/com/android/contacts/common/vcard/ImportRequest.java b/src/com/android/contacts/vcard/ImportRequest.java
similarity index 96%
rename from src/com/android/contacts/common/vcard/ImportRequest.java
rename to src/com/android/contacts/vcard/ImportRequest.java
index 32efb99..6e9470f 100644
--- a/src/com/android/contacts/common/vcard/ImportRequest.java
+++ b/src/com/android/contacts/vcard/ImportRequest.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.accounts.Account;
import android.net.Uri;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.vcard.VCardSourceDetector;
/**
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ImportVCardActivity.java
rename to src/com/android/contacts/vcard/ImportVCardActivity.java
index e5fab4e..e65c3d5 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Activity;
import android.app.AlertDialog;
@@ -42,8 +42,8 @@
import com.android.contacts.common.R;
import com.android.contacts.common.activity.RequestImportVCardPermissionsActivity;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contactsbind.FeedbackHelper;
import com.android.vcard.VCardEntryCounter;
import com.android.vcard.VCardParser;
@@ -92,10 +92,10 @@
private static final int FAILURE_NOTIFICATION_ID = 1;
private static final String LOCAL_TMP_FILE_NAME_EXTRA =
- "com.android.contacts.common.vcard.LOCAL_TMP_FILE_NAME";
+ "com.android.contacts.vcard.LOCAL_TMP_FILE_NAME";
private static final String SOURCE_URI_DISPLAY_NAME =
- "com.android.contacts.common.vcard.SOURCE_URI_DISPLAY_NAME";
+ "com.android.contacts.vcard.SOURCE_URI_DISPLAY_NAME";
private static final String STORAGE_VCARD_URI_PREFIX = "file:///storage";
diff --git a/src/com/android/contacts/common/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ImportVCardDialogFragment.java
rename to src/com/android/contacts/vcard/ImportVCardDialogFragment.java
index b1f1c3b..521a610 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardDialogFragment.java
+++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/contacts/common/vcard/NfcImportVCardActivity.java b/src/com/android/contacts/vcard/NfcImportVCardActivity.java
similarity index 97%
rename from src/com/android/contacts/common/vcard/NfcImportVCardActivity.java
rename to src/com/android/contacts/vcard/NfcImportVCardActivity.java
index f2ddcab..bcf375a 100644
--- a/src/com/android/contacts/common/vcard/NfcImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/NfcImportVCardActivity.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Activity;
import android.app.Notification;
@@ -37,9 +37,9 @@
import com.android.contacts.common.R;
import com.android.contacts.common.activity.RequestPermissionsActivity;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.ImplicitIntentsUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.ImplicitIntentsUtil;
import com.android.contactsbind.FeedbackHelper;
import com.android.vcard.VCardEntry;
import com.android.vcard.VCardEntryCounter;
diff --git a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java b/src/com/android/contacts/vcard/NotificationImportExportListener.java
similarity index 99%
rename from src/com/android/contacts/common/vcard/NotificationImportExportListener.java
rename to src/com/android/contacts/vcard/NotificationImportExportListener.java
index 2ac8c1c..247f399 100644
--- a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Activity;
import android.app.Notification;
diff --git a/src/com/android/contacts/common/vcard/ProcessorBase.java b/src/com/android/contacts/vcard/ProcessorBase.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ProcessorBase.java
rename to src/com/android/contacts/vcard/ProcessorBase.java
index abc859d..1ce21cf 100644
--- a/src/com/android/contacts/common/vcard/ProcessorBase.java
+++ b/src/com/android/contacts/vcard/ProcessorBase.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
diff --git a/src/com/android/contacts/common/vcard/SelectAccountActivity.java b/src/com/android/contacts/vcard/SelectAccountActivity.java
similarity index 94%
rename from src/com/android/contacts/common/vcard/SelectAccountActivity.java
rename to src/com/android/contacts/vcard/SelectAccountActivity.java
index 387f3fb..a0583d2 100644
--- a/src/com/android/contacts/common/vcard/SelectAccountActivity.java
+++ b/src/com/android/contacts/vcard/SelectAccountActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Activity;
import android.app.Dialog;
@@ -23,9 +23,9 @@
import android.util.Log;
import com.android.contacts.common.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.util.AccountSelectionUtil;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.util.AccountSelectionUtil;
import java.util.List;
diff --git a/src/com/android/contacts/common/vcard/ShareVCardActivity.java b/src/com/android/contacts/vcard/ShareVCardActivity.java
similarity index 98%
rename from src/com/android/contacts/common/vcard/ShareVCardActivity.java
rename to src/com/android/contacts/vcard/ShareVCardActivity.java
index 26d20d1..ba6ce92 100644
--- a/src/com/android/contacts/common/vcard/ShareVCardActivity.java
+++ b/src/com/android/contacts/vcard/ShareVCardActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.content.ComponentName;
import android.net.Uri;
diff --git a/src/com/android/contacts/common/vcard/VCardCommonArguments.java b/src/com/android/contacts/vcard/VCardCommonArguments.java
similarity index 95%
rename from src/com/android/contacts/common/vcard/VCardCommonArguments.java
rename to src/com/android/contacts/vcard/VCardCommonArguments.java
index c423ca3..06b49a2 100644
--- a/src/com/android/contacts/common/vcard/VCardCommonArguments.java
+++ b/src/com/android/contacts/vcard/VCardCommonArguments.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
/**
* Argument constants used by many activities and services.
diff --git a/src/com/android/contacts/common/vcard/VCardImportExportListener.java b/src/com/android/contacts/vcard/VCardImportExportListener.java
similarity index 96%
rename from src/com/android/contacts/common/vcard/VCardImportExportListener.java
rename to src/com/android/contacts/vcard/VCardImportExportListener.java
index e4e4893..82d7c21 100644
--- a/src/com/android/contacts/common/vcard/VCardImportExportListener.java
+++ b/src/com/android/contacts/vcard/VCardImportExportListener.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.net.Uri;
diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/vcard/VCardService.java
similarity index 97%
rename from src/com/android/contacts/common/vcard/VCardService.java
rename to src/com/android/contacts/vcard/VCardService.java
index 1d7837b..721c2e4 100644
--- a/src/com/android/contacts/common/vcard/VCardService.java
+++ b/src/com/android/contacts/vcard/VCardService.java
@@ -13,31 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.vcard;
+package com.android.contacts.vcard;
import android.app.Service;
import android.content.Intent;
-import android.content.res.Resources;
import android.media.MediaScannerConnection;
import android.media.MediaScannerConnection.MediaScannerConnectionClient;
import android.net.Uri;
import android.os.Binder;
-import android.os.Environment;
import android.os.IBinder;
-import android.os.Message;
-import android.os.Messenger;
-import android.os.RemoteException;
-import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
import com.android.contacts.common.R;
-import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/src/com/android/contacts/common/widget/ActivityTouchLinearLayout.java b/src/com/android/contacts/widget/ActivityTouchLinearLayout.java
similarity index 92%
rename from src/com/android/contacts/common/widget/ActivityTouchLinearLayout.java
rename to src/com/android/contacts/widget/ActivityTouchLinearLayout.java
index d81526e..bcedb72 100644
--- a/src/com/android/contacts/common/widget/ActivityTouchLinearLayout.java
+++ b/src/com/android/contacts/widget/ActivityTouchLinearLayout.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.LinearLayout;
-import com.android.contacts.common.interactions.TouchPointManager;
+import com.android.contacts.interactions.TouchPointManager;
/**
* Linear layout for an activity that listens to all touch events on the screen and saves the touch
diff --git a/src/com/android/contacts/common/widget/FloatingActionButtonController.java b/src/com/android/contacts/widget/FloatingActionButtonController.java
similarity index 98%
rename from src/com/android/contacts/common/widget/FloatingActionButtonController.java
rename to src/com/android/contacts/widget/FloatingActionButtonController.java
index 0e94df1..9f35049 100644
--- a/src/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/widget/FloatingActionButtonController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
import android.app.Activity;
import android.content.res.Resources;
@@ -24,7 +24,7 @@
import android.view.View;
import android.widget.ImageButton;
-import com.android.contacts.common.util.ViewUtil;
+import com.android.contacts.util.ViewUtil;
import com.android.contacts.common.R;
import com.android.phone.common.animation.AnimUtils;
diff --git a/src/com/android/contacts/common/widget/LayoutSuppressingImageView.java b/src/com/android/contacts/widget/LayoutSuppressingImageView.java
similarity index 96%
rename from src/com/android/contacts/common/widget/LayoutSuppressingImageView.java
rename to src/com/android/contacts/widget/LayoutSuppressingImageView.java
index abcf786..d80aeea 100644
--- a/src/com/android/contacts/common/widget/LayoutSuppressingImageView.java
+++ b/src/com/android/contacts/widget/LayoutSuppressingImageView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
import android.content.Context;
import android.util.AttributeSet;
diff --git a/src/com/android/contacts/common/widget/LayoutSuppressingQuickContactBadge.java b/src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
similarity index 96%
rename from src/com/android/contacts/common/widget/LayoutSuppressingQuickContactBadge.java
rename to src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
index 1f48f5d..3413e53 100644
--- a/src/com/android/contacts/common/widget/LayoutSuppressingQuickContactBadge.java
+++ b/src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
import android.content.Context;
import android.util.AttributeSet;
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index b86bebf..245f781 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -1,7 +1,7 @@
package com.android.contacts.widget;
import com.android.contacts.R;
-import com.android.contacts.common.compat.CompatUtils;
+import com.android.contacts.compat.CompatUtils;
import com.android.contacts.compat.EdgeEffectCompat;
import com.android.contacts.quickcontact.ExpandingEntryCardView;
import com.android.contacts.test.NeededForReflection;
diff --git a/src/com/android/contacts/common/widget/ProportionalLayout.java b/src/com/android/contacts/widget/ProportionalLayout.java
similarity index 98%
rename from src/com/android/contacts/common/widget/ProportionalLayout.java
rename to src/com/android/contacts/widget/ProportionalLayout.java
index 5a5ac29..b60d2a4 100644
--- a/src/com/android/contacts/common/widget/ProportionalLayout.java
+++ b/src/com/android/contacts/widget/ProportionalLayout.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
import android.content.Context;
import android.content.res.TypedArray;
diff --git a/src/com/android/contacts/widget/QuickContactImageView.java b/src/com/android/contacts/widget/QuickContactImageView.java
index f85fe16..4c21670 100644
--- a/src/com/android/contacts/widget/QuickContactImageView.java
+++ b/src/com/android/contacts/widget/QuickContactImageView.java
@@ -1,6 +1,6 @@
package com.android.contacts.widget;
-import com.android.contacts.common.lettertiles.LetterTileDrawable;
+import com.android.contacts.lettertiles.LetterTileDrawable;
import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
diff --git a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
similarity index 97%
rename from src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
rename to src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
index 709ce41..8b7bb5f 100644
--- a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
@@ -14,14 +14,13 @@
* limitations under the License
*/
-package com.android.contacts.common.widget;
+package com.android.contacts.widget;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.Context;
import android.content.DialogInterface;
-import android.graphics.drawable.Icon;
import android.os.Bundle;
import android.os.Handler;
import android.os.ResultReceiver;
@@ -41,8 +40,8 @@
import android.widget.TextView;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.PhoneAccountCompat;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
+import com.android.contacts.compat.PhoneAccountCompat;
+import com.android.contacts.compat.PhoneNumberUtilsCompat;
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
index 9b9b4fe..4057ee8 100644
--- a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
+++ b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
@@ -32,7 +32,7 @@
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.MediumTest;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import java.util.ArrayList;
import java.util.List;
diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
index c9ea3b6..3231ff9 100644
--- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
+++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java
@@ -17,7 +17,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import static com.android.contacts.common.util.PermissionsUtil.hasPermission;
+import static com.android.contacts.util.PermissionsUtil.hasPermission;
import static org.junit.Assume.assumeTrue;
/**
diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index bb463e8..9ff3f95 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -18,37 +18,29 @@
import android.content.ContentUris;
import android.content.ContentValues;
-import android.content.Intent;
-import android.content.Loader;
import android.net.Uri;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Directory;
import android.provider.ContactsContract.Groups;
import android.provider.ContactsContract.ProviderStatus;
-import android.provider.Settings;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
-import android.widget.TextView;
import com.android.contacts.ContactsApplication;
import com.android.contacts.R;
import com.android.contacts.common.ContactPhotoManager;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.testing.InjectedServices;
import com.android.contacts.common.test.mocks.ContactsMockContext;
import com.android.contacts.common.test.mocks.MockContentProvider;
import com.android.contacts.common.test.mocks.MockContentProvider.Query;
-import com.android.contacts.interactions.TestLoaderManager;
-import com.android.contacts.list.ContactBrowseListFragment;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.BaseAccountType;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.BaseAccountType;
import com.android.contacts.common.test.mocks.MockAccountTypeManager;
import com.android.contacts.common.test.mocks.MockContactPhotoManager;
import com.android.contacts.common.test.mocks.MockSharedPreferences;
-import com.android.contacts.util.PhoneCapabilityTester;
/**
* This test is so outdated that it's disabled temporarily. TODO Update the test and re-enable it.
diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
new file mode 100644
index 0000000..98e61f6
--- /dev/null
+++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
@@ -0,0 +1,263 @@
+package com.android.contacts.activities;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.database.Cursor;
+import android.os.Build;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Data;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.Suppress;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.tests.AccountsTestHelper;
+import com.android.contacts.tests.ContactsMatchers;
+import com.android.contacts.tests.FakeSimContactDao;
+import com.android.contacts.tests.StringableCursor;
+import com.google.common.base.Functions;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasMimeType;
+import static com.android.contacts.tests.ContactsMatchers.hasRowMatching;
+import static com.android.contacts.tests.ContactsMatchers.hasValueForColumn;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * UI Tests for {@link SimImportActivity}
+ *
+ * These should probably be converted to espresso tests because espresso does a better job of
+ * waiting for the app to be idle once espresso library is added
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.M)
+@TargetApi(Build.VERSION_CODES.M)
+public class SimImportActivityTest {
+
+ public static final int TIMEOUT = 1000;
+ private Context mContext;
+ private UiDevice mDevice;
+ private Instrumentation mInstrumentation;
+ private FakeSimContactDao mDao;
+ private AccountsTestHelper mAccountHelper;
+
+ @Before
+ public void setUp() throws Exception {
+ mContext = InstrumentationRegistry.getTargetContext();
+ mInstrumentation = InstrumentationRegistry.getInstrumentation();
+ mDao = new FakeSimContactDao();
+ SimContactDao.setFactoryForTest(Functions.<SimContactDao>constant(mDao));
+ mDevice = UiDevice.getInstance(mInstrumentation);
+
+ // Add some test accounts so that account picker is exercised
+ mAccountHelper = new AccountsTestHelper();
+ mAccountHelper.addTestAccount(mAccountHelper.generateAccountName("SimImportActivity1_"));
+ mAccountHelper.addTestAccount(mAccountHelper.generateAccountName("SimImportActivity2_"));
+ mAccountHelper.addTestAccount(mAccountHelper.generateAccountName("SimImportActivity3_"));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ SimContactDao.setFactoryForTest(SimContactDao.DEFAULT_FACTORY);
+ mAccountHelper.cleanup();
+ AccountTypeManager.setInstanceForTest(null);
+ }
+
+ @Test
+ public void shouldDisplaySimContacts() {
+ mDao.addSim(someSimCard(),
+ new SimContact(1, "Sim One", "5550101"),
+ new SimContact(2, "Sim Two", null),
+ new SimContact(3, null, "5550103")
+ );
+ mInstrumentation.startActivitySync(new Intent(mContext, SimImportActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+
+ mDevice.waitForIdle();
+
+ assertTrue(mDevice.hasObject(By.text("Sim One")));
+ assertTrue(mDevice.hasObject(By.text("Sim Two")));
+ assertTrue(mDevice.hasObject(By.text("5550103")));
+}
+
+ @Test
+ public void shouldHaveEmptyState() {
+ mDao.addSim(someSimCard());
+
+ mInstrumentation.startActivitySync(new Intent(mContext, SimImportActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+
+ mDevice.waitForIdle();
+
+ assertTrue(mDevice.hasObject(By.textStartsWith("No contacts")));
+ }
+
+ @Test
+ public void smokeRotateInEmptyState() {
+ mDao.addSim(someSimCard());
+
+ final Activity activity = mInstrumentation.startActivitySync(
+ new Intent(mContext, SimImportActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+
+ assertTrue(mDevice.wait(Until.hasObject(By.textStartsWith("No contacts")), TIMEOUT));
+
+ activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+ mDevice.waitForIdle();
+
+ assertTrue(mDevice.hasObject(By.textStartsWith("No contacts")));
+ }
+
+ @Test
+ public void smokeRotateInNonEmptyState() throws Exception {
+ mDao.addSim(someSimCard(), new SimContact(1, "Name One", "5550101"),
+ new SimContact(2, "Name Two", "5550102"));
+
+ final Activity activity = mInstrumentation.startActivitySync(
+ new Intent(mContext, SimImportActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+
+ assertTrue(mDevice.wait(Until.hasObject(By.textStartsWith("Name One")), TIMEOUT));
+
+ activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+ mDevice.waitForIdle();
+
+ assertTrue(mDevice.hasObject(By.textStartsWith("Name One")));
+ }
+
+
+ // TODO: fix this test. This doesn't work because AccountTypeManager returns a stale account
+ // list (it doesn't contain the accounts added during the current test run).
+ // Could use MockAccountTypeManager but probably ought to look at improving how
+ // AccountTypeManager updates it's account list.
+ @Suppress
+ @Test
+ public void selectionsAreImportedAndDisabledOnSubsequentViews() throws Exception {
+ // Clear out the instance so that it will have the most recent accounts when reloaded
+ AccountTypeManager.setInstanceForTest(null);
+
+ final AccountWithDataSet targetAccount = mAccountHelper.addTestAccount(
+ mAccountHelper.generateAccountName("SimImportActivity_target_"));
+
+ mDao.addSim(someSimCard(),
+ new SimContact(1, "Import One", "5550101"),
+ new SimContact(2, "Skip Two", "5550102"),
+ new SimContact(3, "Import Three", "5550103"),
+ new SimContact(4, "Skip Four", "5550104"),
+ new SimContact(5, "Skip Five", "5550105"),
+ new SimContact(6, "Import Six", "5550106"));
+
+ final Activity activity = mInstrumentation.startActivitySync(
+ new Intent(mContext, SimImportActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+
+ assertTrue(mDevice.wait(Until.hasObject(By.desc("Show more")), TIMEOUT));
+
+ mDevice.findObject(By.desc("Show more")).clickAndWait(Until.newWindow(), TIMEOUT);
+ mDevice.findObject(By.textStartsWith("SimImportActivity_target_")).click();
+ mDevice.waitForIdle();
+
+ mDevice.findObject(By.text("Skip Two")).click();
+ mDevice.findObject(By.text("Skip Five")).click();
+
+ assertTrue(mDevice.hasObject(By.text("Skip Two").checked(false)));
+ assertTrue(mDevice.hasObject(By.text("Skip Five").checked(false)));
+
+ activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ mDevice.wait(Until.hasObject(By.text("Import One")), TIMEOUT);
+ activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
+ mDevice.wait(Until.hasObject(By.text("Import One")), TIMEOUT);
+
+ mDevice.findObject(By.text("IMPORT").clickable(true)).click();
+ mDevice.waitForIdle();
+
+ final Cursor cursor = new StringableCursor(
+ mContext.getContentResolver().query(Data.CONTENT_URI, null,
+ ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " +
+ ContactsContract.RawContacts.ACCOUNT_TYPE+ "=?",
+ new String[] {
+ targetAccount.name,
+ targetAccount.type
+ }, null));
+ // 3 contacts imported with one row for name and one for phone
+ assertThat(cursor, ContactsMatchers.hasCount(3 * 2));
+
+ assertThat(cursor, hasRowMatching(allOf(
+ hasMimeType(Phone.CONTENT_ITEM_TYPE),
+ hasValueForColumn(Phone.DISPLAY_NAME, "Import One"),
+ hasValueForColumn(Phone.NUMBER, "5550101")
+ )));
+ assertThat(cursor, hasRowMatching(allOf(
+ hasMimeType(Phone.CONTENT_ITEM_TYPE),
+ hasValueForColumn(Phone.DISPLAY_NAME, "Import Three"),
+ hasValueForColumn(Phone.NUMBER, "5550103")
+ )));
+ assertThat(cursor, hasRowMatching(allOf(
+ hasMimeType(Phone.CONTENT_ITEM_TYPE),
+ hasValueForColumn(Phone.DISPLAY_NAME, "Import Six"),
+ hasValueForColumn(Phone.NUMBER, "5550106")
+ )));
+
+ cursor.close();
+
+
+ mInstrumentation.startActivitySync(
+ new Intent(mContext, SimImportActivity.class)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+
+ assertTrue(mDevice.wait(Until.hasObject(By.text("Import One")), TIMEOUT));
+
+ mDevice.findObject(By.descStartsWith("Saving to")).clickAndWait(Until.newWindow(), TIMEOUT);
+ mDevice.findObject(By.textContains(targetAccount.name)).click();
+ mDevice.waitForIdle();
+
+ assertTrue(mDevice.hasObject(By.text("Import One").checked(false).enabled(false)));
+ assertTrue(mDevice.hasObject(By.text("Import Three").checked(false).enabled(false)));
+ assertTrue(mDevice.hasObject(By.text("Import Six").checked(false).enabled(false)));
+ }
+
+ private SimCard someSimCard() {
+ return new SimCard("id", 1, "Carrier", "SIM", "18005550101", "us");
+ }
+
+ private Matcher<SimContact> withContactId(final long id) {
+ return new BaseMatcher<SimContact>() {
+ @Override
+ public boolean matches(Object o) {
+ return (o instanceof SimContact) && ((SimContact) o).getId() == id;
+ }
+
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Expected SimContact with id=" + id);
+ }
+ };
+ }
+}
diff --git a/tests/src/com/android/contacts/common/ContactsUtilsTests.java b/tests/src/com/android/contacts/common/ContactsUtilsTests.java
index a209fb2..1c72f02 100644
--- a/tests/src/com/android/contacts/common/ContactsUtilsTests.java
+++ b/tests/src/com/android/contacts/common/ContactsUtilsTests.java
@@ -25,10 +25,9 @@
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Pair;
-import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.EmailDataItem;
-import com.android.contacts.common.model.dataitem.ImDataItem;
+import com.android.contacts.model.dataitem.DataItem;
+import com.android.contacts.model.dataitem.EmailDataItem;
+import com.android.contacts.model.dataitem.ImDataItem;
/**
* Tests for {@link ContactsUtils}.
diff --git a/tests/src/com/android/contacts/common/RawContactDeltaListTests.java b/tests/src/com/android/contacts/common/RawContactDeltaListTests.java
index 77acb98..16bb5a1 100644
--- a/tests/src/com/android/contacts/common/RawContactDeltaListTests.java
+++ b/tests/src/com/android/contacts/common/RawContactDeltaListTests.java
@@ -30,14 +30,14 @@
import android.test.suitebuilder.annotation.LargeTest;
import com.android.contacts.common.RawContactModifierTests.MockContactsSource;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.CPOWrapper;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.account.AccountType;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.CPOWrapper;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.account.AccountType;
import com.google.common.collect.Lists;
diff --git a/tests/src/com/android/contacts/common/RawContactDeltaTests.java b/tests/src/com/android/contacts/common/RawContactDeltaTests.java
index e4690d9..e261e55 100644
--- a/tests/src/com/android/contacts/common/RawContactDeltaTests.java
+++ b/tests/src/com/android/contacts/common/RawContactDeltaTests.java
@@ -27,12 +27,12 @@
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.BuilderWrapper;
-import com.android.contacts.common.model.CPOWrapper;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.BuilderWrapper;
+import com.android.contacts.model.CPOWrapper;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
import com.google.common.collect.Lists;
import java.util.ArrayList;
diff --git a/tests/src/com/android/contacts/common/RawContactModifierTests.java b/tests/src/com/android/contacts/common/RawContactModifierTests.java
index 9765af6..dccfb82 100644
--- a/tests/src/com/android/contacts/common/RawContactModifierTests.java
+++ b/tests/src/com/android/contacts/common/RawContactModifierTests.java
@@ -18,9 +18,7 @@
import android.content.ContentProviderOperation;
import android.content.ContentValues;
-import android.net.Uri;
import android.os.Bundle;
-import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Event;
import android.provider.ContactsContract.CommonDataKinds.Im;
@@ -34,22 +32,22 @@
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.CPOWrapper;
-import com.android.contacts.common.model.RawContact;
-import com.android.contacts.common.model.RawContactDelta;
-import com.android.contacts.common.model.ValuesDelta;
-import com.android.contacts.common.model.RawContactDeltaList;
-import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.account.ExchangeAccountType;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.CPOWrapper;
+import com.android.contacts.model.RawContact;
+import com.android.contacts.model.RawContactDelta;
+import com.android.contacts.model.ValuesDelta;
+import com.android.contacts.model.RawContactDeltaList;
+import com.android.contacts.model.RawContactModifier;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.account.ExchangeAccountType;
+import com.android.contacts.model.account.GoogleAccountType;
+import com.android.contacts.model.dataitem.DataKind;
import com.android.contacts.common.test.mocks.ContactsMockContext;
import com.android.contacts.common.test.mocks.MockAccountTypeManager;
-import com.android.contacts.common.test.mocks.MockContentProvider;
+
import com.google.common.collect.Lists;
import java.util.ArrayList;
diff --git a/tests/src/com/android/contacts/common/database/SimContactDaoTests.java b/tests/src/com/android/contacts/common/database/SimContactDaoTests.java
deleted file mode 100644
index ec03f0f..0000000
--- a/tests/src/com/android/contacts/common/database/SimContactDaoTests.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.database;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.CursorWrapper;
-import android.database.DatabaseUtils;
-import android.provider.ContactsContract;
-import android.support.annotation.RequiresApi;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.tests.AccountsTestHelper;
-import com.android.contacts.tests.SimContactsTestHelper;
-
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static android.os.Build.VERSION_CODES;
-import static org.hamcrest.Matchers.allOf;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(Enclosed.class)
-public class SimContactDaoTests {
-
- // On pre-M addAccountExplicitly (which we call via AccountsTestHelper) causes a
- // SecurityException to be thrown unless we add AUTHENTICATE_ACCOUNTS permission to the app
- // manifest. Instead of adding the extra permission just for tests we'll just only run them
- // on M or newer
- @SdkSuppress(minSdkVersion = VERSION_CODES.M)
- // Lollipop MR1 is required for removeAccountExplicitly
- @RequiresApi(api = VERSION_CODES.LOLLIPOP_MR1)
- @LargeTest
- @RunWith(AndroidJUnit4.class)
- public static class ImportIntegrationTest {
- private AccountWithDataSet mAccount;
- private AccountsTestHelper mAccountsHelper;
- private ContentResolver mResolver;
-
- @Before
- public void setUp() throws Exception {
- mAccountsHelper = new AccountsTestHelper();
- mAccount = mAccountsHelper.addTestAccount();
- mResolver = getContext().getContentResolver();
- }
-
- @After
- public void tearDown() throws Exception {
- mAccountsHelper.cleanup();
- }
-
- @Test
- public void importFromSim() throws Exception {
- final SimContactDao sut = SimContactDao.create(getContext());
-
- sut.importContacts(Arrays.asList(
- new SimContact(1, "Test One", "15095550101", null),
- new SimContact(2, "Test Two", "15095550102", null),
- new SimContact(3, "Test Three", "15095550103", new String[] {
- "user@example.com", "user2@example.com"
- })
- ), mAccount);
-
- Cursor cursor = queryContactWithName("Test One");
- assertThat(cursor, hasCount(2));
- assertThat(cursor, hasName("Test One"));
- assertThat(cursor, hasPhone("15095550101"));
- cursor.close();
-
- cursor = queryContactWithName("Test Two");
- assertThat(cursor, hasCount(2));
- assertThat(cursor, hasName("Test Two"));
- assertThat(cursor, hasPhone("15095550102"));
- cursor.close();
-
- cursor = queryContactWithName("Test Three");
- assertThat(cursor, hasCount(4));
- assertThat(cursor, hasName("Test Three"));
- assertThat(cursor, hasPhone("15095550103"));
- assertThat(cursor, allOf(hasEmail("user@example.com"), hasEmail("user2@example.com")));
- cursor.close();
- }
-
- @Test
- public void importContactWhichOnlyHasName() throws Exception {
- final SimContactDao sut = SimContactDao.create(getContext());
-
- sut.importContacts(Arrays.asList(
- new SimContact(1, "Test importJustName", null, null)
- ), mAccount);
-
- Cursor cursor = queryAllDataInAccount();
-
- assertThat(cursor, hasCount(1));
- assertThat(cursor, hasName("Test importJustName"));
- cursor.close();
- }
-
- @Test
- public void importContactWhichOnlyHasPhone() throws Exception {
- final SimContactDao sut = SimContactDao.create(getContext());
-
- sut.importContacts(Arrays.asList(
- new SimContact(1, null, "15095550111", null)
- ), mAccount);
-
- Cursor cursor = queryAllDataInAccount();
-
- assertThat(cursor, hasCount(1));
- assertThat(cursor, hasPhone("15095550111"));
- cursor.close();
- }
-
- @Test
- public void ignoresEmptyContacts() throws Exception {
- final SimContactDao sut = SimContactDao.create(getContext());
-
- // This probably isn't possible but we'll test it to demonstrate expected behavior and
- // just in case it does occur
- sut.importContacts(Arrays.asList(
- new SimContact(1, null, null, null),
- new SimContact(2, null, null, null),
- new SimContact(3, null, null, null),
- new SimContact(4, "Not null", null, null)
- ), mAccount);
-
- final Cursor contactsCursor = queryAllRawContactsInAccount();
- assertThat(contactsCursor, hasCount(1));
- contactsCursor.close();
-
- final Cursor dataCursor = queryAllDataInAccount();
- assertThat(dataCursor, hasCount(1));
-
- dataCursor.close();
- }
-
- private Cursor queryAllRawContactsInAccount() {
- return new StringableCursor(mResolver.query(ContactsContract.RawContacts.CONTENT_URI,
- null, ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " +
- ContactsContract.RawContacts.ACCOUNT_TYPE+ "=?",
- new String[] {
- mAccount.name,
- mAccount.type
- }, null));
- }
-
- private Cursor queryAllDataInAccount() {
- return new StringableCursor(mResolver.query(ContactsContract.Data.CONTENT_URI, null,
- ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " +
- ContactsContract.RawContacts.ACCOUNT_TYPE+ "=?",
- new String[] {
- mAccount.name,
- mAccount.type
- }, null));
- }
-
- private Cursor queryContactWithName(String name) {
- return new StringableCursor(mResolver.query(ContactsContract.Data.CONTENT_URI, null,
- ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " +
- ContactsContract.RawContacts.ACCOUNT_TYPE+ "=? AND " +
- ContactsContract.Data.DISPLAY_NAME + "=?",
- new String[] {
- mAccount.name,
- mAccount.type,
- name
- }, null));
- }
- }
-
- @SdkSuppress(minSdkVersion = VERSION_CODES.M)
- // Lollipop MR1 is required for removeAccountExplicitly
- @RequiresApi(api = VERSION_CODES.LOLLIPOP_MR1)
- @MediumTest
- @RunWith(AndroidJUnit4.class)
- public static class ExistingContactsTest {
-
- private Context mContext;
- private AccountsTestHelper mAccountHelper;
- private AccountWithDataSet mAccount;
- // We need to generate something distinct to prevent flakiness on devices that may not
- // start with an empty CP2 DB
- private String mNameSuffix = "";
-
- @Before
- public void setUp() {
- mContext = InstrumentationRegistry.getTargetContext();
- mAccountHelper = new AccountsTestHelper(InstrumentationRegistry.getContext());
- mAccount = mAccountHelper.addTestAccount();
- mNameSuffix = "testAt" + System.nanoTime();
- }
-
- @After
- public void tearDown() {
- mAccountHelper.cleanup();
- }
-
- @Test
- public void findAccountsOfExistingContactsReturnsEmptyMapWhenNoMatchingContactsExist() {
- final SimContactDao sut = createDao();
-
- final List<SimContact> contacts = Arrays.asList(
- new SimContact(1, "Name 1 " + mNameSuffix, "15095550101", null),
- new SimContact(2, "Name 2 " + mNameSuffix, "15095550102", null),
- new SimContact(3, "Name 3 " + mNameSuffix, "15095550103", null),
- new SimContact(4, "Name 4 " + mNameSuffix, "15095550104", null));
-
- final Map<AccountWithDataSet, Set<SimContact>> existing = sut
- .findAccountsOfExistingSimContacts(contacts);
-
- assertTrue(existing.isEmpty());
- }
-
- private SimContactDao createDao() {
- return SimContactDao.create(mContext);
- }
- }
-
- @LargeTest
- // suppressed because failed assumptions are reported as test failures by the build server
- @Suppress
- @RunWith(AndroidJUnit4.class)
- public static class ReadIntegrationTest {
- private SimContactsTestHelper mSimTestHelper;
- private ArrayList<ContentProviderOperation> mSimSnapshot;
-
- @Before
- public void setUp() throws Exception {
- mSimTestHelper = new SimContactsTestHelper();
-
- mSimTestHelper.assumeSimWritable();
- if (!mSimTestHelper.isSimWritable()) return;
-
- mSimSnapshot = mSimTestHelper.captureRestoreSnapshot();
- mSimTestHelper.deleteAllSimContacts();
- }
-
- @After
- public void tearDown() throws Exception {
- mSimTestHelper.restore(mSimSnapshot);
- }
-
- @Test
- public void readFromSim() {
- mSimTestHelper.addSimContact("Test Simone", "15095550101");
- mSimTestHelper.addSimContact("Test Simtwo", "15095550102");
- mSimTestHelper.addSimContact("Test Simthree", "15095550103");
-
- final SimContactDao sut = SimContactDao.create(getContext());
- final ArrayList<SimContact> contacts = sut.loadSimContacts();
-
- assertThat(contacts.get(0), isSimContactWithNameAndPhone("Test Simone", "15095550101"));
- assertThat(contacts.get(1), isSimContactWithNameAndPhone("Test Simtwo", "15095550102"));
- assertThat(contacts.get(2),
- isSimContactWithNameAndPhone("Test Simthree", "15095550103"));
- }
- }
-
- private static Matcher<SimContact> isSimContactWithNameAndPhone(final String name,
- final String phone) {
- return new BaseMatcher<SimContact>() {
- @Override
- public boolean matches(Object o) {
- if (!(o instanceof SimContact)) return false;
-
- SimContact other = (SimContact) o;
-
- return name.equals(other.getName())
- && phone.equals(other.getPhone());
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("SimContact with name=" + name + " and phone=" +
- phone);
- }
- };
- }
-
- private static Matcher<Cursor> hasCount(final int count) {
- return new BaseMatcher<Cursor>() {
- @Override
- public boolean matches(Object o) {
- if (!(o instanceof Cursor)) return false;
- return ((Cursor)o).getCount() == count;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("Cursor with " + count + " rows");
- }
- };
- }
-
- private static Matcher<Cursor> hasMimeType(String type) {
- return hasValueForColumn(ContactsContract.Data.MIMETYPE, type);
- }
-
- private static Matcher<Cursor> hasValueForColumn(final String column, final String value) {
- return new BaseMatcher<Cursor>() {
-
- @Override
- public boolean matches(Object o) {
- if (!(o instanceof Cursor)) return false;
- final Cursor cursor = (Cursor)o;
-
- final int index = cursor.getColumnIndexOrThrow(column);
- return value.equals(cursor.getString(index));
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("Cursor with " + column + "=" + value);
- }
- };
- }
-
- private static Matcher<Cursor> hasRowMatching(final Matcher<Cursor> rowMatcher) {
- return new BaseMatcher<Cursor>() {
- @Override
- public boolean matches(Object o) {
- if (!(o instanceof Cursor)) return false;
- final Cursor cursor = (Cursor)o;
-
- cursor.moveToPosition(-1);
- while (cursor.moveToNext()) {
- if (rowMatcher.matches(cursor)) return true;
- }
-
- return false;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("Cursor with row matching ");
- rowMatcher.describeTo(description);
- }
- };
- }
-
- private static Matcher<Cursor> hasName(final String name) {
- return hasRowMatching(allOf(
- hasMimeType(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE),
- hasValueForColumn(
- ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, name)));
- }
-
- private static Matcher<Cursor> hasPhone(final String phone) {
- return hasRowMatching(allOf(
- hasMimeType(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE),
- hasValueForColumn(
- ContactsContract.CommonDataKinds.Phone.NUMBER, phone)));
- }
-
- private static Matcher<Cursor> hasEmail(final String email) {
- return hasRowMatching(allOf(
- hasMimeType(ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE),
- hasValueForColumn(
- ContactsContract.CommonDataKinds.Email.ADDRESS, email)));
- }
-
- static class StringableCursor extends CursorWrapper {
- public StringableCursor(Cursor cursor) {
- super(cursor);
- }
-
- @Override
- public String toString() {
- final Cursor wrapped = getWrappedCursor();
-
- if (wrapped.getCount() == 0) {
- return "Empty Cursor";
- }
-
- return DatabaseUtils.dumpCursorToString(wrapped);
- }
- }
-
- static Context getContext() {
- return InstrumentationRegistry.getTargetContext();
- }
-}
diff --git a/tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java b/tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java
index b701b3a..532b0d8 100644
--- a/tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java
+++ b/tests/src/com/android/contacts/common/test/mocks/MockAccountTypeManager.java
@@ -17,11 +17,11 @@
import android.accounts.Account;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountTypeWithDataSet;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.BaseAccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountTypeWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.BaseAccountType;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
diff --git a/tests/src/com/android/contacts/common/compat/CompatUtilsTest.java b/tests/src/com/android/contacts/compat/CompatUtilsTest.java
similarity index 98%
rename from tests/src/com/android/contacts/common/compat/CompatUtilsTest.java
rename to tests/src/com/android/contacts/compat/CompatUtilsTest.java
index c1d6df9..22694cb 100644
--- a/tests/src/com/android/contacts/common/compat/CompatUtilsTest.java
+++ b/tests/src/com/android/contacts/compat/CompatUtilsTest.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.compat;
+package com.android.contacts.compat;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
diff --git a/tests/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandlerTest.java b/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java
similarity index 98%
rename from tests/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandlerTest.java
rename to tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java
index 99a43a8..987882b 100644
--- a/tests/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandlerTest.java
+++ b/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.database;
+package com.android.contacts.database;
import android.database.Cursor;
import android.net.Uri;
diff --git a/tests/src/com/android/contacts/database/SimContactDaoTests.java b/tests/src/com/android/contacts/database/SimContactDaoTests.java
new file mode 100644
index 0000000..69a7e1f
--- /dev/null
+++ b/tests/src/com/android/contacts/database/SimContactDaoTests.java
@@ -0,0 +1,759 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts.database;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.os.RemoteException;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Data;
+import android.support.annotation.RequiresApi;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.SmallTest;
+import android.support.test.filters.Suppress;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.mock.MockContentResolver;
+import android.test.mock.MockContext;
+
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.common.test.mocks.MockContentProvider;
+import com.android.contacts.tests.AccountsTestHelper;
+import com.android.contacts.tests.ContactsMatchers;
+import com.android.contacts.tests.SimContactsTestHelper;
+import com.android.contacts.tests.StringableCursor;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import static android.os.Build.VERSION_CODES;
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasEmail;
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasName;
+import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasPhone;
+import static com.android.contacts.tests.ContactsMatchers.isSimContactWithNameAndPhone;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(Enclosed.class)
+public class SimContactDaoTests {
+
+ // Some random area codes for generating realistic US phones when
+ // generating fake data for the SIM contacts or CP2
+ private static final String[] AREA_CODES =
+ {"360", "509", "416", "831", "212", "208"};
+ private static final Random sRandom = new Random();
+
+ // Approximate maximum number of contacts that can be stored on a SIM card for testing
+ // boundary cases
+ public static final int MAX_SIM_CONTACTS = 600;
+
+ // On pre-M addAccountExplicitly (which we call via AccountsTestHelper) causes a
+ // SecurityException to be thrown unless we add AUTHENTICATE_ACCOUNTS permission to the app
+ // manifest. Instead of adding the extra permission just for tests we'll just only run them
+ // on M or newer
+ @SdkSuppress(minSdkVersion = VERSION_CODES.M)
+ // Lollipop MR1 is required for removeAccountExplicitly
+ @RequiresApi(api = VERSION_CODES.LOLLIPOP_MR1)
+ @LargeTest
+ @RunWith(AndroidJUnit4.class)
+ public static class ImportIntegrationTest {
+ private AccountWithDataSet mAccount;
+ private AccountsTestHelper mAccountsHelper;
+ private ContentResolver mResolver;
+
+ @Before
+ public void setUp() throws Exception {
+ mAccountsHelper = new AccountsTestHelper();
+ mAccount = mAccountsHelper.addTestAccount();
+ mResolver = getContext().getContentResolver();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mAccountsHelper.cleanup();
+ }
+
+ @Test
+ public void importFromSim() throws Exception {
+ final SimContactDao sut = SimContactDao.create(getContext());
+
+ sut.importContacts(Arrays.asList(
+ new SimContact(1, "Test One", "15095550101"),
+ new SimContact(2, "Test Two", "15095550102"),
+ new SimContact(3, "Test Three", "15095550103", new String[] {
+ "user@example.com", "user2@example.com"
+ })
+ ), mAccount);
+
+ Cursor cursor = queryContactWithName("Test One");
+ assertThat(cursor, ContactsMatchers.hasCount(2));
+ assertThat(cursor, hasName("Test One"));
+ assertThat(cursor, hasPhone("15095550101"));
+ cursor.close();
+
+ cursor = queryContactWithName("Test Two");
+ assertThat(cursor, ContactsMatchers.hasCount(2));
+ assertThat(cursor, hasName("Test Two"));
+ assertThat(cursor, hasPhone("15095550102"));
+ cursor.close();
+
+ cursor = queryContactWithName("Test Three");
+ assertThat(cursor, ContactsMatchers.hasCount(4));
+ assertThat(cursor, hasName("Test Three"));
+ assertThat(cursor, hasPhone("15095550103"));
+ assertThat(cursor, allOf(hasEmail("user@example.com"), hasEmail("user2@example.com")));
+ cursor.close();
+ }
+
+ @Test
+ public void importContactWhichOnlyHasName() throws Exception {
+ final SimContactDao sut = SimContactDao.create(getContext());
+
+ sut.importContacts(Arrays.asList(
+ new SimContact(1, "Test importJustName", null, null)
+ ), mAccount);
+
+ Cursor cursor = queryAllDataInAccount();
+
+ assertThat(cursor, ContactsMatchers.hasCount(1));
+ assertThat(cursor, hasName("Test importJustName"));
+ cursor.close();
+ }
+
+ @Test
+ public void importContactWhichOnlyHasPhone() throws Exception {
+ final SimContactDao sut = SimContactDao.create(getContext());
+
+ sut.importContacts(Arrays.asList(
+ new SimContact(1, null, "15095550111", null)
+ ), mAccount);
+
+ Cursor cursor = queryAllDataInAccount();
+
+ assertThat(cursor, ContactsMatchers.hasCount(1));
+ assertThat(cursor, hasPhone("15095550111"));
+ cursor.close();
+ }
+
+ @Test
+ public void ignoresEmptyContacts() throws Exception {
+ final SimContactDao sut = SimContactDao.create(getContext());
+
+ // This probably isn't possible but we'll test it to demonstrate expected behavior and
+ // just in case it does occur
+ sut.importContacts(Arrays.asList(
+ new SimContact(1, null, null, null),
+ new SimContact(2, null, null, null),
+ new SimContact(3, null, null, null),
+ new SimContact(4, "Not null", null, null)
+ ), mAccount);
+
+ final Cursor contactsCursor = queryAllRawContactsInAccount();
+ assertThat(contactsCursor, ContactsMatchers.hasCount(1));
+ contactsCursor.close();
+
+ final Cursor dataCursor = queryAllDataInAccount();
+ assertThat(dataCursor, ContactsMatchers.hasCount(1));
+
+ dataCursor.close();
+ }
+
+ /**
+ * Tests importing a large number of contacts
+ *
+ * Make sure that {@link android.os.TransactionTooLargeException} is not thrown
+ */
+ @Test
+ public void largeImport() throws Exception {
+ final SimContactDao sut = SimContactDao.create(getContext());
+
+ final List<SimContact> contacts = new ArrayList<>();
+
+ for (int i = 0; i < MAX_SIM_CONTACTS; i++) {
+ contacts.add(new SimContact(i + 1, "Contact " + (i + 1), randomPhone(),
+ new String[] { randomEmail("contact" + (i + 1) + "_")}));
+ }
+
+ sut.importContacts(contacts, mAccount);
+
+ final Cursor contactsCursor = queryAllRawContactsInAccount();
+ assertThat(contactsCursor, ContactsMatchers.hasCount(MAX_SIM_CONTACTS));
+ contactsCursor.close();
+
+ final Cursor dataCursor = queryAllDataInAccount();
+ // Each contact has one data row for each of name, phone and email
+ assertThat(dataCursor, ContactsMatchers.hasCount(MAX_SIM_CONTACTS * 3));
+
+ dataCursor.close();
+ }
+
+ private Cursor queryAllRawContactsInAccount() {
+ return new StringableCursor(mResolver.query(ContactsContract.RawContacts.CONTENT_URI,
+ null, ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " +
+ ContactsContract.RawContacts.ACCOUNT_TYPE+ "=?",
+ new String[] {
+ mAccount.name,
+ mAccount.type
+ }, null));
+ }
+
+ private Cursor queryAllDataInAccount() {
+ return new StringableCursor(mResolver.query(Data.CONTENT_URI, null,
+ ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " +
+ ContactsContract.RawContacts.ACCOUNT_TYPE+ "=?",
+ new String[] {
+ mAccount.name,
+ mAccount.type
+ }, null));
+ }
+
+ private Cursor queryContactWithName(String name) {
+ return new StringableCursor(mResolver.query(Data.CONTENT_URI, null,
+ ContactsContract.RawContacts.ACCOUNT_NAME + "=? AND " +
+ ContactsContract.RawContacts.ACCOUNT_TYPE+ "=? AND " +
+ Data.DISPLAY_NAME + "=?",
+ new String[] {
+ mAccount.name,
+ mAccount.type,
+ name
+ }, null));
+ }
+ }
+
+ /**
+ * Tests for {@link SimContactDao#findAccountsOfExistingSimContacts(List)}
+ *
+ * These are integration tests that query CP2 so that the SQL will be validated in addition
+ * to the detection algorithm
+ */
+ @SdkSuppress(minSdkVersion = VERSION_CODES.M)
+ // Lollipop MR1 is required for removeAccountExplicitly
+ @RequiresApi(api = VERSION_CODES.LOLLIPOP_MR1)
+ @LargeTest
+ @RunWith(AndroidJUnit4.class)
+ public static class FindAccountsIntegrationTests {
+
+ private Context mContext;
+ private AccountsTestHelper mAccountHelper;
+ private List<AccountWithDataSet> mAccounts;
+ // We need to generate something distinct to prevent flakiness on devices that may not
+ // start with an empty CP2 DB
+ private String mNameSuffix;
+
+ private static AccountWithDataSet sSeedAccount;
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ final AccountsTestHelper helper = new AccountsTestHelper(
+ InstrumentationRegistry.getContext());
+ sSeedAccount = helper.addTestAccount(helper.generateAccountName("seedAccount"));
+
+ seedCp2();
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ final AccountsTestHelper helper = new AccountsTestHelper(
+ InstrumentationRegistry.getContext());
+ helper.removeTestAccount(sSeedAccount);
+ sSeedAccount = null;
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ mContext = InstrumentationRegistry.getTargetContext();
+ mAccountHelper = new AccountsTestHelper(InstrumentationRegistry.getContext());
+ mAccounts = new ArrayList<>();
+ mNameSuffix = getClass().getSimpleName() + "At" + System.nanoTime();
+
+ seedCp2();
+ }
+
+ @After
+ public void tearDown() {
+ for (AccountWithDataSet account : mAccounts) {
+ mAccountHelper.removeTestAccount(account);
+ }
+ }
+
+ @Test
+ public void returnsEmptyMapWhenNoMatchingContactsExist() {
+ mAccounts.add(mAccountHelper.addTestAccount());
+
+ final SimContactDao sut = createDao();
+
+ final List<SimContact> contacts = Arrays.asList(
+ new SimContact(1, "Name 1 " + mNameSuffix, "5550101"),
+ new SimContact(2, "Name 2 " + mNameSuffix, "5550102"),
+ new SimContact(3, "Name 3 " + mNameSuffix, "5550103"),
+ new SimContact(4, "Name 4 " + mNameSuffix, "5550104"));
+
+ final Map<AccountWithDataSet, Set<SimContact>> existing = sut
+ .findAccountsOfExistingSimContacts(contacts);
+
+ assertTrue(existing.isEmpty());
+ }
+
+ @Test
+ public void hasAccountWithMatchingContactsWhenSingleMatchingContactExists()
+ throws Exception {
+ final SimContactDao sut = createDao();
+
+ final AccountWithDataSet account = mAccountHelper.addTestAccount(
+ mAccountHelper.generateAccountName("primary_"));
+ mAccounts.add(account);
+
+ final SimContact existing1 =
+ new SimContact(2, "Exists 2 " + mNameSuffix, "5550102");
+ final SimContact existing2 =
+ new SimContact(4, "Exists 4 " + mNameSuffix, "5550104");
+
+ final List<SimContact> contacts = Arrays.asList(
+ new SimContact(1, "Missing 1 " + mNameSuffix, "5550101"),
+ new SimContact(existing1),
+ new SimContact(3, "Missing 3 " + mNameSuffix, "5550103"),
+ new SimContact(existing2));
+
+ sut.importContacts(Arrays.asList(
+ new SimContact(existing1),
+ new SimContact(existing2)
+ ), account);
+
+
+ final Map<AccountWithDataSet, Set<SimContact>> existing = sut
+ .findAccountsOfExistingSimContacts(contacts);
+
+ assertThat(existing.size(), equalTo(1));
+ assertThat(existing.get(account),
+ Matchers.<Set<SimContact>>equalTo(ImmutableSet.of(existing1, existing2)));
+ }
+
+ @Test
+ public void hasMultipleAccountsWhenMultipleMatchingContactsExist() throws Exception {
+ final SimContactDao sut = createDao();
+
+ final AccountWithDataSet account1 = mAccountHelper.addTestAccount(
+ mAccountHelper.generateAccountName("account1_"));
+ mAccounts.add(account1);
+ final AccountWithDataSet account2 = mAccountHelper.addTestAccount(
+ mAccountHelper.generateAccountName("account2_"));
+ mAccounts.add(account2);
+
+ final SimContact existsInBoth =
+ new SimContact(2, "Exists Both " + mNameSuffix, "5550102");
+ final SimContact existsInAccount1 =
+ new SimContact(4, "Exists 1 " + mNameSuffix, "5550104");
+ final SimContact existsInAccount2 =
+ new SimContact(5, "Exists 2 " + mNameSuffix, "5550105");
+
+ final List<SimContact> contacts = Arrays.asList(
+ new SimContact(1, "Missing 1 " + mNameSuffix, "5550101"),
+ new SimContact(existsInBoth),
+ new SimContact(3, "Missing 3 " + mNameSuffix, "5550103"),
+ new SimContact(existsInAccount1),
+ new SimContact(existsInAccount2));
+
+ sut.importContacts(Arrays.asList(
+ new SimContact(existsInBoth),
+ new SimContact(existsInAccount1)
+ ), account1);
+
+ sut.importContacts(Arrays.asList(
+ new SimContact(existsInBoth),
+ new SimContact(existsInAccount2)
+ ), account2);
+
+
+ final Map<AccountWithDataSet, Set<SimContact>> existing = sut
+ .findAccountsOfExistingSimContacts(contacts);
+
+ assertThat(existing.size(), equalTo(2));
+ assertThat(existing, Matchers.<Map<AccountWithDataSet, Set<SimContact>>>equalTo(
+ ImmutableMap.<AccountWithDataSet, Set<SimContact>>of(
+ account1, ImmutableSet.of(existsInBoth, existsInAccount1),
+ account2, ImmutableSet.of(existsInBoth, existsInAccount2))));
+ }
+
+ @Test
+ public void matchesByNameIfSimContactHasNoPhone() throws Exception {
+ final SimContactDao sut = createDao();
+
+ final AccountWithDataSet account = mAccountHelper.addTestAccount(
+ mAccountHelper.generateAccountName("account_"));
+ mAccounts.add(account);
+
+ final SimContact noPhone = new SimContact(1, "Nophone " + mNameSuffix, null);
+ final SimContact otherExisting = new SimContact(
+ 5, "Exists 1 " + mNameSuffix, "5550105");
+
+ final List<SimContact> contacts = Arrays.asList(
+ new SimContact(noPhone),
+ new SimContact(2, "Name 2 " + mNameSuffix, "5550102"),
+ new SimContact(3, "Name 3 " + mNameSuffix, "5550103"),
+ new SimContact(4, "Name 4 " + mNameSuffix, "5550104"),
+ new SimContact(otherExisting));
+
+ sut.importContacts(Arrays.asList(
+ new SimContact(noPhone),
+ new SimContact(otherExisting)
+ ), account);
+
+ final Map<AccountWithDataSet, Set<SimContact>> existing = sut
+ .findAccountsOfExistingSimContacts(contacts);
+
+ assertThat(existing.size(), equalTo(1));
+ assertThat(existing.get(account), Matchers.<Set<SimContact>>equalTo(
+ ImmutableSet.of(noPhone, otherExisting)));
+ }
+
+ @Test
+ public void largeNumberOfSimContacts() throws Exception {
+ final SimContactDao sut = createDao();
+
+ final List<SimContact> contacts = new ArrayList<>();
+ for (int i = 0; i < MAX_SIM_CONTACTS; i++) {
+ contacts.add(new SimContact(
+ i + 1, "Contact " + (i + 1) + " " + mNameSuffix, randomPhone()));
+ }
+ // The work has to be split into batches to avoid hitting SQL query parameter limits
+ // so test contacts that will be at boundary points
+ final SimContact imported1 = contacts.get(0);
+ final SimContact imported2 = contacts.get(99);
+ final SimContact imported3 = contacts.get(100);
+ final SimContact imported4 = contacts.get(101);
+ final SimContact imported5 = contacts.get(MAX_SIM_CONTACTS - 1);
+
+ final AccountWithDataSet account = mAccountHelper.addTestAccount(
+ mAccountHelper.generateAccountName("account_"));
+ mAccounts.add(account);
+
+ sut.importContacts(Arrays.asList(imported1, imported2, imported3, imported4, imported5),
+ account);
+
+ mAccounts.add(account);
+
+ final Map<AccountWithDataSet, Set<SimContact>> existing = sut
+ .findAccountsOfExistingSimContacts(contacts);
+
+ assertThat(existing.size(), equalTo(1));
+ assertThat(existing.get(account), Matchers.<Set<SimContact>>equalTo(
+ ImmutableSet.of(imported1, imported2, imported3, imported4, imported5)));
+
+ }
+
+ private SimContactDao createDao() {
+ return SimContactDao.create(mContext);
+ }
+
+ /**
+ * Adds a bunch of random contact data to CP2 to make the test environment more realistic
+ */
+ private static void seedCp2() throws RemoteException, OperationApplicationException {
+
+ final ArrayList<ContentProviderOperation> ops = new ArrayList<>();
+
+ appendCreateContact("John Smith", sSeedAccount, ops);
+ appendCreateContact("Marcus Seed", sSeedAccount, ops);
+ appendCreateContact("Gary Seed", sSeedAccount, ops);
+ appendCreateContact("Michael Seed", sSeedAccount, ops);
+ appendCreateContact("Isaac Seed", sSeedAccount, ops);
+ appendCreateContact("Sean Seed", sSeedAccount, ops);
+ appendCreateContact("Nate Seed", sSeedAccount, ops);
+ appendCreateContact("Andrey Seed", sSeedAccount, ops);
+ appendCreateContact("Cody Seed", sSeedAccount, ops);
+ appendCreateContact("John Seed", sSeedAccount, ops);
+ appendCreateContact("Alex Seed", sSeedAccount, ops);
+
+ InstrumentationRegistry.getTargetContext()
+ .getContentResolver().applyBatch(ContactsContract.AUTHORITY, ops);
+ }
+
+ private static void appendCreateContact(String name, AccountWithDataSet account,
+ ArrayList<ContentProviderOperation> ops) {
+ final int emailCount = sRandom.nextInt(10);
+ final int phoneCount = sRandom.nextInt(5);
+
+ final List<String> phones = new ArrayList<>();
+ for (int i = 0; i < phoneCount; i++) {
+ phones.add(randomPhone());
+ }
+ final List<String> emails = new ArrayList<>();
+ for (int i = 0; i < emailCount; i++) {
+ emails.add(randomEmail(name));
+ }
+ appendCreateContact(name, phones, emails, account, ops);
+ }
+
+
+ private static void appendCreateContact(String name, List<String> phoneNumbers,
+ List<String> emails, AccountWithDataSet account, List<ContentProviderOperation> ops) {
+ int index = ops.size();
+
+ ops.add(account.newRawContactOperation());
+ ops.add(insertIntoData(name, StructuredName.CONTENT_ITEM_TYPE, index));
+ for (String phone : phoneNumbers) {
+ ops.add(insertIntoData(phone, Phone.CONTENT_ITEM_TYPE, Phone.TYPE_MOBILE, index));
+ }
+ for (String email : emails) {
+ ops.add(insertIntoData(email, Email.CONTENT_ITEM_TYPE, Email.TYPE_HOME, index));
+ }
+ }
+
+ private static ContentProviderOperation insertIntoData(String value, String mimeType,
+ int idBackReference) {
+ return ContentProviderOperation.newInsert(Data.CONTENT_URI)
+ .withValue(Data.DATA1, value)
+ .withValue(Data.MIMETYPE, mimeType)
+ .withValueBackReference(Data.RAW_CONTACT_ID, idBackReference).build();
+ }
+
+ private static ContentProviderOperation insertIntoData(String value, String mimeType,
+ int type, int idBackReference) {
+ return ContentProviderOperation.newInsert(Data.CONTENT_URI)
+ .withValue(Data.DATA1, value)
+ .withValue(ContactsContract.Data.DATA2, type)
+ .withValue(Data.MIMETYPE, mimeType)
+ .withValueBackReference(Data.RAW_CONTACT_ID, idBackReference).build();
+ }
+ }
+
+ /**
+ * Tests for {@link SimContactDao#loadContactsForSim(SimCard)}
+ *
+ * These are unit tests that verify that {@link SimContact}s are created correctly from
+ * the cursors that are returned by queries to the IccProvider
+ */
+ @SmallTest
+ @RunWith(AndroidJUnit4.class)
+ public static class LoadContactsUnitTests {
+
+ private MockContentProvider mMockIccProvider;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = mock(MockContext.class);
+ final MockContentResolver mockResolver = new MockContentResolver();
+ mMockIccProvider = new MockContentProvider();
+ mockResolver.addProvider("icc", mMockIccProvider);
+ when(mContext.getContentResolver()).thenReturn(mockResolver);
+ }
+
+
+ @Test
+ public void createsContactsFromCursor() {
+ mMockIccProvider.expect(MockContentProvider.Query.forAnyUri())
+ .withDefaultProjection(
+ SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
+ SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+ .withAnyProjection()
+ .withAnySelection()
+ .withAnySortOrder()
+ .returnRow(1, "Name One", "5550101", null)
+ .returnRow(2, "Name Two", "5550102", null)
+ .returnRow(3, "Name Three", null, null)
+ .returnRow(4, null, "5550104", null)
+ .returnRow(5, "Name Five", "5550105",
+ "five@example.com,nf@example.com,name.five@example.com")
+ .returnRow(6, "Name Six", "5550106", "thesix@example.com");
+
+ final SimContactDao sut = SimContactDao.create(mContext);
+ final List<SimContact> contacts = sut
+ .loadContactsForSim(new SimCard("123", "carrier", "sim", null, "us"));
+
+ assertThat(contacts, equalTo(
+ Arrays.asList(
+ new SimContact(1, "Name One", "5550101", null),
+ new SimContact(2, "Name Two", "5550102", null),
+ new SimContact(3, "Name Three", null, null),
+ new SimContact(4, null, "5550104", null),
+ new SimContact(5, "Name Five", "5550105", new String[] {
+ "five@example.com", "nf@example.com", "name.five@example.com"
+ }),
+ new SimContact(6, "Name Six", "5550106", new String[] {
+ "thesix@example.com"
+ })
+ )));
+ }
+
+ @Test
+ public void excludesEmptyContactsFromResult() {
+ mMockIccProvider.expect(MockContentProvider.Query.forAnyUri())
+ .withDefaultProjection(
+ SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
+ SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+ .withAnyProjection()
+ .withAnySelection()
+ .withAnySortOrder()
+ .returnRow(1, "Non Empty1", "5550101", null)
+ .returnRow(2, "", "", "")
+ .returnRow(3, "Non Empty2", null, null)
+ .returnRow(4, null, null, null)
+ .returnRow(5, "", null, null)
+ .returnRow(6, null, "5550102", null)
+ .returnRow(7, null, null, "user@example.com");
+
+ final SimContactDao sut = SimContactDao.create(mContext);
+ final List<SimContact> contacts = sut
+ .loadContactsForSim(new SimCard("123", "carrier", "sim", null, "us"));
+
+ assertThat(contacts, equalTo(
+ Arrays.asList(
+ new SimContact(1, "Non Empty1", "5550101", null),
+ new SimContact(3, "Non Empty2", null, null),
+ new SimContact(6, null, "5550102", null),
+ new SimContact(7, null, null, new String[] { "user@example.com" })
+ )));
+ }
+
+ @Test
+ public void usesSimCardSubscriptionIdIfAvailable() {
+ mMockIccProvider.expectQuery(SimContactDaoImpl.ICC_CONTENT_URI.buildUpon()
+ .appendPath("subId").appendPath("2").build())
+ .withDefaultProjection(
+ SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
+ SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+ .withAnyProjection()
+ .withAnySelection()
+ .withAnySortOrder()
+ .returnEmptyCursor();
+
+ final SimContactDao sut = SimContactDao.create(mContext);
+ sut.loadContactsForSim(new SimCard("123", 2, "carrier", "sim", null, "us"));
+ mMockIccProvider.verify();
+ }
+
+ @Test
+ public void omitsSimCardSubscriptionIdIfUnavailable() {
+ mMockIccProvider.expectQuery(SimContactDaoImpl.ICC_CONTENT_URI)
+ .withDefaultProjection(
+ SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
+ SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+ .withAnyProjection()
+ .withAnySelection()
+ .withAnySortOrder()
+ .returnEmptyCursor();
+
+ final SimContactDao sut = SimContactDao.create(mContext);
+ sut.loadContactsForSim(new SimCard("123", SimCard.NO_SUBSCRIPTION_ID,
+ "carrier", "sim", null, "us"));
+ mMockIccProvider.verify();
+ }
+
+ @Test
+ public void returnsEmptyListForEmptyCursor() {
+ mMockIccProvider.expect(MockContentProvider.Query.forAnyUri())
+ .withDefaultProjection(
+ SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
+ SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+ .withAnyProjection()
+ .withAnySelection()
+ .withAnySortOrder()
+ .returnEmptyCursor();
+
+ final SimContactDao sut = SimContactDao.create(mContext);
+ List<SimContact> result = sut
+ .loadContactsForSim(new SimCard("123", "carrier", "sim", null, "us"));
+ assertTrue(result.isEmpty());
+ }
+ }
+
+ @LargeTest
+ // suppressed because failed assumptions are reported as test failures by the build server
+ @Suppress
+ @RunWith(AndroidJUnit4.class)
+ public static class LoadContactsIntegrationTest {
+ private SimContactsTestHelper mSimTestHelper;
+ private ArrayList<ContentProviderOperation> mSimSnapshot;
+
+ @Before
+ public void setUp() throws Exception {
+ mSimTestHelper = new SimContactsTestHelper();
+
+ mSimTestHelper.assumeSimWritable();
+ if (!mSimTestHelper.isSimWritable()) return;
+
+ mSimSnapshot = mSimTestHelper.captureRestoreSnapshot();
+ mSimTestHelper.deleteAllSimContacts();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mSimTestHelper.restore(mSimSnapshot);
+ }
+
+ @Test
+ public void readFromSim() {
+ mSimTestHelper.addSimContact("Test Simone", "15095550101");
+ mSimTestHelper.addSimContact("Test Simtwo", "15095550102");
+ mSimTestHelper.addSimContact("Test Simthree", "15095550103");
+
+ final SimContactDao sut = SimContactDao.create(getContext());
+ final SimCard sim = sut.getSimCards().get(0);
+ final ArrayList<SimContact> contacts = sut.loadContactsForSim(sim);
+
+ assertThat(contacts.get(0), isSimContactWithNameAndPhone("Test Simone", "15095550101"));
+ assertThat(contacts.get(1), isSimContactWithNameAndPhone("Test Simtwo", "15095550102"));
+ assertThat(contacts.get(2),
+ isSimContactWithNameAndPhone("Test Simthree", "15095550103"));
+ }
+ }
+
+ private static String randomPhone() {
+ return String.format(Locale.US, "1%s55501%02d",
+ AREA_CODES[sRandom.nextInt(AREA_CODES.length)],
+ sRandom.nextInt(100));
+ }
+
+ private static String randomEmail(String name) {
+ return String.format("%s%d@example.com", name.replace(" ", ".").toLowerCase(Locale.US),
+ 1000 + sRandom.nextInt(1000));
+ }
+
+
+ static Context getContext() {
+ return InstrumentationRegistry.getTargetContext();
+ }
+}
diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
index 525a85c..952e3a0 100644
--- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
@@ -20,8 +20,8 @@
import android.test.MoreAsserts;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contacts.common.test.mocks.MockAccountTypeManager;
import com.google.common.collect.Sets;
diff --git a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
index aa3f725..559d272 100644
--- a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java
@@ -24,10 +24,10 @@
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfo;
import com.android.contacts.R;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
/**
* Tests {@link EditorUiUtils}.
diff --git a/tests/src/com/android/contacts/common/format/FormatUtilsTests.java b/tests/src/com/android/contacts/format/FormatUtilsTests.java
similarity index 98%
rename from tests/src/com/android/contacts/common/format/FormatUtilsTests.java
rename to tests/src/com/android/contacts/format/FormatUtilsTests.java
index 8f4f772..febed74 100644
--- a/tests/src/com/android/contacts/common/format/FormatUtilsTests.java
+++ b/tests/src/com/android/contacts/format/FormatUtilsTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.format;
+package com.android.contacts.format;
import android.database.CharArrayBuffer;
import android.test.AndroidTestCase;
diff --git a/tests/src/com/android/contacts/common/format/SpannedTestUtils.java b/tests/src/com/android/contacts/format/SpannedTestUtils.java
similarity index 98%
rename from tests/src/com/android/contacts/common/format/SpannedTestUtils.java
rename to tests/src/com/android/contacts/format/SpannedTestUtils.java
index bce7057..0edafbe 100644
--- a/tests/src/com/android/contacts/common/format/SpannedTestUtils.java
+++ b/tests/src/com/android/contacts/format/SpannedTestUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.format;
+package com.android.contacts.format;
import android.text.Html;
import android.text.SpannableString;
diff --git a/tests/src/com/android/contacts/common/format/TextHighlighterTest.java b/tests/src/com/android/contacts/format/TextHighlighterTest.java
similarity index 95%
rename from tests/src/com/android/contacts/common/format/TextHighlighterTest.java
rename to tests/src/com/android/contacts/format/TextHighlighterTest.java
index 7bf28c5..211d944 100644
--- a/tests/src/com/android/contacts/common/format/TextHighlighterTest.java
+++ b/tests/src/com/android/contacts/format/TextHighlighterTest.java
@@ -14,15 +14,12 @@
* limitations under the License.
*/
-package com.android.contacts.common.format;
+package com.android.contacts.format;
import android.graphics.Typeface;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.SpannableString;
-import com.android.contacts.common.format.SpannedTestUtils;
-import com.android.contacts.common.format.TextHighlighter;
-
import junit.framework.TestCase;
/**
diff --git a/tests/src/com/android/contacts/group/GroupUtilTest.java b/tests/src/com/android/contacts/group/GroupUtilTest.java
index bd6554e..cf11762 100644
--- a/tests/src/com/android/contacts/group/GroupUtilTest.java
+++ b/tests/src/com/android/contacts/group/GroupUtilTest.java
@@ -16,7 +16,7 @@
package com.android.contacts.group;
-import com.android.contacts.common.list.ContactsSectionIndexer;
+import com.android.contacts.list.ContactsSectionIndexer;
import android.os.Bundle;
import android.provider.ContactsContract.Contacts;
diff --git a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
index ec08a76..dfae98c 100644
--- a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java
@@ -25,16 +25,16 @@
import com.android.contacts.ContactsApplication;
import com.android.contacts.R;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.BaseAccountType;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.BaseAccountType;
import com.android.contacts.common.test.FragmentTestActivity;
import com.android.contacts.common.test.IntegrationTestUtils;
import com.android.contacts.common.test.mocks.ContactsMockContext;
import com.android.contacts.common.test.mocks.MockAccountTypeManager;
import com.android.contacts.common.test.mocks.MockContentProvider;
import com.android.contacts.common.test.mocks.MockContentProvider.Query;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.testing.InjectedServices;
/**
* Tests for {@link ContactDeletionInteraction}.
diff --git a/tests/src/com/android/contacts/common/list/ContactListItemViewTest.java b/tests/src/com/android/contacts/list/ContactListItemViewTest.java
similarity index 92%
rename from tests/src/com/android/contacts/common/list/ContactListItemViewTest.java
rename to tests/src/com/android/contacts/list/ContactListItemViewTest.java
index c9b2e6d..09c2f36 100644
--- a/tests/src/com/android/contacts/common/list/ContactListItemViewTest.java
+++ b/tests/src/com/android/contacts/list/ContactListItemViewTest.java
@@ -14,22 +14,20 @@
* limitations under the License.
*/
-package com.android.contacts.common.list;
+package com.android.contacts.list;
import android.database.Cursor;
import android.database.MatrixCursor;
-import android.provider.ContactsContract;
import android.test.ActivityInstrumentationTestCase2;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import android.widget.TextView;
-import com.android.contacts.common.format.SpannedTestUtils;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.format.SpannedTestUtils;
+import com.android.contacts.preference.ContactsPreferences;
/**
- * Unit tests for {@link com.android.contacts.common.list.ContactListItemView}.
+ * Unit tests for {@link com.android.contacts.list.ContactListItemView}.
*
* It uses an {@link ActivityInstrumentationTestCase2} for {@link PeopleActivity} because we need
* to have the style properly setup.
diff --git a/tests/src/com/android/contacts/common/model/AccountTypeManagerTest.java b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
similarity index 95%
rename from tests/src/com/android/contacts/common/model/AccountTypeManagerTest.java
rename to tests/src/com/android/contacts/model/AccountTypeManagerTest.java
index 82200ed..4ef102c 100644
--- a/tests/src/com/android/contacts/common/model/AccountTypeManagerTest.java
+++ b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.accounts.Account;
import android.accounts.AccountManager;
@@ -23,10 +23,10 @@
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountTypeWithDataSet;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.GoogleAccountType;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountTypeWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.GoogleAccountType;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -42,7 +42,7 @@
import java.util.Map;
/**
- * Test case for {@link com.android.contacts.common.model.AccountTypeManager}.
+ * Test case for {@link com.android.contacts.model.AccountTypeManager}.
*
* adb shell am instrument -w -e class com.android.contacts.model.AccountTypeManagerTest \
com.android.contacts.tests/android.test.InstrumentationTestRunner
diff --git a/tests/src/com/android/contacts/common/model/AccountWithDataSetTest.java b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
similarity index 97%
rename from tests/src/com/android/contacts/common/model/AccountWithDataSetTest.java
rename to tests/src/com/android/contacts/model/AccountWithDataSetTest.java
index 9339063..4e543b9 100644
--- a/tests/src/com/android/contacts/common/model/AccountWithDataSetTest.java
+++ b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.os.Bundle;
import android.test.AndroidTestCase;
import android.test.MoreAsserts;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.google.common.collect.Lists;
import java.util.List;
diff --git a/tests/src/com/android/contacts/common/model/ContactLoaderTest.java b/tests/src/com/android/contacts/model/ContactLoaderTest.java
similarity index 96%
rename from tests/src/com/android/contacts/common/model/ContactLoaderTest.java
rename to tests/src/com/android/contacts/model/ContactLoaderTest.java
index 9878a12..b542808 100644
--- a/tests/src/com/android/contacts/common/model/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/model/ContactLoaderTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentUris;
import android.net.Uri;
@@ -29,17 +29,15 @@
import android.test.LoaderTestCase;
import android.test.suitebuilder.annotation.LargeTest;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.model.account.BaseAccountType;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.BaseAccountType;
+import com.android.contacts.testing.InjectedServices;
import com.android.contacts.common.test.mocks.ContactsMockContext;
import com.android.contacts.common.test.mocks.MockContentProvider;
-import com.android.contacts.common.test.mocks.MockContentProvider.Query;
import com.android.contacts.common.test.mocks.MockAccountTypeManager;
-import com.android.contacts.common.util.Constants;
+import com.android.contacts.util.Constants;
import com.google.common.collect.Lists;
diff --git a/tests/src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocatorTests.java b/tests/src/com/android/contacts/model/Cp2DeviceLocalAccountLocatorTests.java
similarity index 97%
rename from tests/src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocatorTests.java
rename to tests/src/com/android/contacts/model/Cp2DeviceLocalAccountLocatorTests.java
index 192eb44..70460b4 100644
--- a/tests/src/com/android/contacts/common/model/Cp2DeviceLocalAccountLocatorTests.java
+++ b/tests/src/com/android/contacts/model/Cp2DeviceLocalAccountLocatorTests.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProvider;
import android.content.ContentResolver;
@@ -28,9 +28,9 @@
import android.test.mock.MockContentResolver;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contacts.common.test.mocks.MockContentProvider;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
import com.android.contacts.tests.FakeDeviceAccountTypeFactory;
import java.util.Arrays;
diff --git a/tests/src/com/android/contacts/common/model/RawContactTest.java b/tests/src/com/android/contacts/model/RawContactTest.java
similarity index 97%
rename from tests/src/com/android/contacts/common/model/RawContactTest.java
rename to tests/src/com/android/contacts/model/RawContactTest.java
index 496a20c..d9f05c9 100644
--- a/tests/src/com/android/contacts/common/model/RawContactTest.java
+++ b/tests/src/com/android/contacts/model/RawContactTest.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentValues;
import android.net.Uri;
@@ -22,8 +22,6 @@
import android.os.Parcelable;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.RawContact;
-
import junit.framework.TestCase;
/**
diff --git a/tests/src/com/android/contacts/common/model/SimContactTests.java b/tests/src/com/android/contacts/model/SimContactTests.java
similarity index 97%
rename from tests/src/com/android/contacts/common/model/SimContactTests.java
rename to tests/src/com/android/contacts/model/SimContactTests.java
index 359379e..eeac68d 100644
--- a/tests/src/com/android/contacts/common/model/SimContactTests.java
+++ b/tests/src/com/android/contacts/model/SimContactTests.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.os.Parcel;
import android.support.test.filters.SmallTest;
diff --git a/tests/src/com/android/contacts/common/model/ValuesDeltaTests.java b/tests/src/com/android/contacts/model/ValuesDeltaTests.java
similarity index 95%
rename from tests/src/com/android/contacts/common/model/ValuesDeltaTests.java
rename to tests/src/com/android/contacts/model/ValuesDeltaTests.java
index 77bf456..b7161d7 100644
--- a/tests/src/com/android/contacts/common/model/ValuesDeltaTests.java
+++ b/tests/src/com/android/contacts/model/ValuesDeltaTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model;
+package com.android.contacts.model;
import android.content.ContentProviderOperation.Builder;
import android.content.ContentValues;
@@ -23,8 +23,7 @@
import android.provider.ContactsContract.Data;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.compat.CompatUtils;
-import com.android.contacts.common.model.BuilderWrapper;
+import com.android.contacts.compat.CompatUtils;
import junit.framework.TestCase;
diff --git a/tests/src/com/android/contacts/common/model/account/AccountTypeTest.java b/tests/src/com/android/contacts/model/account/AccountTypeTest.java
similarity index 98%
rename from tests/src/com/android/contacts/common/model/account/AccountTypeTest.java
rename to tests/src/com/android/contacts/model/account/AccountTypeTest.java
index e204722..bb88648 100644
--- a/tests/src/com/android/contacts/common/model/account/AccountTypeTest.java
+++ b/tests/src/com/android/contacts/model/account/AccountTypeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.Context;
import android.test.InstrumentationTestCase;
diff --git a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
similarity index 97%
rename from tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
rename to tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
index 0ddeb67..8a8d25c 100644
--- a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
+++ b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.model.account;
+package com.android.contacts.model.account;
import android.content.Context;
import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -32,7 +32,7 @@
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Suppress;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.dataitem.DataKind;
import com.android.contacts.common.tests.R;
import com.google.common.base.Objects;
@@ -42,7 +42,7 @@
import java.util.List;
/**
- * Test case for {@link com.android.contacts.common.model.account.ExternalAccountType}.
+ * Test case for {@link com.android.contacts.model.account.ExternalAccountType}.
*
* adb shell am instrument -w -e class com.android.contacts.model.ExternalAccountTypeTest \
com.android.contacts.tests/android.test.InstrumentationTestRunner
@@ -121,7 +121,7 @@
/**
* Initialize with "contacts_fallback.xml" and compare the DataKinds to those of
- * {@link com.android.contacts.common.model.account.FallbackAccountType}.
+ * {@link com.android.contacts.model.account.FallbackAccountType}.
*/
public void testEditSchema_fallback() {
final ExternalAccountType type = new ExternalAccountType(getInstrumentation().getTargetContext(),
diff --git a/tests/src/com/android/contacts/common/model/dataitem/DataItemTests.java b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
similarity index 97%
rename from tests/src/com/android/contacts/common/model/dataitem/DataItemTests.java
rename to tests/src/com/android/contacts/model/dataitem/DataItemTests.java
index 3f83710..d6a213f 100644
--- a/tests/src/com/android/contacts/common/model/dataitem/DataItemTests.java
+++ b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-package com.android.contacts.common.model.dataitem;
+package com.android.contacts.model.dataitem;
import android.content.ContentValues;
import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -34,11 +34,9 @@
import android.test.suitebuilder.annotation.SmallTest;
import com.android.contacts.common.Collapser;
-import com.android.contacts.common.model.account.AccountType.EditType;
-import com.android.contacts.common.model.account.BaseAccountType;
-import com.android.contacts.common.model.account.GoogleAccountType;
-import com.android.contacts.common.model.dataitem.DataItem;
-import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.contacts.model.account.AccountType.EditType;
+import com.android.contacts.model.account.BaseAccountType;
+import com.android.contacts.model.account.GoogleAccountType;
import java.lang.Math;
import java.util.ArrayList;
diff --git a/tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
similarity index 98%
rename from tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java
rename to tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
index 8400737..7da9099 100644
--- a/tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java
+++ b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.preference;
+package com.android.contacts.preference;
import android.content.Context;
import android.content.SharedPreferences;
@@ -23,7 +23,7 @@
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
import junit.framework.Assert;
diff --git a/tests/src/com/android/contacts/tests/AccountsTestHelper.java b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
index 123d538..4546026 100644
--- a/tests/src/com/android/contacts/tests/AccountsTestHelper.java
+++ b/tests/src/com/android/contacts/tests/AccountsTestHelper.java
@@ -19,13 +19,18 @@
import android.accounts.AccountManager;
import android.content.ContentResolver;
import android.content.Context;
+import android.os.Binder;
import android.os.Build;
import android.provider.ContactsContract.RawContacts;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.test.InstrumentationRegistry;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountWithDataSet;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
@@ -40,6 +45,7 @@
private final AccountManager mAccountManager;
private final ContentResolver mResolver;
+ private List<Account> mAddedAccounts;
private Account mTestAccount;
public AccountsTestHelper() {
@@ -52,12 +58,27 @@
mContext = context;
mAccountManager = AccountManager.get(mContext);
mResolver = mContext.getContentResolver();
+ mAddedAccounts = new ArrayList<>();
+ }
+
+ public void addTestAccount(AccountWithDataSet account) {
+ mTestAccount = new Account(account.name, TEST_ACCOUNT_TYPE);
+ assertTrue(mAccountManager.addAccountExplicitly(mTestAccount, null, null));
+ mAddedAccounts.add(mTestAccount);
}
public AccountWithDataSet addTestAccount() {
return addTestAccount(generateAccountName());
}
+ public AccountWithDataSet addTestAccount(@NonNull String name) {
+ // remember the most recent one. If the caller wants to add multiple accounts they will
+ // have to keep track of them themselves.
+ final AccountWithDataSet account = new AccountWithDataSet(name, TEST_ACCOUNT_TYPE, null);
+ addTestAccount(account);
+ return account;
+ }
+
public String generateAccountName(String prefix) {
return prefix + "_t" + System.nanoTime();
}
@@ -66,26 +87,33 @@
return generateAccountName("test");
}
- public AccountWithDataSet addTestAccount(@NonNull String name) {
- // remember the most recent one. If the caller wants to add multiple accounts they will
- // have to keep track of them themselves.
- mTestAccount = new Account(name, TEST_ACCOUNT_TYPE);
- assertTrue(mAccountManager.addAccountExplicitly(mTestAccount, null, null));
- return convertTestAccount();
- }
-
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
public void removeTestAccount(AccountWithDataSet account) {
final Account remove = account.getAccountOrNull();
mAccountManager.removeAccountExplicitly(remove);
+ mAddedAccounts.remove(remove);
+ }
+
+ @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
+ public void removeTestAccount(String accountName) {
+ removeTestAccount(new AccountWithDataSet(accountName, TEST_ACCOUNT_TYPE, null));
+ }
+
+ public boolean hasTestAccount(String name) {
+ final List<Account> accounts = Arrays.asList(
+ mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE));
+ return accounts.contains(new Account(name, TEST_ACCOUNT_TYPE));
}
public void removeContactsForAccount() {
- // Not sure if this is necessary or if contacts are automatically cleaned up when the
- // account is removed.
+ removeContactsForAccount(
+ new AccountWithDataSet(mTestAccount.name, mTestAccount.type, null));
+ }
+
+ public void removeContactsForAccount(AccountWithDataSet account) {
mResolver.delete(RawContacts.CONTENT_URI,
RawContacts.ACCOUNT_NAME + "=? AND " + RawContacts.ACCOUNT_TYPE + "=?",
- new String[] { mTestAccount.name, mTestAccount.type });
+ new String[] { account.name, account.type });
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
@@ -98,7 +126,11 @@
// is removed so if multiple tests are using the same account name then the data should
// be manually deleted after each test run.
- mAccountManager.removeAccountExplicitly(mTestAccount);
+ for (Account account : mAddedAccounts) {
+ mAccountManager.removeAccountExplicitly(account);
+ }
+ mAddedAccounts.clear();
+
mTestAccount = null;
}
diff --git a/tests/src/com/android/contacts/tests/AdbHelpers.java b/tests/src/com/android/contacts/tests/AdbHelpers.java
index 163d7cc..240dbbb 100644
--- a/tests/src/com/android/contacts/tests/AdbHelpers.java
+++ b/tests/src/com/android/contacts/tests/AdbHelpers.java
@@ -16,14 +16,16 @@
package com.android.contacts.tests;
import android.content.Context;
+import android.content.OperationApplicationException;
import android.os.Build;
import android.os.Bundle;
+import android.os.RemoteException;
import android.support.annotation.RequiresApi;
import android.support.test.InstrumentationRegistry;
import android.util.Log;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.model.account.AccountWithDataSet;
+import com.android.contacts.preference.ContactsPreferences;
import com.android.contacts.util.SharedPreferenceUtil;
/**
@@ -85,6 +87,11 @@
getAppContext().getPackageName(), Context.MODE_PRIVATE).getAll());
}
+ public static void clearSimCard(Context context)
+ throws RemoteException, OperationApplicationException {
+ new SimContactsTestHelper(context).deleteAllSimContacts();
+ }
+
private static Context getAppContext() {
return InstrumentationRegistry.getTargetContext();
}
diff --git a/tests/src/com/android/contacts/tests/ContactsMatchers.java b/tests/src/com/android/contacts/tests/ContactsMatchers.java
new file mode 100644
index 0000000..a3a08de
--- /dev/null
+++ b/tests/src/com/android/contacts/tests/ContactsMatchers.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts.tests;
+
+import android.database.Cursor;
+import android.provider.ContactsContract;
+
+import com.android.contacts.model.SimContact;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+import static org.hamcrest.Matchers.allOf;
+
+
+/**
+ * Has useful {@link org.hamcrest.Matchers}s for the Contacts app
+ */
+public class ContactsMatchers {
+
+ private ContactsMatchers() {
+ }
+
+ /**
+ * Matchers for {@link Cursor}s returned by queries to
+ * {@link android.provider.ContactsContract.Data#CONTENT_URI}
+ */
+ public static class DataCursor {
+
+ public static Matcher<Cursor> hasMimeType(String type) {
+ return hasValueForColumn(ContactsContract.Data.MIMETYPE, type);
+ }
+
+ public static Matcher<Cursor> hasName(final String name) {
+ return hasRowMatching(allOf(
+ hasMimeType(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE),
+ hasValueForColumn(
+ ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, name)));
+ }
+
+ public static Matcher<Cursor> hasPhone(final String phone) {
+ return hasRowMatching(allOf(
+ hasMimeType(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE),
+ hasValueForColumn(
+ ContactsContract.CommonDataKinds.Phone.NUMBER, phone)));
+ }
+
+ public static Matcher<Cursor> hasEmail(final String email) {
+ return hasRowMatching(allOf(
+ hasMimeType(ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE),
+ hasValueForColumn(
+ ContactsContract.CommonDataKinds.Email.ADDRESS, email)));
+ }
+ }
+
+ public static Matcher<Cursor> hasCount(final int count) {
+ return new BaseMatcher<Cursor>() {
+ @Override
+ public boolean matches(Object o) {
+ if (!(o instanceof Cursor)) return false;
+ return ((Cursor)o).getCount() == count;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Cursor with " + count + " rows");
+ }
+ };
+ }
+
+ public static Matcher<Cursor> hasValueForColumn(final String column, final String value) {
+ return new BaseMatcher<Cursor>() {
+
+ @Override
+ public boolean matches(Object o) {
+ if (!(o instanceof Cursor)) return false;
+ final Cursor cursor = (Cursor)o;
+
+ final int index = cursor.getColumnIndexOrThrow(column);
+ return value.equals(cursor.getString(index));
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Cursor with " + column + "=" + value);
+ }
+ };
+ }
+
+ public static Matcher<Cursor> hasRowMatching(final Matcher<Cursor> rowMatcher) {
+ return new BaseMatcher<Cursor>() {
+ @Override
+ public boolean matches(Object o) {
+ if (!(o instanceof Cursor)) return false;
+ final Cursor cursor = (Cursor)o;
+
+ cursor.moveToPosition(-1);
+ while (cursor.moveToNext()) {
+ if (rowMatcher.matches(cursor)) return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Cursor with row matching ");
+ rowMatcher.describeTo(description);
+ }
+ };
+ }
+
+ public static Matcher<SimContact> isSimContactWithNameAndPhone(final String name,
+ final String phone) {
+ return new BaseMatcher<SimContact>() {
+ @Override
+ public boolean matches(Object o) {
+ if (!(o instanceof SimContact)) return false;
+
+ SimContact other = (SimContact) o;
+
+ return name.equals(other.getName())
+ && phone.equals(other.getPhone());
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("SimContact with name=" + name + " and phone=" +
+ phone);
+ }
+ };
+ }
+}
diff --git a/tests/src/com/android/contacts/tests/FakeAccountType.java b/tests/src/com/android/contacts/tests/FakeAccountType.java
index 59327d8..966c29f 100644
--- a/tests/src/com/android/contacts/tests/FakeAccountType.java
+++ b/tests/src/com/android/contacts/tests/FakeAccountType.java
@@ -21,8 +21,8 @@
import android.graphics.PixelFormat;
import android.graphics.drawable.Drawable;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
public class FakeAccountType extends AccountType {
public boolean areContactsWritable = false;
diff --git a/tests/src/com/android/contacts/tests/FakeDeviceAccountTypeFactory.java b/tests/src/com/android/contacts/tests/FakeDeviceAccountTypeFactory.java
index 65f8014..9ed9595 100644
--- a/tests/src/com/android/contacts/tests/FakeDeviceAccountTypeFactory.java
+++ b/tests/src/com/android/contacts/tests/FakeDeviceAccountTypeFactory.java
@@ -15,8 +15,8 @@
*/
package com.android.contacts.tests;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.util.DeviceLocalAccountTypeFactory;
import java.util.HashMap;
import java.util.Map;
diff --git a/tests/src/com/android/contacts/tests/FakeSimContactDao.java b/tests/src/com/android/contacts/tests/FakeSimContactDao.java
new file mode 100644
index 0000000..c40ab25
--- /dev/null
+++ b/tests/src/com/android/contacts/tests/FakeSimContactDao.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts.tests;
+
+import android.content.ContentProviderResult;
+import android.content.OperationApplicationException;
+import android.os.RemoteException;
+
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
+import com.android.contacts.model.account.AccountWithDataSet;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Fake implementation of SimContactDao for testing
+ */
+public class FakeSimContactDao extends SimContactDao {
+
+ public boolean canReadSimContacts = true;
+ public List<SimCard> simCards;
+ public Map<SimCard, ArrayList<SimContact>> simContacts;
+ public ContentProviderResult[] importResult;
+ public Map<AccountWithDataSet, Set<SimContact>> existingSimContacts;
+
+ public FakeSimContactDao() {
+ simCards = new ArrayList<>();
+ simContacts = new HashMap<>();
+ importResult = new ContentProviderResult[0];
+ existingSimContacts = new HashMap<>();
+ }
+
+ @Override
+ public boolean canReadSimContacts() {
+ return canReadSimContacts;
+ }
+
+ @Override
+ public List<SimCard> getSimCards() {
+ return simCards;
+ }
+
+ @Override
+ public ArrayList<SimContact> loadContactsForSim(SimCard sim) {
+ return simContacts.get(sim);
+ }
+
+ @Override
+ public ContentProviderResult[] importContacts(List<SimContact> contacts,
+ AccountWithDataSet targetAccount)
+ throws RemoteException, OperationApplicationException {
+ return importResult;
+ }
+
+ @Override
+ public void persistSimStates(List<SimCard> simCards) {
+ this.simCards = simCards;
+ }
+
+ @Override
+ public SimCard getSimBySubscriptionId(int subscriptionId) {
+ if (subscriptionId == SimCard.NO_SUBSCRIPTION_ID) {
+ return simCards.get(0);
+ }
+ for (SimCard sim : simCards) {
+ if (sim.getSubscriptionId() == subscriptionId) {
+ return sim;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public Map<AccountWithDataSet, Set<SimContact>> findAccountsOfExistingSimContacts(
+ List<SimContact> contacts) {
+ return existingSimContacts;
+ }
+
+ public FakeSimContactDao addSim(SimCard sim, SimContact... contacts) {
+ simCards.add(sim);
+ simContacts.put(sim, new ArrayList<>(Arrays.asList(contacts)));
+ return this;
+ }
+
+ public static FakeSimContactDao singleSimWithContacts(SimCard sim, SimContact... contacts) {
+ return new FakeSimContactDao().addSim(sim, contacts);
+ }
+
+ public static FakeSimContactDao noSim() {
+ FakeSimContactDao result = new FakeSimContactDao();
+ result.canReadSimContacts = false;
+ return result;
+ }
+
+}
diff --git a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
index c2ffead..ffecd74 100644
--- a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
+++ b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
@@ -15,7 +15,6 @@
*/
package com.android.contacts.tests;
-import android.content.ContentProvider;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentResolver;
@@ -29,9 +28,10 @@
import android.support.test.InstrumentationRegistry;
import android.telephony.TelephonyManager;
-import com.android.contacts.common.model.SimContact;
-import com.android.contacts.common.database.SimContactDao;
-import com.android.contacts.common.test.mocks.MockContentProvider;
+import com.android.contacts.database.SimContactDao;
+import com.android.contacts.database.SimContactDaoImpl;
+import com.android.contacts.model.SimCard;
+import com.android.contacts.model.SimContact;
import java.util.ArrayList;
import java.util.List;
@@ -59,7 +59,7 @@
}
public int getSimContactCount() {
- Cursor cursor = mContext.getContentResolver().query(SimContactDao.ICC_CONTENT_URI,
+ Cursor cursor = mContext.getContentResolver().query(SimContactDaoImpl.ICC_CONTENT_URI,
null, null, null, null);
try {
return cursor.getCount();
@@ -68,32 +68,6 @@
}
}
- public ContentValues iccRow(long id, String name, String number, String emails) {
- ContentValues values = new ContentValues();
- values.put(SimContactDao._ID, id);
- values.put(SimContactDao.NAME, name);
- values.put(SimContactDao.NUMBER, number);
- values.put(SimContactDao.EMAILS, emails);
- return values;
- }
-
- public ContentProvider iccProviderExpectingNoQueries() {
- return new MockContentProvider();
- }
-
- public ContentProvider emptyIccProvider() {
- final MockContentProvider provider = new MockContentProvider();
- provider.expectQuery(SimContactDao.ICC_CONTENT_URI)
- .withDefaultProjection(
- SimContactDao._ID, SimContactDao.NAME,
- SimContactDao.NUMBER, SimContactDao.EMAILS)
- .withAnyProjection()
- .withAnySelection()
- .withAnySortOrder()
- .returnEmptyCursor();
- return provider;
- }
-
public Uri addSimContact(String name, String number) {
ContentValues values = new ContentValues();
// Oddly even though it's called name when querying we have to use "tag" for it to work
@@ -102,23 +76,26 @@
values.put("tag", name);
}
if (number != null) {
- values.put(SimContactDao.NUMBER, number);
+ values.put(SimContactDaoImpl.NUMBER, number);
}
- return mResolver.insert(SimContactDao.ICC_CONTENT_URI, values);
+ return mResolver.insert(SimContactDaoImpl.ICC_CONTENT_URI, values);
}
public ContentProviderResult[] deleteAllSimContacts()
throws RemoteException, OperationApplicationException {
- SimContactDao dao = SimContactDao.create(mContext);
- List<SimContact> contacts = dao.loadSimContacts();
+ final List<SimCard> sims = mSimDao.getSimCards();
+ if (sims.isEmpty()) {
+ throw new IllegalStateException("Expected SIM card");
+ }
+ final List<SimContact> contacts = mSimDao.loadContactsForSim(sims.get(0));
ArrayList<ContentProviderOperation> ops = new ArrayList<>();
for (SimContact contact : contacts) {
ops.add(ContentProviderOperation
- .newDelete(SimContactDao.ICC_CONTENT_URI)
+ .newDelete(SimContactDaoImpl.ICC_CONTENT_URI)
.withSelection(getWriteSelection(contact), null)
.build());
}
- return mResolver.applyBatch(SimContactDao.ICC_CONTENT_URI.getAuthority(), ops);
+ return mResolver.applyBatch(SimContactDaoImpl.ICC_CONTENT_URI.getAuthority(), ops);
}
public ContentProviderResult[] restore(ArrayList<ContentProviderOperation> restoreOps)
@@ -128,13 +105,17 @@
// Remove SIM contacts because we assume that caller wants the data to be in the exact
// state as when the restore ops were captured.
deleteAllSimContacts();
- return mResolver.applyBatch(SimContactDao.ICC_CONTENT_URI.getAuthority(), restoreOps);
+ return mResolver.applyBatch(SimContactDaoImpl.ICC_CONTENT_URI.getAuthority(), restoreOps);
}
public ArrayList<ContentProviderOperation> captureRestoreSnapshot() {
- ArrayList<SimContact> contacts = mSimDao.loadSimContacts();
+ final List<SimCard> sims = mSimDao.getSimCards();
+ if (sims.isEmpty()) {
+ throw new IllegalStateException("Expected SIM card");
+ }
+ final ArrayList<SimContact> contacts = mSimDao.loadContactsForSim(sims.get(0));
- ArrayList<ContentProviderOperation> ops = new ArrayList<>();
+ final ArrayList<ContentProviderOperation> ops = new ArrayList<>();
for (SimContact contact : contacts) {
final String[] emails = contact.getEmails();
if (emails != null && emails.length > 0) {
@@ -142,7 +123,7 @@
" Please manually remove SIM contacts with emails.");
}
ops.add(ContentProviderOperation
- .newInsert(SimContactDao.ICC_CONTENT_URI)
+ .newInsert(SimContactDaoImpl.ICC_CONTENT_URI)
.withValue("tag", contact.getName())
.withValue("number", contact.getPhone())
.build());
@@ -151,15 +132,15 @@
}
public String getWriteSelection(SimContact simContact) {
- return "tag='" + simContact.getName() + "' AND " + SimContactDao.NUMBER + "='" +
+ return "tag='" + simContact.getName() + "' AND " + SimContactDaoImpl.NUMBER + "='" +
simContact.getPhone() + "'";
}
public int deleteSimContact(@NonNull String name, @NonNull String number) {
// IccProvider doesn't use the selection args.
final String selection = "tag='" + name + "' AND " +
- SimContactDao.NUMBER + "='" + number + "'";
- return mResolver.delete(SimContactDao.ICC_CONTENT_URI, selection, null);
+ SimContactDaoImpl.NUMBER + "='" + number + "'";
+ return mResolver.delete(SimContactDaoImpl.ICC_CONTENT_URI, selection, null);
}
public boolean isSimReady() {
diff --git a/tests/src/com/android/contacts/tests/StringableCursor.java b/tests/src/com/android/contacts/tests/StringableCursor.java
new file mode 100644
index 0000000..dbe3fca
--- /dev/null
+++ b/tests/src/com/android/contacts/tests/StringableCursor.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts.tests;
+
+import android.database.Cursor;
+import android.database.CursorWrapper;
+import android.database.DatabaseUtils;
+
+/**
+ * Wrapper around a cursor with a custom toString that dumps the entire cursor data
+ *
+ * This is for providing more useful info during debugging and testing.
+ */
+public class StringableCursor extends CursorWrapper {
+ public StringableCursor(Cursor cursor) {
+ super(cursor);
+ }
+
+ @Override
+ public String toString() {
+ final Cursor wrapped = getWrappedCursor();
+
+ if (wrapped.getCount() == 0) {
+ return "Empty Cursor";
+ }
+
+ return DatabaseUtils.dumpCursorToString(wrapped);
+ }
+}
diff --git a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
index 875f40e..1fce724 100644
--- a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
+++ b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java
@@ -22,13 +22,12 @@
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.model.AccountTypeManager;
-import com.android.contacts.common.model.account.AccountDisplayInfo;
-import com.android.contacts.common.model.account.AccountDisplayInfoFactory;
-import com.android.contacts.common.model.account.AccountType;
-import com.android.contacts.common.model.account.AccountWithDataSet;
+import com.android.contacts.model.AccountTypeManager;
+import com.android.contacts.model.account.AccountDisplayInfo;
+import com.android.contacts.model.account.AccountDisplayInfoFactory;
+import com.android.contacts.model.account.AccountType;
+import com.android.contacts.model.account.AccountWithDataSet;
import com.android.contacts.common.test.mocks.MockAccountTypeManager;
-import com.android.contacts.common.util.DeviceLocalAccountTypeFactory;
import com.android.contacts.tests.FakeAccountType;
import com.android.contacts.tests.FakeDeviceAccountTypeFactory;
diff --git a/tests/src/com/android/contacts/common/util/BitmapUtilTests.java b/tests/src/com/android/contacts/util/BitmapUtilTests.java
similarity index 96%
rename from tests/src/com/android/contacts/common/util/BitmapUtilTests.java
rename to tests/src/com/android/contacts/util/BitmapUtilTests.java
index 94394b1..ee7ebc0 100644
--- a/tests/src/com/android/contacts/common/util/BitmapUtilTests.java
+++ b/tests/src/com/android/contacts/util/BitmapUtilTests.java
@@ -14,19 +14,17 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.graphics.Bitmap;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.common.util.BitmapUtil;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
/**
- * Tests for {@link com.android.contacts.common.util.BitmapUtil}.
+ * Tests for {@link com.android.contacts.util.BitmapUtil}.
*/
@SmallTest
public class BitmapUtilTests extends AndroidTestCase {
diff --git a/tests/src/com/android/contacts/common/util/ContactDisplayUtilTests.java b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
similarity index 98%
rename from tests/src/com/android/contacts/common/util/ContactDisplayUtilTests.java
rename to tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
index b4cd1ca..9032a02 100644
--- a/tests/src/com/android/contacts/common/util/ContactDisplayUtilTests.java
+++ b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import static android.provider.ContactsContract.CommonDataKinds.Phone;
@@ -22,7 +22,7 @@
import android.test.suitebuilder.annotation.SmallTest;
import com.android.contacts.common.R;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.contacts.preference.ContactsPreferences;
import org.mockito.Mock;
import org.mockito.Mockito;
diff --git a/tests/src/com/android/contacts/common/util/SearchUtilTest.java b/tests/src/com/android/contacts/util/SearchUtilTest.java
similarity index 98%
rename from tests/src/com/android/contacts/common/util/SearchUtilTest.java
rename to tests/src/com/android/contacts/util/SearchUtilTest.java
index 3176a3c..e2156ca 100644
--- a/tests/src/com/android/contacts/common/util/SearchUtilTest.java
+++ b/tests/src/com/android/contacts/util/SearchUtilTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.contacts.common.util;
+package com.android.contacts.util;
import android.test.suitebuilder.annotation.SmallTest;