X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=res%2Fvalues-am%2Fstrings.xml;h=091a9db3d5507207627b48c825c1eaa4e473dfa0;hb=67a50f99d80b76337541fb71f98025c0b144e5b5;hp=d40f08c06ddc2cbce9b303ba6c98f69feb992890;hpb=43c9dcc18e4e1137c59b847eadde7ae27302b08f;p=android-x86%2Fpackages-apps-Settings.git

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d40f08c06d..091a9db3d5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -331,12 +331,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"áá³á« áááá ááá¥"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"áµá­áá° á¥ááµá£  PINá£ áá­á á¨á­áá áá ááá¥ áá­á á á¦áá"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"áá«áá ááááá áá°áµ áá¨á¥"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"áá½ á­ááµ á áá°á áá¨áµ á³á­á½á á²áá­ áµáá©á á¥áá´áµ ááµá¨ááµ áµááááá?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Face Unlock á áá°á áá¨áµ á³á­á½á á²áá­ áµáá©á á¥áá´áµ ááµá¨ááµ áµááááá?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ááá"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"á°áá¸á«á³á½"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"ááá á¥á á á¨áá"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"áá½ á­ááµ"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"ááµ á­ááµ"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"ááá°á á¥á áá£ áá¨á«"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"áµá­áá° á¥ááµ"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"áá«á¨áá á¥á á"</string>
@@ -347,7 +347,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"á¨ááµá á« ááá² áá­á ááµá¨á áá¨áá» á á áµá°á³á³áª á¦ááá"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ááá"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"á°áá¸á«á³á½"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"áá½ á­ááµ"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"ááµ á­ááµ"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"á áµá­áá° á¥ááµ á°á á¥áá"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"á PIN  á°á á¥áá"</string>
     <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"á á­áá áá á°á á¥áá"</string>
@@ -869,8 +869,8 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"á¥áá"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"á¨á°ááá³áá½ áµáá­á áá³á¨áá¨á¥"</string>
     <string name="location_title" msgid="1029961368397484576">"á¨á á¥áá«"</string>
-    <string name="location_network_based" msgid="5569673665032992664">"á¨Google áµáá« á áááááµ"</string>
-    <string name="location_neighborhood_level" msgid="1337612962522836900">"á¨á¥á­áµáá á¨á°á áá á¥áá« áááá°á á¥áá° Wi-Fi á¥á á¨á°ááá³áá½ áµáá­ á áá³á¨ áá¨á¦á½ á«ááµá á¨ááá¥ ááá®á½ áµáá á«áá½ á­á ááá£á¸áá¢"</string>
+    <string name="location_network_based" msgid="5569673665032992664">"á¨Google á¥áá« á áááááµ"</string>
+    <string name="location_neighborhood_level" msgid="1337612962522836900">"á¨á°á áá á¥áá«áá áááá°á á¥áá° Wi-Fi á¥á á¨á°ááá³áá½ áµáá­ á áá³á¨ áá¨á¦á½ á«ááµá á¨ááá¥ ááá®á½ áµáá á«áá½ á°á ááá£á¸áá¢"</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"á¥áá« á Wi-Fi á­áá°áá"</string>
     <string name="location_gps" msgid="8392461023569708478">"á¨GPS á³á°áá­á¶á½"</string>
     <string name="location_street_level" msgid="4244496898967415234">"áµáá á«áá½ á¨á¥á­áµáá áµáá« á áµá­á­á á¥áá²á«á³á© GPS á­á ááá¢"</string>
@@ -927,6 +927,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"áá« ááá­ááµ áµá­áá° á¥ááµ á³á"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ááá­ á¨áá³á­ á áµá­á"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"á²áá« ááá­"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"á¨áá­á á áá«á­ áá²á«áá á­áááá"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"á¨á­ááµ áµá­áá° á¥ááµ á ááá"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"áá­áá» áµá­ááµ á¥ááµ ááá¥"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"á¨áá­áá» áµá­áá° áá¥á á¥áá´áµ á­á³áá"</string>
@@ -1172,13 +1173,13 @@
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"áááµ"</string>
     <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"á áµáááµ"</string>
     <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g> á­á áá?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> á¥á­áµá á¨áá°á­á¡áµá ááá ááá£ á¨á­áá áá á áµá°áá­ áá°á¥á°á¥ á­á½ááá¢ á­áá á¥áá° á±á¤ á«á­áµ á«á á¨áá ááá¥ áá¥á®á½á á«á«áµá³áá¢ á¥áá²áá á¨áá£áªá«á áá­ á«áááµá á á­á áááááµ ááá¥ áá°á¥á°á¥ á­á½ááá¢"</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> á¥á­áµá á¨áá°á­á¡áµá ááá ááá£ á¨á­áá áá á áµá°áá­ áá°á¥á°á¥ á­á½ááá¢ á­áá á¥áá° á±á¤ á«á­áµ á«á á¨áá ááá¥ áá¥á®á½á á«á«áµá³áá¢ á¥áá²áá á¨áá£áªá«á áá­ á«áááµá á á­á áááááµ ááá¥ áá°á¥á°á¥ á­á½ááá¢"</string>
