diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-03-24 13:36:45 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-25 03:25:09 -0700 |
| commit | 90b89eda4c38deeb39a0c961b8149a04d553051b (patch) | |
| tree | 2988137a54c868d49cae08a99a86bbf36912ba88 | |
| parent | 516b8b57f2a445afe1b1ef212e9abfa4549a13c7 (diff) | |
| parent | 7c27248f86795222adc8b87543eda5c6148610db (diff) | |
| download | android_packages_apps_ContactsCommon-90b89eda4c38deeb39a0c961b8149a04d553051b.tar.gz android_packages_apps_ContactsCommon-90b89eda4c38deeb39a0c961b8149a04d553051b.tar.bz2 android_packages_apps_ContactsCommon-90b89eda4c38deeb39a0c961b8149a04d553051b.zip | |
Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/ContactsCommon into cm-12.1
Change-Id: I271972eb6db4d6c5cc620a1adb26b1f06beaf1b4
117 files changed, 1211 insertions, 546 deletions
diff --git a/res/layout/default_account_checkbox.xml b/res/layout/default_account_checkbox.xml new file mode 100644 index 00000000..9a1a4504 --- /dev/null +++ b/res/layout/default_account_checkbox.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/default_account_checkbox_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp" + android:orientation="vertical"> + <CheckBox + android:id="@+id/default_account_checkbox_view" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="15dip" + android:layout_marginLeft="13dip" + android:layout_marginBottom="20dip" + android:gravity="center" + android:textAlignment="viewStart" + android:text="@string/set_default_account" + android:textColor="@color/dialtacts_secondary_text_color" + /> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml new file mode 100644 index 00000000..0ba4336c --- /dev/null +++ b/res/layout/select_account_list_item.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<!-- Layout of a single item in the InCallUI Account Chooser Dialog. --> +<view class="com.android.contacts.common.widget.ActivityTouchLinearLayout" + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="8dp" > + + <ImageView android:id="@+id/icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:scaleType="center" /> + + <LinearLayout + android:id="@+id/text" + android:gravity="start|center_vertical" + android:layout_marginLeft="8dp" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="match_parent" + android:orientation="vertical" > + <TextView android:id="@+id/label" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/dialtacts_primary_text_color" + android:includeFontPadding="false" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <TextView android:id="@+id/number" + android:textAppearance="?android:attr/textAppearanceSmall" + android:includeFontPadding="false" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" /> + </LinearLayout> + +</view> diff --git a/res/layout/select_dialog_item.xml b/res/layout/select_dialog_item.xml index de495f65..b0fceac7 100644 --- a/res/layout/select_dialog_item.xml +++ b/res/layout/select_dialog_item.xml @@ -16,8 +16,8 @@ <!-- List item in the pop-up window that appears when tapping a contact's photo - in the contact editor. This is similar to the framework's select_dialog_item.xml layout - except the text appearance is medium. + in the contact editor. This is similar to the framework's select_dialog_item_material.xml layout + except the text appearance is medium and the padding is set to match the material spec. --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" @@ -27,9 +27,6 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="?android:attr/textColorAlertDialogListItem" android:gravity="center_vertical" - android:paddingLeft="14dip" - android:paddingRight="15dip" - android:paddingStart="14dip" - android:paddingEnd="15dip" - android:ellipsize="marquee" -/> + android:paddingStart="24dip" + android:paddingEnd="24dip" + android:ellipsize="marquee" />
\ No newline at end of file diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index c30de7d3..c5be645e 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Enkel kontak"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Skep kontak onder rekening"</string> <string name="import_from_sim" msgid="4749894687871835873">"Voer van SIM-kaart af in"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Voer vanaf SIM-kaart #<xliff:g id="SIM_NUMBER">%d</xliff:g> in"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Voer in vanaf SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Voer in vanaf SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Voer van berging af in"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Kanselleer invoer van <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Kanselleer uitvoer van <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard uitvoerversoek is verwerp. Probeer asseblief later weer."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontak"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Kas tans vCard(s) na die plaaslike tydelike berging. Die werklike invoer sal binnekort begin."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTSIGN">%%</xliff:g><xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Kon nie vCard invoer nie."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Geen vCard-lêer in berging gevind nie."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Geen vCard-lêer op die SD-kaart gevind nie."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"hou op soek"</string> <string name="description_clear_search" msgid="3893511425518852086">"Vee soektog uit"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opsies vir wys van kontakte"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Rekening"</string> + <string name="set_default_account" msgid="3865970860434642695">"Gebruik dit altyd vir oproepe"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Bel met"</string> </resources> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index ed268bbb..268928bd 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"ነጠላ እውቂያ"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"በመለያ ስር ዕውቂያ ይፍጠሩ"</string> <string name="import_from_sim" msgid="4749894687871835873">"ከሲም ካርድ ያስመጡ"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"ከሲም ካርድ #<xliff:g id="SIM_NUMBER">%d</xliff:g> አስመጣ"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"ከSIM አስመጣ <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"ከSIM አስመጣ <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"ከማከማቻ ያስመጡ"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"የ<xliff:g id="FILENAME">%s</xliff:g> ወደ ውስጥ ማስመጣት ይቅር?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"የ<xliff:g id="FILENAME">%s</xliff:g> ወደ ውጭ መላክ ይቅር?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"የvCard ወደ ውጪ መላክ ጥያቄ ተቀባይነት አላገኘም። ትንሽ ቆይተው ይሞከሩ።"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"እውቂያ"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(s) ወደ ጊዜያዊ ማከማቻ በመሸጎጥ ላይ ነው። ትክክለኛው ማስመጣቱ በቅርቡ ይጀምራል።"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCardን ማስመጣት አልተቻለም።"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"በማከማቻ ላይ ምንም የvCard ፋይል አልተገኘም።"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"በSD ካርዱ ላይ ምንም vCard ካርድ ፋይል አልተገኘም።"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"መፈለግ አቁም"</string> <string name="description_clear_search" msgid="3893511425518852086">"ፍለጋን አጽዳ"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"የእውቂያ ማሳያ አማራጮች"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"መለያ"</string> + <string name="set_default_account" msgid="3865970860434642695">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"ይደውሉ ከዚህ ጋር"</string> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index b28642b5..d3f674e6 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"جهة اتصال واحدة"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"إنشاء جهة اتصال ضمن حساب"</string> <string name="import_from_sim" msgid="4749894687871835873">"استيراد من بطاقة SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"الاستيراد من بطاقة SIM رقم <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"استيراد من بطاقة SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"استيراد من بطاقة SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"استيراد من وحدة التخزين"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"هل تريد إلغاء استيراد <xliff:g id="FILENAME">%s</xliff:g>؟"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"هل تريد إلغاء تصدير <xliff:g id="FILENAME">%s</xliff:g>؟"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"تم رفض طلب تصدير vCard. أعد المحاولة لاحقًا."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"جهة اتصال"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"يجري تخزين ملفات vCard مؤقتًا على وحدة تخزين مؤقتة محلية. سيبدأ الاستيراد الفعلي قريبًا."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"تعذر استيراد vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"لم يتم العثور على أي ملف vCard في وحدة التخزين."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"لم يتم العثور على ملف vCard على بطاقة SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"إيقاف البحث"</string> <string name="description_clear_search" msgid="3893511425518852086">"محو البحث"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"خيارات عرض جهات الاتصال"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"الحساب"</string> + <string name="set_default_account" msgid="3865970860434642695">"استخدام هذا للمكالمات دائمًا"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"الاتصال باستخدام"</string> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 9a7f10fe..aa80f522 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Един контакт"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Създаване на контакт в профил"</string> <string name="import_from_sim" msgid="4749894687871835873">"Импортиране от SIM карта"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Импортиране от SIM карта №<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Импортиране от SIM картата „<xliff:g id="SIM_NAME">^1</xliff:g>“ – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Импортиране от SIM картата „<xliff:g id="SIM_NAME">%1$s</xliff:g>“"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Импорт. от хранилището"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Да се анулира ли импортирането на „<xliff:g id="FILENAME">%s</xliff:g>“?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Да се анулира ли експортирането на „<xliff:g id="FILENAME">%s</xliff:g>“?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Заявката за експортиране на vCard бе отхвърлена. Опитайте отново по-късно."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard се кешира/т във временно локално хранилище. Самото импортиране ще започне скоро."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard не можа да се импортира."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"В хранилището не бе намерен vCard файл."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"На SD картата не бе намерен vCard файл."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"спиране на търсенето"</string> <string name="description_clear_search" msgid="3893511425518852086">"Изчистване на търсенето"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Опции за показване на контактите"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Профил"</string> + <string name="set_default_account" msgid="3865970860434642695">"Винаги да се използва за обаждания"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Обаждане чрез"</string> </resources> diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 6f8e89ab..3bc04b8b 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"একক পরিচিতি"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"অ্যাকাউন্টের অধীনে পরিচিতি তৈরি করুন"</string> <string name="import_from_sim" msgid="4749894687871835873">"সিম কার্ড থেকে আমদানি করুন"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"সিম কার্ড #<xliff:g id="SIM_NUMBER">%d</xliff:g> থেকে আমদানি করুন"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> SIM থেকে আমদানি করুন - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM থেকে আমদানি করুন"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"সংগ্রহস্থল থেকে আমদানি করুন"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> এর আমদানি বাতিল করবেন?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> এর রপ্তানি বাতিল করবেন?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard রপ্তানি করার অনুরোধ প্রত্যাখ্যাত হয়েছে৷ পরে আবার চেষ্টা করুন৷"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"পরিচিতি"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"স্থানীয় অস্থায়ী সংগ্রহস্থলে vCard(গুলি)কে ক্যাশ করা হচ্ছে৷ প্রকৃত আমদানি শীঘ্রই শুরু হবে৷"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard আমদানি করতে পারা যায় নি৷"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"সংগ্রহস্থলে কোনো vCard ফাইল পাওয়া যায়নি৷"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD কার্ডে কোনো vCard ফাইল পাওয়া যায়নি৷"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"অনুসন্ধান বন্ধ করুন"</string> <string name="description_clear_search" msgid="3893511425518852086">"অনুসন্ধান সাফ করুন"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"পরিচিতি প্রদর্শনের বিকল্পগুলি"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"অ্যাকাউন্ট"</string> + <string name="set_default_account" msgid="3865970860434642695">"কলের জন্য সবসময় এটি ব্যবহার করুন"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"এর মাধ্যমে কল করুন"</string> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 6b648034..4621892b 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -82,7 +82,7 @@ <string name="description_quick_contact_for" msgid="6355240770807101947">"Contacte ràpid per a <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="missing_name" msgid="2633118852693000081">"(Sense nom)"</string> <string name="favoritesFrequentCalled" msgid="6600127125011757687">"Usuaris a qui es truca sovint"</string> - <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Usuaris amb qui es contacta sovint"</string> + <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactes freqüents"</string> <string name="description_view_contact_detail" msgid="2756753096193839285">"Mostra el contacte"</string> <string name="list_filter_phones" msgid="3692815632088465422">"Tots els contactes que tenen números de telèfon"</string> <string name="view_updates_from_group" msgid="3310864388165884352">"Mostra les actualitzacions"</string> @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Un sol contacte"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Crea el contacte al compte"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importa des de la targeta SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importa de la targeta SIM núm. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importa des de la targeta SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importa des de la targeta SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importa de l\'emmagatzematge"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Vols cancel·lar la importació de <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Vols cancel·lar l\'exportació de <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"S\'ha rebutjat la sol·licitud per exportar la vCard. Torna-ho a provar més tard."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacte"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"S\'estan desant les vCard a l\'emmagatzematge temporal local. La importació real començarà aviat."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"No s\'ha pogut importar la vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"No s\'ha trobat cap fitxer vCard a l\'emmagatzematge."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"No s\'ha trobat cap fitxer vCard a la targeta SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"Atura la cerca."</string> <string name="description_clear_search" msgid="3893511425518852086">"Esborra la cerca."</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opcions de visualització de contactes"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Compte"</string> + <string name="set_default_account" msgid="3865970860434642695">"Utilitza sempre per a les trucades"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Truca mitjançant"</string> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index fde414db..a04964e1 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Jeden kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Vytvořit kontakt na základě účtu"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importovat ze SIM karty"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importovat ze SIM karty č. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importovat ze SIM karty <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importovat ze SIM karty <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importovat z úložiště"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Zrušit import souboru <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Zrušit export souboru <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Požadavek na export souborů vCard byl zamítnut. Zkuste to prosím později."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Načítání souboru vCard do mezipaměti místního dočasného úložiště. Vlastní import bude zahájen v krátké době."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Soubor vCard se nepodařilo importovat."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"V úložišti nebyl nalezen žádný soubor vCard."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Na kartě SD nebyl nalezen žádný soubor vCard."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zastavit vyhledávání"</string> <string name="description_clear_search" msgid="3893511425518852086">"Vymazat vyhledávání"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Možnosti zobrazení kontaktů"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Účet"</string> + <string name="set_default_account" msgid="3865970860434642695">"Vždy používat pro hovory"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Volat pomocí"</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index e5cd17db..a57f6061 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Enkelt kontaktperson"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Opret kontaktperson på konto"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importér fra SIM-kort"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importér fra SIM-kort nr. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importér fra SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importér fra SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importér fra lager"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Vil du annullere importen af <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Vil du annullere eksporten af <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Anmodningen om eksport af vCard blev afvist. Prøv igen senere."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktperson"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Cachelagrer vCard-fil(er) til lokalt midlertidigt lager. Den egentlige import starter snart."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard kunne ikke importeres."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Der blev ikke fundet nogen vCard-filer på lageret."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Der blev ikke fundet nogen vCard-filer på SD-kortet."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop søgning"</string> <string name="description_clear_search" msgid="3893511425518852086">"Ryd søgning"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Indstillinger for visning af kontaktpersoner"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string> + <string name="set_default_account" msgid="3865970860434642695">"Brug altid ved opkald"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ring med"</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 00091cc9..b7b61d2a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Einzelner Kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Neuen Kontakt unter Konto erstellen"</string> <string name="import_from_sim" msgid="4749894687871835873">"Von SIM-Karte importieren"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Von SIM-Karte <xliff:g id="SIM_NUMBER">%d</xliff:g> importieren"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Von SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g> importieren"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Von SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> importieren"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Aus Speicher importieren"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Import von <xliff:g id="FILENAME">%s</xliff:g> abbrechen?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Export von <xliff:g id="FILENAME">%s</xliff:g> abbrechen?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Die vCard-Exportanfrage wurde abgelehnt. Bitte versuchen Sie es später erneut."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"Kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Caching der vCard(s) in lokalen temporären Speicher wird durchgeführt. Der eigentliche Import beginnt gleich."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Importieren der vCard nicht möglich"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Im Speicher wurde keine vCard-Datei gefunden."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Auf der SD-Karte wurde keine vCard-Datei gefunden."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"Suche beenden"</string> <string name="description_clear_search" msgid="3893511425518852086">"Suche zurücksetzen"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Anzeigeoptionen für Kontakte"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string> + <string name="set_default_account" msgid="3865970860434642695">"Diese SIM für alle Anrufe verwenden"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Anrufen mit"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index f554ea07..c922fedd 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Μία επαφή"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Δημιουργία επαφής στο λογαριασμό"</string> <string name="import_from_sim" msgid="4749894687871835873">"Εισαγωγή από κάρτα SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Εισαγωγή από κάρτα SIM #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Εισαγωγή από κάρτα SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Εισαγωγή από κάρτα SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Εισαγωγή από χώρο αποθ."</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Ακύρωση της εισαγωγής του αρχείου <xliff:g id="FILENAME">%s</xliff:g>;"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Ακύρωση της εξαγωγής του αρχείου <xliff:g id="FILENAME">%s</xliff:g>;"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Το αίτημα εξαγωγής vCard απορρίφθηκε. Δοκιμάστε ξανά αργότερα."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"επαφή"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Αλλαγή vCard σε τοπικό χώρο προσωρινής αποθήκευσης. Η εισαγωγή θα ξεκινήσει σύντομα."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Δεν ήταν δυνατή η εισαγωγή κάρτας vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Δεν βρέθηκαν αρχεία vCard στο χώρο αποθήκευσης."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Δεν βρέθηκε αρχείο vCard στην κάρτα SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"τέλος αναζήτησης"</string> <string name="description_clear_search" msgid="3893511425518852086">"Εκκαθάριση αναζητήσεων"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Επιλογές εμφάνισης επαφών"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Λογαριασμός"</string> + <string name="set_default_account" msgid="3865970860434642695">"Χρήση πάντα για κλήσεις"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Κλήση με"</string> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 3a0a062a..799863f1 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Single contact"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Create contact under account"</string> <string name="import_from_sim" msgid="4749894687871835873">"Import from SIM card"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Import from SIM card #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Import from SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Import from SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Import from storage"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Cancel import of <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard export request was rejected. Try again later."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Couldn\'t import vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"No vCard file found in storage."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"No vCard file found on the SD card."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string> <string name="description_clear_search" msgid="3893511425518852086">"Clear search"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Contact display options"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string> + <string name="set_default_account" msgid="3865970860434642695">"Always use this for calls"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Call with"</string> </resources> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 3a0a062a..799863f1 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Single contact"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Create contact under account"</string> <string name="import_from_sim" msgid="4749894687871835873">"Import from SIM card"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Import from SIM card #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Import from SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Import from SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Import from storage"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Cancel import of <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Cancel export of <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard export request was rejected. Try again later."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Couldn\'t import vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"No vCard file found in storage."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"No vCard file found on the SD card."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string> <string name="description_clear_search" msgid="3893511425518852086">"Clear search"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Contact display options"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string> + <string name="set_default_account" msgid="3865970860434642695">"Always use this for calls"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Call with"</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index f6e321f5..6a6ec76e 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Contacto único"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Crear contacto en la cuenta"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importar desde tarjeta SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importar de tarjeta SIM n.° <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importar desde SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importar desde SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importar desde almac."</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"¿Deseas cancelar la importación de <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"¿Deseas cancelar la exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Se rechazó la solicitud de exportación de vCard. Vuelve a intentarlo más tarde."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contactar"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Almacenando vCard(s) en caché local temporal. La importación comenzará pronto."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"No se pudo importar el archivo de vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"No se encontró ningún archivo vCard en el almacenamiento."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"No se encontró ningún archivo vCard en la Tarjeta SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"detener la búsqueda"</string> <string name="description_clear_search" msgid="3893511425518852086">"Eliminar búsqueda"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opciones de visualización de contactos"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Cuenta"</string> + <string name="set_default_account" msgid="3865970860434642695">"Usar siempre para llamadas"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Llamar con"</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index bdd146ca..2764c51d 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Contacto único"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Crear contacto en la cuenta"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importar contactos de la tarjeta SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importar de tarjeta SIM número <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importar de SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importar de SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importar de almacenamiento"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"¿Quieres cancelar la importación de <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"¿Quieres cancelar la exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Se ha rechazado la solicitud de exportación de vCard. Inténtalo de nuevo más tarde."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacto"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Se están almacenando los archivos vCard en la caché. La importación empezará pronto."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Error al importar el archivo vCard"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"No se han encontrado archivos vCard en el almacenamiento."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"No se han encontrado archivos vCard en la tarjeta SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"dejar de buscar"</string> <string name="description_clear_search" msgid="3893511425518852086">"Borrar la búsqueda"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opciones para mostrar contactos"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Cuenta"</string> + <string name="set_default_account" msgid="3865970860434642695">"Usar siempre esta para llamadas"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Llamar con"</string> </resources> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 84b585af..31a35ef7 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Üks kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Loo konto all kontakt"</string> <string name="import_from_sim" msgid="4749894687871835873">"Impordi SIM-kaardilt"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Impordi SIM-kaardilt #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importimine SIM-kaardilt <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importimine SIM-kaardilt <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Impordi mäluseadmest"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Kas tühistada faili <xliff:g id="FILENAME">%s</xliff:g> importimine?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Kas tühistada faili <xliff:g id="FILENAME">%s</xliff:g> eksportimine?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCardi eksportimistaotlus lükati tagasi. Proovige hiljem uuesti."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCardi(de) vahemälustamine kohalikku ajutisse mäluruumi. Tegelik importimine algab peagi."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCardi importimine ebaõnnestus."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Mälust ei leitud vCardi faili."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD-kaardilt ei leitud vCardi faili."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"otsimise peatamine"</string> <string name="description_clear_search" msgid="3893511425518852086">"Otsingu kustutamine"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktide kuvavalikud"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string> + <string name="set_default_account" msgid="3865970860434642695">"Kasuta helistamiseks alati seda"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Helistamine kontoga"</string> </resources> diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index 633b01dd..04c76fe5 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -110,7 +110,7 @@ <string name="sms" msgid="8086289395154598654">"Testu-mezua"</string> <string name="postal_address" msgid="7692926530081579786">"Helbidea"</string> <string name="ghostData_company" msgid="22470841482615409">"Enpresa"</string> - <string name="ghostData_title" msgid="6221293237772204604">"Titulua"</string> + <string name="ghostData_title" msgid="6221293237772204604">"Izena"</string> <string name="label_notes" msgid="3997277594846722699">"Oharrak"</string> <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string> <string name="websiteLabelsGroup" msgid="8620657380165071493">"Webgunea"</string> @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Kontaktu bakarra"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Sortu kontaktua kontu baten barruan"</string> <string name="import_from_sim" msgid="4749894687871835873">"Inportatu SIM txarteletik"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Inportatu <xliff:g id="SIM_NUMBER">%d</xliff:g> zenbakidun SIM txarteletik"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Inportatu SIM honetatik: <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Inportatu SIM honetatik: <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Inportatu memoriatik"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> fitxategiaren inportazioa utzi?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> fitxategiaren esportazioa utzi?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard fitxategia esportatzeko eskaera ukatu da. Saiatu berriro geroago."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktua"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard-ak aldi baterako biltegi lokalaren cachean gordetzen ari dira. Inportazioa bera laster hasiko da."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTSIGN">%%</xliff:g> <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Ezin izan da vCard fitxategia inportatu."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Ez da vCard fitxategirik aurkitu memorian."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Ez da vCard fitxategirik aurkitu SD memorian."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"gelditu bilaketa"</string> <string name="description_clear_search" msgid="3893511425518852086">"Garbitu bilaketa"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktuak bistaratzeko aukerak"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Kontua"</string> + <string name="set_default_account" msgid="3865970860434642695">"Erabili beti hau deietarako"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Deitu kontu honekin:"</string> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 187ba0f4..bafc1ffb 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"مخاطب تکی"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"ایجاد مخاطبین تحت حساب"</string> <string name="import_from_sim" msgid="4749894687871835873">"وارد کردن از سیم کارت"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"از سیم کارت #<xliff:g id="SIM_NUMBER">%d</xliff:g> وارد کنید"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"وارد کردن از سیمکارت <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"وارد کردن از سیم کارت <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"وارد کردن از حافظه"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"وارد کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"صادر کردن به <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"درخواست صدور کارت ویزیت رد شد. لطفاً بعداً امتحان کنید."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"مخاطب"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"در حال ذخیره کارت(های) ویزیت در حافظه موقت محلی است. وارد کردن واقعی به زودی آغاز خواهد شد."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"وارد کردن کارت ویزیت انجام نشد."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"هیچ فایل کارت ویزیتی در حافظه یافت نشد."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"هیچ فایل کارت ویزیتی در کارت SD یافت نشد."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"توقف جستجو"</string> <string name="description_clear_search" msgid="3893511425518852086">"پاک کردن جستجو"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"گزینههای نمایش تماس"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"حساب"</string> + <string name="set_default_account" msgid="3865970860434642695">"همیشه این سیم برای تماس استفاده شود"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"تماس با"</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index ca124ac5..0cd2029a 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Yksi yhteystieto"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Luo yhteystieto tilissä"</string> <string name="import_from_sim" msgid="4749894687871835873">"Tuo SIM-kortilta"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Tuo SIM-kortista #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Tuo SIM-kortilta <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Tuo SIM-kortilta <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Tuo tallennustilasta"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Peruutetaanko kohteen <xliff:g id="FILENAME">%s</xliff:g> tuonti?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Peruutetaanko kohteen <xliff:g id="FILENAME">%s</xliff:g> vienti?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard-vientipyyntö hylättiin. Yritä myöhemmin uudelleen."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"yhteystieto"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Lisätään vCard-tietojen välimuistiversiot paikalliseen väliaikaistallennustilaan. Tuonti alkaa pian."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard-tietojen tuominen epäonnistui."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Tallennustilasta ei löydy vCard-tiedostoja."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD-kortilta ei löydy vCard-tiedostoa."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"lopeta hakeminen"</string> <string name="description_clear_search" msgid="3893511425518852086">"Tyhjennä haku"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Yhteystietojen näyttöasetukset"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Tili"</string> + <string name="set_default_account" msgid="3865970860434642695">"Käytä kaikille puheluille"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Valitse puhelinoperaattori:"</string> </resources> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 6b26abee..740c6af1 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Contact"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Créer un contact sous le compte"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importer depuis la carte SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importer de la carte SIM nº <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importer de la carte SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importer de la carte SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importer depuis la mémoire"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Annuler l\'importation du fichier <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Annuler l\'exportation du fichier <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer plus tard."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Mise en cache des fichiers vCard dans l\'espace de stockage temporaire local. L\'importation va bientôt démarrer."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Impossible d\'importer le fichier vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Aucun fichier vCard trouvé dans la mémoire de stockage."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Aucun fichier vCard trouvé sur la carte SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"arrêter la recherche"</string> <string name="description_clear_search" msgid="3893511425518852086">"Effacer les termes de recherche"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Options d\'affichage des contacts"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Compte"</string> + <string name="set_default_account" msgid="3865970860434642695">"Toujours l\'utiliser pour les appels"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Appeler avec"</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index be7c8093..e3de3cf1 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Contact"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Créer un contact sous le compte"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importer depuis la carte SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importer depuis la carte SIM n° <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importer depuis la carte SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importer depuis la carte SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importer depuis la mémoire"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Annuler l\'importation du fichier <xliff:g id="FILENAME">%s</xliff:g> ?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Annuler l\'exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> ?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer ultérieurement."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Mise en cache des fichiers vCard dans l\'espace de stockage temporaire local. L\'importation va bientôt démarrer."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Impossible d\'importer le fichier vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Aucun fichier vCard trouvé dans la mémoire de stockage."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Aucun fichier vCard trouvé sur la carte SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"arrêter la recherche"</string> <string name="description_clear_search" msgid="3893511425518852086">"Effacer la recherche"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Options d\'affichage des contacts"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Compte"</string> + <string name="set_default_account" msgid="3865970860434642695">"Toujours l\'utiliser pour les appels"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Appeler avec"</string> </resources> diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index 11aabe60..4c74f445 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Un só contacto"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Crear contacto na conta"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importar da tarxeta SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importar da tarxeta SIM número <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importar da SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importar da SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importar do almacenamento"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Cancelar importación de <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Cancelar exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Rexeitouse a solicitude de exportación do vCard. Téntao de novo máis tarde."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacto"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Almacenando vCard na memoria caché do almacenamento temporal local. A importación real iniciarase en breve."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Non se puido importar o vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Non se encontrou ningún ficheiro vCard no almacenamento."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Non se encontrou ningún ficheiro vCard na tarxeta SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"detén a busca"</string> <string name="description_clear_search" msgid="3893511425518852086">"Borrar busca"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opcións de visualización de contactos"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Conta"</string> + <string name="set_default_account" msgid="3865970860434642695">"Usar sempre para as chamadas"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Chamar con"</string> </resources> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index ff105af1..61b7c850 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"एकल संपर्क"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"खाते के अंतर्गत संपर्क बनाएं"</string> <string name="import_from_sim" msgid="4749894687871835873">"सिम कार्ड से आयात करें"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"सिम कार्ड #<xliff:g id="SIM_NUMBER">%d</xliff:g> से आयात करें"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> सिम से आयात करें"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> सिम से आयात करें"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"मेमोरी से आयात करें"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> का आयात रहने दें?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> का निर्यात रहने दें?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard निर्यात अनुरोध अस्वीकार हो गया था. बाद में पुन: प्रयास करें."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"संपर्क"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard को स्थानीय अस्थायी मेमोरी में संचित कर रहा है. वास्तविक आयात जल्दी ही प्रारंभ होगा."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard आयात नहीं कर सका."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"मेमोरी में कोई vCard फ़ाइल नहीं मिली."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD कार्ड पर कोई vCard फ़ाइल नहीं मिली."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"खोजना बंद करें"</string> <string name="description_clear_search" msgid="3893511425518852086">"खोज साफ़ करें"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"संपर्क प्रदर्शन विकल्प"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"खाता"</string> + <string name="set_default_account" msgid="3865970860434642695">"कॉल के लिए हमेशा इसका उपयोग करें"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"इस सिम से कॉल करें"</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 1f13bd81..0a5e3150 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Jedan kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Izrada kontakta pod računom"</string> <string name="import_from_sim" msgid="4749894687871835873">"Uvoz sa SIM kartice"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Uvezi sa SIM kartice broj <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Uvoz sa SIM-a <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Uvoz sa SIM-a <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Uvoz iz pohrane"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Otkazati uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Otkazati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Zahtjev za izvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Spremanje vCard datoteka u lokalnu privremenu pohranu. Stvarni uvoz počet će uskoro."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Uvoz vCard datoteke nije uspio."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"U pohrani nije pronađena nijedna vCard datoteka."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Na SD kartici nije pronađena nijedna vCard datoteka."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zaustavi pretraživanje"</string> <string name="description_clear_search" msgid="3893511425518852086">"Brisanje pretraživanja"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opcije prikaza kontakata"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Račun"</string> + <string name="set_default_account" msgid="3865970860434642695">"Uvijek upotrebljavaj za pozive"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Poziv putem usluge"</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index a404cffd..c0bf04b2 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Egyetlen névjegy"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Névjegy létrehozása a következő fiókban:"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importálás a SIM kártyáról"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importálás a következő SIM kártyáról: #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importálás a következő SIM kártyáról: <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importálás a következő SIM kártyáról: <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importálás a tárhelyről"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Megszakítja <xliff:g id="FILENAME">%s</xliff:g> importálását?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Megszakítja <xliff:g id="FILENAME">%s</xliff:g> exportálását?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"A vCard-exportálási kérelem elutasítva. Próbálja újra később."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"névjegy"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(ok) mentése az ideiglenes helyi tárolóba. A tényleges importálás hamarosan megkezdődik."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Nem sikerült a vCard importálása."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Nem található vCard fájl a tárhelyen."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Nem található vCard fájl az SD-kártyán"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"keresés leállítása"</string> <string name="description_clear_search" msgid="3893511425518852086">"Keresés törlése"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Névjegy megjelenítési lehetőségei"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Fiók"</string> + <string name="set_default_account" msgid="3865970860434642695">"Mindig ezt használja hívásokhoz"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Hívás a következővel:"</string> </resources> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index c14e29cb..2179e580 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Մեկ կոնտակտ"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Ստեղծել կոնտակտ հաշվի հետ"</string> <string name="import_from_sim" msgid="4749894687871835873">"Ներմուծել SIM քարտից"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Ներմուծել SIM քարտ #<xliff:g id="SIM_NUMBER">%d</xliff:g>-ից"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Ներմուծել <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM-ից"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Ներմուծել <xliff:g id="SIM_NAME">%1$s</xliff:g> SIM-ից"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Ներմուծել պահոցից"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Չեղարկե՞լ <xliff:g id="FILENAME">%s</xliff:g>-ի ներմուծումը:"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Չեղարկե՞լ <xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard-ի արտահանման հայցը մերժվեց: Փորձեք կրկին ավելի ուշ:"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"կոնտակտ"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(եր)-ի քեշավորում ժամանակավոր պաոց: Փաստացի ներմուծումը կսկսվի շուտով:"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Չհաջողվեց ներմուծել vCard-ը:"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Պահոցում vCard ֆայլ չի գտնվել:"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD քարտում vCard ֆայլ չի հայտնաբերվել:"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"դադարեցնել որոնումը"</string> <string name="description_clear_search" msgid="3893511425518852086">"Մաքրել որոնման դաշտը"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Կոնտակտի ցուցադրման ընտրանքները"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Հաշիվ"</string> + <string name="set_default_account" msgid="3865970860434642695">"Միշտ օգտագործել սա՝ զանգերի համար"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Զանգահարել հետևյալով"</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index c448569e..54f98a22 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -19,7 +19,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="toast_text_copied" msgid="8327159932780920627">"Teks disalin"</string> <string name="call_custom" msgid="2786306789889210756">"Hubungi <xliff:g id="CUSTOM">%s</xliff:g>"</string> - <string name="call_home" msgid="1479549630992276827">"Hubungi rumah"</string> + <string name="call_home" msgid="1479549630992276827">"Telepon rumah"</string> <string name="call_mobile" msgid="8618334085824709009">"Hubungi nomor seluler"</string> <string name="call_work" msgid="8299062439076337075">"Hubungi kantor"</string> <string name="call_fax_work" msgid="3770754834467992571">"Hubungi faks kantor"</string> @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Kontak tunggal"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Buat kontak di bawah akun"</string> <string name="import_from_sim" msgid="4749894687871835873">"Impor dari kartu SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Impor dari kartu SIM #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Impor dari SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Impor dari SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Impor dari penyimpanan"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Batalkan impor <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Batalkan ekspor <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Permintaan ekspor vCard ditolak. Coba lagi nanti."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontak"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Menyimpan vCard ke dalam cache penyimpanan lokal sementara. Impor yang sebenarnya akan segera dimulai."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Tidak dapat mengimpor vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Tidak ditemukan file vCard dalam penyimpanan."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Tidak ditemukan file vCard pada kartu SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"menghentikan penelusuran"</string> <string name="description_clear_search" msgid="3893511425518852086">"Hapus penelusuran"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opsi tampilan kontak"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Akun"</string> + <string name="set_default_account" msgid="3865970860434642695">"Selalu gunakan ini untuk panggilan"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Telepon dengan"</string> </resources> diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml index ef4349a6..b5744e6f 100644 --- a/res/values-is-rIS/strings.xml +++ b/res/values-is-rIS/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Einn tengiliður"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Búa til tengilið á reikningnum"</string> <string name="import_from_sim" msgid="4749894687871835873">"Flytja inn af SIM-korti"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Flytja inn af SIM-korti <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Flytja inn af SIM-korti <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Flytja inn af SIM-korti <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Flytja inn úr geymslu"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Hætta við innflutning á <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Hætta við útflutning á <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Beiðni um útflutning vCard-skrár hafnað. Reyndu aftur síðar."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"tengiliður"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Setur vCard í skyndiminni í staðbundinni geymslu. Raunverulegur innflutningur hefst innan skamms."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Ekki tókst að flytja vCard-skrána inn."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Engin vCard-skrá fannst í geymslu."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Engin vCard-skrá fannst á SD-kortinu."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"hætta leit"</string> <string name="description_clear_search" msgid="3893511425518852086">"Hreinsa leit"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Birtingarkostir fyrir tengiliði"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Reikningur"</string> + <string name="set_default_account" msgid="3865970860434642695">"Nota þetta alltaf fyrir símtöl"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Hringja með"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b7847d52..41bbef06 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Contatto singolo"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Crea contatto nell\'account"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importa da scheda SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importare dalla scheda SIM n. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importa da SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importa da SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importa da archivio"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Annullare l\'importazione di <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Annullare l\'esportazione di <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Richiesta esportazione vCard rifiutata. Riprova più tardi."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contatto"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Memorizzazione delle vCard nella cache di archiviazione temporanea locale. L\'importazione reale inizierà a breve."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Importazione vCard non riuscita."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Nessun file vCard trovato nell\'archivio."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Nessun file vCard trovato sulla scheda SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"interrompi ricerca"</string> <string name="description_clear_search" msgid="3893511425518852086">"Cancella ricerca"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opzioni di visualizzazione dei contatti"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string> + <string name="set_default_account" msgid="3865970860434642695">"Usa sempre questa per chiamare"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Chiama con"</string> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index dc7dc9a3..c18614e1 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"איש קשר יחיד"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"צור איש קשר בחשבון"</string> <string name="import_from_sim" msgid="4749894687871835873">"יבא מכרטיס SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"יבא מכרטיס SIM מס\' <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"יבא מ-SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"יבא מ-SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"יבא מאמצעי אחסון"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"האם לבטל את הייבוא של <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"האם לבטל את הייצוא של <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"הבקשה לייצוא ה-vCard נדחתה. נסה שוב מאוחר יותר."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"איש קשר"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"קובצי ה-vCard נשמרים כקבצים באחסון מקומי זמני. הייבוא בפועל יחל בקרוב."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"לא ניתן היה לייבא את ה-vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"לא נמצאו קובצי vCard באמצעי האחסון."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"לא נמצאו קובצי vCard בכרטיס ה-SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"הפסק לחפש"</string> <string name="description_clear_search" msgid="3893511425518852086">"נקה את החיפוש"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"אפשרויות להצגת אנשי קשר"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"חשבון"</string> + <string name="set_default_account" msgid="3865970860434642695">"השתמש תמיד עבור שיחות"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"התקשר באמצעות"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 51163ee9..f2b27b60 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"単独の連絡先"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"アカウントに連絡先を作成"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIMカードからインポート"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIMカード（番号: <xliff:g id="SIM_NUMBER">%d</xliff:g>）からインポート"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM（<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>）からインポート"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM（<xliff:g id="SIM_NAME">%1$s</xliff:g>）からインポート"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"ストレージからインポート"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g>のインポートをキャンセルしますか？"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g>のエクスポートをキャンセルしますか？"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCardのエクスポートリクエストは拒否されました。しばらくしてからもう一度お試しください。"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"連絡先"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCardをローカル一時ストレージにキャッシュしています。まもなくインポート処理を開始します。"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCardをインポートできませんでした。"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"ストレージ内にvCardファイルが見つかりません。"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SDカードにvCardファイルが見つかりません。"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"検索を停止"</string> <string name="description_clear_search" msgid="3893511425518852086">"検索をクリア"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"連絡先表示オプション"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"アカウント"</string> + <string name="set_default_account" msgid="3865970860434642695">"このSIMを常に通話に使用する"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"発信用の端末アカウントを選択してください"</string> </resources> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 7280ecfd..270a3307 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"ერთი კონტაქტი"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"კონტაქტის შექმნა ანგარიშში"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM ბარათიდან იმპორტი"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"იმპორტი SIM ბარათიდან #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"იმპორტი SIM-იდან <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"იმპორტი SIM-იდან <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"მეხსიერებიდან იმპორტი"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"გსურთ <xliff:g id="FILENAME">%s</xliff:g>-ის იმპორტის გაუქმება?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"გსურთ <xliff:g id="FILENAME">%s</xliff:g>-ის ექსპორტის გაუქმება?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard-ის ექსპორტის მოთხოვნა უარყოფილია. სცადეთ მოგვიანებით."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"კონტაქტი"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"მიმდინარეობს vCard ფაილ(ებ)ის ქეშირება ადგილობრივ დროებით მეხსიერებაში. ფაქტიური იმპორტი დაიწყება მალე."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard-ის იმპორტი ვერ მოხერხდა."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"USB მეხსიერებაში vCard ფაილი ვერ მოიძებნა."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD ბარათზე vCard ფაილი ვერ მოიძებნა."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ძიების შეჩერება"</string> <string name="description_clear_search" msgid="3893511425518852086">"ძიების გასუფთავება"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"კონტაქტის ჩვენების ვარიანტები"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"ანგარიში"</string> + <string name="set_default_account" msgid="3865970860434642695">"ზარებისთვის მუდამ ამის გამოყენება"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"დარეკვა ანგარიშით:"</string> </resources> diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index 6e313181..4fbf2036 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Жалғыз контакт"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Есептік жазба арқылы контакт жасақтау"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM картадан импорттау"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"#<xliff:g id="SIM_NUMBER">%d</xliff:g> SIM картасынан импорттау"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM картасынан импорттау"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM картасынан импорттау"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Жадтан импорттау"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> импорттау тоқтатылсын ба?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> экспорттау тоқтатылсын ба?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vКартасын экспорттау өтініші қабылданбады. Кейінірек қайта әрекеттеніп көріңіз."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vКарталарын жергілікті уақытша жадқа кэштеу. Импорттау жуық арада басталады."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vКартасын экспорттау мүмкін болмады."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Жадта ешқандай vКарта табылмады."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD картада ешқандай vКарта табылмады."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"іздеуді тоқтату"</string> <string name="description_clear_search" msgid="3893511425518852086">"Іздеуді тазалау"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Контактілерді көрсету опциялары"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Есептік жазба"</string> + <string name="set_default_account" msgid="3865970860434642695">"Осыны қоңыраулар үшін әрқашан пайд."</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Келесімен қоңырау шалу"</string> </resources> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 0b9cdf6b..ef199072 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"ទំនាក់ទំនងទោល"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"បង្កើតទំនាក់ទំនងនៅក្នុងគណនី"</string> <string name="import_from_sim" msgid="4749894687871835873">"នាំចូលពីស៊ីមកាត"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"នាំចូលពីស៊ីមកាត #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"នាំចូលពីស៊ីម <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"នាំចូលពីស៊ីម <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"នាំចូលពីឧបករណ៍ផ្ទុក"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"បោះបង់ការនាំចូល <xliff:g id="FILENAME">%s</xliff:g> ?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"បោះបង់ការនាំចេញ <xliff:g id="FILENAME">%s</xliff:g> ?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"បានបដិសេធសំណើនាំចេញ vCard ។ សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ។"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"ទំនាក់ទំនង"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"ការផ្ទុក vCard(s) ទៅកាន់ឧបករណ៍ផ្ទុកបណ្ដោះអាសន្នមូលដ្ឋាន។ ការនាំចូលពិតប្រាកដនឹងចាប់ផ្ដើមក្នុងពេលឆាប់ៗ។"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"មិនអាចនាំចូល vCard ។"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"រកមិនឃើញឯកសារ vCard នៅក្នុងឧបករណ៍ផ្ទុក។"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"រកមិនឃើញឯកសារ vCard នៅលើកាតអេសឌី។"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"បញ្ឈប់ការស្វែងរក"</string> <string name="description_clear_search" msgid="3893511425518852086">"សម្អាតការស្វែងរក"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"ជម្រើសបង្ហាញទំនាក់ទំនង"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"គណនី"</string> + <string name="set_default_account" msgid="3865970860434642695">"ប្រើវាសម្រាប់ការហៅជានិច្ច"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"ហៅជាមួយ"</string> </resources> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index d36baaaf..9386bbc7 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -160,8 +160,9 @@ <string name="listCustomView" msgid="1915154113477432033">"ಕಸ್ಟಮ್ ವೀಕ್ಷಣೆಯಲ್ಲಿನ ಸಂಪರ್ಕಗಳು"</string> <string name="listSingleContact" msgid="8525131203887307088">"ಏಕೈಕ ಸಂಪರ್ಕ"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಿ"</string> - <string name="import_from_sim" msgid="4749894687871835873">"SIM ಕಾರ್ಡ್ನಿಂದ ಆಮದು ಮಾಡಿ"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIM ಕಾರ್ಡ್ #<xliff:g id="SIM_NUMBER">%d</xliff:g> ನಿಂದ ಆಮದು ಮಾಡಿ"</string> + <string name="import_from_sim" msgid="4749894687871835873">"ಸಿಮ್ ಕಾರ್ಡ್ನಿಂದ ಆಮದು ಮಾಡಿ"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM ನಿಂದ ಆಮದು ಮಾಡಿ"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM ನಿಂದ ಆಮದು ಮಾಡಿ"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"ಸಂಗ್ರಹಣೆಯಿಂದ ಆಮದು ಮಾಡಿ"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> ಆಮದು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> ಅನ್ನು ರಫ್ತು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard ರಫ್ತು ವಿನಂತಿಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"ಸಂಪರ್ಕ"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(ಗಳು) ಅನ್ನು ಸ್ಥಳೀಯ ತಾತ್ಕಾಲಿಕ ಸಂಗ್ರಹಣೆಗೆ ಸಂಗ್ರಹ ಮಾಡಲಾಗುತ್ತಿದೆ. ನಿಜವಾದ ಆಮದು ಶೀಘ್ರದಲ್ಲೇ ಪ್ರಾರಂಭವಾಗುತ್ತದೆ."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard ಆಮದು ಮಾಡಲಾಗಿಲ್ಲ."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"ಸಂಗ್ರಹಣೆಯಲ್ಲಿ ಯಾವುದೇ vCard ಫೈಲ್ ಕಂಡುಬಂದಿಲ್ಲ."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD ಕಾರ್ಡ್ನಲ್ಲಿ ಯಾವುದೇ vCard ಫೈಲ್ ಕಂಡುಬಂದಿಲ್ಲ."</string> @@ -243,7 +243,7 @@ <string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"ಯಾವುದೇ ಮೆಚ್ಚಿನವುಗಳು ಇಲ್ಲ."</string> <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> ರಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string> <string name="menu_clear_frequents" msgid="8492322695770647639">"ಪುನರಾವರ್ತನೆಗಳನ್ನು ತೆರುವುಗೊಳಿಸಿ"</string> - <string name="menu_select_sim" msgid="7814841439832447299">"SIM ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string> + <string name="menu_select_sim" msgid="7814841439832447299">"ಸಿಮ್ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string> <string name="menu_accounts" msgid="795417468541517082">"ಖಾತೆಗಳು"</string> <string name="menu_import_export" msgid="6446229463809981669">"ಆಮದು/ರಫ್ತು ಮಾಡಿ"</string> <string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> ಮೂಲಕ"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ಹುಡುಕಾಟವನ್ನು ನಿಲ್ಲಿಸಿ"</string> <string name="description_clear_search" msgid="3893511425518852086">"ಹುಡುಕಾಟವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"ಸಂಪರ್ಕ ಪ್ರದರ್ಶನ ಆಯ್ಕೆಗಳು"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"ಖಾತೆ"</string> + <string name="set_default_account" msgid="3865970860434642695">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"ಇದರೊಂದಿಗೆ ಕರೆ ಮಾಡಿ"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 518c9ff7..2f3b85d7 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"단일 연락처"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"연락처 추가할 계정 선택하기"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM 카드에서 가져오기"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIM 카드 #<xliff:g id="SIM_NUMBER">%d</xliff:g>에서 가져오기"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>에서 가져오기"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>에서 가져오기"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"저장소에서 가져오기"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> 가져오기를 취소하시겠습니까?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> 내보내기를 취소하시겠습니까?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 내보내기 요청이 거부되었습니다. 나중에 다시 시도해 주세요."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"연락처"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard를 로컬 임시 저장공간에 캐시하는 중입니다. 곧 가져오기가 시작됩니다."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard를 가져오지 못했습니다."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"저장공간에 vCard 파일이 없습니다."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD 카드에 vCard 파일이 없습니다."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"검색 중지"</string> <string name="description_clear_search" msgid="3893511425518852086">"검색창 지우기"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"연락처 표시 옵션"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"계정"</string> + <string name="set_default_account" msgid="3865970860434642695">"통화에 항상 사용"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"통화에 사용할 SIM"</string> </resources> diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index 2f963bcb..a2a5d4e6 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -166,7 +166,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Жалгыз байланыш"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Кийинки эсеп менен байланыш түзүү:"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM-картадан импорттоо"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"#<xliff:g id="SIM_NUMBER">%d</xliff:g> SIM картасынан импорттоо"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g> ичинен импорттоо"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> ичинен импорттоо"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Сактагычтан импорттоо"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> импортто токтотулсунбу?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> экспорттоо токтотулсунбу?"</string> @@ -210,7 +211,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard экспорттоо талабы четке кагылды. Кийинчерээк кайра аракеттениңиз."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"байланыш"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(дар) жергиликтүү убактылуу жайга топтолууда. Чыныгы импорт жакында башталат."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard импорт кылынган жок."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Сактагычта эч бир vCard файл табылган жок."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD-картада эч бир vCard файл табылган жок."</string> @@ -256,4 +256,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"издөөнү токтотуу"</string> <string name="description_clear_search" msgid="3893511425518852086">"Издөөнү тазалоо"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Байланышты көрсөтүү параметрлери"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Каттоо эсеби"</string> + <string name="set_default_account" msgid="3865970860434642695">"Бул ар дайым чалуулр үчн колдонулсн"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Төмөнкү менен чалуу"</string> </resources> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index a10a95f5..d488e2a4 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"ລາຍຊື່ຜູ່ຕິດຕໍ່ດ່ຽວ"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"ສ້າງລາຍຊື່ຜູ່ຕິດຕໍ່ພາຍໃຕ້ບັນຊີ"</string> <string name="import_from_sim" msgid="4749894687871835873">"ນຳເຂົ້າຈາກ SD card"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"ນຳເຂົ້າຈາກ SIM ກາດ #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"ນຳເຂົ້າຈາກ SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"ນຳເຂົ້າຈາກ SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"ນຳເຂົ້າຈາກບ່ອນຈັດເກັບຂໍ້ມູນ"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"ຍົກເລີກການນຳເຂົ້າ <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"ຍົກເລີກການສົ່ງອອກ <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"ຄຳຂໍການສົ່ງອອກ vCard ຖືກປະຕິເສດ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"ກຳລັງເກັບຂໍ້ມູນ vCard ໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນຊົ່ວຄາວໃນອຸປະກອນ. ການນຳເຂົ້າຈະເລີ່ມຂຶ້ນໃນໄວໆນີ້."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"ບໍ່ສາມາດນຳເຂົ້າ vCard ໄດ້."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"ບໍ່ພົບໄຟລ໌ vCard ໃນບ່ອນຈັດເກັບຂໍ້ມູນ."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"ບໍ່ພົບໄຟລ໌ vCard ໃນ SD card."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ຢຸດການຊອກຫາ"</string> <string name="description_clear_search" msgid="3893511425518852086">"ລຶບການຊອກຫາ"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"ໂຕເລືອກການສະແດງລາຍຊື່ຜູ່ຕິດຕໍ່"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"ບັນຊີ"</string> + <string name="set_default_account" msgid="3865970860434642695">"ໃຊ້ຊິມນີ້ເພື່ອການໂທທຸກເທື່ອ"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"ໂທດ້ວຍ"</string> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index b9f851b1..6cf86ec9 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Vienas kontaktas"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Kurti kontaktą paskyroje"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importuoti iš SIM kortelės"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importuoti iš SIM kortelės Nr. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importuoti iš SIM kortelės „<xliff:g id="SIM_NAME">^1</xliff:g>“ – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importuoti iš SIM kortelės „<xliff:g id="SIM_NAME">%1$s</xliff:g>“"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importuoti iš saugyklos"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Atšaukti „<xliff:g id="FILENAME">%s</xliff:g>“ importavimą?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Atšaukti „<xliff:g id="FILENAME">%s</xliff:g>“ eksportavimą?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"El. vizitinės kortelės eksportavimo užklausa buvo atmesta. Vėliau bandykite dar kartą."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktas"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"El. vizitinė (-ės) kortelė (-ės) padedama (-os) į vietinę laikinąją saugyklą. Netrukus bus pradėtas tikrasis importavimas."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Nepavyko importuoti el. vizit. kortelės."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Saugykloje nerasta jokių el. vizitinių kortelių failų."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD kortelėje nerasta jokių el. vizitinių kortelių failų."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"sustabdyti paiešką"</string> <string name="description_clear_search" msgid="3893511425518852086">"Išvalyti paiešką"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktų rodymo parinktys"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Paskyra"</string> + <string name="set_default_account" msgid="3865970860434642695">"Visada naudoti tai skambučiams"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Skambinkite naudodami"</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 6469c380..94b86252 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Viena kontaktpersona"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Izveidot jaunu kontaktpersonu kontā"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importēt no SIM kartes"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importēt no SIM kartes Nr. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importēt no SIM kartes <xliff:g id="SIM_NAME">^1</xliff:g> — <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importēt no SIM kartes <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importēt no atmiņas"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Vai atcelt faila <xliff:g id="FILENAME">%s</xliff:g> importēšanu?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Vai atcelt faila <xliff:g id="FILENAME">%s</xliff:g> eksportēšanu?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Tika noraidīts vCard faila eksportēšanas pieprasījums. Vēlāk mēģiniet vēlreiz."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktpersona"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Notiek vCard failu saglabāšana vietējā pagaidu kešatmiņā. Importēšana tiks sākta pēc neilga brīža."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Nevarēja importēt vCard datus."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Atmiņā netika atrasts neviens vCard fails."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD kartē netika atrasts neviens vCard fails."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"pārtraukt meklēšanu"</string> <string name="description_clear_search" msgid="3893511425518852086">"Notīrīt meklēšanas lauku"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktpersonu rādīšanas opcijas"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Konts"</string> + <string name="set_default_account" msgid="3865970860434642695">"Vienmēr izmantot zvaniem"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Zvanīt, izmantojot"</string> </resources> diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index 8bb27f2b..92eab4f3 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Еден контакт"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Создај контакт под сметка"</string> <string name="import_from_sim" msgid="4749894687871835873">"Увези од СИМ картичка"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Увези од СИМ-картичка #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Увези од СИМ <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Увези од СИМ <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Увези од меморија"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Откажи увоз на <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Откажи извоз на <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Барањето за извезување визит картичка беше одбиено. Обидете се повторно подоцна."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Кеширање визит картичка(и) во локална привремена меморија. Реалниот увоз ќе започне наскоро."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Не можеше да се увезе визит картичка."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Не е пронајдена датотека со визит картичка во меморија."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Не е пронајдена датотека со визит картичка на СД картичката."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"запри пребарување"</string> <string name="description_clear_search" msgid="3893511425518852086">"Исчисти го полето за пребарување"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Опции за прикажување контакт"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Сметка"</string> + <string name="set_default_account" msgid="3865970860434642695">"Секогаш користи го ова за повици"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Повикајте со"</string> </resources> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 425aee2f..83ada9e9 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -67,7 +67,7 @@ <string name="status_available" msgid="4832569677396634846">"ലഭ്യം"</string> <string name="status_away" msgid="6267905184545881094">"ലഭ്യമല്ല"</string> <string name="status_busy" msgid="7111912905211403545">"തിരക്കിലാണ്"</string> - <string name="contactsList" msgid="7140022347217602605">"കോണ്ടാക്റ്റുകള്"</string> + <string name="contactsList" msgid="7140022347217602605">"വിലാസങ്ങൾ"</string> <string name="local_invisible_directory" msgid="8934840494825588347">"മറ്റുള്ളവ"</string> <string name="directory_search_label" msgid="4484648822765516947">"ഡയറക്ടറി"</string> <string name="local_search_label" msgid="9094584931063745728">"എല്ലാ കോൺടാക്റ്റുകളും"</string> @@ -160,12 +160,13 @@ <string name="listCustomView" msgid="1915154113477432033">"ഇഷ്ടാനുസൃത കാഴ്ചയിലെ കോൺടാക്റ്റുകൾ"</string> <string name="listSingleContact" msgid="8525131203887307088">"സിംഗിൾ കോൺടാക്റ്റ്"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"അക്കൗണ്ടിന് കീഴിൽ കോൺടാക്റ്റ് സൃഷ്ടിക്കുക"</string> - <string name="import_from_sim" msgid="4749894687871835873">"SIM കാർഡിൽ നിന്നും ഇമ്പോർട്ടുചെയ്യുക"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"#<xliff:g id="SIM_NUMBER">%d</xliff:g> എന്ന SIM കാർഡിൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യുക"</string> + <string name="import_from_sim" msgid="4749894687871835873">"സിം കാർഡിൽ നിന്നും ഇമ്പോർട്ടുചെയ്യുക"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM-ൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യുക <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM-ൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യുക <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"സംഭരണത്തിൽ നിന്നും ഇമ്പോർട്ടുചെയ്യുക"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് ഇമ്പോർട്ടുചെയ്യുന്നത് റദ്ദാക്കണോ?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് എക്സ്പോർട്ടുചെയ്യുന്നത് റദ്ദാക്കണോ?"</string> - <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"vCard ഇമ്പോർട്ടുചെയ്യൽ/എക്സ്പോർട്ടുചെയ്യൽ റദ്ദാക്കാനായില്ല"</string> + <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"vCard ഡൗൺലോഡ്/അപ്ലോഡ് റദ്ദാക്കാനായില്ല"</string> <string name="fail_reason_unknown" msgid="8541352164960008557">"അജ്ഞാത പിശക്."</string> <string name="fail_reason_could_not_open_file" msgid="7041148341788958325">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" തുറക്കാനായില്ല: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string> <string name="fail_reason_could_not_initialize_exporter" msgid="1231982631020480035">"എക്സ്പോർട്ടർ ആരംഭിക്കാനായില്ല: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard എക്സ്പോർട്ടുചെയ്യൽ അഭ്യർത്ഥന നിരസിച്ചു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"കോൺടാക്റ്റ്"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"പ്രാദേശിക താൽക്കാലിക സംഭരണത്തിലേക്ക് vCard (vCard-കൾ) കാഷെ ചെയ്യുന്നു. യഥാർത്ഥ ഇമ്പോർട്ടുചെയ്യൽ ഉടൻ ആരംഭിക്കും."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard ഇമ്പോർട്ടുചെയ്യാനായില്ല."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"സംഭരണത്തിൽ vCard ഫയലുകളൊന്നും കണ്ടെത്തിയില്ല."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD കാർഡിൽ vCard ഫയലുകളൊന്നും കണ്ടെത്തിയില്ല."</string> @@ -229,7 +229,7 @@ <string name="display_options_view_given_name_first" msgid="7283772578267332801">"പേരിന്റെ ആദ്യഭാഗം ആദ്യം"</string> <string name="display_options_view_family_name_first" msgid="8133167685885174166">"പേരിന്റെ അവസാന ഭാഗം ആദ്യം"</string> <string name="share_visible_contacts" msgid="2150662668080757107">"ദൃശ്യമായ കോൺടാക്റ്റുകൾ പങ്കിടുക"</string> - <string name="dialog_import_export" msgid="1125776851100740858">"കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുക/എക്സ്പോർട്ടുചെയ്യുക"</string> + <string name="dialog_import_export" msgid="1125776851100740858">"കോൺടാക്റ്റുകൾ ഡൗൺലോഡ്/അപ്ലോഡ് ചെയ്യുക"</string> <string name="dialog_import" msgid="5177004290082451296">"കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുക"</string> <string name="share_error" msgid="665756457151793108">"ഈ കോൺടാക്റ്റ് പങ്കിടാനാകില്ല."</string> <string name="menu_search" msgid="7464453023659824700">"തിരയുക"</string> @@ -243,12 +243,15 @@ <string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"പ്രിയപ്പെട്ടവർ ആരുമില്ല."</string> <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> എന്നതിൽ കോൺടാക്റ്റുകളൊന്നുമില്ല"</string> <string name="menu_clear_frequents" msgid="8492322695770647639">"പതിവായി കോൺടാക്റ്റുചെയ്യുന്നവരെ മായ്ക്കുക"</string> - <string name="menu_select_sim" msgid="7814841439832447299">"SIM കാർഡ് തിരഞ്ഞെടുക്കുക"</string> + <string name="menu_select_sim" msgid="7814841439832447299">"സിം കാർഡ് തിരഞ്ഞെടുക്കുക"</string> <string name="menu_accounts" msgid="795417468541517082">"അക്കൗണ്ടുകൾ"</string> - <string name="menu_import_export" msgid="6446229463809981669">"ഇമ്പോർട്ടുചെയ്യുക/എക്സ്പോർട്ടുചെയ്യുക"</string> + <string name="menu_import_export" msgid="6446229463809981669">"ഡൗൺലോഡ്/അപ്ലോഡ്"</string> <string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> വഴി"</string> <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="SOURCE">%2$s</xliff:g> വഴി <xliff:g id="DATE">%1$s</xliff:g>"</string> <string name="action_menu_back_from_search" msgid="1138551123844019647">"തിരയൽ നിർത്തുക"</string> <string name="description_clear_search" msgid="3893511425518852086">"തിരയുന്നത് മായ്ക്കുക"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"കോൺടാക്റ്റ് ഡിസ്പ്ലേ ഓപ്ഷനുകൾ"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"അക്കൗണ്ട്"</string> + <string name="set_default_account" msgid="3865970860434642695">"ഇത് എല്ലായ്പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"ഇത് ഉപയോഗിച്ച് വിളിക്കുക"</string> </resources> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index f735270d..a9ec93eb 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Ганц харилцагч"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Акаунт дотор харилцагч үүсгэх"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM картаас импорт хийх"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIM карт #<xliff:g id="SIM_NUMBER">%d</xliff:g> дээрээс импортлох"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>-с импортлох"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>-с импортлох"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Сангаас импорт хийх"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g>-г импорт хийхийг цуцлах уу?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g>-г экспорт хийхийг цуцлах уу?"</string> @@ -207,7 +208,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard экспорт хийх хүсэлтийг зөвшөөрсөнгүй. Дараа дахин оролдоно уу."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"харилцагч"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard-г дотоод түр санд кеш хийж байна. Удахгүй бодитоор импорт хийж эхлэх болно."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard-г импорт хийж чадсангүй."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Сан дотор vCard файл олдсонгүй."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD карт дотор vCard файл олдсонгүй."</string> @@ -253,4 +253,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"хайлтыг зогсоох"</string> <string name="description_clear_search" msgid="3893511425518852086">"Хайлтыг цэвэрлэх"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Харилцагчийн харагдах сонголт"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Акаунт"</string> + <string name="set_default_account" msgid="3865970860434642695">"Дуудлагад байнга үүнийг ашиглах"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Залгах"</string> </resources> diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index 680c0cf0..592ea348 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"एकल संपर्क"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"खात्याअंतर्गत संपर्क तयार करा"</string> <string name="import_from_sim" msgid="4749894687871835873">"सिमकार्डवरुन आयात करा"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"#<xliff:g id="SIM_NUMBER">%d</xliff:g> सिम कार्ड वरून आयात करा"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM वरून आयात करा"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM वरून आयात करा"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"संचयनावरुन आयात करा"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> चे आयात रद्द करायचे?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> चे निर्यात रद्द करायचे?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard निर्यात विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"संपर्क"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"स्थानिक तात्पुरत्या संचयनावर vCard(s) कॅशे करीत आहे. वास्तविक आयात लवकरच प्रारंभ होईल."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard आयात करू शकलो नाही."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"संचयनामध्ये कोणतीही vCard फाईल आढळली नाही."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD कार्डवर कोणतीही vCard फाईल आढळली नाही."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"शोध थांबवा"</string> <string name="description_clear_search" msgid="3893511425518852086">"शोध साफ करा"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"संपर्क प्रदर्शन पर्याय"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"खाते"</string> + <string name="set_default_account" msgid="3865970860434642695">"कॉलसाठी हे नेहमी वापरा"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"यासह कॉल करा"</string> </resources> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 27a8656e..2c235e47 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Kenalan tunggal"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Wujudkan kenalan di bawah akaun"</string> <string name="import_from_sim" msgid="4749894687871835873">"Import dari kad SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Import dari kad SIM #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Import dari SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Import dari SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Import dari storan"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Batalkan import <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Batalkan eksport <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -207,7 +208,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Permintaan eksport vCard telah ditolak. Cuba lagi nanti."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kenalan"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Membuat cache vCard ke storan sementara setempat. Pengimportan sebenar akan bermula tidak lama lagi."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Tidak dapat mengimport vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Tiada fail vCard ditemui dalam storan"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Tiada fail vCard ditemui pada kad SD."</string> @@ -253,4 +253,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"berhenti mencari"</string> <string name="description_clear_search" msgid="3893511425518852086">"Kosongkan carian"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Pilihan paparan kenalan"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Akaun"</string> + <string name="set_default_account" msgid="3865970860434642695">"Sentiasa gunakan ini untuk panggilan"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Panggil dengan"</string> </resources> diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index f85f7015..a4f759e6 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"အဆက်အသွယ်တစ်ခုတည်း"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"အကောင့်အောက်မှာ အဆက်အသွယ်များပြုလုပ်ပါ"</string> <string name="import_from_sim" msgid="4749894687871835873">"ဆင်းမ်ကဒ်ထဲမှ အထဲသို့သွင်းရန်"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"ဆင်းမ် ကဒ် #<xliff:g id="SIM_NUMBER">%d</xliff:g>ထံမှ တင်သွင်းရန်"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"ဆင်းမ်ကဒ်မှ သွင်းယူရန် <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"ဆင်းမ်ကဒ်မှ သွင်းယူရန် <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"သိုလှောင်ရာနေရာမှ အထဲသို့သွင့်ရန်"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> ကို အထဲသို့သွင်းခြင်းအား ရပ်တန့်မလား?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> ကိုအပြင်သို့ထုတ်ခြင်းအား ရပ်တန့်မလား?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"လိပ်စာကဒ်အား အပြင်ထုတ်ရန် တောင်းဆိုမှု ငြင်းဆန်ခံရပါသည်။ နောင်မှ ပြန်လည်ကြိုးစားပါ"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"အဆက်အသွယ်"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"လိပ်စာကဒ်(များ)ကို စက်တွင်း ခဏသိမ်းဆည်းရာနေရာသို့ ပို့နေပါသည်။ အမှန်တကယ် တင်သွင်းခြင်း မကြာခင် စပါမည်။"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"လိပ်စာကဒ်အား အထဲသွင်းလို့မရပါ"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"သိုလှောင်ရာနေရာထဲတွင် လိပ်စာကဒ်ဖိုင်မှမရှိပါ"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD ကဒ်ထဲတွင် လိပ်စာကဒ်ဖိုင်မှမရှိပါ"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ရှာဖွေမှုကို ရပ်ရန်"</string> <string name="description_clear_search" msgid="3893511425518852086">"ရှာဖွေမှုကို ရှင်းပါ"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"အဆက်အသွယ် ပြသမှု ရွေးစရာများ"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"အကောင့်"</string> + <string name="set_default_account" msgid="3865970860434642695">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"ဖြင့် ခေါ်ဆိုရန်"</string> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 8ffcd0c5..5085b9f2 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Enkeltkontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Opprett kontakt under konto"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importer fra SIM-kort"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importér fra SIM-kort nr.<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importer fra lagring"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Vil du avbryte importeringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Vil du avbryte eksporteringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Forespørselen om eksport av vCard ble avvist. Prøv på nytt senere."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Bufrer vCard for import til lokal, midlertidig lagring. Selve importeringen starter snart."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Kunne ikke importere vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Finner ingen vCard-filer på lagringsenheten."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Fant ingen vCard-filer på SD-kortet."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"avslutt søket"</string> <string name="description_clear_search" msgid="3893511425518852086">"Slett søket"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Alternativer for visning av kontakter"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string> + <string name="set_default_account" msgid="3865970860434642695">"Bruk alltid dette for samtaler"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ring med"</string> </resources> diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 49e27140..1dffaeb0 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"एकल सम्पर्क"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"खाताअन्तर्गत सम्पर्क सिर्जना गर्नुहोस्"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM कार्डबाट आयात गर्नुहोस्"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"सिमकार्ड #<xliff:g id="SIM_NUMBER">%d</xliff:g> बाट आयात गर्नुहोस्"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> बाट आयात"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> सिमबाट आयात"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"भण्डारणबाट आयात गर्नुहोस्"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g>को आयात रद्द गर्ने हो?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> को निर्यात रद्द गर्नहोस्?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard निर्यात अनुरोध अस्वीकार गरियो। कृपया फेरि प्रयास गर्नुहोस्।"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"सम्पर्क"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"स्थानीय अस्थायी भण्डारणका लागि vCard (हरू) क्यास गर्दै । वास्तविक आयात छिट्टै सुरु हुने छ।"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"VCard आयात गर्न सकेन।"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"भण्डारणमा कुने vCard फाइल पाइएन।"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD कार्डमा कुनै पनि vCard फाइल भेटिएन।"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"खोजी गर्न रोक्नुहोस्"</string> <string name="description_clear_search" msgid="3893511425518852086">"खोजी खाली गर्नुहोस्"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"सम्पर्क प्रदर्शन विकल्पहरू"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"खाता"</string> + <string name="set_default_account" msgid="3865970860434642695">"कल गर्नका लागि यसको प्रयोग सधैं गर्नुहोस्"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"संग कल"</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 9bd385ad..b6223114 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Eén contact"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Contact in account maken"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importeren van simkaart"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importeren van simkaart #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importeren van simkaart <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importeren van simkaart <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importeren uit opslag"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Import van <xliff:g id="FILENAME">%s</xliff:g> annuleren?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Export van <xliff:g id="FILENAME">%s</xliff:g> annuleren?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Verzoek voor vCard-export is geweigerd. Probeer het later opnieuw."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Bezig met opslaan van vCard(s) in de lokale tijdelijke opslag. Het daadwerkelijke importeren begint binnenkort."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Kan vCard niet importeren."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Geen vCard-bestand gevonden in opslag."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Geen vCard-bestand gevonden op SD-kaart."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"stoppen met zoeken"</string> <string name="description_clear_search" msgid="3893511425518852086">"Zoekopdracht wissen"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opties voor contactweergave"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string> + <string name="set_default_account" msgid="3865970860434642695">"Altijd gebruiken voor oproepen"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Bellen met"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5fa593ce..29c35d30 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Jeden kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Utwórz kontakt na koncie"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importuj z karty SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importuj z karty SIM nr <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importuj z karty SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importuj z karty SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importuj z nośnika"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Anulować importowanie pliku <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Anulować eksportowanie pliku <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Żądanie eksportu danych vCard zostało odrzucone. Spróbuj ponownie później."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Trwa buforowanie plików vCard w lokalnym obszarze tymczasowym. Właściwy import rozpocznie się za chwilę."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Nie udało się zaimportować pliku vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Na nośniku nie znaleziono żadnego pliku vCard."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Na karcie SD nie znaleziono żadnego pliku vCard."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zatrzymaj wyszukiwanie"</string> <string name="description_clear_search" msgid="3893511425518852086">"Wyczyść wyszukiwanie"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opcje wyświetlania kontaktów"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string> + <string name="set_default_account" msgid="3865970860434642695">"Zawsze używaj do połączeń"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Zadzwoń, używając"</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 93949c17..b52534d6 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Contacto único"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Criar contacto na conta"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importar do cartão SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importar do cartão SIM <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importar do SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importar do SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importar do armazenamento"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Cancelar a importação de <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Cancelar a exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacto"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"A colocar vCard(s) em cache no armazenamento temporário local. A importação efetiva começará brevemente."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Não foi possível importar o vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Não foi encontrado nenhum ficheiro vCard no armazenamento."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Não foi encontrado nenhum ficheiro vCard no cartão SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"parar de pesquisar"</string> <string name="description_clear_search" msgid="3893511425518852086">"Limpar pesquisa"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opções de visualização de contactos"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Conta"</string> + <string name="set_default_account" msgid="3865970860434642695">"Utilizar sempre este para chamadas"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ao telefone com"</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index fedd1b44..7340f48b 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Contato único"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Criar contato na conta"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importar do cartão SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importar do cartão SIM <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importar do SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importar do SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importar do armazenamento"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Cancelar a importação de <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Cancelar a exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contato"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Armazenando VCards em cache no armazenamento temporário local. A importação real começará em breve."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Não foi possível importar o vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Nenhum arquivo vCard encontrado no armazenamento."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Nenhum arquivo vCard encontrado no cartão SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"parar de pesquisar"</string> <string name="description_clear_search" msgid="3893511425518852086">"Limpar pesquisa"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opções de exibição de contato"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Conta"</string> + <string name="set_default_account" msgid="3865970860434642695">"Sempre usar esta opção para chamadas"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ligar com"</string> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 5e1d2147..a9b62282 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"O singură persoană de contact"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Creați o persoană de contact în contul"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importați de pe cardul SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importați de pe cardul SIM #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importați de pe cardul SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importați de pe cardul SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importați din stocare"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Anulați importul fișierului <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Anulați exportul fișierului <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Solicitarea de export a fișierului vCard a fost respinsă. Încercați din nou mai târziu."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"persoană de contact"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Fișierele vCard se stochează în memoria cache într-un spațiu de stocare local temporar. Importul propriu-zis va începe în curând."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Nu s-a putut importa fișierul vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Nu s-a găsit niciun fișier vCard în stocare."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Nu s-a găsit niciun fișier vCard pe cardul SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"nu mai căutați"</string> <string name="description_clear_search" msgid="3893511425518852086">"Ștergeți căutarea"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Opțiuni de afișare pentru persoanele de contact"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Cont"</string> + <string name="set_default_account" msgid="3865970860434642695">"Utilizați mereu pentru apeluri"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Apelați cu"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index abcd3b7c..14a3ebd3 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Один контакт"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Создать контакт в аккаунте"</string> <string name="import_from_sim" msgid="4749894687871835873">"Импорт с SIM-карты"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Импортировать с SIM-карты <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Импорт с SIM-карты <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Импорт с SIM-карты <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Импорт с накопителя"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Отменить импорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Отменить экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Запрос на экспорт данных vCard отклонен. Повторите попытку позже."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Выполняется кеширование файлов vCard в локальное временное хранилище, после чего начнется импорт."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Не удалось импортировать данные vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"На накопителе нет файлов vCard."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"На SD-карте нет файлов vCard."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"прекратить поиск"</string> <string name="description_clear_search" msgid="3893511425518852086">"Очистить условия поиска"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Отображение контактов"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Аккаунт"</string> + <string name="set_default_account" msgid="3865970860434642695">"Всегда использовать для звонков"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Аккаунт для звонка"</string> </resources> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index d5a9d71d..5724328d 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"එක් සම්බන්ධතාවය"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"ගිණුම යටතේ සම්බන්ධතාවය නිර්මාණය කරන්න"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM පතෙන් ආයාත කරන්න"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIM කාඩ්පතින් #<xliff:g id="SIM_NUMBER">%d</xliff:g> ආයාත කරන්න"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> වෙතින් ආයාත කරන්න"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> වෙතින් ආයාත කරන්න"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"ආචයනයෙන් ආයාත කරන්න"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> ආයාත කිරීම අවලංගු කරන්නද?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම අවලංගු කරන්නද?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard නිර්යාත අයැදුම ප්රතික්ෂේප කරන ලදි. පසුව නැවත උත්සාහ කරන්න."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"සම්බන්ධතාවය"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"පෙදෙසි තාවකාලික ආචයනයට vCard(s) හැඹිලිගත කරමින් පවතී. සැබෑ ආයාත කිරීම ඉක්මනින් පටන් ගනු ඇත."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard ආයාත කිරීමට නොහැකි විය."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"ආචයනයෙහි vCard ගොනුවක් සොයා නොගන්නා ලදී."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD පතෙහි vCard ගොනුවක් සොයා නොගන්නා ලදී."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"සෙවීම අවසන් කරන්න"</string> <string name="description_clear_search" msgid="3893511425518852086">"සෙවීම හිස් කරන්න"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"දර්ශනය කිරීමේ විකල්පය සම්බන්ධ කරගන්න"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"ගිණුම"</string> + <string name="set_default_account" msgid="3865970860434642695">"ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"සමඟ අමතන්න"</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 3e44428a..918b7a14 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Jednotlivý kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Vytvoriť kontakt na základe účtu"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importovať z karty SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importovať zo SIM karty č. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importovať zo SIM karty <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importovať zo SIM karty <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importovať z úložiska"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Zrušiť importovanie súboru <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Zrušiť exportovanie súboru <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Žiadosť o exportovanie vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Prebieha načítavanie vizitiek vCard do vyrovnávacej pamäte miestneho dočasného úložiska. Samotné importovanie začne o chvíľu."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Vizitku vCard sa nepodarilo importovať."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"V ukladacom priestore sa nenašla žiadna vizitka vCard."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Na karte SD sa nenašla žiadna vizitka vCard."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"zastaviť vyhľadávanie"</string> <string name="description_clear_search" msgid="3893511425518852086">"Vymazať vyhľadávanie"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Možnosti zobrazenia kontaktov"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Účet"</string> + <string name="set_default_account" msgid="3865970860434642695">"Vždy používať pre hovory"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Volať pomocou"</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 111e7c1e..dafe5317 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Posamezen stik"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Ustvari stik v računu"</string> <string name="import_from_sim" msgid="4749894687871835873">"Uvozi s kartice SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Uvoz s kartice SIM št. <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Uvoz s kartice SIM <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Uvoz s kartice SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Uvoz iz shrambe"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Želite preklicati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Želite preklicati izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Zahteva za izvoz datoteke vCard je bila zavrnjena. Poskusite znova pozneje."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"stik"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Predpomnjenje datotek vCard v lokalno začasno shrambo. Dejanski uvoz se bo začel kmalu."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Datoteke vCard ni mogoče uvoziti."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"V shrambi ni mogoče najti datotek vCard."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Na kartici SD ni mogoče najti datotek vCard."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ustavitev iskanja"</string> <string name="description_clear_search" msgid="3893511425518852086">"Počisti iskalno polje"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Možnosti prikaza stikov"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Račun"</string> + <string name="set_default_account" msgid="3865970860434642695">"Vedno uporabi to možnost za klice"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Klicanje z …"</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 480feedf..7d8a6257 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Појединачни контакт"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Прављење контакта у оквиру налога"</string> <string name="import_from_sim" msgid="4749894687871835873">"Увези са SIM картице"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Увези са SIM картице број <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Увоз са SIM картице <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Увоз са SIM картице <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Увези из меморије"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Желите ли да откажете увоз датотеке <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Желите ли да откажете извоз датотеке <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Захтев за извоз vCard датотеке је одбијен. Покушајте поново касније."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Кеширање vCard датотекa у локалну привремену меморију. Увоз ће ускоро започети."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Увоз vCard датотеке није могућ."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"У меморији није пронађена ниједна vCard датотека."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"На SD картици није пронађена ниједна vCard датотека."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"заустављање претраживања"</string> <string name="description_clear_search" msgid="3893511425518852086">"Брисање претраге"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Опције приказивања контаката"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Налог"</string> + <string name="set_default_account" msgid="3865970860434642695">"Увек користи ово за позиве"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Позови помоћу"</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 18932a91..5c121a48 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"En kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Skapa kontakt under konto"</string> <string name="import_from_sim" msgid="4749894687871835873">"Importera från SIM-kort"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Importera från SIM-kort nr <xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Importera från SIM-kort <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importera från SIM-kort <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Importera från USB"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Vill du avbryta importen av <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Vill du avbryta exporten av <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Begäran om vCard-export avvisades. Försök igen vid ett senare tillfälle."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard-fil(er) cachelagras till en lokal tillfällig lagringsenhet. Den faktiska importen börjar snart."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Det gick inte att importera vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Det finns ingen vCard-fil på lagringsenheten."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Det finns ingen vCard-fil på SD-kortet."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"avbryt sökning"</string> <string name="description_clear_search" msgid="3893511425518852086">"Rensa sökning"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Visningsalternativ för kontakter"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Konto"</string> + <string name="set_default_account" msgid="3865970860434642695">"Använd alltid för samtal"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ring med"</string> </resources> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 3f815d1f..e3a0e52f 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Anwani moja"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Weka anwani katika akaunti"</string> <string name="import_from_sim" msgid="4749894687871835873">"Ingiza kutoka SIM kadi"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Ingiza kutoka SIM kadi #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Leta kutoka SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Leta kutoka SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Ingiza kutoka hifadhi"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Ghairi uhamisho wa <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Ighairi uhamisho wa <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -207,7 +208,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Ombi la kuhamishwa kwa vCard limekataliwa. Jaribu tena baadaye."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"anwani"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Vcard Inaakibisha ndani ya hifadhi ya muda mfupi. Uhamisho halisi utaanza hivi karibuni."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Haikuweza kuleta vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Hakuna faili ya vCard iliyopatikana katika hifadhi."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Hakuna faili ya vCard iliyopatikana kwenye kadi ya SD."</string> @@ -253,4 +253,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"acha kutafuta"</string> <string name="description_clear_search" msgid="3893511425518852086">"Futa utafutaji"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Chaguo za onyesho la anwani"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Akaunti"</string> + <string name="set_default_account" msgid="3865970860434642695">"Tumia hii kwa simu wakati wote"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Piga simu ukitumia"</string> </resources> diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index b1e62000..381c2666 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"ஒரு தொடர்பு"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"கணக்கின் கீழ் தொடர்பை உருவாக்கு"</string> <string name="import_from_sim" msgid="4749894687871835873">"சிம் கார்டிலிருந்து இறக்குமதிசெய்"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIM கார்டு #<xliff:g id="SIM_NUMBER">%d</xliff:g> இலிருந்து இறக்கு"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> என்ற SIM இல் இருந்து இறக்குமதிசெய்"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> என்ற SIM இல் இருந்து இறக்குமதிசெய்"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"சேமிப்பிடத்திலிருந்து இறக்குமதிசெய்"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> இன் இறக்குமதியை ரத்துசெய்யவா?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> இன் ஏற்றுமதியை ரத்துசெய்யவா?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard இன் ஏற்றுமதி கோரிக்கை நிராகரிக்கப்பட்டது. பிறகு முயற்சிக்கவும்."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"தொடர்பு"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(களை) ஐ அகச் சேமிப்பிடத்தில் தற்காலிகமாகச் சேமிக்கிறது. அசல் இறக்குமதி உடனடியாக தொடங்கப்படும்."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard ஐ இறக்குமதி செய்ய முடியவில்லை."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"சேமிப்பிடத்தில் vCard கோப்பு இல்லை."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD கார்டில் vCard கோப்பு இல்லை."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"தேடுவதை நிறுத்து"</string> <string name="description_clear_search" msgid="3893511425518852086">"தேடலை அழி"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"தொடர்பின் காட்சி விருப்பங்கள்"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"கணக்கு"</string> + <string name="set_default_account" msgid="3865970860434642695">"அழைப்புகளுக்கு எப்போதும் இதைப் பயன்படுத்து"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"இதன் மூலம் அழை"</string> </resources> diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index c4fcff45..ed0a84e4 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -160,8 +160,9 @@ <string name="listCustomView" msgid="1915154113477432033">"అనుకూల వీక్షణలో పరిచయాలు"</string> <string name="listSingleContact" msgid="8525131203887307088">"ఒక పరిచయం"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"ఖాతాలో పరిచయాన్ని సృష్టించండి"</string> - <string name="import_from_sim" msgid="4749894687871835873">"SIM కార్డు నుండి దిగుమతి చేయండి"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIM కార్డ్ #<xliff:g id="SIM_NUMBER">%d</xliff:g> నుండి దిగుమతి చేయండి"</string> + <string name="import_from_sim" msgid="4749894687871835873">"సిమ్ కార్డు నుండి దిగుమతి చేయండి"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM నుండి దిగుమతి చేయండి"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM నుండి దిగుమతి చేయండి"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"నిల్వ నుండి దిగుమతి చేయండి"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> యొక్క దిగుమతిని రద్దు చేయాలా?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> యొక్క ఎగుమతిని రద్దు చేయాలా?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard ఎగుమతి అభ్యర్థన తిరస్కరించబడింది. తర్వాత మళ్లీ ప్రయత్నించండి."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"పరిచయం"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(ల)ను స్థానిక తాత్కాలిక నిల్వకు కాష్ చేస్తోంది. అసలు దిగుమతి కొద్దిసేపట్లో ప్రారంభమవుతుంది."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCardని దిగుమతి చేయడం సాధ్యపడలేదు."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"నిల్వలో vCard ఫైల్ ఏదీ కనుగొనబడలేదు."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD కార్డులో vCard ఫైల్ ఏదీ కనుగొనబడలేదు."</string> @@ -243,7 +243,7 @@ <string name="listTotalAllContactsZeroStarred" msgid="4176827228429279164">"ఇష్టమైనవి లేవు."</string> <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g>లో పరిచయాలు లేవు"</string> <string name="menu_clear_frequents" msgid="8492322695770647639">"తరచుగా ఉన్నవాటిని క్లియర్ చేయి"</string> - <string name="menu_select_sim" msgid="7814841439832447299">"SIM కార్డును ఎంచుకోండి"</string> + <string name="menu_select_sim" msgid="7814841439832447299">"సిమ్ కార్డును ఎంచుకోండి"</string> <string name="menu_accounts" msgid="795417468541517082">"ఖాతాలు"</string> <string name="menu_import_export" msgid="6446229463809981669">"దిగుమతి చేయి/ఎగుమతి చేయి"</string> <string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> ద్వారా"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"శోధించడం ఆపివేయి"</string> <string name="description_clear_search" msgid="3893511425518852086">"శోధనను క్లియర్ చేయండి"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"పరిచయ ప్రదర్శన ఎంపికలు"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"ఖాతా"</string> + <string name="set_default_account" msgid="3865970860434642695">"కాల్ల కోసం ఎల్లప్పుడూ దీన్ని ఉపయోగించు"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"దీనితో కాల్ చేయండి"</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 56676f48..8775b89f 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"รายชื่อติดต่อเดียว"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"สร้างรายชื่อภายในบัญชี"</string> <string name="import_from_sim" msgid="4749894687871835873">"นำเข้าจากซิมการ์ด"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"นำเข้าจากซิมการ์ด #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"นำเข้าจากซิม <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"นำเข้าจากซิม <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"นำเข้าจากที่เก็บข้อมูล"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"ยกเลิกการนำเข้า <xliff:g id="FILENAME">%s</xliff:g> หรือไม่"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"ยกเลิกการส่งออก <xliff:g id="FILENAME">%s</xliff:g> หรือไม่"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"คำขอส่งออก vCard ถูกปฏิเสธ ลองใหม่ภายหลัง"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"รายชื่อติดต่อ"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"กำลังแคช vCard ไปยังที่จัดเก็บข้อมูลชั่วคราวในตัวเครื่อง การนำเข้าจริงจะเริ่มต้นในอีกสักครู่"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"ไม่สามารถนำเข้า vCard"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"ไม่พบไฟล์ vCard ในที่จัดเก็บข้อมูล"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"ไม่พบไฟล์ vCard บนการ์ด SD"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"หยุดการค้นหา"</string> <string name="description_clear_search" msgid="3893511425518852086">"ล้างการค้นหา"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"ตัวเลือกการแสดงรายชื่อผู้ติดต่อ"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"บัญชี"</string> + <string name="set_default_account" msgid="3865970860434642695">"ใช้ในการโทรทุกครั้ง"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"โทรด้วย"</string> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index c9193d5c..c3a1a468 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Iisang contact"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Lumikha ng contact sa ilalim ng account"</string> <string name="import_from_sim" msgid="4749894687871835873">"I-import mula sa SIM card"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"I-import mula sa SIM card #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"I-import mula sa SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"I-import mula sa SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"I-import mula sa storage"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Kanselahin ang pag-import ng <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Kanselahin ang pag-export ng <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Tinanggihan ang kahilingan sa pag-export ng vCard. Subukang muli sa ibang pagkakataon."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Kina-cache ang (mga) vCard sa lokal na pansamantalang storage. Magsisimula sa lalong madaling panahon ang aktwal na pag-import."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Hindi ma-import ang vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Walang nahanap na vCard file sa storage."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Walang nahanap na vCard file sa SD card."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ihinto ang paghahanap"</string> <string name="description_clear_search" msgid="3893511425518852086">"I-clear ang paghahanap"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Mga opsyon ng display ng contact"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Account"</string> + <string name="set_default_account" msgid="3865970860434642695">"Gamitin ito palagi sa mga tawag"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Tumawag gamit ang"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 0bd31659..aa560345 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Tek kişi"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Hesap altında kişi oluştur"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM karttan içe aktar"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"<xliff:g id="SIM_NUMBER">%d</xliff:g> numaralı SIM karttan içe aktar"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM\'den (<xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>) içe aktar"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM\'den (<xliff:g id="SIM_NAME">%1$s</xliff:g>) içe aktar"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Depolama biriminden içe aktar"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> dosyasının içe aktarılması iptal edilsin mi?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> dosyasının dışa aktarılması iptal edilsin mi?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard\'ı dışa aktarma isteği reddedildi. Daha sonra tekrar deneyin."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kişi"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"vCard\'lar geçici bir yerel depolama alanında önbelleğe alınıyor. Asıl içe aktarma işlemi kısa süre içinde başlayacak."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTSIGN">%%</xliff:g><xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"vCard içe aktarılamadı."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Depolama biriminde hiç vCard dosyası bulunamadı."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD kartta hiç vCard dosyası bulunamadı."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"aramayı durdur"</string> <string name="description_clear_search" msgid="3893511425518852086">"Aramayı temizle"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kişi görüntüleme seçenekleri"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Hesap"</string> + <string name="set_default_account" msgid="3865970860434642695">"Çağrılar için her zaman bunu kullan"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Çağrıyı şununla yap:"</string> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index c09bbe32..bc93796e 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Один контакт"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Створити контакт в обліковому записі"</string> <string name="import_from_sim" msgid="4749894687871835873">"Імпорт із SIM-карти"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Імпортувати із SIM-карти №<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Імпортувати із SIM-карти \"<xliff:g id="SIM_NAME">^1</xliff:g>\" – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Імпортувати із SIM-карти \"<xliff:g id="SIM_NAME">%1$s</xliff:g>\""</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Імпорт із носія"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Скасувати імпорт файлу <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Скасувати експорт файлу <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Запит на експорт файлу vCard відхилено. Повторіть спробу пізніше."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Кешування файлів vCard у локальну тимчасову пам’ять. Імпорт почнеться незабаром."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Не вдалось імпортувати файл vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"У пам’яті не знайдено жодного файлу vCard."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"На карті SD не знайдено жодного файлу vCard."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"припинити пошук"</string> <string name="description_clear_search" msgid="3893511425518852086">"Очистити поле пошуку"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Параметри відображення контактів"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Обліковий запис"</string> + <string name="set_default_account" msgid="3865970860434642695">"Завжди використовувати для дзвінків"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Телефонувати за допомогою"</string> </resources> diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index 1660223e..d53a5e2b 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"واحد رابطہ"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"اکاؤنٹ کے تحت رابطہ بنائیں"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM کارڈ سے درآمد کریں"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"SIM کارڈ #<xliff:g id="SIM_NUMBER">%d</xliff:g> سے درآمد کریں"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> سے درآمد کریں"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g> سے درآمد کریں"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"اسٹوریج سے درآمد کریں"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g> کی درآمد منسوخ کریں؟"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g> کی برآمد منسوخ کریں؟"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"وی کارڈ برآمد کرنے کی درخواست مسترد ہوگئی تھی۔ بعد میں دوبارہ کوشش کریں۔"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"رابطہ"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"وی کارڈ (کارڈز) کو مقامی عارضی اسٹوریج میں ذخیرہ کر رہا ہے۔ اصل درآمد جلد ہی شروع ہوگی۔"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"وی کارڈ درآمد نہیں کرسکا۔"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"اسٹوریج میں کوئی وی کارڈ فائل نہیں ملی۔"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD کارڈ میں کوئی وی کارڈ فائل نہیں ملی۔"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"تلاش کرنا بند کریں"</string> <string name="description_clear_search" msgid="3893511425518852086">"تلاش صاف کریں"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"رابطہ کے ڈسپلے کے اختیارات"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"اکاؤنٹ"</string> + <string name="set_default_account" msgid="3865970860434642695">"کالز کیلئے ہمیشہ اس کا استعمال کریں"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"کال کریں مع"</string> </resources> diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index ec66de39..a20fa1c5 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Bitta kontakt"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Hisob ostida kontakt yaratish"</string> <string name="import_from_sim" msgid="4749894687871835873">"SIM kartadan import qilish"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"<xliff:g id="SIM_NUMBER">%d</xliff:g>-SIM kartadan import qilish"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Quyidagi SIM-kartadan import qilish: <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Quyidagi SIM-kartadan import qilish: <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Xotiradan import qilish"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"<xliff:g id="FILENAME">%s</xliff:g>ni import qilish bekor qilinsinmi?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"<xliff:g id="FILENAME">%s</xliff:g>ni eksport qilish bekor qilinsinmi?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Tashrifnomani eksport qilish rad qilindi. Keyinroq urinib ko‘ring."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Tashrifnoma(lar) telefondagi vaqtinchalik xotira keshiga yuklanmoqda. Import qilish jarayoni tezda boshlanadi."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Tashrifnoma import qilinmadi."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Xotiradan birorta ham tashrifnoma topilmadi."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"SD kartadan birorta ham tashrifnoma topilmadi."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"qidiruvni to‘xtatish"</string> <string name="description_clear_search" msgid="3893511425518852086">"Qidiruvni tozalash"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Kontaktlarning ko‘rinishi sozlamalari"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Hisob"</string> + <string name="set_default_account" msgid="3865970860434642695">"Har doim qo‘ng‘iroqlar u-n foyd-sin"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Ushbu bilan qo‘ng‘iroq qilish"</string> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 84543fc7..c949ebe4 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Một liên hệ"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Tạo liên hệ trong tài khoản"</string> <string name="import_from_sim" msgid="4749894687871835873">"Nhập từ thẻ SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Nhập từ thẻ SIM #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Nhập từ SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Nhập từ SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Nhập từ bộ nhớ"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Hủy nhập <xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Hủy xuất <xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Yêu cầu xuất vCard bị từ chối. Hãy thử lại sau."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"liên hệ"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Đang lưu vào bộ nhớ cache các tệp vCard sẽ được nhập vào bộ nhớ cục bộ tạm thời. Thao tác nhập thực sự sẽ sớm bắt đầu."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Không thể nhập vCard."</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Không tìm thấy tệp vCard nào trong bộ nhớ."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Không tìm thấy tệp vCard trên thẻ SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"ngừng tìm kiếm"</string> <string name="description_clear_search" msgid="3893511425518852086">"Xóa tìm kiếm"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Tùy chọn hiển thị liên hệ"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"Tài khoản"</string> + <string name="set_default_account" msgid="3865970860434642695">"Luôn sử dụng SIM này để gọi"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Gọi bằng"</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 8e86c74a..32f1d08f 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"单个联系人"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"在以下帐户中创建联系人："</string> <string name="import_from_sim" msgid="4749894687871835873">"从SIM卡导入"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"从第<xliff:g id="SIM_NUMBER">%d</xliff:g>张SIM卡导入"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"从<xliff:g id="SIM_NAME">^1</xliff:g> SIM 卡 - <xliff:g id="SIM_NUMBER">^2</xliff:g> 导入"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"从<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM 卡导入"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"从存储设备导入"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"要取消导入“<xliff:g id="FILENAME">%s</xliff:g>”吗？"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"要取消导出“<xliff:g id="FILENAME">%s</xliff:g>”吗？"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 导出请求遭拒，请稍后重试。"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"联系人"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"正在将 vCard 缓存到本地临时存储空间。实际导入操作即将开始。"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"无法导入 vCard。"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"未在存储设备中找到 vCard 文件。"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"未在SD卡上找到 vCard 文件。"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜索"</string> <string name="description_clear_search" msgid="3893511425518852086">"清除搜索内容"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"联系人显示选项"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"帐户"</string> + <string name="set_default_account" msgid="3865970860434642695">"一律使用这张卡进行通话"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"用于外拨电话的帐户"</string> </resources> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 146ec074..8c0f263a 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"單一聯絡人"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"在帳戶中建立聯絡人"</string> <string name="import_from_sim" msgid="4749894687871835873">"從 SIM 卡匯入"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"從 SIM 卡 #<xliff:g id="SIM_NUMBER">%d</xliff:g> 匯入"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"從 SIM 卡匯入 <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"從 SIM 卡匯入 <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"從儲存匯入"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"要取消匯入 <xliff:g id="FILENAME">%s</xliff:g> 嗎？"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"要取消匯出 <xliff:g id="FILENAME">%s</xliff:g> 嗎？"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 匯出要求已被拒，請稍後再試。"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"聯絡人"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"正在將 vCard 資料快取至本機暫存空間，隨即將開始實際的匯入操作。"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"無法匯入 vCard。"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"在儲存中找不到 vCard 檔案。"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"在 SD 記憶卡上找不到 vCard 檔案。"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜尋"</string> <string name="description_clear_search" msgid="3893511425518852086">"清除搜尋"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"聯絡人顯示選項"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"帳戶"</string> + <string name="set_default_account" msgid="3865970860434642695">"永遠使用這張 SIM 卡通話"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"選取用於撥號的 SIM 卡："</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 9866c6fe..d09f0ec2 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"單一聯絡人"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"在帳戶下建立聯絡人"</string> <string name="import_from_sim" msgid="4749894687871835873">"從 SIM 卡匯入"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"從 SIM 卡 #<xliff:g id="SIM_NUMBER">%d</xliff:g> 匯入"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"從 SIM 卡 <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g> 匯入"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"從 SIM 卡 <xliff:g id="SIM_NAME">%1$s</xliff:g> 匯入"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"從儲存裝置匯入"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"確定要取消匯入 <xliff:g id="FILENAME">%s</xliff:g>？"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"確定要取消匯出 <xliff:g id="FILENAME">%s</xliff:g>？"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 匯出要求遭到拒絕，請稍後再試。"</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"聯絡人"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"正在將 vCard 資料快取至本機暫存空間，隨即將啟動實際的匯入作業。"</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"無法匯入 vCard。"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"在儲存裝置中找不到 vCard 檔案。"</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"在 SD 卡上找不到 vCard 檔案。"</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜尋"</string> <string name="description_clear_search" msgid="3893511425518852086">"清除搜尋"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"聯絡人顯示選項"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"帳戶"</string> + <string name="set_default_account" msgid="3865970860434642695">"一律使用這張 SIM 卡通話"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"選擇通話帳戶"</string> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 5320630f..c196db39 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -161,7 +161,8 @@ <string name="listSingleContact" msgid="8525131203887307088">"Oyedwa oxhumana naye"</string> <string name="dialog_new_contact_account" msgid="4107520273478326011">"Dala oxhumana naye ngaphansi kwe-akhawunti"</string> <string name="import_from_sim" msgid="4749894687871835873">"Landa kusuka kwikhadi le-SIM"</string> - <string name="import_from_sim_number" msgid="1232500923375370101">"Ngenisa kusuka kukhadi le-SIM #<xliff:g id="SIM_NUMBER">%d</xliff:g>"</string> + <string name="import_from_sim_summary" msgid="2306434118233541675">"Ngenisa kusuka ku-SIM <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string> + <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Ngenisa kusuka ku-SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string> <string name="import_from_sdcard" product="default" msgid="6423964533801496764">"Landa kusukela kusitoreji"</string> <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Khansela ukulandwa kwe-<xliff:g id="FILENAME">%s</xliff:g>?"</string> <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Khansela ukuthunyelwa kwe-<xliff:g id="FILENAME">%s</xliff:g>?"</string> @@ -205,7 +206,6 @@ <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Isicelo sokuthumela i-vCard sinqatshelwe. Sicela uzame futhi emuva kwesikhathi."</string> <string name="vcard_unknown_filename" msgid="4832657686149881554">"oxhumana naye"</string> <string name="caching_vcard_message" msgid="6635485116655518520">"Ifaka kunqolobane ama-vCard kusitoreji sesikhashana. Ukulandwa kwangempela kuzoqala khona maduze."</string> - <string name="percentage" msgid="6699653515463625488">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> <string name="vcard_import_failed" msgid="4105296876768072508">"Yehlulekile ukulanda i-vCard"</string> <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2066107150525521097">"Alikho ifayela le-vCard elitholakele kusitoreji."</string> <string name="import_failure_no_vcard_file" product="default" msgid="1748300468382501403">"Alikho ifayela le-vCard elitholakele ekhadini le-SD."</string> @@ -251,4 +251,7 @@ <string name="action_menu_back_from_search" msgid="1138551123844019647">"misa ukusesha"</string> <string name="description_clear_search" msgid="3893511425518852086">"Sula usesho"</string> <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Izinketho zokubonisa oxhumana naye"</string> + <string name="select_account_dialog_title" msgid="5509088895267310568">"I-Akhawunti"</string> + <string name="set_default_account" msgid="3865970860434642695">"Njalo sebenzisa lokhu kumakholi"</string> + <string name="select_phone_account_for_calls" msgid="933905607702811164">"Shaya nge"</string> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index c9698166..8f5d5387 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,8 +20,8 @@ <color name="focus_color">#44ff0000</color> - <!-- Color of ripples used by Theme.Material. Taken from res/values/colors_material.xml --> - <color name="ripple_material_dark">#20ffffff</color> + <!-- Color of ripples used for views with dark backgrounds --> + <color name="ripple_material_dark">#a0ffffff</color> <!-- Divider color for header separator --> <color name="primary_text_color">#363636</color> @@ -46,6 +46,9 @@ <!-- Color of image view placeholder. --> <color name="image_placeholder">#DDDDDD</color> + <!-- Primary text color in the Phone app --> + <color name="dialtacts_primary_text_color">#333333</color> + <!-- Secondary text color in the Phone app --> <color name="dialtacts_secondary_text_color">#737373</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 57bcdfde..595d6269 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -101,7 +101,7 @@ <!-- Corner radius of the floating action button --> <dimen name="floating_action_button_radius">28dp</dimen> <!-- Z translation of the floating action button --> - <dimen name="floating_action_button_translation_z">2dp</dimen> + <dimen name="floating_action_button_translation_z">8dp</dimen> <!-- Padding to be applied to the bottom of lists to make space for the floating action button --> <dimen name="floating_action_button_list_bottom_padding">88dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6cf20a50..b24261f2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -421,8 +421,11 @@ a ren't members of any other group. [CHAR LIMIT=25] --> <!-- Action string for selecting SIM for importing contacts --> <string name="import_from_sim">Import from SIM card</string> - <!-- Action string for selecting SIM for importing contacts, when more than one SIM card --> - <string name="import_from_sim_number">Import from SIM card #<xliff:g id="sim_number" example="2">%d</xliff:g></string> + <!-- Action string for selecting a SIM subscription for importing contacts --> + <string name="import_from_sim_summary">Import from SIM <xliff:g id="sim_name">^1</xliff:g> - <xliff:g id="sim_number">^2</xliff:g></string> + + <!-- Action string for selecting a SIM subscription for importing contacts, without a phone number --> + <string name="import_from_sim_summary_no_number">Import from SIM <xliff:g id="sim_name">%1$s</xliff:g></string> <!-- Action string for selecting (USB) storage for importing contacts [CHAR LIMIT=30] --> <string name="import_from_sdcard" product="default">Import from storage</string> @@ -590,9 +593,6 @@ a ren't members of any other group. [CHAR LIMIT=25] --> data storage. [CHAR LIMIT=NONE] --> <string name="caching_vcard_message">Caching vCard(s) to local temporary storage. The actual import will start soon.</string> - <!-- The percentage, used for expressing the progress of vCard import/export. --> - <string name="percentage"><xliff:g id="percentage" example="50">%s</xliff:g><xliff:g id="percentsign" example="%">%%</xliff:g></string> - <!-- Message used when vCard import has failed. [CHAR LIMIT=40] --> <string name="vcard_import_failed">Couldn\'t import vCard.</string> @@ -763,4 +763,12 @@ a ren't members of any other group. [CHAR LIMIT=25] --> contacts to be displayed. [CHAR LIMIT=128] --> <string name="settings_contact_display_options_title">Contact display options</string> + <!-- Title for Select Account Dialog [CHAR LIMIT=30] --> + <string name="select_account_dialog_title">Account</string> + + <!-- Label for the check box to toggle default sim card setting [CHAR LIMIT=35]--> + <string name="set_default_account">Always use this for calls</string> + + <!-- Title for dialog to select Phone Account for outgoing call. [CHAR LIMIT=40] --> + <string name="select_phone_account_for_calls">Call with</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 54d5f8c8..7e1127d4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -78,12 +78,14 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar <item name="android:layout_height">match_parent</item> </style> - <style name="BackgroundOnlyTheme" parent="@android:style/Theme.Holo.Light"> + <style name="BackgroundOnlyTheme" parent="@android:style/Theme.Material.Light"> <item name="android:windowBackground">@null</item> <item name="android:windowContentOverlay">@null</item> <item name="android:windowAnimationStyle">@null</item> <item name="android:windowNoTitle">true</item> - <item name="android:windowNoDisplay">true</item> + <!-- Activities that use this theme are background activities without obvious displays. + However, some also have dialogs. Therefore, it doesn't make sense to set this true.--> + <item name="android:windowNoDisplay">false</item> <item name="android:windowIsFloating">true</item> </style> </resources> diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java index 7c491664..3d5f7eab 100644 --- a/src/com/android/contacts/common/CallUtil.java +++ b/src/com/android/contacts/common/CallUtil.java @@ -141,6 +141,13 @@ public class CallUtil { } /** + * A variant of {@link #getCallIntent(android.net.Uri)} for calling Voicemail. + */ + public static Intent getVoicemailIntent() { + return getCallIntent(Uri.fromParts(PhoneAccount.SCHEME_VOICEMAIL, "", null)); + } + + /** * A variant of {@link #getCallIntent(android.net.Uri)} but also accept a call * origin and {@code Account} and {@code VideoCallProfile} state. * For more information about call origin, see comments in Phone package (PhoneApp). diff --git a/src/com/android/contacts/common/ContactsUtils.java b/src/com/android/contacts/common/ContactsUtils.java index 857450d9..a6e0e0e8 100644 --- a/src/com/android/contacts/common/ContactsUtils.java +++ b/src/com/android/contacts/common/ContactsUtils.java @@ -41,6 +41,8 @@ public class ContactsUtils { public static final String SCHEME_MAILTO = "mailto"; public static final String SCHEME_SMSTO = "smsto"; + private static final int DEFAULT_THUMBNAIL_SIZE = 96; + private static int sThumbnailSize = -1; // TODO find a proper place for the canonical version of these @@ -139,14 +141,17 @@ public class ContactsUtils { final Cursor c = context.getContentResolver().query( DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI, new String[] { DisplayPhoto.THUMBNAIL_MAX_DIM }, null, null, null); - try { - c.moveToFirst(); - sThumbnailSize = c.getInt(0); - } finally { - c.close(); + if (c != null) { + try { + if (c.moveToFirst()) { + sThumbnailSize = c.getInt(0); + } + } finally { + c.close(); + } } } - return sThumbnailSize; + return sThumbnailSize != -1 ? sThumbnailSize : DEFAULT_THUMBNAIL_SIZE; } private static Intent getCustomImIntent(ImDataItem im, int protocol) { diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index 6908b09d..68fb7df4 100644 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -22,6 +22,7 @@ import android.accounts.Account; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.app.DialogFragment; import android.app.FragmentManager; import android.app.ProgressDialog; import android.content.BroadcastReceiver; @@ -52,8 +53,11 @@ import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.provider.Settings; +import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; +import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; +import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -75,8 +79,9 @@ import com.android.contacts.common.util.AccountSelectionUtil; import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter; import com.android.contacts.common.vcard.ExportVCardActivity; import com.android.contacts.common.vcard.VCardCommonArguments; -import com.android.dialerbind.analytics.AnalyticsDialogFragment; +import com.android.contacts.commonbind.analytics.AnalyticsUtil; +import java.util.Collections; import java.util.List; import java.util.ArrayList; import java.util.Iterator; @@ -84,13 +89,12 @@ import java.util.Iterator; /** * An dialog invoked to import/export contacts. */ -public class ImportExportDialogFragment extends AnalyticsDialogFragment +public class ImportExportDialogFragment extends DialogFragment implements SelectAccountDialogFragment.Listener { public static final String TAG = "ImportExportDialogFragment"; - private static final String SIM_INDEX = "sim_index"; - private static final String KEY_RES_ID = "resourceId"; + private static final String KEY_SUBSCRIPTION_ID = "subscriptionId"; private static final String ARG_CONTACTS_ARE_AVAILABLE = "CONTACTS_ARE_AVAILABLE"; private static int SIM_ID_INVALID = -1; private static int mSelectedSim = SIM_ID_INVALID; @@ -155,6 +159,9 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment public void showExportToSIMProgressDialog(Activity activity){ mExportThread.showExportProgressDialog(activity); } + + private SubscriptionManager mSubscriptionManager; + /** Preferred way to show this dialog */ public static void show(FragmentManager fragmentManager, boolean contactsAreAvailable, Class callingActivity) { @@ -169,7 +176,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment @Override public void onAttach(Activity activity) { super.onAttach(activity); - sendScreenView(); + AnalyticsUtil.sendScreenView(this); } @Override @@ -184,35 +191,70 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment VCardCommonArguments.ARG_CALLING_ACTIVITY); // Adapter that shows a list of string resources - mAdapter = new ArrayAdapter<Integer>(getActivity(), + final ArrayAdapter<AdapterEntry> adapter = new ArrayAdapter<AdapterEntry>(getActivity(), R.layout.select_dialog_item) { @Override public View getView(int position, View convertView, ViewGroup parent) { final TextView result = (TextView)(convertView != null ? convertView : dialogInflater.inflate(R.layout.select_dialog_item, parent, false)); - final int resId = getItem(position); - result.setText(resId); + result.setText(getItem(position).mLabel); return result; } }; // Manually call notifyDataSetChanged() to refresh the list. - mAdapter.setNotifyOnChange(false); + adapter.setNotifyOnChange(false); loadData(contactsAreAvailable); + final TelephonyManager manager = + (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE); + + mSubscriptionManager = SubscriptionManager.from(getActivity()); + + if (res.getBoolean(R.bool.config_allow_import_from_sdcard)) { + adapter.add(new AdapterEntry(getString(R.string.import_from_sdcard), + R.string.import_from_sdcard)); + } + if (manager != null && res.getBoolean(R.bool.config_allow_sim_import)) { + final List<SubscriptionInfo> subInfoRecords = + mSubscriptionManager.getActiveSubscriptionInfoList(); + if (subInfoRecords != null) { + if (subInfoRecords.size() == 1) { + adapter.add(new AdapterEntry(getString(R.string.import_from_sim), + R.string.import_from_sim, subInfoRecords.get(0).getSubscriptionId())); + } else { + for (SubscriptionInfo record : subInfoRecords) { + adapter.add(new AdapterEntry(getSubDescription(record), + R.string.import_from_sim, record.getSubscriptionId())); + } + } + } + } + if (res.getBoolean(R.bool.config_allow_export_to_sdcard)) { + if (contactsAreAvailable) { + adapter.add(new AdapterEntry(getString(R.string.export_to_sdcard), + R.string.export_to_sdcard)); + } + } + if (res.getBoolean(R.bool.config_allow_share_visible_contacts)) { + if (contactsAreAvailable) { + adapter.add(new AdapterEntry(getString(R.string.share_visible_contacts), + R.string.share_visible_contacts)); + } + } + final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - final int resId = mAdapter.getItem(which); + boolean dismissDialog; + final int resId = adapter.getItem(which).mChoiceResourceId; switch (resId) { - case R.string.import_from_sim: { - handleImportFromSimRequest(resId); - break; - } + case R.string.import_from_sim: case R.string.import_from_sdcard: { - handleImportRequest(resId); + dismissDialog = handleImportRequest(resId, + adapter.getItem(which).mSubscriptionId); break; } case R.string.export_to_sim: { @@ -308,9 +350,10 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment * * @return {@code true} if the dialog show be closed. {@code false} otherwise. */ - private boolean handleImportRequest(int resId) { - // There are two possibilities: - // - one or more than one accounts -> ask the user (user can select phone-local also) + private boolean handleImportRequest(int resId, int subscriptionId) { + // There are three possibilities: + // - more than one accounts -> ask the user + // - just one account -> use the account without asking the user // - no account -> use phone-local storage without asking the user final AccountTypeManager accountTypes = AccountTypeManager.getInstance(mActivity); final List<AccountWithDataSet> accountList = accountTypes.getAccounts(true); @@ -319,6 +362,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment // Send over to the account selector final Bundle args = new Bundle(); args.putInt(KEY_RES_ID, resId); + args.putInt(KEY_SUBSCRIPTION_ID, subscriptionId); SelectAccountDialogFragment.show( mActivity.getFragmentManager(), this, R.string.dialog_new_contact_account, @@ -330,7 +374,8 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment return false; } - AccountSelectionUtil.doImport(mActivity, resId, null); + AccountSelectionUtil.doImport(getActivity(), resId, + (size == 1 ? accountList.get(0) : null), subscriptionId); return true; // Close the dialog. } @@ -339,7 +384,8 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment */ @Override public void onAccountChosen(AccountWithDataSet account, Bundle extraArgs) { - AccountSelectionUtil.doImport(mActivity, extraArgs.getInt(KEY_RES_ID), account); + AccountSelectionUtil.doImport(getActivity(), extraArgs.getInt(KEY_RES_ID), + account, extraArgs.getInt(KEY_SUBSCRIPTION_ID)); // At this point the dialog is still showing (which is why we can use getActivity() above) // So close it. @@ -375,7 +421,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment if (which >= 0) { AccountSelectionUtil.setImportSubscription(which); } else if (which == DialogInterface.BUTTON_POSITIVE) { - handleImportRequest(R.string.import_from_sim); + handleImportRequest(R.string.import_from_sim, which); } } } @@ -750,20 +796,6 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment .setSingleChoiceItems(items, 0, listener).create().show(); } - private void handleImportFromSimRequest(int Id) { - if (TelephonyManager.getDefault().isMultiSimEnabled()) { - if (MoreContactUtils.getEnabledSimCount() > 1) { - displayImportExportDialog(R.string.import_from_sim_select - ,null); - } else { - AccountSelectionUtil.setImportSubscription(getEnabledIccCard()); - handleImportRequest(Id); - } - } else { - handleImportRequest(Id); - } - } - private void handleExportToSimRequest(int Id) { if (MoreContactUtils.getEnabledSimCount() >1) { //has two enalbed sim cards, prompt dialog to select one @@ -796,4 +828,32 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment } return SimContactsConstants.SUB_1; } + + private CharSequence getSubDescription(SubscriptionInfo record) { + CharSequence name = record.getDisplayName(); + if (TextUtils.isEmpty(record.getNumber())) { + // Don't include the phone number in the description, since we don't know the number. + return getString(R.string.import_from_sim_summary_no_number, name); + } + return TextUtils.expandTemplate( + getString(R.string.import_from_sim_summary), + name, + PhoneNumberUtils.ttsSpanAsPhoneNumber(record.getNumber())); + } + + private static class AdapterEntry { + public final CharSequence mLabel; + public final int mChoiceResourceId; + public final int mSubscriptionId; + + public AdapterEntry(CharSequence label, int resId, int subId) { + mLabel = label; + mChoiceResourceId = resId; + mSubscriptionId = subId; + } + + public AdapterEntry(String label, int resId) { + this(label, resId, SubscriptionManager.INVALID_SUBSCRIPTION_ID); + } + } } diff --git a/src/com/android/contacts/common/list/ContactEntryListFragment.java b/src/com/android/contacts/common/list/ContactEntryListFragment.java index 1819c0c8..c7204931 100755 --- a/src/com/android/contacts/common/list/ContactEntryListFragment.java +++ b/src/com/android/contacts/common/list/ContactEntryListFragment.java @@ -17,6 +17,7 @@ package com.android.contacts.common.list; import android.app.Activity; +import android.app.Fragment; import android.app.LoaderManager; import android.app.LoaderManager.LoaderCallbacks; import android.content.BroadcastReceiver; @@ -25,7 +26,6 @@ import android.content.CursorLoader; import android.content.Intent; import android.content.IntentFilter; import android.content.Loader; -import android.content.res.Resources; import android.database.Cursor; import android.os.Bundle; import android.os.Handler; @@ -47,12 +47,10 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; import com.android.common.widget.CompositeCursorAdapter.Partition; -import com.android.contacts.common.R; import com.android.contacts.common.ContactPhotoManager; import com.android.contacts.common.preference.ContactsPreferences; import com.android.contacts.common.util.ContactListViewUtils; import com.android.contacts.common.util.SchedulingUtils; -import com.android.dialerbind.analytics.AnalyticsFragment; import com.android.internal.telephony.TelephonyIntents; import java.util.Locale; @@ -61,7 +59,7 @@ import java.util.Locale; * Common base class for various contact-related list fragments. */ public abstract class ContactEntryListFragment<T extends ContactEntryListAdapter> - extends AnalyticsFragment + extends Fragment implements OnItemClickListener, OnScrollListener, OnFocusChangeListener, OnTouchListener, LoaderCallbacks<Cursor> { private static final String TAG = "ContactEntryListFragment"; diff --git a/src/com/android/contacts/common/list/ContactListAdapter.java b/src/com/android/contacts/common/list/ContactListAdapter.java index b987e4d8..ea2d8539 100755 --- a/src/com/android/contacts/common/list/ContactListAdapter.java +++ b/src/com/android/contacts/common/list/ContactListAdapter.java @@ -407,8 +407,7 @@ public abstract class ContactListAdapter extends ContactEntryListAdapter { super.changeCursor(partitionIndex, cursor); // Check if a profile exists - if (cursor != null && cursor.getCount() > 0) { - cursor.moveToFirst(); + if (cursor != null && cursor.moveToFirst()) { setProfileExists(cursor.getInt(ContactQuery.CONTACT_IS_USER_PROFILE) == 1); } } diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java index e6369977..dd869b0c 100755 --- a/src/com/android/contacts/common/list/ContactListItemView.java +++ b/src/com/android/contacts/common/list/ContactListItemView.java @@ -50,6 +50,7 @@ import com.android.contacts.common.ContactPresenceIconUtil; import com.android.contacts.common.ContactStatusUtil; import com.android.contacts.common.R; 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.common.widget.CheckableImageView; @@ -1031,6 +1032,7 @@ public class ContactListItemView extends ViewGroup mPhoneticNameTextView.setSingleLine(true); mPhoneticNameTextView.setEllipsize(getTextEllipsis()); mPhoneticNameTextView.setTextAppearance(getContext(), android.R.style.TextAppearance_Small); + mPhoneticNameTextView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START); mPhoneticNameTextView.setTypeface(mPhoneticNameTextView.getTypeface(), Typeface.BOLD); mPhoneticNameTextView.setActivated(isActivated()); mPhoneticNameTextView.setId(R.id.cliv_phoneticname_textview); @@ -1156,6 +1158,7 @@ public class ContactListItemView extends ViewGroup mDataView.setSingleLine(true); mDataView.setEllipsize(getTextEllipsis()); mDataView.setTextAppearance(getContext(), R.style.TextAppearanceSmall); + mDataView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START); mDataView.setActivated(isActivated()); mDataView.setId(R.id.cliv_data_view); mDataView.setElegantTextHeight(false); @@ -1175,6 +1178,13 @@ public class ContactListItemView extends ViewGroup } else { mTextHighlighter.setPrefixText(getSnippetView(), text, mHighlightedPrefix); mSnippetView.setVisibility(VISIBLE); + if (ContactDisplayUtils.isPossiblePhoneNumber(text)) { + // Give the text-to-speech engine a hint that it's a phone number + mSnippetView.setContentDescription( + ContactDisplayUtils.getTelephoneTtsSpannable(text)); + } else { + mSnippetView.setContentDescription(null); + } } } @@ -1187,6 +1197,7 @@ public class ContactListItemView extends ViewGroup mSnippetView.setSingleLine(true); mSnippetView.setEllipsize(getTextEllipsis()); mSnippetView.setTextAppearance(getContext(), android.R.style.TextAppearance_Small); + mSnippetView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START); mSnippetView.setActivated(isActivated()); addView(mSnippetView); } @@ -1300,6 +1311,14 @@ public class ContactListItemView extends ViewGroup name = mUnknownNameText; } setMarqueeText(getNameTextView(), name); + + if (ContactDisplayUtils.isPossiblePhoneNumber(name)) { + // Give the text-to-speech engine a hint that it's a phone number + mNameTextView.setContentDescription( + ContactDisplayUtils.getTelephoneTtsSpannable(name.toString())); + } else { + mNameTextView.setContentDescription(null); + } } public void hideDisplayName() { diff --git a/src/com/android/contacts/common/list/ContactTileAdapter.java b/src/com/android/contacts/common/list/ContactTileAdapter.java index 70bdebf2..35f9f185 100644 --- a/src/com/android/contacts/common/list/ContactTileAdapter.java +++ b/src/com/android/contacts/common/list/ContactTileAdapter.java @@ -583,7 +583,8 @@ public class ContactTileAdapter extends BaseAdapter { // Just line up children horizontally. for (int i = 0; i < count; i++) { - final View child = getChildAt(i); + final int rtlAdjustedIndex = isLayoutRtl() ? count - i - 1 : i; + final View child = getChildAt(rtlAdjustedIndex); // Note MeasuredWidth includes the padding. final int childWidth = child.getMeasuredWidth(); diff --git a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java b/src/com/android/contacts/common/list/CustomContactListFilterActivity.java index b0bf9c3d..5066b294 100755 --- a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/common/list/CustomContactListFilterActivity.java @@ -148,9 +148,12 @@ public class CustomContactListFilterActivity extends Activity if (account.dataSet != null) { groupsUri.appendQueryParameter(Groups.DATA_SET, account.dataSet).build(); } + final Cursor cursor = resolver.query(groupsUri.build(), null, null, null, null); + if (cursor == null) { + continue; + } android.content.EntityIterator iterator = - ContactsContract.Groups.newEntityIterator(resolver.query( - groupsUri.build(), null, null, null, null)); + ContactsContract.Groups.newEntityIterator(cursor); try { boolean hasGroups = false; diff --git a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java index 5f850933..06a4f50c 100644 --- a/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java +++ b/src/com/android/contacts/common/list/PhoneNumberPickerFragment.java @@ -15,7 +15,6 @@ */ package com.android.contacts.common.list; -import android.content.CursorLoader; import android.content.Intent; import android.content.Loader; import android.database.Cursor; diff --git a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java index c19737d9..698ef96f 100644 --- a/src/com/android/contacts/common/list/ProfileAndContactsLoader.java +++ b/src/com/android/contacts/common/list/ProfileAndContactsLoader.java @@ -61,8 +61,8 @@ public class ProfileAndContactsLoader extends CursorLoader { Cursor cursor = null; try { cursor = super.loadInBackground(); - } catch (NullPointerException e) { - // Ignore NPEs thrown by providers + } catch (NullPointerException | SecurityException e) { + // Ignore NPEs and SecurityExceptions thrown by providers } final Cursor contactsCursor = cursor; cursors.add(contactsCursor); diff --git a/src/com/android/contacts/common/list/ViewPagerTabs.java b/src/com/android/contacts/common/list/ViewPagerTabs.java index ec95de6f..006d6321 100644 --- a/src/com/android/contacts/common/list/ViewPagerTabs.java +++ b/src/com/android/contacts/common/list/ViewPagerTabs.java @@ -198,7 +198,12 @@ public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnP @Override public void onPageSelected(int position) { position = getRtlPosition(position); - if (mPrevSelected >= 0) { + int tabStripChildCount = mTabStrip.getChildCount(); + if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) { + return; + } + + if (mPrevSelected >= 0 && mPrevSelected < tabStripChildCount) { mTabStrip.getChildAt(mPrevSelected).setSelected(false); } final View selectedChild = mTabStrip.getChildAt(position); diff --git a/src/com/android/contacts/common/location/UpdateCountryService.java b/src/com/android/contacts/common/location/UpdateCountryService.java index e339306f..9403187e 100644 --- a/src/com/android/contacts/common/location/UpdateCountryService.java +++ b/src/com/android/contacts/common/location/UpdateCountryService.java @@ -38,6 +38,10 @@ public class UpdateCountryService extends IntentService { @Override protected void onHandleIntent(Intent intent) { + if (intent == null) { + Log.d(TAG, "onHandleIntent: could not handle null intent"); + return; + } if (ACTION_UPDATE_COUNTRY.equals(intent.getAction())) { final Location location = (Location) intent.getParcelableExtra(KEY_INTENT_LOCATION); final String country = getCountryFromLocation(getApplicationContext(), location); diff --git a/src/com/android/contacts/common/model/ContactLoader.java b/src/com/android/contacts/common/model/ContactLoader.java index bea72107..59ab292e 100644 --- a/src/com/android/contacts/common/model/ContactLoader.java +++ b/src/com/android/contacts/common/model/ContactLoader.java @@ -63,9 +63,11 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.ArrayList; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; /** @@ -773,6 +775,34 @@ public class ContactLoader extends AsyncTaskLoader<Contact> { } } + static private class AccountKey { + private final String mAccountName; + private final String mAccountType; + private final String mDataSet; + + public AccountKey(String accountName, String accountType, String dataSet) { + mAccountName = accountName; + mAccountType = accountType; + mDataSet = dataSet; + } + + @Override + public int hashCode() { + return Objects.hash(mAccountName, mAccountType, mDataSet); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof AccountKey)) { + return false; + } + final AccountKey other = (AccountKey) obj; + return Objects.equals(mAccountName, other.mAccountName) + && Objects.equals(mAccountType, other.mAccountType) + && Objects.equals(mDataSet, other.mDataSet); + } + } + /** * Loads groups meta-data for all groups associated with all constituent raw contacts' * accounts. @@ -780,11 +810,15 @@ public class ContactLoader extends AsyncTaskLoader<Contact> { private void loadGroupMetaData(Contact result) { StringBuilder selection = new StringBuilder(); ArrayList<String> selectionArgs = new ArrayList<String>(); + final HashSet<AccountKey> accountsSeen = new HashSet<>(); for (RawContact rawContact : result.getRawContacts()) { final String accountName = rawContact.getAccountName(); final String accountType = rawContact.getAccountTypeString(); final String dataSet = rawContact.getDataSet(); - if (accountName != null && accountType != null) { + final AccountKey accountKey = new AccountKey(accountName, accountType, dataSet); + if (accountName != null && accountType != null && + !accountsSeen.contains(accountKey)) { + accountsSeen.add(accountKey); if (selection.length() != 0) { selection.append(" OR "); } diff --git a/src/com/android/contacts/common/model/account/BaseAccountType.java b/src/com/android/contacts/common/model/account/BaseAccountType.java index 8b4c955c..1ead103f 100644 --- a/src/com/android/contacts/common/model/account/BaseAccountType.java +++ b/src/com/android/contacts/common/model/account/BaseAccountType.java @@ -99,20 +99,20 @@ public abstract class BaseAccountType extends AccountType { static final String TYPE = "type"; } - private interface Weight { + protected interface Weight { static final int NONE = -1; - static final int ORGANIZATION = 5; static final int PHONE = 10; static final int EMAIL = 15; - static final int IM = 20; static final int STRUCTURED_POSTAL = 25; - static final int NOTE = 110; - static final int NICKNAME = 115; - static final int WEBSITE = 120; - static final int SIP_ADDRESS = 130; - static final int EVENT = 150; - static final int RELATIONSHIP = 160; - static final int GROUP_MEMBERSHIP = 999; + static final int NICKNAME = 111; + static final int EVENT = 120; + static final int ORGANIZATION = 125; + static final int NOTE = 130; + static final int IM = 140; + static final int SIP_ADDRESS = 145; + static final int GROUP_MEMBERSHIP = 150; + static final int WEBSITE = 160; + static final int RELATIONSHIP = 999; } public BaseAccountType() { @@ -148,7 +148,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindStructuredName(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(StructuredName.CONTENT_ITEM_TYPE, - R.string.nameLabelsGroup, -1, true)); + R.string.nameLabelsGroup, Weight.NONE, true)); kind.actionHeader = new SimpleInflater(R.string.nameLabelsGroup); kind.actionBody = new SimpleInflater(Nickname.NAME); kind.typeOverallMax = 1; @@ -178,7 +178,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindDisplayName(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(DataKind.PSEUDO_MIME_TYPE_DISPLAY_NAME, - R.string.nameLabelsGroup, -1, true)); + R.string.nameLabelsGroup, Weight.NONE, true)); kind.actionHeader = new SimpleInflater(R.string.nameLabelsGroup); kind.actionBody = new SimpleInflater(Nickname.NAME); kind.typeOverallMax = 1; @@ -219,7 +219,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindPhoneticName(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME, - R.string.name_phonetic, -1, true)); + R.string.name_phonetic, Weight.NONE, true)); kind.actionHeader = new SimpleInflater(R.string.nameLabelsGroup); kind.actionBody = new SimpleInflater(Nickname.NAME); kind.typeOverallMax = 1; @@ -239,7 +239,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindNickname(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Nickname.CONTENT_ITEM_TYPE, - R.string.nicknameLabelsGroup, 115, true)); + R.string.nicknameLabelsGroup, Weight.NICKNAME, true)); kind.typeOverallMax = 1; kind.actionHeader = new SimpleInflater(R.string.nicknameLabelsGroup); kind.actionBody = new SimpleInflater(Nickname.NAME); @@ -255,7 +255,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindPhone(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Phone.CONTENT_ITEM_TYPE, R.string.phoneLabelsGroup, - 10, true)); + Weight.PHONE, true)); kind.iconAltRes = R.drawable.ic_text_holo_light; kind.iconAltDescriptionRes = R.string.sms; kind.actionHeader = new PhoneActionInflater(); @@ -294,7 +294,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindEmail(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Email.CONTENT_ITEM_TYPE, R.string.emailLabelsGroup, - 15, true)); + Weight.EMAIL, true)); kind.actionHeader = new EmailActionInflater(); kind.actionBody = new SimpleInflater(Email.DATA); kind.typeColumn = Email.TYPE; @@ -314,7 +314,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindStructuredPostal(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(StructuredPostal.CONTENT_ITEM_TYPE, - R.string.postalLabelsGroup, 25, true)); + R.string.postalLabelsGroup, Weight.STRUCTURED_POSTAL, true)); kind.actionHeader = new PostalActionInflater(); kind.actionBody = new SimpleInflater(StructuredPostal.FORMATTED_ADDRESS); kind.typeColumn = StructuredPostal.TYPE; @@ -336,8 +336,8 @@ public abstract class BaseAccountType extends AccountType { } protected DataKind addDataKindIm(Context context) throws DefinitionException { - DataKind kind = addKind(new DataKind(Im.CONTENT_ITEM_TYPE, R.string.imLabelsGroup, 20, - true)); + DataKind kind = addKind(new DataKind(Im.CONTENT_ITEM_TYPE, R.string.imLabelsGroup, + Weight.IM, true)); kind.actionHeader = new ImActionInflater(); kind.actionBody = new SimpleInflater(Im.DATA); @@ -368,7 +368,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindOrganization(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Organization.CONTENT_ITEM_TYPE, - R.string.organizationLabelsGroup, 5, true)); + R.string.organizationLabelsGroup, Weight.ORGANIZATION, true)); kind.actionHeader = new SimpleInflater(R.string.organizationLabelsGroup); kind.actionBody = ORGANIZATION_BODY_INFLATER; kind.typeOverallMax = 1; @@ -383,7 +383,7 @@ public abstract class BaseAccountType extends AccountType { } protected DataKind addDataKindPhoto(Context context) throws DefinitionException { - DataKind kind = addKind(new DataKind(Photo.CONTENT_ITEM_TYPE, -1, -1, true)); + DataKind kind = addKind(new DataKind(Photo.CONTENT_ITEM_TYPE, -1, Weight.NONE, true)); kind.typeOverallMax = 1; kind.fieldList = Lists.newArrayList(); kind.fieldList.add(new EditField(Photo.PHOTO, -1, -1)); @@ -391,8 +391,8 @@ public abstract class BaseAccountType extends AccountType { } protected DataKind addDataKindNote(Context context) throws DefinitionException { - DataKind kind = addKind(new DataKind(Note.CONTENT_ITEM_TYPE, R.string.label_notes, 110, - true)); + DataKind kind = addKind(new DataKind(Note.CONTENT_ITEM_TYPE, R.string.label_notes, + Weight.NOTE, true)); kind.typeOverallMax = 1; kind.actionHeader = new SimpleInflater(R.string.label_notes); kind.actionBody = new SimpleInflater(Note.NOTE); @@ -406,7 +406,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindWebsite(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Website.CONTENT_ITEM_TYPE, - R.string.websiteLabelsGroup, 120, true)); + R.string.websiteLabelsGroup, Weight.WEBSITE, true)); kind.actionHeader = new SimpleInflater(R.string.websiteLabelsGroup); kind.actionBody = new SimpleInflater(Website.URL); kind.defaultValues = new ContentValues(); @@ -420,7 +420,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindSipAddress(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(SipAddress.CONTENT_ITEM_TYPE, - R.string.label_sip_address, 130, true)); + R.string.label_sip_address, Weight.SIP_ADDRESS, true)); kind.typeOverallMax = 1; kind.actionHeader = new SimpleInflater(R.string.label_sip_address); @@ -434,7 +434,7 @@ public abstract class BaseAccountType extends AccountType { protected DataKind addDataKindGroupMembership(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(GroupMembership.CONTENT_ITEM_TYPE, - R.string.groupsLabel, 999, true)); + R.string.groupsLabel, Weight.GROUP_MEMBERSHIP, true)); kind.actionHeader = new SimpleInflater(R.string.label_groups); kind.actionBody = new SimpleInflater(GroupMembership.GROUP_ROW_ID); diff --git a/src/com/android/contacts/common/model/account/ExchangeAccountType.java b/src/com/android/contacts/common/model/account/ExchangeAccountType.java index 04b5263a..7020836d 100644 --- a/src/com/android/contacts/common/model/account/ExchangeAccountType.java +++ b/src/com/android/contacts/common/model/account/ExchangeAccountType.java @@ -80,7 +80,7 @@ public class ExchangeAccountType extends BaseAccountType { @Override protected DataKind addDataKindStructuredName(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(StructuredName.CONTENT_ITEM_TYPE, - R.string.nameLabelsGroup, -1, true)); + R.string.nameLabelsGroup, Weight.NONE, true)); kind.actionHeader = new SimpleInflater(R.string.nameLabelsGroup); kind.actionBody = new SimpleInflater(Nickname.NAME); @@ -109,7 +109,7 @@ public class ExchangeAccountType extends BaseAccountType { @Override protected DataKind addDataKindDisplayName(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(DataKind.PSEUDO_MIME_TYPE_DISPLAY_NAME, - R.string.nameLabelsGroup, -1, true)); + R.string.nameLabelsGroup, Weight.NONE, true)); boolean displayOrderPrimary = context.getResources().getBoolean(R.bool.config_editor_field_order_primary); @@ -142,7 +142,7 @@ public class ExchangeAccountType extends BaseAccountType { @Override protected DataKind addDataKindPhoneticName(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME, - R.string.name_phonetic, -1, true)); + R.string.name_phonetic, Weight.NONE, true)); kind.actionHeader = new SimpleInflater(R.string.nameLabelsGroup); kind.actionBody = new SimpleInflater(Nickname.NAME); @@ -307,7 +307,7 @@ public class ExchangeAccountType extends BaseAccountType { protected DataKind addDataKindEvent(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Event.CONTENT_ITEM_TYPE, R.string.eventLabelsGroup, - 150, true)); + Weight.EVENT, true)); kind.actionHeader = new EventActionInflater(); kind.actionBody = new SimpleInflater(Event.START_DATE); diff --git a/src/com/android/contacts/common/model/account/ExternalAccountType.java b/src/com/android/contacts/common/model/account/ExternalAccountType.java index e4cef522..53089b84 100644 --- a/src/com/android/contacts/common/model/account/ExternalAccountType.java +++ b/src/com/android/contacts/common/model/account/ExternalAccountType.java @@ -17,9 +17,10 @@ package com.android.contacts.common.model.account; import android.content.Context; -import android.content.pm.PackageInfo; +import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.res.Resources; import android.content.res.TypedArray; @@ -48,12 +49,15 @@ import java.util.List; public class ExternalAccountType extends BaseAccountType { private static final String TAG = "ExternalAccountType"; + private static final String SYNC_META_DATA = "android.content.SyncAdapter"; + /** * The metadata name for so-called "contacts.xml". * * On LMP and later, we also accept the "alternate" name. * This is to allow sync adapters to have a contacts.xml without making it visible on older - * platforms. + * platforms. If you modify this also update the corresponding list in + * ContactsProvider/PhotoPriorityResolver */ private static final String[] METADATA_CONTACTS_NAMES = new String[] { "android.provider.ALTERNATE_CONTACTS_STRUCTURE", @@ -114,15 +118,9 @@ public class ExternalAccountType extends BaseAccountType { this.resourcePackageName = packageName; this.syncAdapterPackageName = packageName; - final PackageManager pm = context.getPackageManager(); final XmlResourceParser parser; if (injectedMetadata == null) { - try { - parser = loadContactsXml(context, packageName); - } catch (NameNotFoundException e1) { - // If the package name is not found, we can't initialize this account type. - return; - } + parser = loadContactsXml(context, packageName); } else { parser = injectedMetadata; } @@ -181,35 +179,41 @@ public class ExternalAccountType extends BaseAccountType { /** * Returns the CONTACTS_STRUCTURE metadata (aka "contacts.xml") in the given apk package. * - * Unfortunately, there's no public way to determine which service defines a sync service for - * which account type, so this method looks through all services in the package, and just - * returns the first CONTACTS_STRUCTURE metadata defined in any of them. + * This method looks through all services in the package that handle sync adapter + * intents for the first one that contains CONTACTS_STRUCTURE metadata. We have to look + * through all sync adapters in the package in case there are contacts and other sync + * adapters (eg, calendar) in the same package. * * Returns {@code null} if the package has no CONTACTS_STRUCTURE metadata. In this case * the account type *will* be initialized with minimal configuration. - * - * On the other hand, if the package is not found, it throws a {@link NameNotFoundException}, - * in which case the account type will *not* be initialized. */ - private XmlResourceParser loadContactsXml(Context context, String resPackageName) - throws NameNotFoundException { + public static XmlResourceParser loadContactsXml(Context context, String resPackageName) { final PackageManager pm = context.getPackageManager(); - PackageInfo packageInfo = pm.getPackageInfo(resPackageName, - PackageManager.GET_SERVICES|PackageManager.GET_META_DATA); - for (ServiceInfo serviceInfo : packageInfo.services) { - for (String metadataName : METADATA_CONTACTS_NAMES) { - final XmlResourceParser parser = serviceInfo.loadXmlMetaData(pm, - metadataName); - if (parser != null) { - if (Log.isLoggable(TAG, Log.DEBUG)) { - Log.d(TAG, String.format("Metadata loaded from: %s, %s, %s", - serviceInfo.packageName, serviceInfo.name, - metadataName)); + final Intent intent = new Intent(SYNC_META_DATA).setPackage(resPackageName); + final List<ResolveInfo> intentServices = pm.queryIntentServices(intent, + PackageManager.GET_SERVICES | PackageManager.GET_META_DATA); + + if (intentServices != null) { + for (final ResolveInfo resolveInfo : intentServices) { + final ServiceInfo serviceInfo = resolveInfo.serviceInfo; + if (serviceInfo == null) { + continue; + } + for (String metadataName : METADATA_CONTACTS_NAMES) { + final XmlResourceParser parser = serviceInfo.loadXmlMetaData( + pm, metadataName); + if (parser != null) { + if (Log.isLoggable(TAG, Log.DEBUG)) { + Log.d(TAG, String.format("Metadata loaded from: %s, %s, %s", + serviceInfo.packageName, serviceInfo.name, + metadataName)); + } + return parser; } - return parser; } } } + // Package was found, but that doesn't contain the CONTACTS_STRUCTURE metadata. return null; } diff --git a/src/com/android/contacts/common/model/account/GoogleAccountType.java b/src/com/android/contacts/common/model/account/GoogleAccountType.java index 8705ae34..68771874 100644 --- a/src/com/android/contacts/common/model/account/GoogleAccountType.java +++ b/src/com/android/contacts/common/model/account/GoogleAccountType.java @@ -122,7 +122,7 @@ public class GoogleAccountType extends BaseAccountType { private DataKind addDataKindRelation(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Relation.CONTENT_ITEM_TYPE, - R.string.relationLabelsGroup, 160, true)); + R.string.relationLabelsGroup, Weight.RELATIONSHIP, true)); kind.actionHeader = new RelationActionInflater(); kind.actionBody = new SimpleInflater(Relation.NAME); @@ -157,7 +157,7 @@ public class GoogleAccountType extends BaseAccountType { private DataKind addDataKindEvent(Context context) throws DefinitionException { DataKind kind = addKind(new DataKind(Event.CONTENT_ITEM_TYPE, - R.string.eventLabelsGroup, 150, true)); + R.string.eventLabelsGroup, Weight.EVENT, true)); kind.actionHeader = new EventActionInflater(); kind.actionBody = new SimpleInflater(Event.START_DATE); diff --git a/src/com/android/contacts/common/model/dataitem/EventDataItem.java b/src/com/android/contacts/common/model/dataitem/EventDataItem.java index aae00e97..5096fea2 100644 --- a/src/com/android/contacts/common/model/dataitem/EventDataItem.java +++ b/src/com/android/contacts/common/model/dataitem/EventDataItem.java @@ -20,6 +20,7 @@ import android.content.ContentValues; import android.content.Context; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Event; +import android.text.TextUtils; /** * Represents an event data item, wrapping the columns in @@ -46,12 +47,14 @@ public class EventDataItem extends DataItem { } final EventDataItem that = (EventDataItem) t; // Events can be different (anniversary, birthday) but have the same start date - if (!getStartDate().equals(that.getStartDate())) { + if (!TextUtils.equals(getStartDate(), that.getStartDate())) { return false; + } else if (!hasKindTypeColumn(mKind) || !that.hasKindTypeColumn(that.getDataKind())) { + return hasKindTypeColumn(mKind) == that.hasKindTypeColumn(that.getDataKind()); } else if (getKindTypeColumn(mKind) != that.getKindTypeColumn(that.getDataKind())) { return false; } else if (getKindTypeColumn(mKind) == Event.TYPE_CUSTOM && - !getLabel().equals(that.getLabel())) { + !TextUtils.equals(getLabel(), that.getLabel())) { // Check if custom types are not the same return false; } diff --git a/src/com/android/contacts/common/model/dataitem/ImDataItem.java b/src/com/android/contacts/common/model/dataitem/ImDataItem.java index d1af2462..f89e5c6a 100644 --- a/src/com/android/contacts/common/model/dataitem/ImDataItem.java +++ b/src/com/android/contacts/common/model/dataitem/ImDataItem.java @@ -21,6 +21,7 @@ import android.content.Context; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Im; +import android.text.TextUtils; /** * Represents an IM data item, wrapping the columns in @@ -91,21 +92,21 @@ public class ImDataItem extends DataItem { // IM can have the same data put different protocol. These should not collapse. if (!getData().equals(that.getData())) { return false; - } else if (isProtocolValid() && that.isProtocolValid() && - getProtocol() != that.getProtocol()) { + } else if (!isProtocolValid() || !that.isProtocolValid()) { + // Deal with invalid protocol as if it was custom. If either has a non valid + // protocol, check to see if the other has a valid that is not custom + if (isProtocolValid()) { + return getProtocol() == Im.PROTOCOL_CUSTOM; + } else if (that.isProtocolValid()) { + return that.getProtocol() == Im.PROTOCOL_CUSTOM; + } + return true; + } else if (getProtocol() != that.getProtocol()) { return false; - } else if (isProtocolValid() && that.isProtocolValid() && - getProtocol() == Im.PROTOCOL_CUSTOM && - !getCustomProtocol().equals(that.getCustomProtocol())) { + } else if (getProtocol() == Im.PROTOCOL_CUSTOM && + !TextUtils.equals(getCustomProtocol(), that.getCustomProtocol())) { // Check if custom protocols are not the same return false; - } else if ((isProtocolValid() && !that.isProtocolValid() && - getProtocol() != Im.PROTOCOL_CUSTOM) || - (that.isProtocolValid() && !isProtocolValid() && - that.getProtocol() != Im.PROTOCOL_CUSTOM)) { - // Deal with invalid protocol as if it was custom. If either has a non valid protocol, - // check to see if the other has a valid that is not custom - return false; } return true; } diff --git a/src/com/android/contacts/common/model/dataitem/RelationDataItem.java b/src/com/android/contacts/common/model/dataitem/RelationDataItem.java index 1ba3fcfb..9e883fef 100644 --- a/src/com/android/contacts/common/model/dataitem/RelationDataItem.java +++ b/src/com/android/contacts/common/model/dataitem/RelationDataItem.java @@ -20,6 +20,7 @@ import android.content.ContentValues; import android.content.Context; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Relation; +import android.text.TextUtils; /** * Represents a relation data item, wrapping the columns in @@ -46,12 +47,14 @@ public class RelationDataItem extends DataItem { } final RelationDataItem that = (RelationDataItem) t; // Relations can have different types (assistant, father) but have the same name - if (!getName().equals(that.getName())) { + if (!TextUtils.equals(getName(), that.getName())) { return false; + } else if (!hasKindTypeColumn(mKind) || !that.hasKindTypeColumn(that.getDataKind())) { + return hasKindTypeColumn(mKind) == that.hasKindTypeColumn(that.getDataKind()); } else if (getKindTypeColumn(mKind) != that.getKindTypeColumn(that.getDataKind())) { return false; } else if (getKindTypeColumn(mKind) == Relation.TYPE_CUSTOM && - !getLabel().equals(that.getLabel())) { + !TextUtils.equals(getLabel(), that.getLabel())) { // Check if custom types are not the same return false; } diff --git a/src/com/android/contacts/common/util/AccountSelectionUtil.java b/src/com/android/contacts/common/util/AccountSelectionUtil.java index 2ea53f11..ed77da22 100644 --- a/src/com/android/contacts/common/util/AccountSelectionUtil.java +++ b/src/com/android/contacts/common/util/AccountSelectionUtil.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; +import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; import android.view.ContextThemeWrapper; @@ -53,7 +54,6 @@ public class AccountSelectionUtil { public static boolean mVCardShare = false; private static int SIM_ID_INVALID = -1; private static int mSelectedSim = SIM_ID_INVALID; - private static final String SIM_INDEX = "sim_index"; // Constant value to know option is import from all SIM's private static int IMPORT_FROM_ALL = 8; @@ -66,22 +66,31 @@ public class AccountSelectionUtil { final private Context mContext; final private int mResId; + final private int mSubscriptionId; protected List<AccountWithDataSet> mAccountList; public AccountSelectedListener(Context context, List<AccountWithDataSet> accountList, - int resId) { + int resId, int subscriptionId) { if (accountList == null || accountList.size() == 0) { Log.e(LOG_TAG, "The size of Account list is 0."); } mContext = context; mAccountList = accountList; mResId = resId; + mSubscriptionId = subscriptionId; + } + + public AccountSelectedListener(Context context, List<AccountWithDataSet> accountList, + int resId) { + // Subscription id is only needed for importing from SIM card. We can safely ignore + // its value for SD card importing. + this(context, accountList, resId, SubscriptionManager.INVALID_SUBSCRIPTION_ID); } public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - doImport(mContext, mResId, mAccountList.get(which)); + doImport(mContext, mResId, mAccountList.get(which), mSubscriptionId); } /** * Reset the account list for this listener, to make sure the selected @@ -195,10 +204,11 @@ public class AccountSelectionUtil { .create(); } - public static void doImport(Context context, int resId, AccountWithDataSet account) { + public static void doImport(Context context, int resId, AccountWithDataSet account, + int subscriptionId) { switch (resId) { case R.string.import_from_sim: { - doImportFromSim(context, account); + doImportFromSim(context, account, subscriptionId); break; } case R.string.import_from_sdcard: { @@ -208,23 +218,8 @@ public class AccountSelectionUtil { } } - public static void doImportFromSim(Context context, AccountWithDataSet account) { - Intent importIntent = new Intent(SimContactsConstants.ACTION_MULTI_PICK_SIM); - if (account != null) { - importIntent.putExtra(SimContactsConstants.ACCOUNT_NAME, account.name); - importIntent.putExtra(SimContactsConstants.ACCOUNT_TYPE, account.type); - importIntent.putExtra(SimContactsConstants.ACCOUNT_DATA, account.dataSet); - } - if (TelephonyManager.getDefault().isMultiSimEnabled()) { - importIntent.putExtra(SimContactsConstants.SUB, mImportSub); - } else { - importIntent.putExtra(SimContactsConstants.SUB,SimContactsConstants.SUB_1); - } - context.startActivity(importIntent); - } - - public static void doImportFromMultiSim(Context context, AccountWithDataSet account, - int selectedSim) { + public static void doImportFromSim(Context context, AccountWithDataSet account, + int subscriptionId) { Intent importIntent = new Intent(Intent.ACTION_VIEW); importIntent.setType("vnd.android.cursor.item/sim-contact"); if (account != null) { @@ -232,8 +227,8 @@ public class AccountSelectionUtil { importIntent.putExtra("account_type", account.type); importIntent.putExtra("data_set", account.dataSet); } + importIntent.putExtra("subscription_id", (Integer) subscriptionId); importIntent.setClassName("com.android.phone", "com.android.phone.SimContacts"); - importIntent.putExtra(SIM_INDEX, selectedSim); context.startActivity(importIntent); } @@ -268,7 +263,7 @@ public class AccountSelectionUtil { public void onClick(DialogInterface dialog, int which) { Log.d(LOG_TAG, "onClick OK: mSelectedSim = " + mSelectedSim); if (mSelectedSim != SIM_ID_INVALID) { - doImportFromMultiSim(mContext, mAccount, mSelectedSim); + doImportFromSim(mContext, mAccount, mSelectedSim); } } } diff --git a/src/com/android/contacts/common/util/BitmapUtil.java b/src/com/android/contacts/common/util/BitmapUtil.java index a70831ec..66ab00f5 100644 --- a/src/com/android/contacts/common/util/BitmapUtil.java +++ b/src/com/android/contacts/common/util/BitmapUtil.java @@ -19,6 +19,11 @@ package com.android.contacts.common.util; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PorterDuff.Mode; +import android.graphics.PorterDuffXfermode; +import android.graphics.Rect; +import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.graphics.drawable.BitmapDrawable; @@ -107,4 +112,51 @@ public class BitmapUtil { return new BitmapDrawable(resources,rotated); } + + /** + * Given an input bitmap, scales it to the given width/height and makes it round. + * + * @param input {@link Bitmap} to scale and crop + * @param targetWidth desired output width + * @param targetHeight desired output height + * @return output bitmap scaled to the target width/height and cropped to an oval. The + * cropping algorithm will try to fit as much of the input into the output as possible, + * while preserving the target width/height ratio. + */ + public static Bitmap getRoundedBitmap(Bitmap input, int targetWidth, int targetHeight) { + if (input == null) { + return null; + } + final Bitmap result = Bitmap.createBitmap(targetWidth, targetHeight, input.getConfig()); + final Canvas canvas = new Canvas(result); + final Paint paint = new Paint(); + canvas.drawARGB(0, 0, 0, 0); + paint.setAntiAlias(true); + canvas.drawOval(0, 0, targetWidth, targetHeight, paint); + + // Specifies that only pixels present in the destination (i.e. the drawn oval) should + // be overwritten with pixels from the input bitmap. + paint.setXfermode(new PorterDuffXfermode(Mode.SRC_IN)); + + final int inputWidth = input.getWidth(); + final int inputHeight = input.getHeight(); + + // Choose the largest scale factor that will fit inside the dimensions of the + // input bitmap. + final float scaleBy = Math.min((float) inputWidth / targetWidth, + (float) inputHeight / targetHeight); + + final int xCropAmountHalved = (int) (scaleBy * targetWidth / 2); + final int yCropAmountHalved = (int) (scaleBy * targetHeight / 2); + + final Rect src = new Rect( + inputWidth / 2 - xCropAmountHalved, + inputHeight / 2 - yCropAmountHalved, + inputWidth / 2 + xCropAmountHalved, + inputHeight / 2 + yCropAmountHalved); + + final RectF dst = new RectF(0, 0, targetWidth, targetHeight); + canvas.drawBitmap(input, src, dst, paint); + return result; + } } diff --git a/src/com/android/contacts/common/util/ContactDisplayUtils.java b/src/com/android/contacts/common/util/ContactDisplayUtils.java index 7ec751a2..bb91b531 100644 --- a/src/com/android/contacts/common/util/ContactDisplayUtils.java +++ b/src/com/android/contacts/common/util/ContactDisplayUtils.java @@ -19,10 +19,18 @@ package com.android.contacts.common.util; import static android.provider.ContactsContract.CommonDataKinds.Phone; import android.content.Context; +import android.telephony.PhoneNumberUtils; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.style.TtsSpan; import android.util.Log; +import android.util.Patterns; import com.android.contacts.common.R; +import com.android.i18n.phonenumbers.NumberParseException; +import com.android.i18n.phonenumbers.PhoneNumberUtil; +import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.common.base.Preconditions; /** @@ -187,4 +195,80 @@ public class ContactDisplayUtils { } } + /** + * Whether the given text could be a phone number. + * + * Note this will miss many things that are legitimate phone numbers, for example, + * phone numbers with letters. + */ + public static boolean isPossiblePhoneNumber(CharSequence text) { + return text == null ? false : Patterns.PHONE.matcher(text.toString()).matches(); + } + + /** + * Returns a Spannable for the given phone number with a telephone {@link TtsSpan} set over + * the entire length of the given phone number. + */ + public static Spannable getTelephoneTtsSpannable(String phoneNumber) { + if (phoneNumber == null) { + return null; + } + final Spannable spannable = new SpannableString(phoneNumber); + final TtsSpan ttsSpan = getTelephoneTtsSpan(phoneNumber); + spannable.setSpan(ttsSpan, 0, phoneNumber.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + return spannable; + } + + /** + * Returns a Spannable for the given message with a telephone {@link TtsSpan} set for + * the given phone number text wherever it is found within the message. + */ + public static Spannable getTelephoneTtsSpannable(String message, String phoneNumber) { + if (message == null) { + return null; + } + final Spannable spannable = new SpannableString(message); + int start = phoneNumber == null ? -1 : message.indexOf(phoneNumber); + while (start >= 0) { + final int end = start + phoneNumber.length(); + final TtsSpan ttsSpan = getTelephoneTtsSpan(phoneNumber); + spannable.setSpan(ttsSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + start = message.indexOf(phoneNumber, end); + } + return spannable; + } + + /** + * Returns a telephone {@link TtsSpan} for the given phone number. + */ + public static TtsSpan getTelephoneTtsSpan(String phoneNumberString) { + if (phoneNumberString == null) { + throw new NullPointerException(); + } + + // Parse the phone number + final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance(); + PhoneNumber phoneNumber = null; + try { + // Don't supply a defaultRegion so this fails for non-international numbers because + // we don't want to TalkBalk to read a country code (e.g. +1) if it is not already + // present + phoneNumber = phoneNumberUtil.parse(phoneNumberString, /* defaultRegion */ null); + } catch (NumberParseException ignored) { + } + + // Build a telephone tts span + final TtsSpan.TelephoneBuilder builder = new TtsSpan.TelephoneBuilder(); + if (phoneNumber == null) { + // Strip separators otherwise TalkBack will be silent + // (this behavior was observed with TalkBalk 4.0.2 from their alpha channel) + builder.setNumberParts(PhoneNumberUtils.stripSeparators(phoneNumberString)); + } else { + if (phoneNumber.hasCountryCode()) { + builder.setCountryCode(Integer.toString(phoneNumber.getCountryCode())); + } + builder.setNumberParts(Long.toString(phoneNumber.getNationalNumber())); + } + return builder.build(); + } } diff --git a/src/com/android/contacts/common/util/LocalizedNameResolver.java b/src/com/android/contacts/common/util/LocalizedNameResolver.java index 3c21946a..92104c44 100644 --- a/src/com/android/contacts/common/util/LocalizedNameResolver.java +++ b/src/com/android/contacts/common/util/LocalizedNameResolver.java @@ -19,10 +19,8 @@ package com.android.contacts.common.util; import android.accounts.AccountManager; import android.accounts.AuthenticatorDescription; import android.content.Context; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.ServiceInfo; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.content.res.TypedArray; @@ -32,6 +30,7 @@ import android.util.Log; import android.util.Xml; import com.android.contacts.common.R; +import com.android.contacts.common.model.account.ExternalAccountType; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -45,11 +44,6 @@ import java.io.IOException; public class LocalizedNameResolver { private static final String TAG = "LocalizedNameResolver"; - /** - * Meta-data key for the contacts configuration associated with a sync service. - */ - private static final String METADATA_CONTACTS = "android.provider.CONTACTS_STRUCTURE"; - private static final String CONTACTS_DATA_KIND = "ContactsDataKind"; /** @@ -82,20 +76,9 @@ public class LocalizedNameResolver { * reads the picture priority from that file. */ private static String resolveAllContactsNameFromMetaData(Context context, String packageName) { - final PackageManager pm = context.getPackageManager(); - try { - PackageInfo pi = pm.getPackageInfo(packageName, PackageManager.GET_SERVICES - | PackageManager.GET_META_DATA); - if (pi != null && pi.services != null) { - for (ServiceInfo si : pi.services) { - final XmlResourceParser parser = si.loadXmlMetaData(pm, METADATA_CONTACTS); - if (parser != null) { - return loadAllContactsNameFromXml(context, parser, packageName); - } - } - } - } catch (NameNotFoundException e) { - Log.w(TAG, "Problem loading \"All Contacts\"-name: " + e.toString()); + final XmlResourceParser parser = ExternalAccountType.loadContactsXml(context, packageName); + if (parser != null) { + return loadAllContactsNameFromXml(context, parser, packageName); } return null; } diff --git a/src/com/android/contacts/common/util/MaterialColorMapUtils.java b/src/com/android/contacts/common/util/MaterialColorMapUtils.java index 7827ae36..a8fbf421 100644 --- a/src/com/android/contacts/common/util/MaterialColorMapUtils.java +++ b/src/com/android/contacts/common/util/MaterialColorMapUtils.java @@ -25,7 +25,6 @@ import android.os.Parcelable; import android.os.Trace; public class MaterialColorMapUtils { - private final TypedArray sPrimaryColors; private final TypedArray sSecondaryColors; diff --git a/src/com/android/contacts/common/vcard/ExportVCardActivity.java b/src/com/android/contacts/common/vcard/ExportVCardActivity.java index 625412e8..029561d0 100644 --- a/src/com/android/contacts/common/vcard/ExportVCardActivity.java +++ b/src/com/android/contacts/common/vcard/ExportVCardActivity.java @@ -30,6 +30,8 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.Messenger; +import android.text.BidiFormatter; +import android.text.TextDirectionHeuristics; import android.text.TextUtils; import android.util.Log; @@ -113,6 +115,7 @@ public class ExportVCardActivity extends Activity implements ServiceConnection, private VCardService mService; private final Messenger mIncomingMessenger = new Messenger(new IncomingHandler()); + private static final BidiFormatter mBidiFormatter = BidiFormatter.getInstance(); // Used temporarily when asking users to confirm the file name private String mTargetFileName; @@ -268,13 +271,25 @@ public class ExportVCardActivity extends Activity implements ServiceConnection, } } + /** + * Returns the name of the target path with additional formatting characters to improve its + * appearance in bidirectional text. + */ + private String getTargetFileForDisplay() { + if (mTargetFileName == null) { + return null; + } + return mBidiFormatter.unicodeWrap(mTargetFileName, TextDirectionHeuristics.LTR); + } + @Override protected Dialog onCreateDialog(int id, Bundle bundle) { switch (id) { case R.id.dialog_export_confirmation: { return new AlertDialog.Builder(this) .setTitle(R.string.confirm_export_title) - .setMessage(getString(R.string.confirm_export_message, mTargetFileName)) + .setMessage(getString(R.string.confirm_export_message, + getTargetFileForDisplay())) .setPositiveButton(android.R.string.ok, new ExportConfirmationListener(mTargetFileName)) .setNegativeButton(android.R.string.cancel, this) @@ -318,7 +333,7 @@ public class ExportVCardActivity extends Activity implements ServiceConnection, ((AlertDialog)dialog).setMessage(mErrorReason); } else if (id == R.id.dialog_export_confirmation) { ((AlertDialog)dialog).setMessage( - getString(R.string.confirm_export_message, mTargetFileName)); + getString(R.string.confirm_export_message, getTargetFileForDisplay())); } else { super.onPrepareDialog(id, dialog, args); } diff --git a/src/com/android/contacts/common/vcard/ImportProcessor.java b/src/com/android/contacts/common/vcard/ImportProcessor.java index 37128755..219ec144 100644 --- a/src/com/android/contacts/common/vcard/ImportProcessor.java +++ b/src/com/android/contacts/common/vcard/ImportProcessor.java @@ -194,14 +194,14 @@ public class ImportProcessor extends ProcessorBase implements VCardEntryHandler Log.i(LOG_TAG, "Successfully finished importing one vCard file: " + uri); List<Uri> uris = committer.getCreatedUris(); if (mListener != null) { - if (uris != null && uris.size() > 0) { - // TODO: construct intent showing a list of imported contact list. + if (uris != null && uris.size() == 1) { mListener.onImportFinished(mImportRequest, mJobId, uris.get(0)); } else { - // Not critical, but suspicious. - Log.w(LOG_TAG, - "Created Uris is null or 0 length " + - "though the creation itself is successful."); + if (uris == null || uris.size() == 0) { + // Not critical, but suspicious. + Log.w(LOG_TAG, "Created Uris is null or 0 length " + + "though the creation itself is successful."); + } mListener.onImportFinished(mImportRequest, mJobId, null); } } diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java index 24f24dd1..d36dcaf3 100644 --- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java +++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java @@ -110,8 +110,6 @@ public class ImportVCardActivity extends Activity { final static String CACHED_URIS = "cached_uris"; - private AccountSelectionUtil.AccountSelectedListener mAccountSelectionListener; - private AccountWithDataSet mAccount; private ProgressDialog mProgressDialogForScanVCard; @@ -946,14 +944,6 @@ public class ImportVCardActivity extends Activity { @Override protected Dialog onCreateDialog(int resId, Bundle bundle) { switch (resId) { - case R.string.import_from_sdcard: { - if (mAccountSelectionListener == null) { - throw new NullPointerException( - "mAccountSelectionListener must not be null."); - } - return AccountSelectionUtil.getSelectAccountDialog(this, resId, - mAccountSelectionListener, mCancelListener); - } case R.id.dialog_searching_vcard: { if (mProgressDialogForScanVCard == null) { String message = getString(R.string.searching_vcard_message); diff --git a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java b/src/com/android/contacts/common/vcard/NotificationImportExportListener.java index 7117f9f5..63420026 100644 --- a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java +++ b/src/com/android/contacts/common/vcard/NotificationImportExportListener.java @@ -26,12 +26,15 @@ import android.content.Intent; import android.net.Uri; import android.os.Handler; import android.os.Message; +import android.provider.ContactsContract; import android.provider.ContactsContract.RawContacts; import android.widget.Toast; import com.android.contacts.common.R; import com.android.vcard.VCardEntry; +import java.text.NumberFormat; + public class NotificationImportExportListener implements VCardImportExportListener, Handler.Callback { /** The tag used by vCard-related notifications. */ @@ -123,7 +126,8 @@ public class NotificationImportExportListener implements VCardImportExportListen RawContacts.CONTENT_URI, rawContactId)); intent = new Intent(Intent.ACTION_VIEW, contactUri); } else { - intent = null; + intent = new Intent(Intent.ACTION_VIEW); + intent.setType(ContactsContract.Contacts.CONTENT_TYPE); } final Notification notification = NotificationImportExportListener.constructFinishNotification(mContext, @@ -218,13 +222,15 @@ public class NotificationImportExportListener implements VCardImportExportListen .setProgress(totalCount, currentCount, totalCount == - 1) .setTicker(tickerText) .setContentTitle(description) + .setColor(context.getResources().getColor(R.color.dialtacts_theme_color)) .setSmallIcon(type == VCardService.TYPE_IMPORT ? android.R.drawable.stat_sys_download : android.R.drawable.stat_sys_upload) .setContentIntent(PendingIntent.getActivity(context, 0, intent, 0)); if (totalCount > 0) { - builder.setContentText(context.getString(R.string.percentage, - String.valueOf(currentCount * 100 / totalCount))); + String percentage = + NumberFormat.getPercentInstance().format((double) currentCount / totalCount); + builder.setContentText(percentage); } return builder.getNotification(); } @@ -240,6 +246,7 @@ public class NotificationImportExportListener implements VCardImportExportListen return new Notification.Builder(context) .setAutoCancel(true) .setSmallIcon(android.R.drawable.stat_notify_error) + .setColor(context.getResources().getColor(R.color.dialtacts_theme_color)) .setContentTitle(description) .setContentText(description) .setContentIntent(PendingIntent.getActivity(context, 0, new Intent(), 0)) @@ -260,6 +267,7 @@ public class NotificationImportExportListener implements VCardImportExportListen .setSmallIcon(type == VCardService.TYPE_IMPORT ? android.R.drawable.stat_sys_download_done : android.R.drawable.stat_sys_upload_done) + .setColor(context.getResources().getColor(R.color.dialtacts_theme_color)) .setContentTitle(title) .setContentText(description) .setContentIntent(PendingIntent.getActivity(context, 0, @@ -277,6 +285,7 @@ public class NotificationImportExportListener implements VCardImportExportListen Context context, String reason) { return new Notification.Builder(context) .setAutoCancel(true) + .setColor(context.getResources().getColor(R.color.dialtacts_theme_color)) .setSmallIcon(android.R.drawable.stat_notify_error) .setContentTitle(context.getString(R.string.vcard_import_failed)) .setContentText(reason) diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/common/vcard/VCardService.java index f11598a1..7b90eddb 100644 --- a/src/com/android/contacts/common/vcard/VCardService.java +++ b/src/com/android/contacts/common/vcard/VCardService.java @@ -38,6 +38,7 @@ 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; @@ -496,7 +497,8 @@ public class VCardService extends Service { * This method increments "index" part from 1 to maximum, and checks whether any file name * following naming rule is available. If there's no file named /mnt/sdcard/00001.vcf, the * name will be returned to a caller. If there are 00001.vcf 00002.vcf, 00003.vcf is - * returned. + * returned. We format these numbers in the US locale to ensure we they appear as + * english numerals. * * There may not be any appropriate file name. If there are 99999 vCard files in the * storage, for example, there's no appropriate name, so this method returns @@ -519,7 +521,7 @@ public class VCardService extends Service { if (!ALLOW_LONG_FILE_NAME) { final String possibleBody = - String.format(bodyFormat, mFileNamePrefix, 1, mFileNameSuffix); + String.format(Locale.US, bodyFormat, mFileNamePrefix, 1, mFileNameSuffix); if (possibleBody.length() > 8 || mFileNameExtension.length() > 3) { Log.e(LOG_TAG, "This code does not allow any long file name."); mErrorReason = getString(R.string.fail_reason_too_long_filename, @@ -531,7 +533,8 @@ public class VCardService extends Service { for (int i = mFileIndexMinimum; i <= mFileIndexMaximum; i++) { boolean numberIsAvailable = true; - final String body = String.format(bodyFormat, mFileNamePrefix, i, mFileNameSuffix); + final String body + = String.format(Locale.US, bodyFormat, mFileNamePrefix, i, mFileNameSuffix); // Make sure that none of the extensions of mExtensionsToConsider matches. If this // number is free, we'll go ahead with mFileNameExtension (which is included in // mExtensionsToConsider) diff --git a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java new file mode 100644 index 00000000..08702543 --- /dev/null +++ b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2014 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.widget; + +import android.telecom.PhoneAccount; +import android.telecom.PhoneAccountHandle; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.app.FragmentManager; +import android.content.Context; +import android.content.DialogInterface; +import android.os.Bundle; +import android.telecom.TelecomManager; +import android.telephony.PhoneNumberUtils; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ListAdapter; +import android.widget.TextView; + +import com.android.contacts.common.R; + +import java.util.List; + +/** + * Dialog that allows the user to select a phone accounts for a given action. Optionally provides + * the choice to set the phone account as default. + */ +public class SelectPhoneAccountDialogFragment extends DialogFragment { + private int mTitleResId; + private boolean mCanSetDefault; + private List<PhoneAccountHandle> mAccountHandles; + private boolean mIsSelected; + private boolean mIsDefaultChecked; + private TelecomManager mTelecomManager; + private SelectPhoneAccountListener mListener; + + /** + * Shows the account selection dialog. + * This is the preferred way to show this dialog. + * + * @param fragmentManager The fragment manager. + * @param accountHandles The {@code PhoneAccountHandle}s available to select from. + * @param listener The listener for the results of the account selection. + */ + public static void showAccountDialog(FragmentManager fragmentManager, + List<PhoneAccountHandle> accountHandles, SelectPhoneAccountListener listener) { + showAccountDialog(fragmentManager, R.string.select_account_dialog_title, false, + accountHandles, listener); + } + + /** + * Shows the account selection dialog. + * This is the preferred way to show this dialog. + * This method also allows specifying a custom title and "set default" checkbox. + * + * @param fragmentManager The fragment manager. + * @param titleResId The resource ID for the string to use in the title of the dialog. + * @param canSetDefault {@code true} if the dialog should include an option to set the selection + * as the default. False otherwise. + * @param accountHandles The {@code PhoneAccountHandle}s available to select from. + * @param listener The listener for the results of the account selection. + */ + public static void showAccountDialog(FragmentManager fragmentManager, int titleResId, + boolean canSetDefault, List<PhoneAccountHandle> accountHandles, + SelectPhoneAccountListener listener) { + SelectPhoneAccountDialogFragment fragment = + new SelectPhoneAccountDialogFragment( + titleResId, canSetDefault, accountHandles, listener); + fragment.show(fragmentManager, "selectAccount"); + } + + public SelectPhoneAccountDialogFragment(int titleResId, boolean canSetDefault, + List<PhoneAccountHandle> accountHandles, SelectPhoneAccountListener listener) { + super(); + mTitleResId = titleResId; + mCanSetDefault = canSetDefault; + mAccountHandles = accountHandles; + mListener = listener; + } + + public interface SelectPhoneAccountListener { + void onPhoneAccountSelected(PhoneAccountHandle selectedAccountHandle, boolean setDefault); + void onDialogDismissed(); + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + mIsSelected = false; + mIsDefaultChecked = false; + mTelecomManager = + (TelecomManager) getActivity().getSystemService(Context.TELECOM_SERVICE); + + final DialogInterface.OnClickListener selectionListener = + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + mIsSelected = true; + PhoneAccountHandle selectedAccountHandle = mAccountHandles.get(which); + mListener.onPhoneAccountSelected(selectedAccountHandle, mIsDefaultChecked); + } + }; + + final CompoundButton.OnCheckedChangeListener checkListener = + new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton check, boolean isChecked) { + mIsDefaultChecked = isChecked; + } + }; + + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + ListAdapter selectAccountListAdapter = new SelectAccountListAdapter( + builder.getContext(), + R.layout.select_account_list_item, + mAccountHandles); + + AlertDialog dialog = builder.setTitle(mTitleResId) + .setAdapter(selectAccountListAdapter, selectionListener) + .create(); + + if (mCanSetDefault) { + // Generate custom checkbox view + LinearLayout checkboxLayout = (LinearLayout) getActivity() + .getLayoutInflater() + .inflate(R.layout.default_account_checkbox, null); + + CheckBox cb = + (CheckBox) checkboxLayout.findViewById(R.id.default_account_checkbox_view); + cb.setOnCheckedChangeListener(checkListener); + + dialog.getListView().addFooterView(checkboxLayout); + } + + return dialog; + } + + private class SelectAccountListAdapter extends ArrayAdapter<PhoneAccountHandle> { + private int mResId; + + public SelectAccountListAdapter( + Context context, int resource, List<PhoneAccountHandle> accountHandles) { + super(context, resource, accountHandles); + mResId = resource; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + LayoutInflater inflater = (LayoutInflater) + getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + View rowView; + final ViewHolder holder; + + if (convertView == null) { + // Cache views for faster scrolling + rowView = inflater.inflate(mResId, null); + holder = new ViewHolder(); + holder.labelTextView = (TextView) rowView.findViewById(R.id.label); + holder.numberTextView = (TextView) rowView.findViewById(R.id.number); + holder.imageView = (ImageView) rowView.findViewById(R.id.icon); + rowView.setTag(holder); + } + else { + rowView = convertView; + holder = (ViewHolder) rowView.getTag(); + } + + PhoneAccountHandle accountHandle = getItem(position); + PhoneAccount account = mTelecomManager.getPhoneAccount(accountHandle); + holder.labelTextView.setText(account.getLabel()); + if (account.getAddress() == null || + TextUtils.isEmpty(account.getAddress().getSchemeSpecificPart())) { + holder.numberTextView.setVisibility(View.GONE); + } else { + holder.numberTextView.setVisibility(View.VISIBLE); + holder.numberTextView.setText( + PhoneNumberUtils.ttsSpanAsPhoneNumber( + account.getAddress().getSchemeSpecificPart())); + } + holder.imageView.setImageDrawable(account.createIconDrawable(getContext())); + return rowView; + } + + private class ViewHolder { + TextView labelTextView; + TextView numberTextView; + ImageView imageView; + } + } + + @Override + public void onPause() { + if (!mIsSelected) { + mListener.onDialogDismissed(); + } + super.onPause(); + } +} diff --git a/src/com/android/contacts/commonbind/analytics/AnalyticsUtil.java b/src/com/android/contacts/commonbind/analytics/AnalyticsUtil.java new file mode 100644 index 00000000..59650aa9 --- /dev/null +++ b/src/com/android/contacts/commonbind/analytics/AnalyticsUtil.java @@ -0,0 +1,25 @@ +package com.android.contacts.commonbind.analytics; + +import android.app.Activity; +import android.app.Application; +import android.app.Fragment; +import android.text.TextUtils; + +public class AnalyticsUtil { + + /** + * Initialize this class and setup automatic activity tracking. + */ + public static void initialize(Application application) { } + + /** + * Log a screen view for {@param fragment}. + */ + public static void sendScreenView(Fragment fragment) {} + + public static void sendScreenView(Fragment fragment, Activity activity) {} + + public static void sendScreenView(Fragment fragment, Activity activity, String tag) {} + + public static void sendScreenView(String fragmentName, Activity activity, String tag) {} +}
\ No newline at end of file diff --git a/src/com/android/dialerbind/analytics/AnalyticsActivity.java b/src/com/android/dialerbind/analytics/AnalyticsActivity.java deleted file mode 100644 index e9021305..00000000 --- a/src/com/android/dialerbind/analytics/AnalyticsActivity.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2014 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.dialerbind.analytics; - -import android.app.Activity; - -public abstract class AnalyticsActivity extends Activity implements AnalyticsInterface { - @Override - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } - - @Override - public void sendScreenView() { - } -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsDialogFragment.java b/src/com/android/dialerbind/analytics/AnalyticsDialogFragment.java deleted file mode 100644 index 5253ff99..00000000 --- a/src/com/android/dialerbind/analytics/AnalyticsDialogFragment.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2014 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.dialerbind.analytics; - -import android.app.DialogFragment; - -public abstract class AnalyticsDialogFragment extends DialogFragment implements AnalyticsInterface { - @Override - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } - - @Override - public void sendScreenView() { - } -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsFragment.java b/src/com/android/dialerbind/analytics/AnalyticsFragment.java deleted file mode 100644 index 15debeb8..00000000 --- a/src/com/android/dialerbind/analytics/AnalyticsFragment.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2014 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.dialerbind.analytics; - -import android.app.Fragment; - -public abstract class AnalyticsFragment extends Fragment implements AnalyticsInterface { - @Override - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } - - @Override - public void sendScreenView() { - } -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsInterface.java b/src/com/android/dialerbind/analytics/AnalyticsInterface.java deleted file mode 100644 index 370f8b05..00000000 --- a/src/com/android/dialerbind/analytics/AnalyticsInterface.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2014 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.dialerbind.analytics; - -public interface AnalyticsInterface { - void sendHitEvent(String categoryId, String actionId, String labelId); - - void sendScreenView(); -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsListFragment.java b/src/com/android/dialerbind/analytics/AnalyticsListFragment.java deleted file mode 100644 index 8c39054a..00000000 --- a/src/com/android/dialerbind/analytics/AnalyticsListFragment.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2014 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.dialerbind.analytics; - -import android.app.ListFragment; - -public abstract class AnalyticsListFragment extends ListFragment implements AnalyticsInterface { - @Override - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } - - @Override - public void sendScreenView() { - } -} diff --git a/src/com/android/dialerbind/analytics/AnalyticsPreferenceActivity.java b/src/com/android/dialerbind/analytics/AnalyticsPreferenceActivity.java deleted file mode 100644 index f270cf21..00000000 --- a/src/com/android/dialerbind/analytics/AnalyticsPreferenceActivity.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2014 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.dialerbind.analytics; - -import android.preference.PreferenceActivity; - -public abstract class AnalyticsPreferenceActivity extends PreferenceActivity - implements AnalyticsInterface { - @Override - public void sendHitEvent(String categoryId, String actionId, String labelId) { - } - - @Override - public void sendScreenView() { - } -} |