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

Commit ca60e552 authored by Xin Li's avatar Xin Li
Browse files

Merge stage-dr1-aosp-master into stage-aosp-master 

Bug: 112535855
Change-Id: Id81dd6061dfe1992d4b6dcf0bc775ff82c61a800
parents ac9e90c0 fefe4e7b

res/values-af/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
    <string name="never_ask_again" msgid="1089938738199748687">"Moenie weer vra nie"</string>

    <string name="no_permissions" msgid="3210542466245591574">"Geen toestemmings nie"</string>

    <string name="additional_permissions" msgid="6667573114240111763">"Bykomende toestemmings"</string>

    <string name="app_permissions_info_button_label" msgid="7789812060395257748">"Maak programinligting oop"</string>

    <plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">

      <item quantity="other">Nog <xliff:g id="COUNT_1">%1$d</xliff:g></item>

      <item quantity="one">Nog <xliff:g id="COUNT_0">%1$d</xliff:g></item>

res/values-am/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
    <string name="never_ask_again" msgid="1089938738199748687">"ዳግም አትጠይቅ"</string>

    <string name="no_permissions" msgid="3210542466245591574">"ምንም ፍቃዶች የሉም"</string>

    <string name="additional_permissions" msgid="6667573114240111763">"ተጨማሪ ፈቃዶች"</string>

    <string name="app_permissions_info_button_label" msgid="7789812060395257748">"የመተግበሪያ መረጃን ክፈት"</string>

    <plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">

      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ተጨማሪ</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ተጨማሪ</item>

res/values-ar/strings.xml

