Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 496a337e authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Android 13"

parents 19df6070 af019f65

AndroidManifest.xml

+21 −4
Original line number Original line Diff line number Diff line
@@ -16,12 +16,12 @@ 




<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.contacts"

          package="com.android.contacts"

          android:versionCode="10733"

          android:versionCode="10734"

          android:versionName="1.7.33">

          android:versionName="1.7.34">





    <uses-sdk

    <uses-sdk

        android:minSdkVersion="31"

        android:minSdkVersion="33"

        android:targetSdkVersion="31"/>

        android:targetSdkVersion="33"/>





    <original-package android:name="com.android.contacts"/>

    <original-package android:name="com.android.contacts"/>
@@ -46,6 +46,7 @@ 
    <uses-permission android:name="android.permission.VIBRATE"/>

    <uses-permission android:name="android.permission.VIBRATE"/>

    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>

    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

    <uses-permission android:name="android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS"/>

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

    <!-- Following used for Contact metadata syncing -->

    <!-- Following used for Contact metadata syncing -->

    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>

    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
@@ -55,6 +56,7 @@ 
    <!-- Required in P to run Service.startForeground() -->

    <!-- Required in P to run Service.startForeground() -->

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />

    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />





    <uses-feature

    <uses-feature

        android:name="android.hardware.telephony"

        android:name="android.hardware.telephony"
@@ -259,6 +261,17 @@ 
            android:launchMode="singleTop"

            android:launchMode="singleTop"

            android:theme="@style/ContactsPreferencesTheme"/>

            android:theme="@style/ContactsPreferencesTheme"/>





        <activity

            android:name=".preference.SetDefaultAccountActivity"

            android:exported="true"

            android:theme="@style/BackgroundOnlyTheme"

            android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.provider.action.SET_DEFAULT_ACCOUNT"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>



        <activity

        <activity

            android:name=".activities.LicenseActivity"

            android:name=".activities.LicenseActivity"

            android:exported="true"

            android:exported="true"
@@ -701,6 +714,10 @@ 
        </intent>

        </intent>





        <!-- edit contact photo -->

        <!-- edit contact photo -->

        <intent>

            <action android:name="android.media.action.IMAGE_CAPTURE" />

        </intent>



        <intent>

        <intent>

            <action android:name="com.android.camera.action.CROP" />

            <action android:name="com.android.camera.action.CROP" />

            <data android:mimeType="image/*" />

            <data android:mimeType="image/*" />

lint-baseline.xml

+103 −15
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">

<issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">





    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"

        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"

        errorLine1="                        ContactsContract.SimContacts.getSimAccounts(mContext.getContentResolver());"

        errorLine1="                        ContactsContract.SimContacts.getSimAccounts(mContext.getContentResolver());"

        errorLine2="                                                     ~~~~~~~~~~~~~~">

        errorLine2="                                                     ~~~~~~~~~~~~~~">

        <location

        <location
@@ -14,7 +14,7 @@ 




    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountName`"

        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountName`"

        errorLine1="                    simAccountWithDataSets.add(new AccountWithDataSet(simAccount.getAccountName(),"

        errorLine1="                    simAccountWithDataSets.add(new AccountWithDataSet(simAccount.getAccountName(),"

        errorLine2="                                                                                 ~~~~~~~~~~~~~~">

        errorLine2="                                                                                 ~~~~~~~~~~~~~~">

        <location

        <location
@@ -25,7 +25,7 @@ 




    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"

        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"

        errorLine1="                            simAccount.getAccountType(), null));"

        errorLine1="                            simAccount.getAccountType(), null));"

        errorLine2="                                       ~~~~~~~~~~~~~~">

        errorLine2="                                       ~~~~~~~~~~~~~~">

        <location

        <location
