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

Commit 829ce776 authored by Michael Bestas's avatar Michael Bestas
Browse files

Revert "Merge tag 'android-6.0.1_r22' of... 

Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Contacts into cm-13.0"

This reverts commit 3c1aaac1, reversing
changes made to cd5f6711.

Change-Id: I69612db3197cf06c8884a095bd4a4a5a946318f0
parent b89eaa13

res/values-af/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
    <string name="splitConfirmation_title" msgid="633640935430370530">"Skei kontak?"</string>

    <string name="splitConfirmation" msgid="740190210499587175">"Hierdie kontak sal geskei word in verskeie kontakte."</string>

    <string name="menu_joinAggregate" msgid="4050157483569357666">"Voeg saam"</string>

    <string name="menu_save" msgid="1727844363591825909">"Stoor"</string>

    <string name="titleJoinContactDataWith" msgid="7684875775798635354">"Voeg kontakte saam"</string>

    <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Kies die kontak wat jy wil saamvoeg met <xliff:g id="NAME">%s</xliff:g>."</string>

    <string name="showAllContactsJoinItem" msgid="2189695051430392383">"Wys alle kontakte"</string>
@@ -99,6 +100,7 @@ 
    <string name="savingContact" msgid="4075751076741924939">"Stoor tans kontak..."</string>

    <string name="contactSavedToast" msgid="7152589189385441091">"Kontak gestoor."</string>

    <string name="contactSavedErrorToast" msgid="3207250533172944892">"Kon nie kontakveranderinge stoor nie."</string>

    <string name="contactPhotoSavedErrorToast" msgid="4079032272022979114">"Kon nie kontakfotoveranderings stoor nie."</string>

    <string name="groupSavedToast" msgid="1168756874239833756">"Groep gestoor."</string>

    <string name="groupSavedErrorToast" msgid="7984466936615304740">"Kon nie groepsveranderinge stoor nie."</string>

    <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
@@ -141,6 +143,7 @@ 
    <string name="recent" msgid="2659189233141493004">"Onlangs"</string>

    <string name="recent_updates" msgid="4267258535615860710">"Onlangse opdaterings"</string>

    <string name="account_type_format" msgid="718948015590343010">"<xliff:g id="SOURCE">%1$s</xliff:g> kontak"</string>

    <string name="google_account_type_format" msgid="5283997303922067997">"<xliff:g id="SOURCE">%1$s</xliff:g>-rekening"</string>

    <!-- no translation found for from_account_format (4469138575127580203) -->

    <skip />

    <string name="contact_read_only" msgid="7421346527289472273">"Nie redigeerbaar vanuit hierdie program nie."</string>
@@ -149,7 +152,6 @@ 
    <string name="take_new_photo" msgid="7341354729436576304">"Neem nuwe foto"</string>

    <string name="pick_photo" msgid="2129509985223564942">"Kies foto"</string>

    <string name="pick_new_photo" msgid="9122450996263688237">"Kies nuwe foto"</string>

    <string name="locale_change_in_progress" msgid="7583992153091537467">"Kontaklys word tans opgedateer om die taalverandering te weerspieël."</string>

    <string name="upgrade_in_progress" msgid="474511436863451061">"Kontaklys word opgedateer."</string>

    <string name="search_results_searching" msgid="3984833028938569930">"Soek tans…"</string>

    <string name="menu_display_selected" msgid="6470001164297969034">"Wys gekose"</string>
@@ -269,4 +271,6 @@ 
    <string name="message_from_you_prefix" msgid="7180706529908434482">"Jy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts werk beter as jy die persoon se Hangouts-identifiseerder in die e-posveld of foonveld invoer."</string>

    <string name="compact_editor_more_fields" msgid="2874181192382284115">"Meer velde"</string>

    <string name="compact_editor_change_photo_content_description" msgid="5495487714301211540">"Verander foto"</string>

    <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>

</resources>

