From fc0eb8ccebcc7846db5e8b5c5430070055679bfa Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 31 Aug 2017 06:57:16 -0700
Subject: Update Dialer source to latest internal Google revision.

Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.

The Dialer team is now switching to a public development model similar
to the telephony team.

This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.

(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)

This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):

  git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
  git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef

Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
---
 .../android/dialer/dialpadview/res/values-ko/strings.xml   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'java/com/android/dialer/dialpadview/res/values-ko')

diff --git a/java/com/android/dialer/dialpadview/res/values-ko/strings.xml b/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
index 748843c60..8366ec5f6 100644
--- a/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
@@ -22,4 +22,18 @@
     <string name="description_delete_button" msgid="8431313818404527096">"백스페이스"</string>
     <string name="description_image_button_plus" msgid="8936338119824589388">"더하기"</string>
     <string name="description_voicemail_button" msgid="4187006295368768215">"음성사서함"</string>
+    <string name="description_dial_button" msgid="6826108965053146374">"전화걸기"</string>
+    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"음성사서함 메시지를 확인하려면 먼저 비행기 모드를 해제하세요."</string>
+    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"음성사서함을 설정하려면 메뉴 &gt; 설정으로 이동하세요."</string>
+    <string name="add_2sec_pause" msgid="395591627218789322">"2초간 일시중지 추가"</string>
+    <string name="add_wait" msgid="2278146476349811062">"대기 시간 추가"</string>
+    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"터치톤 키패드 사용"</string>
+    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"진행 중인 통화로 돌아가기"</string>
+    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"통화 추가"</string>
+    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
+    <string name="meid" msgid="5274167198744847659">"MEID"</string>
+    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM 카드에서 로딩 중…"</string>
+    <string name="simContacts_title" msgid="8972942600800349990">"SIM 카드 연락처"</string>
+    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g>에 전화걸기"</string>
+    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"이 번호에 전화를 걸 수 없습니다."</string>
 </resources>
-- 
cgit v1.2.3