@@ -177,6 +177,17 @@ 
            column="46"/>

            column="46"/>

    </issue>

    </issue>





    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="                MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                          ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/interactions/ContactDeletionInteraction.java"

            line="360"

            column="43"/>

    </issue>



    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 23 (current min is 21): `android.widget.QuickContactBadge#setPrioritizedMimeType`"

        message="Call requires API level 23 (current min is 21): `android.widget.QuickContactBadge#setPrioritizedMimeType`"
@@ -190,7 +201,29 @@ 




    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="            MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                      ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/ContactSaveService.java"

            line="1221"

            column="39"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="            MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                      ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/list/DefaultContactBrowseListFragment.java"

            line="1129"

            column="39"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimContacts#getSimAccounts`"

        errorLine1="                    ContactsContract.SimContacts.getSimAccounts("

        errorLine1="                    ContactsContract.SimContacts.getSimAccounts("

        errorLine2="                                                 ~~~~~~~~~~~~~~">

        errorLine2="                                                 ~~~~~~~~~~~~~~">

        <location

        <location
@@ -201,7 +234,7 @@ 




    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"

        message="Call requires API level S (current min is 21): `android.provider.ContactsContract.SimAccount#getAccountType`"

        errorLine1="                        simAccount.getAccountType())) {"

        errorLine1="                        simAccount.getAccountType())) {"

        errorLine2="                                   ~~~~~~~~~~~~~~">

        errorLine2="                                   ~~~~~~~~~~~~~~">

        <location

        <location
@@ -223,13 +256,13 @@ 




    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `android.provider.BlockedNumberContract#canCurrentUserBlockNumbers`"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="                &amp;&amp; BlockedNumberContract.canCurrentUserBlockNumbers(getContext());"

        errorLine1="                MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~">

        errorLine2="                                          ~~~~~~~~~~~~~~~~~">

        <location

        <location

            file="packages/apps/Contacts/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java"

            file="packages/apps/Contacts/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java"

            line="300"

            line="436"

            column="42"/>

            column="43"/>

    </issue>

    </issue>





    <issue

    <issue
@@ -243,6 +276,28 @@ 
            column="57"/>

            column="57"/>

    </issue>

    </issue>





    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="                    MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                              ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/interactions/ImportDialogFragment.java"

            line="178"

            column="47"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="                    MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                              ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/interactions/ImportDialogFragment.java"

            line="187"

            column="47"/>

    </issue>



    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 26 (current min is 21): `android.graphics.drawable.AdaptiveIconDrawable#getExtraInsetFraction`"

        message="Call requires API level 26 (current min is 21): `android.graphics.drawable.AdaptiveIconDrawable#getExtraInsetFraction`"
@@ -254,6 +309,28 @@ 
            column="51"/>

            column="51"/>

    </issue>

    </issue>





    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="            MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                      ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/list/MultiSelectContactsListFragment.java"

            line="357"

            column="39"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="            MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                      ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/list/MultiSelectContactsListFragment.java"

            line="362"

            column="39"/>

    </issue>



    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#getIcon`"

        message="Call requires API level 23 (current min is 21): `android.telecom.PhoneAccount#getIcon`"
@@ -360,7 +437,7 @@ 
        errorLine2="                                                                          ~~~~~~~~~~~">

        errorLine2="                                                                          ~~~~~~~~~~~">

        <location

        <location

            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"

            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"

            line="652"

            line="654"

            column="75"/>

            column="75"/>

    </issue>

    </issue>
@@ -371,10 +448,21 @@ 
        errorLine2="                        ~~~~~~~~~~~">

        errorLine2="                        ~~~~~~~~~~~">

        <location

        <location

            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"

            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"

            line="653"

            line="655"

            column="25"/>

            column="25"/>

    </issue>

    </issue>





    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `new android.icu.text.MessageFormat`"

        errorLine1="        MessageFormat msgFormat = new MessageFormat("

        errorLine2="                                  ~~~~~~~~~~~~~~~~~">

        <location

            file="packages/apps/Contacts/src/com/android/contacts/quickcontact/QuickContactActivity.java"

            line="2226"

            column="35"/>

    </issue>



    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Class requires API level 23 (current min is 21): `android.telecom.PhoneAccountHandle`"

        message="Class requires API level 23 (current min is 21): `android.telecom.PhoneAccountHandle`"
