Merge "Fix on/off switch for Android Beam." into jb-mr1-dev

1 files changed, 7 insertions, 17 deletions

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c214d9a..59cbc22 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -600,8 +600,6 @@
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Iskanje …"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Preimenovanje naprave"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Enakovredne naprave"</string>
-    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
-    <skip />
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Povezava ni mogoča."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Naprave ni bilo mogoče preimenovati."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Želite prekiniti povezavo?"</string>
@@ -609,10 +607,6 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Če prekinete povezavo, bo prekinjena povezava z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g> in še toliko drugimi: <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Želite preklicati povabilo?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ali želite preklicati povabilo za povezavo z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <!-- no translation found for wifi_p2p_delete_group_title (8049872630241986374) -->
-    <skip />
-    <!-- no translation found for wifi_p2p_delete_group_message (5521624017163200215) -->
-    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Vklop dostopne točke  ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Izklop dostopne točke ..."</string>
@@ -1019,8 +1013,7 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Podatki na pogonu USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kartica SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odstrani"</string>
-    <!-- no translation found for install_text (884360662922471113) -->
-    <skip />
+    <string name="install_text" msgid="884360662922471113">"Namesti"</string>
     <string name="disable_text" msgid="6544054052049395202">"Onemogoči"</string>
     <string name="enable_text" msgid="9217362512327828987">"Omogoči"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Počisti podatke"</string>
@@ -1689,14 +1682,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Dodajanje profila VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Urejanje profila"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Brisanja profila"</string>
-    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
-    <skip />
-    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
-    <skip />
-    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
-    <skip />
-    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
-    <skip />
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Stalno vklopljeno navidez. zaseb. omrež."</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izberite profil za navidezno zasebno omrežje, s katerim boste vedno povezani. Omrežni promet bo dovoljen samo prek tega navideznega zasebnega omrežja."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Brez"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Za stalno vklopljeno navidezno zasebno omrežje je potreben naslov IP tako za strežnik kot za DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Ni omrežne povezave. Poskusite pozneje."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Ni potrdila. Uredite profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistemska"</string>
@@ -1718,7 +1707,8 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogočeno"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Dopuščajoče"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Uveljavljajoče"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Uporabniki in omejitve"</string>
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
+    <skip />
     <string name="user_list_title" msgid="2152311434413878709">"Uporabniki"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
     <string name="user_details_title" msgid="3037625632127241370">"Urejanje podrobnosti"</string>