res/values-am/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
    <string name="splitConfirmation_title" msgid="633640935430370530">"ዕውቂያ ለይ"</string>

    <string name="splitConfirmation" msgid="740190210499587175">"ይህ ዕውቅያ ወደ ብዙ ዕውቅያዎች ይለያል፡፡"</string>

    <string name="menu_joinAggregate" msgid="4050157483569357666">"አዋህድ"</string>

    <string name="menu_save" msgid="1727844363591825909">"አስቀምጥ"</string>

    <string name="titleJoinContactDataWith" msgid="7684875775798635354">"ዕውቄያዎችን አገናኝ"</string>

    <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"ከ<xliff:g id="NAME">%s</xliff:g> ጋር ለመቀላቀል የምትፈልገውን ዕውቂያ ምረጥ።"</string>

    <string name="showAllContactsJoinItem" msgid="2189695051430392383">"ሁሉንም ዕውቂያዎች አሳይ"</string>
@@ -99,6 +100,7 @@ 
    <string name="savingContact" msgid="4075751076741924939">"ዕውቂያ በማስቀመጥ ላይ..."</string>

    <string name="contactSavedToast" msgid="7152589189385441091">"ዕውቂያተቀምጧል።"</string>

    <string name="contactSavedErrorToast" msgid="3207250533172944892">"የእውቂያ ለውጦች ማስቀመጥ አልተቻለም::"</string>

    <string name="contactPhotoSavedErrorToast" msgid="4079032272022979114">"የእውቂያ ፎቶ ለውጦችን ማስቀመጥ አልተቻለም።"</string>

    <string name="groupSavedToast" msgid="1168756874239833756">"ቡድን ተቀምጧል።"</string>

    <string name="groupSavedErrorToast" msgid="7984466936615304740">"የቡድን ለውጦች ማስቀመጥ አልተቻለም::"</string>

    <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
@@ -141,6 +143,7 @@ 
    <string name="recent" msgid="2659189233141493004">"የቅርብ ጊዜ"</string>

    <string name="recent_updates" msgid="4267258535615860710">"የቅርብ ጊዜ አዘምን"</string>

    <string name="account_type_format" msgid="718948015590343010">"<xliff:g id="SOURCE">%1$s</xliff:g> እውቅያ"</string>

    <string name="google_account_type_format" msgid="5283997303922067997">"የ<xliff:g id="SOURCE">%1$s</xliff:g> መለያ"</string>

    <!-- no translation found for from_account_format (4469138575127580203) -->

    <skip />

    <string name="contact_read_only" msgid="7421346527289472273">"ከዚህ መተግበሪያ አርትዕ ሊደረግ አይችልም፡፡"</string>
@@ -149,7 +152,6 @@ 
    <string name="take_new_photo" msgid="7341354729436576304">"አዲስ ፎቶ አንሳ"</string>

    <string name="pick_photo" msgid="2129509985223564942">"ፎቶ ምረጥ"</string>

    <string name="pick_new_photo" msgid="9122450996263688237">"አዲስ ፎቶ ይምረጡ"</string>

    <string name="locale_change_in_progress" msgid="7583992153091537467">"የቋንቋ ለውጥ ለማንፀባረቅ የዕውቂያ ዝርዝር ዘምኗል።"</string>

    <string name="upgrade_in_progress" msgid="474511436863451061">"የዕውቂያ ዝርዝር ዘምኗል"</string>

    <string name="search_results_searching" msgid="3984833028938569930">"በመፈለግ ላይ…"</string>

    <string name="menu_display_selected" msgid="6470001164297969034">"የተመረጡትን አሳይ"</string>
@@ -269,4 +271,6 @@ 
    <string name="message_from_you_prefix" msgid="7180706529908434482">"እርስዎ፦ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"የግለሰቡን የHangouts ለይቶ አዋቂ ወደ ኢሜይል መስኩ ወይም የስልክ መስኩ በሚያስገቡበት ጊዜ Hangouts በተሻለ ሁኔታ ይሰራል።"</string>

    <string name="compact_editor_more_fields" msgid="2874181192382284115">"ተጨማሪ መስኮች"</string>

    <string name="compact_editor_change_photo_content_description" msgid="5495487714301211540">"ፎቶ ለውጥ"</string>

    <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>