@@ -454,7 +542,7 @@ 




    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level R (current min is 21): `android.telephony.TelephonyManager#getSubscriptionId`"

        message="Call requires API level 30 (current min is 21): `android.telephony.TelephonyManager#getSubscriptionId`"

        errorLine1="            return new SimCard(telephony.getSimSerialNumber(), telephony.getSubscriptionId(),"

        errorLine1="            return new SimCard(telephony.getSimSerialNumber(), telephony.getSubscriptionId(),"

        errorLine2="                                                                         ~~~~~~~~~~~~~~~~~">

        errorLine2="                                                                         ~~~~~~~~~~~~~~~~~">

        <location

        <location
@@ -465,7 +553,7 @@ 




    <issue

    <issue

        id="NewApi"

        id="NewApi"

        message="Call requires API level 31 (current min is 21): `android.provider.SimPhonebookContract.SimRecords#getContentUri`"

        message="Call requires API level S (current min is 21): `android.provider.SimPhonebookContract.SimRecords#getContentUri`"

        errorLine1="                SimRecords.getContentUri("

        errorLine1="                SimRecords.getContentUri("

        errorLine2="                           ~~~~~~~~~~~~~">

        errorLine2="                           ~~~~~~~~~~~~~">

        <location

        <location

res/values-af/strings.xml

+7 −28
Original line number Original line Diff line number Diff line
@@ -65,18 +65,9 @@ 
    <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"<xliff:g id="NAME">%1$s</xliff:g> uitgevee"</string>

    <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"<xliff:g id="NAME">%1$s</xliff:g> uitgevee"</string>

    <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> en <xliff:g id="NAME_1">%2$s</xliff:g> uitgevee"</string>

    <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> en <xliff:g id="NAME_1">%2$s</xliff:g> uitgevee"</string>

    <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g> … uitgevee"</string>

    <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g> … uitgevee"</string>

    <plurals name="contacts_deleted_toast" formatted="false" msgid="198534700386623765">

    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{Kontak is uitgevee}other{Kontakte is uitgevee}}"</string>

      <item quantity="other">Kontakte is uitgevee</item>

    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{# kontak}other{# kontakte}}"</string>

      <item quantity="one">Kontak is uitgevee</item>

    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{# kontak · {account}}other{# kontakte • {account}}}"</string>

    </plurals>

    <plurals name="contacts_count" formatted="false" msgid="8804860300387044572">

      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kontakte</item>

      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kontak</item>

    </plurals>

    <plurals name="contacts_count_with_account" formatted="false" msgid="1025146902085751375">

      <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> kontakte · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>

      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kontak · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>

    </plurals>

    <string name="title_from_google" msgid="2554633992366572820">"Vanaf Google"</string>

    <string name="title_from_google" msgid="2554633992366572820">"Vanaf Google"</string>

    <string name="title_from_other_accounts" msgid="7813596336566711843">"Vanaf <xliff:g id="ACCOUNT">%s</xliff:g>"</string>

    <string name="title_from_other_accounts" msgid="7813596336566711843">"Vanaf <xliff:g id="ACCOUNT">%s</xliff:g>"</string>

    <string name="menu_set_ring_tone" msgid="8876328286439724181">"Stel luitoon op"</string>

    <string name="menu_set_ring_tone" msgid="8876328286439724181">"Stel luitoon op"</string>
@@ -136,10 +127,7 @@ 
    <string name="menu_share" msgid="6343022811796001773">"Deel"</string>

    <string name="menu_share" msgid="6343022811796001773">"Deel"</string>

    <string name="menu_add_contact" msgid="5822356185421997656">"Voeg by kontakte"</string>

    <string name="menu_add_contact" msgid="5822356185421997656">"Voeg by kontakte"</string>

    <string name="menu_add_contacts" msgid="7114262784903366463">"Voeg by"</string>

    <string name="menu_add_contacts" msgid="7114262784903366463">"Voeg by"</string>

    <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">

    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Deel kontak via}other{Deel kontakte via}}"</string>

      <item quantity="other">Deel kontakte via</item>

      <item quantity="one">Deel kontak via</item>

    </plurals>

    <string name="dialog_new_group_account" msgid="4326402875327788728">"Kies rekening"</string>

    <string name="dialog_new_group_account" msgid="4326402875327788728">"Kies rekening"</string>

    <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Skep etiket"</string>

    <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Skep etiket"</string>

    <string name="group_name_dialog_update_title" msgid="3955919589366745101">"Hernoem etiket"</string>

    <string name="group_name_dialog_update_title" msgid="3955919589366745101">"Hernoem etiket"</string>
