Skip to content

Commit

Permalink
Merge tag 'android-10.0.0_r38' into staging/ten-android-10.0.0_r38
Browse files Browse the repository at this point in the history
Android 10.0.0 Release 38 (QQ3A.200605.002)

# gpg: Signature made Tue 02 Jun 2020 01:20:19 IDT
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key

* tag 'android-10.0.0_r38':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  • Loading branch information
idoybh committed Jun 1, 2020
2 parents c01555f + 084f242 commit 13eeae9
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@
<string name="wifi_installer_fail" msgid="894483173306576331">"‏يتعذر تثبيت بيانات اعتماد Wi-Fi. يمكنك تجربة تنزيل الملف مرة أخرى."</string>
<string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"تم إلغاء التثبيت"</string>
<string name="wifi_installer_fail_title" msgid="5547079779067835479">"يتعذر التثبيت"</string>
<string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"‏شغِّل Wi-Fi وأعد المحاولة."</string>
<string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"‏فعِّل Wi-Fi وأعد المحاولة."</string>
</resources>
2 changes: 1 addition & 1 deletion res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<string name="done_label" msgid="5597425930652904250">"EGINDA"</string>
<string name="wifi_installer_detail" msgid="63879632832701669">"Instalatu Wi-Fi kredentzialak <xliff:g id="NAME">%1$s</xliff:g> bidez erabilgarri dauden sareetara konektatzeko."</string>
<string name="wifi_installer_download_error" msgid="5429453090956277692">"Deskargatutako fitxategiak arazoak ditu eta ezin da instalatu. Ziurtatu iturburu zuzenetik deskargatu duzula fitxategia."</string>
<string name="wifi_installer_fail" msgid="894483173306576331">"Ezin dira instalatu Wi-Fi kredentzialak. Saiatu fitxategia berriro deskargatzen."</string>
<string name="wifi_installer_fail" msgid="894483173306576331">"Ezin dira instalatu wifi-kredentzialak. Deskargatu fitxategia berriro."</string>
<string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Instalazioa bertan behera utzi da"</string>
<string name="wifi_installer_fail_title" msgid="5547079779067835479">"Ezin da instalatu"</string>
<string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Aktibatu Wi-Fi konexioa eta saiatu berriro."</string>
Expand Down
2 changes: 1 addition & 1 deletion res/values-gu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<string name="wifi_title" msgid="8475811746333426489">"વાઇ-ફાઇ પ્રોફાઇલ"</string>
<string name="wifi_detail_title" msgid="3627332137252994395">"%s માટેની વિગતો"</string>
<string name="wifi_detail_label" msgid="3032151019356747583">"વિગતો"</string>
<string name="wifi_install_label" msgid="1449629407724323233">"ઇન્સ્ટોલ કરો"</string>
<string name="wifi_install_label" msgid="1449629407724323233">"ઇન્સ્ટૉલ કરો"</string>
<string name="wifi_installing_label" msgid="8387393993627129025">"ઇન્સ્ટોલ કરી રહ્યું છે"</string>
<string name="wifi_cancel_label" msgid="1328748037608392134">"રદ કરો"</string>
<string name="wifi_dismiss_label" msgid="1916684434873972698">"કાઢી નાખો"</string>
Expand Down
4 changes: 1 addition & 3 deletions res/values-hy/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
<string name="pick_file_title" msgid="4481949485108233297">"Ընտրել վկայական"</string>
<string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"Արտահանեք վկայական"</string>
<string name="extracting_pkcs12" msgid="1881267738821799771">"Արտահանվում է..."</string>
<!-- String.format failed for translation -->
<!-- no translation found for pkcs12_file_password_dialog_title (8102721384767269510) -->
<skip />
<string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"Դուրսբերում %s-ից"</string>
<string name="name_credential_dialog_title" msgid="277729846491554437">"Անվանեք վկայագիրը"</string>
<string name="credential_name" msgid="1974979771369744378">"Վկայագրի անունը`"</string>
<string name="credential_password" msgid="3520176519550993326">"Մուտքագրեք գաղտնաբառը` հավաստագրերն արտածելու համար:"</string>
Expand Down
4 changes: 1 addition & 3 deletions res/values-ka/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@
<string name="wifi_ttls_config_text" msgid="2002413183253872168">"მომხმარებლის სახელი: %s\n"</string>
<string name="wifi_tls_config_text" msgid="9062328536640168510">"კლიენტის სერტიფიკატი:\n%1$s\nგასაღები: %2$s\n"</string>
<string name="wifi_sim_config_text" msgid="1666019954520831840">"SIM: %s\n"</string>
<!-- String.format failed for translation -->
<!-- no translation found for wifi_trust_config_text (5916047381475747783) -->
<skip />
<string name="wifi_trust_config_text" msgid="5916047381475747783">"სერტიფიკატის ნდობა: \n%s\n"</string>
<string name="install_done_title" msgid="4822989918460334497">"ავტორიზაციის მონაცემები დაყენებულია"</string>
<string name="install_done" msgid="1522718684172097080">"<xliff:g id="NAME">%1$s</xliff:g> ავტორიზაციის მონაცემები დაემატა შენახულ Wi-Fi ქსელებს."</string>
<string name="done_label" msgid="5597425930652904250">"შესრულდა"</string>
Expand Down
2 changes: 1 addition & 1 deletion res/values-ky/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@
<string name="wifi_installer_fail" msgid="894483173306576331">"Wi-Fi эсептик дайындары орнотулбай калды. Файлды кайра жүктөп көрүңүз."</string>
<string name="wifi_installer_fail_no_wifi_title" msgid="8358191074828840533">"Орнотуу жокко чыгарылды"</string>
<string name="wifi_installer_fail_title" msgid="5547079779067835479">"Орнотулбай жатат"</string>
<string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Wi-Fi күйгүзүп, кайра аракет кылыңыз."</string>
<string name="wifi_installer_fail_no_wifi" msgid="2044576439984209921">"Wi-Fi күйгүзүп, кайталап көрүңүз."</string>
</resources>
4 changes: 1 addition & 3 deletions res/values-si/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
<string name="pick_file_title" msgid="4481949485108233297">"සහතිකයක් තෝරන්න"</string>
<string name="pkcs12_password_dialog_title" msgid="5997624645207427161">"සහතිකය උද්ධෘත කරන්න"</string>
<string name="extracting_pkcs12" msgid="1881267738821799771">"උද්ධෘත කරමින්..."</string>
<!-- String.format failed for translation -->
<!-- no translation found for pkcs12_file_password_dialog_title (8102721384767269510) -->
<skip />
<string name="pkcs12_file_password_dialog_title" msgid="8102721384767269510">"%s ගෙන් උද්ධෘත කරන්න"</string>
<string name="name_credential_dialog_title" msgid="277729846491554437">"සහතිකය නම් කරන්න"</string>
<string name="credential_name" msgid="1974979771369744378">"සහතිකයේ නම:"</string>
<string name="credential_password" msgid="3520176519550993326">"සහතික උද්ධෘත කිරීමට මුරපදය ටයිප් කරන්න."</string>
Expand Down

0 comments on commit 13eeae9

Please sign in to comment.