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

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

DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: If5873b7625739cce34305bad391217391837e619
parents 1d5b10bf dfb9bb32
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@
    <uses-permission android:name="android.permission.KILL_UID" />
    <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />

    <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" />

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@
    <string name="launch" msgid="4826921505917605463">"Otvori"</string>
    <string name="unknown_apps_admin_dlg_text" msgid="7488386758312008790">"Administrator ne dozvoljava instaliranje aplikacija dobijenih iz nepoznatih izvora"</string>
    <string name="unknown_apps_user_restriction_dlg_text" msgid="5785226253054083336">"Ovaj korisnik ne može da instalira nepoznate aplikacije"</string>
    <!-- no translation found for install_apps_user_restriction_dlg_text (5041150186260066212) -->
    <skip />
    <string name="install_apps_user_restriction_dlg_text" msgid="5041150186260066212">"Ovom korisniku nije dozvoljeno da instalira aplikacije"</string>
    <string name="ok" msgid="3468756155452870475">"Potvrdi"</string>
    <string name="settings" msgid="6743583734099755409">"Podešavanja"</string>
    <string name="manage_applications" msgid="4033876279091996596">"Upravljanje aplikacijama"</string>
+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@
    <string name="launch" msgid="4826921505917605463">"Адкрыць"</string>
    <string name="unknown_apps_admin_dlg_text" msgid="7488386758312008790">"Ваш адміністратар не дазваляе ўсталёўку праграм з невядомых крыніц."</string>
    <string name="unknown_apps_user_restriction_dlg_text" msgid="5785226253054083336">"Гэты карыстальнік не можа ўсталёўваць невядомыя праграмы"</string>
    <!-- no translation found for install_apps_user_restriction_dlg_text (5041150186260066212) -->
    <skip />
    <string name="install_apps_user_restriction_dlg_text" msgid="5041150186260066212">"Гэты карыстальнік не можа ўсталёўваць праграмы"</string>
    <string name="ok" msgid="3468756155452870475">"ОК"</string>
    <string name="settings" msgid="6743583734099755409">"Налады"</string>
    <string name="manage_applications" msgid="4033876279091996596">"Кіраванне прыкладаннямі"</string>
+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@
    <string name="wear_not_allowed_dlg_title" msgid="8104666773577525713">"Android Wear"</string>
    <string name="wear_not_allowed_dlg_text" msgid="1322352525843583064">"ওয়েরে ইনস্টল/আনইনস্টল করার কাজগুলি সমর্থিত নয়।"</string>
    <string name="permission_review_warning_title_template_update" msgid="2569412700408535872">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> আপডেট করা হয়েছে৷ <xliff:g id="APP_NAME_1">%1$s</xliff:g>কে নিম্নলিখিত জিনিসগুলি অ্যাক্সেস করার অনুমতি দেবেন?"</string>
    <string name="permission_review_title_template_install" msgid="6819338441305295479">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; কে কোন জিনিসগুলিতে অ্যাক্সেস দেবেন তা চয়ন করুন"</string>
    <string name="permission_review_title_template_install" msgid="6819338441305295479">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; কে কোন জিনিসগুলিতে অ্যাক্সেস দেবেন তা বেছে নিন"</string>
    <string name="permission_review_title_template_update" msgid="8632233603161669426">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; আপডেট করা হয়েছে৷ এই অ্যাপ্লিকেশানটিকে কোন জিনিসগুলিতে অ্যাক্সেস দেবেন তা চয়ন করুন৷"</string>
    <string name="review_button_cancel" msgid="957906817733578877">"বাতিল করুন"</string>
    <string name="review_button_continue" msgid="4809162078179371370">"চালিয়ে যান"</string>
+3 −4
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@
    <string name="launch" msgid="4826921505917605463">"Otvori"</string>
    <string name="unknown_apps_admin_dlg_text" msgid="7488386758312008790">"Vaš administrator ne dozvoljava instaliranje aplikacija iz nepoznatih izvora."</string>
    <string name="unknown_apps_user_restriction_dlg_text" msgid="5785226253054083336">"Ovaj korisnik ne može instalirati nepoznate aplikacije."</string>
    <!-- no translation found for install_apps_user_restriction_dlg_text (5041150186260066212) -->
    <skip />
    <string name="install_apps_user_restriction_dlg_text" msgid="5041150186260066212">"Ovom korisniku nije dozvoljeno instaliranje aplikacija"</string>
    <string name="ok" msgid="3468756155452870475">"Uredu"</string>
    <string name="settings" msgid="6743583734099755409">"Postavke"</string>
    <string name="manage_applications" msgid="4033876279091996596">"Upravljaj aplikacijama"</string>
@@ -133,8 +132,8 @@
    <string name="wear_not_allowed_dlg_title" msgid="8104666773577525713">"Android Wear"</string>
    <string name="wear_not_allowed_dlg_text" msgid="1322352525843583064">"Instaliranje/deinstaliranje nije podržano na Wearu."</string>
    <string name="permission_review_warning_title_template_update" msgid="2569412700408535872">"Aplikacija <xliff:g id="APP_NAME_0">%1$s</xliff:g> je ažurirana. Želite li aplikaciji <xliff:g id="APP_NAME_1">%1$s</xliff:g> dopustiti pristup sljedećem?"</string>
    <string name="permission_review_title_template_install" msgid="6819338441305295479">"Izaberite čemu aplikacija &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&amp;Lt;/b&gt; može pristupiti"</string>
    <string name="permission_review_title_template_update" msgid="8632233603161669426">"Aplikacija &amp;Lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&amp;Lt;/b&gt; je ažurirana. Izaberite čemu ova aplikacija može pristupiti."</string>
    <string name="permission_review_title_template_install" msgid="6819338441305295479">"Odaberite čemu aplikacija &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&amp;Lt;/b&gt; može pristupiti"</string>
    <string name="permission_review_title_template_update" msgid="8632233603161669426">"Aplikacija &amp;Lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&amp;Lt;/b&gt; je ažurirana. Odaberite čemu ova aplikacija može pristupiti."</string>
    <string name="review_button_cancel" msgid="957906817733578877">"Otkaži"</string>
    <string name="review_button_continue" msgid="4809162078179371370">"Nastavi"</string>
    <string name="new_permissions_category" msgid="3213523410139204183">"Nova odobrenja"</string>
Loading