@@ -380,14 +368,8 @@ 
    <string name="dialog_new_contact_account" msgid="5652018124788855057">"Stoor ingevoerde kontakte na:"</string>

    <string name="dialog_new_contact_account" msgid="5652018124788855057">"Stoor ingevoerde kontakte na:"</string>

    <string name="import_from_sim" msgid="7825280799813847991">"SIM-kaart"</string>

    <string name="import_from_sim" msgid="7825280799813847991">"SIM-kaart"</string>

    <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>

    <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>

    <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="8737770002554878728">

    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{# kontak}other{# kontakte}}"</string>

      <item quantity="other">%1$d kontakte</item>

    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{# kontak • <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}other{# kontakte • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>

      <item quantity="one">1 kontak</item>

    </plurals>

    <plurals name="import_from_sim_secondary_template" formatted="false" msgid="6698670511061586532">

      <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> kontakte • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>

      <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> kontak • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>

    </plurals>

    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf-lêer"</string>

    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf-lêer"</string>

    <string name="nothing_to_import_message" msgid="2594519620375509783">"Niks om in te voer nie"</string>

    <string name="nothing_to_import_message" msgid="2594519620375509783">"Niks om in te voer nie"</string>

    <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Voer kontakte vanaf vCard in?"</string>

    <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Voer kontakte vanaf vCard in?"</string>
@@ -490,10 +472,7 @@ 
    <string name="sim_import_title_none_selected" msgid="3527680774575468781">"Kies kontakte"</string>

    <string name="sim_import_title_none_selected" msgid="3527680774575468781">"Kies kontakte"</string>

    <string name="sim_import_empty_message" msgid="7238368542566545854">"Geen kontakte op jou SIM-kaart nie"</string>

    <string name="sim_import_empty_message" msgid="7238368542566545854">"Geen kontakte op jou SIM-kaart nie"</string>

    <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"Kontak bestaan reeds in jou lys"</string>

    <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"Kontak bestaan reeds in jou lys"</string>

    <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="422539156156042210">

    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{# SIM-kontak is ingevoer}other{# SIM-kontakte is ingevoer}}"</string>

      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> SIM-kontakte ingevoer</item>

      <item quantity="one">1 SIM-kontak ingevoer</item>

    </plurals>

    <string name="sim_import_failed_toast" msgid="358117391138073786">"Kon nie SIM-kontakte invoer nie"</string>

    <string name="sim_import_failed_toast" msgid="358117391138073786">"Kon nie SIM-kontakte invoer nie"</string>

    <string name="sim_import_title" msgid="8202961146093040684">"Voer in vanaf SIM"</string>

    <string name="sim_import_title" msgid="8202961146093040684">"Voer in vanaf SIM"</string>

    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Kanselleer"</string>

    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Kanselleer"</string>

res/values-am/strings.xml

+7 −28
Original line number Original line Diff line number Diff line
@@ -65,18 +65,9 @@ 
    <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"<xliff:g id="NAME">%1$s</xliff:g> ተሰርዟል"</string>

    <string name="contacts_deleted_one_named_toast" msgid="2707266264779781309">"<xliff:g id="NAME">%1$s</xliff:g> ተሰርዟል"</string>

    <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> እና<xliff:g id="NAME_1">%2$s</xliff:g> ተሰርዝዋል"</string>

    <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> እና<xliff:g id="NAME_1">%2$s</xliff:g> ተሰርዝዋል"</string>

    <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>፣ <xliff:g id="NAME_1">%2$s</xliff:g>፣ <xliff:g id="NAME_2">%3$s</xliff:g>… ተሰርዘዋል"</string>

    <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>፣ <xliff:g id="NAME_1">%2$s</xliff:g>፣ <xliff:g id="NAME_2">%3$s</xliff:g>… ተሰርዘዋል"</string>

    <plurals name="contacts_deleted_toast" formatted="false" msgid="198534700386623765">

    <string name="contacts_deleted_toast" msgid="3185825083067357305">"{count,plural, =1{እውቂያ ተሰርዟል}one{እውቂያዎች ተሰርዘዋል}other{እውቂያዎች ተሰርዘዋል}}"</string>

      <item quantity="one">እውቂያዎች ተሰርዘዋል</item>

    <string name="contacts_count" msgid="92227640680327707">"{count,plural, =1{# እውቂያ}one{# እውቂያዎች}other{# እውቂያዎች}}"</string>

      <item quantity="other">እውቂያዎች ተሰርዘዋል</item>

    <string name="contacts_count_with_account" msgid="3921405666045433256">"{count,plural, =1{# እውቂያ · {account}}one{# እውቂያዎች · {account}}other{# እውቂያዎች · {account}}}"</string>

    </plurals>

    <plurals name="contacts_count" formatted="false" msgid="8804860300387044572">

      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> እውቂያዎች</item>

      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> እውቂያዎች</item>

    </plurals>

    <plurals name="contacts_count_with_account" formatted="false" msgid="1025146902085751375">

      <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> እውቂያዎች · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>

      <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> እውቂያዎች · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>

    </plurals>

    <string name="title_from_google" msgid="2554633992366572820">"ከGoogle"</string>

    <string name="title_from_google" msgid="2554633992366572820">"ከGoogle"</string>

    <string name="title_from_other_accounts" msgid="7813596336566711843">"ከ<xliff:g id="ACCOUNT">%s</xliff:g>"</string>

    <string name="title_from_other_accounts" msgid="7813596336566711843">"ከ<xliff:g id="ACCOUNT">%s</xliff:g>"</string>

    <string name="menu_set_ring_tone" msgid="8876328286439724181">"የጥሪ ድምፅ አዘጋጅ"</string>

    <string name="menu_set_ring_tone" msgid="8876328286439724181">"የጥሪ ድምፅ አዘጋጅ"</string>
@@ -136,10 +127,7 @@ 
    <string name="menu_share" msgid="6343022811796001773">"መጋሪያ"</string>

    <string name="menu_share" msgid="6343022811796001773">"መጋሪያ"</string>

    <string name="menu_add_contact" msgid="5822356185421997656">"ወደ እውቂያዎች ያክሉ"</string>

    <string name="menu_add_contact" msgid="5822356185421997656">"ወደ እውቂያዎች ያክሉ"</string>

    <string name="menu_add_contacts" msgid="7114262784903366463">"አክል"</string>

    <string name="menu_add_contacts" msgid="7114262784903366463">"አክል"</string>

    <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">

    <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{እውቂያን አጋራ በ}one{እውቂያዎችን አጋራ በ}other{እውቂያዎችን አጋራ በ}}"</string>

      <item quantity="one">ዕውቂያ በማን በኩል ይጋራ</item>

      <item quantity="other">ዕውቂያ በማን በኩል ይጋራ</item>

    </plurals>

    <string name="dialog_new_group_account" msgid="4326402875327788728">"መለያ ይምረጡ"</string>

    <string name="dialog_new_group_account" msgid="4326402875327788728">"መለያ ይምረጡ"</string>

    <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"መሰየሚያ ይፍጠሩ"</string>

    <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"መሰየሚያ ይፍጠሩ"</string>

    <string name="group_name_dialog_update_title" msgid="3955919589366745101">"መሰየሚያውን ዳግም ሰይም"</string>

    <string name="group_name_dialog_update_title" msgid="3955919589366745101">"መሰየሚያውን ዳግም ሰይም"</string>
@@ -380,14 +368,8 @@ 
    <string name="dialog_new_contact_account" msgid="5652018124788855057">"እንዲመጡ የተደረጉ እውቂያዎችን አስቀምጥ ወደ፦"</string>

    <string name="dialog_new_contact_account" msgid="5652018124788855057">"እንዲመጡ የተደረጉ እውቂያዎችን አስቀምጥ ወደ፦"</string>

    <string name="import_from_sim" msgid="7825280799813847991">"ሲም ካርድ"</string>

    <string name="import_from_sim" msgid="7825280799813847991">"ሲም ካርድ"</string>

    <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"ሲም <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>

    <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"ሲም <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>

    <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="8737770002554878728">

    <string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{# እውቂያ}one{# እውቂያዎች}other{# እውቂያዎች}}"</string>

      <item quantity="one">%1$d እውቂያዎች</item>

    <string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{# እውቂያ • <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}one{# እውቂያዎች • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}other{# እውቂያዎች • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>

      <item quantity="other">%1$d እውቂያዎች</item>

    </plurals>

    <plurals name="import_from_sim_secondary_template" formatted="false" msgid="6698670511061586532">

      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> እውቂያዎች • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>

      <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> እውቂያዎች • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>

    </plurals>

    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf ፋይል"</string>

    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf ፋይል"</string>

    <string name="nothing_to_import_message" msgid="2594519620375509783">"ለማምጣት ምንም"</string>

    <string name="nothing_to_import_message" msgid="2594519620375509783">"ለማምጣት ምንም"</string>

    <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"እውቂያዎች ከvCard ይምጡ?"</string>

    <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"እውቂያዎች ከvCard ይምጡ?"</string>
@@ -490,10 +472,7 @@ 
    <string name="sim_import_title_none_selected" msgid="3527680774575468781">"እውቂያዎችን ምረጥ"</string>

    <string name="sim_import_title_none_selected" msgid="3527680774575468781">"እውቂያዎችን ምረጥ"</string>

    <string name="sim_import_empty_message" msgid="7238368542566545854">"በ ሲም ካርድዎ ላይ ዕውቂያዎች የሉም"</string>

    <string name="sim_import_empty_message" msgid="7238368542566545854">"በ ሲም ካርድዎ ላይ ዕውቂያዎች የሉም"</string>

    <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"እውቂያው ቀድሞም በዝርዝርዎ ውስጥ አለ"</string>

    <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"እውቂያው ቀድሞም በዝርዝርዎ ውስጥ አለ"</string>

    <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="422539156156042210">

    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{# የሲም እውቂያ መጥቷል}one{# የሲም እውቂያዎች መጥተዋል}other{# የሲም እውቂያዎች መጥተዋል}}"</string>

      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> የሲም እውቂያዎች መጥተዋል</item>

      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> የሲም እውቂያዎች መጥተዋል</item>

    </plurals>

    <string name="sim_import_failed_toast" msgid="358117391138073786">"የሲም እውቂያዎችን ማምጣት አልተሳካም"</string>

    <string name="sim_import_failed_toast" msgid="358117391138073786">"የሲም እውቂያዎችን ማምጣት አልተሳካም"</string>

    <string name="sim_import_title" msgid="8202961146093040684">"ከሲም አምጣ"</string>

    <string name="sim_import_title" msgid="8202961146093040684">"ከሲም አምጣ"</string>

    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"ይቅር"</string>

    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"ይቅር"</string>

res/values-ar/strings.xml

+7 −56

File changed.

Preview size limit exceeded, changes collapsed.