</resources>

res/values-ar/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
    <string name="splitConfirmation_title" msgid="633640935430370530">"فصل جهة الاتصال؟"</string>

    <string name="splitConfirmation" msgid="740190210499587175">"سيتم فصل جهة الاتصال هذه إلى عدة جهات اتصال."</string>

    <string name="menu_joinAggregate" msgid="4050157483569357666">"دمج"</string>

    <string name="menu_save" msgid="1727844363591825909">"حفظ"</string>

    <string name="titleJoinContactDataWith" msgid="7684875775798635354">"ضم جهات الاتصال"</string>

    <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"اختر جهة الاتصال التي تريد ضمها إلى <xliff:g id="NAME">%s</xliff:g>:"</string>

    <string name="showAllContactsJoinItem" msgid="2189695051430392383">"عرض جميع جهات الاتصال"</string>
@@ -99,6 +100,7 @@ 
    <string name="savingContact" msgid="4075751076741924939">"جارٍ حفظ جهة الاتصال..."</string>

    <string name="contactSavedToast" msgid="7152589189385441091">"تم حفظ جهة الاتصال."</string>

    <string name="contactSavedErrorToast" msgid="3207250533172944892">"تعذر حفظ التغييرات التي تم إجراؤها على جهة الاتصال."</string>

    <string name="contactPhotoSavedErrorToast" msgid="4079032272022979114">"تعذر حفظ تغييرات صورة جهة الاتصال."</string>

    <string name="groupSavedToast" msgid="1168756874239833756">"تم حفظ المجموعة."</string>

    <string name="groupSavedErrorToast" msgid="7984466936615304740">"تعذر حفظ التغييرات التي تم إجراؤها على المجموعة."</string>

    <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
@@ -153,6 +155,7 @@ 
    <string name="recent" msgid="2659189233141493004">"الأحدث"</string>

    <string name="recent_updates" msgid="4267258535615860710">"التحديثات الأخيرة"</string>

    <string name="account_type_format" msgid="718948015590343010">"جهة اتصال <xliff:g id="SOURCE">%1$s</xliff:g>"</string>

    <string name="google_account_type_format" msgid="5283997303922067997">"حساب <xliff:g id="SOURCE">%1$s</xliff:g>"</string>

    <!-- no translation found for from_account_format (4469138575127580203) -->

    <skip />

    <string name="contact_read_only" msgid="7421346527289472273">"غير قابلة للتعديل من هذا التطبيق."</string>
@@ -161,7 +164,6 @@ 
    <string name="take_new_photo" msgid="7341354729436576304">"التقاط صورة جديدة"</string>

    <string name="pick_photo" msgid="2129509985223564942">"اختيار صورة"</string>

    <string name="pick_new_photo" msgid="9122450996263688237">"تحديد صورة جديدة"</string>

    <string name="locale_change_in_progress" msgid="7583992153091537467">"يجري تحديث قائمة جهات الاتصال لتعكس التغير في اللغة."</string>

    <string name="upgrade_in_progress" msgid="474511436863451061">"يجري تحديث قائمة جهات الاتصال."</string>

    <string name="search_results_searching" msgid="3984833028938569930">"جارٍ البحث..."</string>

    <string name="menu_display_selected" msgid="6470001164297969034">"عرض العناصر المحددة"</string>
@@ -297,4 +299,6 @@ 
    <string name="message_from_you_prefix" msgid="7180706529908434482">"أنت: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>

    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"‏تعمل Hangouts بشكل أفضل عند إدخال معرف الشخص في Hangouts في حقل البريد الإلكتروني أو حقل الهاتف."</string>

    <string name="compact_editor_more_fields" msgid="2874181192382284115">"المزيد من الحقول"</string>

    <string name="compact_editor_change_photo_content_description" msgid="5495487714301211540">"تغيير الصورة"</string>

    <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>

</resources>