am d2dec8c7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'd2dec8c70eb8f745425c09070069ef52d306b233':
  Import translations. DO NOT MERGE

1 files changed, 19 insertions, 27 deletions

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 96dde1c..7c35aab 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -602,8 +602,7 @@
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"검색 중…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"기기 이름 변경"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"P2P 기기"</string>
-    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
-    <skip />
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"저장된 그룹"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"연결할 수 없습니다."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"기기 이름을 바꾸지 못했습니다."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"연결을 해제하시겠습니까?"</string>
@@ -611,10 +610,8 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"연결을 중단하면 <xliff:g id="PEER_NAME">%1$s</xliff:g> 외 다른 <xliff:g id="PEER_COUNT">%2$s</xliff:g>개 기기와의 연결이 끊어집니다."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<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_p2p_delete_group_title" msgid="8049872630241986374">"그룹을 삭제하시겠습니까?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="5521624017163200215">"<xliff:g id="GROUP_NAME">%1$s</xliff:g> 그룹을 삭제하시겠습니까?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"핫스팟 켜는 중…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"핫스팟 끄는 중…"</string>
@@ -687,17 +684,16 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"배경화면"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"배경화면 선택"</string>
     <string name="screensaver_settings_title" msgid="4458091032540874366">"스크린 세이버 모듈"</string>
-    <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"도킹할 때 또는 대기상태이거나 충전할 때"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"대기상태이거나 충전할 때"</string>
-    <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"도킹할 때"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"도킹할 때 또는 대기상태이거나 충전할 때"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"어느 한쪽인 경우"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="3642352561593337637">"대기상태이거나 충전할 때"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"도킹할 때"</string>
     <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"사용 안함"</string>
-    <string name="screensaver_component_title" msgid="5786117148360329058">"선택한 모듈"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"활성화 시기"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 유휴 상태일 때"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"안함"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"사용해 보기"</string>
-    <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"절전 모드 시 시작"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"도킹할 때 시작"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="2060724968623677666">"휴대전화가 도킹 또는 절전 모드일 때 작동 방식을 조정하려면 화면 보호기를 사용하도록 설정합니다."</string>
+    <string name="screensaver_settings_start_dreaming" msgid="1695787491111862810">"지금 화면 보호기 시작"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="9110320844270942351">"화면 보호기로 전환 시점"</string>
+    <!-- no translation found for screensaver_settings_dream_start (1265346994126658796) -->
+    <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"글꼴 크기"</string>
@@ -1021,8 +1017,7 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 저장소 데이터"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 카드"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"제거"</string>
-    <!-- no translation found for install_text (884360662922471113) -->
-    <skip />
+    <string name="install_text" msgid="884360662922471113">"설치"</string>
     <string name="disable_text" msgid="6544054052049395202">"사용 안함"</string>
     <string name="enable_text" msgid="9217362512327828987">"사용"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"데이터 지우기"</string>
@@ -1590,6 +1585,7 @@
     <string name="window_animation_scale_title" msgid="6162587588166114700">"창 애니메이션 배율"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"전환 애니메이션 배율"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator 길이 배율"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"보조 디스플레이 효과를 적용"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"앱"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"액티비티 유지 안함"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"사용자가 종료하는 즉시 바로 제거"</string>
@@ -1691,14 +1687,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN 프로필 추가"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"프로필 수정"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"프로필 삭제"</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">"연결 유지 VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"VPN 프로필을 선택하여 연결된 상태를 유지하세요. 이 VPN에 연결된 상태에서만 네트워크 트래픽이 허용됩니다."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"없음"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN을 연결 상태로 유지하려면 서버와 DNS의 IP 주소가 필요합니다."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"네트워크에 연결되어 있지 않습니다. 잠시 후 다시 시도해 주세요."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"인증서가 누락되었습니다. 프로필을 수정하세요."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"시스템"</string>
@@ -1720,7 +1712,7 @@
     <string name="selinux_status_disabled" msgid="924551035552323327">"사용 안함"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"허가"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"사용자/제한사항"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"사용자"</string>
     <string name="user_list_title" msgid="2152311434413878709">"사용자"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
     <string name="user_details_title" msgid="3037625632127241370">"세부정보 수정"</string>