+    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> á¨ááµá°á­á áá ááá ááá£  á¨á­áá áá á áµá°áá­ áá°á¥á°á¥ á­á½ááá¢ á­áá á¥áá° á¨á¥áµá­ á«á­áµ á«á ááá á¨á°á á ááá¥ áá¥á®á½á á«á«áµá³áá¢ á¥áá²áá á¨áµáá© áá­ á«ááá á á­á áááááµ ááá¥ áá°á¥á°á¥ á­á½ááá¢"</string>
+    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> á¨ááµá°á­á áá ááá ááá£  á¨á­áá áá á áµá°áá­ áá°á¥á°á¥ á­á½ááá¢ á­áá á¥áá° á¨á¥áµá­ á«á­áµ á«á ááá á¨á°á á ááá¥ áá¥á®á½á á«á«áµá³áá¢ á¥áá²áá á¨áµáá© áá­ á«ááá á á­á áááááµ ááá¥ áá°á¥á°á¥ á­á½ááá¢"</string>
     <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g> á­áá?"</string>
     <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"á¥áº ááá«áµ <xliff:g id="SERVICE">%1$s</xliff:g> á«áµáááá¢"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ááá á ááááá¶á½ á áá°á«áá"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"á¨áá« ááá á¢á« á«áµáááá?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack á¨áááá­ áá¥á¨ ááá½á áá á­ááµáá«á á¥á á°á«á á¨á á­á á¥á­áá ááá¸á á°á áááá½ á«áá­á£áá¢ á¨Android áá á« áá­ á áá ááá«á á­áááá?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack áá¨áµ áá°á³áá¸á á¥á ááá°á á¨áá¨áµ á áá ááá¸á á°á áááá½ á¨áááá­ áá¥á¨ áááµ á«áá­á£áá¡á¡ á áá» á¨ Android Market ááµá­áá áµááááá?"</string>
     <string name="accessibility_script_injection_security_warning_title" msgid="4158946557435736650">"á¨áµá¨ áµá­áªáá¶á½ á­á«á?"</string>
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"á¨áµá¨ á­áá³á¸áá á¨á áá  á°á°á«á½ á¨áá«á°á­á á¨Google áá­ á¨áµáá á« áµá­áªáá¶á½ ááá«á á­áááá?"</string>
     <string name="accessibility_touch_exploration_warning" msgid="2442154805472989569">"á­á á£ááª áá³áªá«á áááª á¨áá°á áá ááá½ á á°á£á¥ á­ááá£áá¡á¡ á á¥á«á?"</string>
@@ -1399,7 +1400,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"áá°áá áªá«áá½ á ááááá á°ááµ ááá³á°áá£ ááá­á£ á¥á ááá¥ ááá á áµá½áááá¢"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"á¨á³á« ááá¥á á á°áá­á?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"á¨á³á« ááá¥ á áááµá»á á¨á£áµáªá ááµá á á­áá á¨ááá¥ á¥ááá á­ááá³áá¢ á áá³ááµ áá°áá áªá«áá½ á¨á³á« ááá¥ á°á«á«á¥ááµá áá áá á­á½ááá¢"</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"á¨áµáá á« ááá¥ á á«áµ-á á³áá­"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"á¨áá°áá áªá« ááá¥ á á«áµ-á á³áá­"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"á á³áá­ á á­á·á"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"á á³áá­ á áá·á"</string>
     <string name="sync_error" msgid="5060969083117872149">"á¨á á³áá­ áµáá°áµ"</string>
@@ -1525,8 +1526,7 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec  ááµá- á¨á°áá«ááá"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"á¨IPSec á°á áá áááá áá¨ááá«"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"á¨IPSec CA áááá áá¨ááá«"</string>
-    <!-- no translation found for vpn_ipsec_server_cert (6599276718456935010) -->
-    <skip />
+    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"á¨IPSec á áááá­ áááá áá¨ááá«"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"á¨áá á áá«á®á½á á á³á­"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"á¨DNS ááá áá«áá½"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"á¨DNS á áááá®á½ (áá³á 8.8.8.8)"</string>
@@ -1536,8 +1536,7 @@
     <string name="vpn_save_login" msgid="6350322456427484881">"á¨ááá« áá¨á á áµááá¥"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(á áááááá)"</string>
     <string name="vpn_no_ca_cert" msgid="2095005387500126113">"(á áááá­ á á³á¨ááá¥)"</string>
-    <!-- no translation found for vpn_no_server_cert (2167487440231913330) -->
-    <skip />
+    <string name="vpn_no_server_cert" msgid="2167487440231913330">"(á¨á áááá­ á¨á°á¨á°)"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"á­áá­"</string>
     <string name="vpn_save" msgid="4233484051644764510">"á áµááá¥"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"á á«á­á"</string>
