From 7558467ab12ddd4f74c4844de50e9c1813099293 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Sun, 6 Jul 2014 07:08:18 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I1c7a134d69f9dfe74dd2fa8dfbf4b807d455d211
Auto-generated-cl: translation import
---
 res/values-ko/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'res/values-ko')

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0ad809799..ef2a55abd 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -357,8 +357,7 @@
     <string name="setting_front_camera_photo" msgid="4131886734622868637">"전면 카메라 사진"</string>
     <string name="setting_front_camera_video" msgid="2178799452805359752">"전면 카메라 동영상"</string>
     <string name="setting_default_camera" msgid="6954076799301004779">"기본 카메라"</string>
-    <string name="setting_send_feedback" msgid="6637165939344951380">"의견 보내기"</string>
-    <string name="setting_google_help" msgid="9188405022782314357">"도움말"</string>
+    <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"도움말 및 의견"</string>
     <string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ 처리 중…"</string>
     <string name="open_source_licenses" msgid="2169711954264883060">"오픈소스 라이선스"</string>
     <string name="pref_category_general" msgid="6737748849700581019">"일반 설정"</string>
-- 
cgit v1.2.3