+6 −7
Original line number Diff line number Diff line
@@ -97,16 +97,15 @@ 
    <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"الرفض على أي حال"</string>

    <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> من <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="permission_warning_template" msgid="7332275268559121742">"‏هل توافق على منح &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; إذن <xliff:g id="ACTION">%2$s</xliff:g>؟"</string>

    <string name="permission_revoked_count" msgid="7386129423432613024">"<xliff:g id="COUNT">%1$d</xliff:g> إذن غير مفعّل"</string>

    <string name="permission_revoked_all" msgid="8595742638132863678">"كل الأذونات غير مفعّلة"</string>

    <string name="permission_revoked_none" msgid="2059511550181271342">"ليس هناك أذونات غير مفعّلة"</string>

    <string name="permission_revoked_count" msgid="7386129423432613024">"<xliff:g id="COUNT">%1$d</xliff:g> إذن معطَّل"</string>

    <string name="permission_revoked_all" msgid="8595742638132863678">"كل الأذونات معطّلة"</string>

    <string name="permission_revoked_none" msgid="2059511550181271342">"ليس هناك أذونات معطّلة"</string>

    <string name="grant_dialog_button_allow" msgid="4616529495342337095">"سماح"</string>

    <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"التطبيقات"</string>

    <string name="app_permissions" msgid="3146758905824597178">"أذونات التطبيق"</string>

    <string name="never_ask_again" msgid="1089938738199748687">"عدم السؤال مرة أخرى"</string>

    <string name="no_permissions" msgid="3210542466245591574">"ما مِن أذونات"</string>

    <string name="no_permissions" msgid="3210542466245591574">"ليست هناك أذونات"</string>

    <string name="additional_permissions" msgid="6667573114240111763">"أذونات إضافية"</string>

    <string name="app_permissions_info_button_label" msgid="7789812060395257748">"فتح معلومات التطبيق"</string>

    <plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">

      <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g>لا أذونات أخرى</item>

      <item quantity="two">إذنان آخران (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item>
@@ -117,7 +116,7 @@ 
    </plurals>

    <string name="old_sdk_deny_warning" msgid="3872277112584842615">"‏تم تصميم هذا التطبيق لإصدار قديم من Android. وقد يؤدي رفض الإذن إلى عدم العمل على النحو المطلوب مرة أخرى."</string>

    <string name="default_permission_description" msgid="4992892207044156668">"تنفيذ إجراء غير معروف"</string>

    <string name="app_permissions_group_summary" msgid="4787239772223699263">"تم السماح لـ <xliff:g id="COUNT_0">%1$d</xliff:g> من أصل <xliff:g id="COUNT_1">%2$d</xliff:g> تطبيق"</string>

    <string name="app_permissions_group_summary" msgid="4787239772223699263">"تم السماح لعدد <xliff:g id="COUNT_0">%1$d</xliff:g> من <xliff:g id="COUNT_1">%2$d</xliff:g> من التطبيقات"</string>

    <string name="menu_show_system" msgid="6773743421743728921">"عرض النظام"</string>

    <string name="menu_hide_system" msgid="7595471742649432977">"إخفاء النظام"</string>

    <string name="permission_title" msgid="6495415273398916381">"أذونات <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
@@ -131,7 +130,7 @@ 
    <string name="other_permissions" msgid="2016192512386091933">"إمكانات التطبيق الأخرى"</string>

    <string name="permission_request_title" msgid="1204446718549121199">"طلب الإذن"</string>

    <string name="screen_overlay_title" msgid="3021729846864038529">"تم اكتشاف طبقة متراكبة للشاشة"</string>

    <string name="screen_overlay_message" msgid="2141944461571677331">"لتغيير إعداد هذا الإذن، يتعين عليك أولاً إيقاف الطبقة المتراكبة للشاشة من الإعدادات &gt; التطبيقات"</string>

    <string name="screen_overlay_message" msgid="2141944461571677331">"لتغيير إعداد هذا الإذن، يتعين عليك أولاً تعطيل الطبقة المتراكبة للشاشة من الإعدادات &gt; التطبيقات"</string>

    <string name="screen_overlay_button" msgid="4344544843349937743">"فتح الإعدادات"</string>

    <string name="wear_not_allowed_dlg_title" msgid="8104666773577525713">"Android Wear"</string>

    <string name="wear_not_allowed_dlg_text" msgid="1322352525843583064">"‏لا تتوافق إجراءات التثبيت/إلغاء التثبيت مع نظام Android Wear."</string>

res/values-az/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
    <string name="never_ask_again" msgid="1089938738199748687">"Bir daha soruşmayın"</string>

    <string name="no_permissions" msgid="3210542466245591574">"İcazə yoxdur"</string>

    <string name="additional_permissions" msgid="6667573114240111763">"Əlavə icazələr"</string>

    <string name="app_permissions_info_button_label" msgid="7789812060395257748">"Tətbiq məlumatını açın"</string>

    <plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">

      <item quantity="other">daha <xliff:g id="COUNT_1">%1$d</xliff:g></item>

      <item quantity="one">daha <xliff:g id="COUNT_0">%1$d</xliff:g></item>

res/values-b+sr+Latn/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="2738748390251381682">"Upakovani program za instalaciju"</string>

    <string name="next" msgid="3057143178373252333">"Dalje"</string>

    <string name="next" msgid="3057143178373252333">"Sledeće"</string>

    <string name="install" msgid="5896438203900042068">"Instaliraj"</string>

    <string name="done" msgid="3889387558374211719">"Gotovo"</string>

    <string name="security_settings_desc" msgid="2706691034244052604">"Dozvoli da ova aplikacija:"</string>
@@ -106,7 +106,6 @@ 
    <string name="never_ask_again" msgid="1089938738199748687">"Ne pitaj ponovo"</string>

    <string name="no_permissions" msgid="3210542466245591574">"Nema dozvola"</string>

    <string name="additional_permissions" msgid="6667573114240111763">"Dodatne dozvole"</string>

    <string name="app_permissions_info_button_label" msgid="7789812060395257748">"Otvori informacije o aplikaciji"</string>

    <plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">

      <item quantity="one">još <xliff:g id="COUNT_1">%1$d</xliff:g></item>

      <item quantity="few">još <xliff:g id="COUNT_1">%1$d</xliff:g></item>