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

Unverified Commit 40bcf176 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r68' of... 

Merge tag 'android-security-11.0.0_r68' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-18.1_merge_android-security-11.0.0_r68

Android Security 11.0.0 Release 68 (9892680)

* tag 'android-security-11.0.0_r68' of https://android.googlesource.com/platform/packages/apps/Settings:
  Don't show NLSes with excessively long component names
  Convert argument to intent in AddAccountSettings.
  Import translations. DO NOT MERGE ANYWHERE
  [Settings] Move display of VPN version into summary text

Change-Id: Ifa0709c29e7aa7d6f3c028817d456648321a1698
parents 0978deda 14e30602

res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ 
    <string name="vpn_connect_to" msgid="216709261691085594">"Koppel aan <xliff:g id="PROFILE">%s</xliff:g>"</string>

    <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Ontkoppel hierdie VPN?"</string>

    <string name="vpn_disconnect" msgid="7753808961085867345">"Ontkoppel"</string>

    <string name="vpn_version" msgid="41856553718304367">"Weergawe <xliff:g id="VERSION">%s</xliff:g>"</string>

    <string name="vpn_version" msgid="6344167191984400976">"Weergawe"</string>

    <string name="vpn_forget_long" msgid="729132269203870205">"Vergeet VPN"</string>

    <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Vervang bestaande VPN?"</string>

    <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Stel altyd-aan VPN?"</string>

res/values-am/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ 
    <string name="vpn_connect_to" msgid="216709261691085594">"ከ<xliff:g id="PROFILE">%s</xliff:g> ጋር ተገናኝ"</string>

    <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"የዚህ ቪፒኤን ግንኙነት ይቋረጥ?"</string>

    <string name="vpn_disconnect" msgid="7753808961085867345">"ግንኙነት አቋርጥ"</string>

    <string name="vpn_version" msgid="41856553718304367">"ሥሪት <xliff:g id="VERSION">%s</xliff:g>"</string>

    <string name="vpn_version" msgid="6344167191984400976">"ስሪት"</string>

    <string name="vpn_forget_long" msgid="729132269203870205">"VPNን እርሳ"</string>

    <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"አሁን ያለው VPN ይተካ?"</string>

    <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ሁልጊዜ-የበራ VPN ይቀናበር?"</string>

res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -3089,7 +3089,7 @@ 
    <string name="vpn_connect_to" msgid="216709261691085594">"الاتصال بـ <xliff:g id="PROFILE">%s</xliff:g>"</string>

    <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"‏هل تريد قطع الاتصال بهذه الشبكة الافتراضية الخاصة (VPN)؟"</string>

    <string name="vpn_disconnect" msgid="7753808961085867345">"قطع الاتصال"</string>

    <string name="vpn_version" msgid="41856553718304367">"الإصدار <xliff:g id="VERSION">%s</xliff:g>"</string>

    <string name="vpn_version" msgid="6344167191984400976">"الإصدار"</string>

    <string name="vpn_forget_long" msgid="729132269203870205">"نسيان الشبكة الافتراضية الخاصة"</string>

    <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟"</string>

    <string name="vpn_set_vpn_title" msgid="1667539483005810682">"هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟"</string>

res/values-as/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ 
    <string name="vpn_connect_to" msgid="216709261691085594">"<xliff:g id="PROFILE">%s</xliff:g>ৰ সৈতে সংযোগ কৰক"</string>

    <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"এই ভিপিএনটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবনে?"</string>

    <string name="vpn_disconnect" msgid="7753808961085867345">"সংযোগ বিচ্ছিন্ন কৰক"</string>

    <string name="vpn_version" msgid="41856553718304367">"সংস্কৰণ <xliff:g id="VERSION">%s</xliff:g>"</string>

    <string name="vpn_version" msgid="6344167191984400976">"সংস্কৰণ"</string>

    <string name="vpn_forget_long" msgid="729132269203870205">"ভিপিএন পাহৰক"</string>

    <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"পূৰ্বৰ ভিপিএনটো সলনি কৰেনে?"</string>

    <string name="vpn_set_vpn_title" msgid="1667539483005810682">"ভিপিএনক যিকোনো সময়ত অন থকা অবস্থাত ছেট কৰিবনে?"</string>

res/values-az/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ 
    <string name="vpn_connect_to" msgid="216709261691085594">"<xliff:g id="PROFILE">%s</xliff:g> profilinə qoşulun"</string>

    <string name="vpn_disconnect_confirm" msgid="6356789348816854539">"Bu VPN bağlantısı kəsilsin?"</string>

    <string name="vpn_disconnect" msgid="7753808961085867345">"Bağlantını kəsin"</string>

    <string name="vpn_version" msgid="41856553718304367">"Versiya <xliff:g id="VERSION">%s</xliff:g>"</string>

    <string name="vpn_version" msgid="6344167191984400976">"Versiya"</string>

    <string name="vpn_forget_long" msgid="729132269203870205">"VPN\'i unudun"</string>

    <string name="vpn_replace_vpn_title" msgid="3994226561866340280">"Mövcud VPN əvəz edilsin?"</string>

    <string name="vpn_set_vpn_title" msgid="1667539483005810682">"Hər zaman aktiv VPN quraşdırılsın?"</string>