am ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit 'ce11881accf5db04e2a54b58176e24de49ef6917':
Allow VPN to stay connected for some time before disconnecting it.
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 72a1ef3..beeac97 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -205,8 +205,6 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле парта павінна быць пустым, калі поле хоста пустое."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Несапраўдны ўведзены порт."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</string>
- <!-- no translation found for proxy_url (2523518669129974654) -->
- <skip />
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Месцазнаходжанне:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседнія CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Звесткi ячэйкi:"</string>
@@ -526,22 +524,28 @@
<string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як гучная сувязь"</string>
<string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыкі і мультымедыя"</string>
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомніць налады"</string>
- <!-- no translation found for wifi_display_settings_title (2925465988657380522) -->
- <skip />
- <!-- no translation found for wifi_display_enable_menu_item (4883036464138167674) -->
- <skip />
- <!-- no translation found for wifi_display_no_devices_found (1382012407154143453) -->
- <skip />
+ <string name="wifi_display_settings_title" msgid="564299108014609382">"Бесправадны дысплей"</string>
+ <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Каб убачыць прылады, уключыце бесправадны дысплей."</string>
+ <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Бесправадны дысплей адключаны, паколькі выключана Wi-Fi."</string>
+ <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Пошук дысплеяў"</string>
+ <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Пошук..."</string>
+ <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Паблiзу не знойдзены бесправадныя дысплеi."</string>
+ <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Спалучаныя дысплеi"</string>
+ <string name="wifi_display_available_devices" msgid="4558314642853513487">"Даступныя прылады"</string>
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"Падключэнне"</string>
<string name="wifi_display_status_connected" msgid="8364125226376985558">"Падключана"</string>
+ <string name="wifi_display_status_available" msgid="1924167525172207067">"Даступна"</string>
<string name="wifi_display_status_in_use" msgid="8556830875615434792">"Выкарыстоўваецца"</string>
- <!-- no translation found for wifi_display_status_not_available (5714978725794210102) -->
- <skip />
<string name="wifi_display_details" msgid="7791118209992162698">"Налады экрана"</string>
+ <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Адключыцца?"</string>
+ <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Будзе завершана вашай сувящь з прыладай :<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
<string name="wifi_display_options_title" msgid="5740656401635054838">"Параметры бесправаднога дысплея"</string>
<string name="wifi_display_options_forget" msgid="9119048225398894580">"Ігнараваць"</string>
<string name="wifi_display_options_done" msgid="5703116500357822557">"Гатова"</string>
<string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
+ <string name="wifi_display_summary_on" msgid="3695429596604962531">"Укл."</string>
+ <string name="wifi_display_summary_off" msgid="2445210133184740611">"Выкл."</string>
+ <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Выключана"</string>
<string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
<string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
<string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
@@ -798,12 +802,6 @@
<string name="sim_lock_failed" msgid="5651596916127873626">"Немагчыма змяніць стан блакавання SIM-карты.\nМагчыма, няправільны PIN-код."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Адмяніць"</string>
- <!-- no translation found for wrong_pin_code_pukked (4003655226832658066) -->
- <skip />
- <!-- no translation found for wrong_pin_code:one (4840607930166101114) -->
- <!-- no translation found for wrong_pin_code:other (77103619544346451) -->
- <!-- no translation found for pin_failed (1848423634948587645) -->
- <skip />
<string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан планшэта"</string>
<string name="device_info_settings" product="default" msgid="475872867864762157">"Стан тэлефону"</string>
<string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Абнаўленні сiстэмы"</string>
@@ -1045,11 +1043,11 @@
<skip />
<!-- no translation found for location_mode_screen_title (4528716772270246542) -->
<skip />
- <!-- no translation found for location_mode_high_accuracy_description (6418936349431602808) -->
+ <!-- no translation found for location_mode_high_accuracy_description (8640231702873607191) -->
<skip />
- <!-- no translation found for location_mode_battery_saving_description (1728668969743485109) -->
+ <!-- no translation found for location_mode_battery_saving_description (7110846007772128971) -->
<skip />
- <!-- no translation found for location_mode_sensors_only_description (7178415350457794366) -->
+ <!-- no translation found for location_mode_sensors_only_description (3103917665724654860) -->
<skip />
<!-- no translation found for location_loading_injected_setting (4238574500081976654) -->
<skip />
@@ -1555,8 +1553,6 @@
<skip />
<!-- no translation found for print_printing_state_title_template (5736107667714582025) -->
<skip />
- <!-- no translation found for print_cancelling_state_title_template (7102968925358219875) -->
- <skip />
<!-- no translation found for print_failed_state_title_template (1436099128973357969) -->
<skip />
<!-- no translation found for print_blocked_state_title_template (9065391617425962424) -->
@@ -1968,6 +1964,8 @@
<string name="app_process_limit_title" msgid="4280600650253107163">"Ліміт фонавага працэсу"</string>
<string name="show_all_anrs" msgid="28462979638729082">"Паказаць усе ANRS"</string>
<string name="show_all_anrs_summary" msgid="641908614413544127">"Паказаць дыялогавае акно \"Праграма не адказвае\" для фонавых прыкладанняў"</string>
+ <string name="experimental_webview" msgid="4492200819033780927">"Выкарыстоўваць эксперыментальны WebView"</string>
+ <string name="experimental_webview_summary" msgid="3431620080869482446">"Прыкладанні будуць выкарыстоўваць найноўшы (бэта-версія) WebView"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Выкарыстанне дадзеных"</string>
<string name="data_usage_cycle" msgid="5652529796195787949">"Цыкл выкарыст. дадзеных"</string>
<string name="data_usage_menu_roaming" msgid="8042359966835203296">"Роўмінг дадзеных"</string>
@@ -2099,7 +2097,7 @@
<skip />
<!-- no translation found for ssl_ca_cert_info_message (4583879256548819713) -->
<skip />
- <!-- no translation found for ssl_ca_cert_warning_message (8216218659139190498) -->
+ <!-- no translation found for ssl_ca_cert_warning_message (8212122519110935512) -->
<skip />
<!-- no translation found for ssl_ca_cert_settings_button (8760495070836213605) -->
<skip />
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index b7ebcfb..ef4e701 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -143,7 +143,7 @@
<item msgid="8151962652413645395">"2 Minuten"</item>
<item msgid="8675215713017289017">"5 Minuten"</item>
<item msgid="477015974247590543">"1 Stunde"</item>
- <item msgid="5198271470953124739">"Keine Zeitüberschreitung"</item>
+ <item msgid="5198271470953124739">"Kein Timeout"</item>
</string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Schwach"</item>
@@ -464,7 +464,7 @@
<item msgid="6692305604213080515">"Initialisierung läuft..."</item>
<item msgid="8001704909356800092">"Verbindung wird hergestellt..."</item>
<item msgid="4039737283841672166">"Verbunden"</item>
- <item msgid="4042143101664725090">"Zeitüberschreitung"</item>
+ <item msgid="4042143101664725090">"Timeout"</item>
<item msgid="7664124146786465092">"Nicht erfolgreich"</item>
</string-array>
<string-array name="security_settings_premium_sms_values">
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index f6e4e80..6186caa 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -427,7 +427,7 @@
<item msgid="1340692776955662664">"Pila de llamadas en glGetError"</item>
</string-array>
<string-array name="show_non_rect_clip_entries">
- <item msgid="993742912147090253">"No"</item>
+ <item msgid="993742912147090253">"Desactivado"</item>
<item msgid="675719912558941285">"Dibujar región de recorte no rectangular en azul"</item>
<item msgid="1064373276095698656">"Resaltar comandos de dibujo probados en verde"</item>
</string-array>
diff --git a/res/values-hi-nokeys/strings.xml b/res/values-hi-nokeys/strings.xml
index 2354ee3..6ea8e99 100644
--- a/res/values-hi-nokeys/strings.xml
+++ b/res/values-hi-nokeys/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applications_settings_summary" msgid="6616938758022986257">"ऐप्स प्रबंधित करें"</string>
+ <string name="applications_settings_summary" msgid="6616938758022986257">"एप्स प्रबंधित करें"</string>
</resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index c59515e..18099b5 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -169,7 +169,7 @@
<string-array name="usage_stats_display_order_types">
<item msgid="2100172576767439288">"उपयोग समय"</item>
<item msgid="3703676222230317933">"लॉन्च की संख्या"</item>
- <item msgid="2502754479975776899">"ऐप्स का नाम"</item>
+ <item msgid="2502754479975776899">"एप्स का नाम"</item>
</string-array>
<string-array name="wifi_eap_entries">
<item msgid="8615575908717909498">"PEAP"</item>
@@ -429,7 +429,7 @@
<string-array name="show_non_rect_clip_entries">
<item msgid="993742912147090253">"बंद"</item>
<item msgid="675719912558941285">"गैर-आयताकार क्लिप क्षेत्र नीले रंग से बनाएं"</item>
- <item msgid="1064373276095698656">"परीक्षित ड्रॉइंग आदेशों को हरे रंग से हाइलाइट करें"</item>
+ <item msgid="1064373276095698656">"परीक्षित आरेखण आदेशों को हरे रंग से हाइलाइट करें"</item>
</string-array>
<string-array name="track_frame_time_entries">
<item msgid="2193584639058893150">"बंद"</item>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 9e6b1b7..2574992 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -143,7 +143,7 @@
<item msgid="8151962652413645395">"2 minute"</item>
<item msgid="8675215713017289017">"5 minuta"</item>
<item msgid="477015974247590543">"1 sat"</item>
- <item msgid="5198271470953124739">"Nikada ne istječe"</item>
+ <item msgid="5198271470953124739">"Nikada privremeni prekid"</item>
</string-array>
<string-array name="wifi_signal">
<item msgid="2245412278046491293">"Loše"</item>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 0364905..ac1a883 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -194,7 +194,7 @@
<item msgid="628395202971532382">"Statik"</item>
</string-array>
<string-array name="wifi_proxy_settings">
- <item msgid="4473276491748503377">"Tidak Ada"</item>
+ <item msgid="4473276491748503377">"Tak Satu Pun"</item>
<item msgid="8673874894887358090">"Manual"</item>
</string-array>
<string-array name="emergency_tone_entries">
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index 52af7c3..9573015 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -137,7 +137,7 @@
<item msgid="3189211552661432651">"បានអញ្ជើញ"</item>
<item msgid="3206450250360237549">"បរាជ័យ"</item>
<item msgid="7785896708926971207">"មាន"</item>
- <item msgid="2330782789550628803">"ក្រៅតំបន់"</item>
+ <item msgid="2330782789550628803">"ក្រៅជួរ"</item>
</string-array>
<string-array name="bluetooth_visibility_timeout_entries">
<item msgid="8151962652413645395">"២ នាទី"</item>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 2521c20..5894da4 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -348,7 +348,7 @@
<string-array name="captioning_edge_type_selector_titles">
<item msgid="6022616153255438487">"Nėra"</item>
<item msgid="1352974708028506778">"Išdėstymas"</item>
- <item msgid="5850876295428722675">"Krintantis šešėlis"</item>
+ <item msgid="5850876295428722675">"Viršuje esančio objekto šešėlis"</item>
</string-array>
<string-array name="captioning_opacity_selector_titles">
<item msgid="7622491218136667566">"25 %"</item>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 75661e1..1c80afb 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -232,7 +232,7 @@
<string-array name="app_ops_categories">
<item msgid="6358963769537892925">"Plats"</item>
<item msgid="255608127647030286">"Personligt"</item>
- <item msgid="4588829735729884491">"SMS/MMS"</item>
+ <item msgid="4588829735729884491">"Meddelanden"</item>
<item msgid="886742181977884584">"Media"</item>
<item msgid="7924928667052300589">"Enhet"</item>
</string-array>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 7b2c62f..e92935c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -302,7 +302,7 @@
<item msgid="3984213795861739778">"接收 SMS/MMS"</item>
<item msgid="3656243523752472788">"接收 SMS/MMS"</item>
<item msgid="8105802370238551510">"接收 SMS/MMS"</item>
- <item msgid="1407766984645388488">"傳送文字/多媒體訊息"</item>
+ <item msgid="1407766984645388488">"傳送 SMS/MMS"</item>
<item msgid="3527273606643794973">"讀取簡訊/MMS"</item>
<item msgid="4370895547001583812">"寫入簡訊/MMS"</item>
<item msgid="4218544235221631789">"修改設定"</item>