From 9050823ccf6f512e06ad65c8a741cb17cbc4a833 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Fri, 24 Mar 2017 09:31:16 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/151128062 Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/150756069 (3/21/2017) to cl/151128062 (3/24/2017). Notable this release: - Explicitly enumerate host and target dependencies. - Update proguard flag references. This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Bug: 33210202 36511925 Addresses 33210202 - Proguard support 36511925 - Compiler warnings when building against platform sdk Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae --- java/com/android/incallui/answer/impl/res/values-ko/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'java/com/android/incallui/answer/impl/res/values-ko/strings.xml') diff --git a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml index c39b32543..5ce6d929e 100644 --- a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml @@ -3,6 +3,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> "메시지를 거부하려면 아이콘에서 스와이프하세요." "음성 통화로 받으려면 아이콘에서 스와이프하세요." + "현재 통화를 끊지 않고 받으려면 위로 스와이프" + "대기 중 통화를 종료하고 받으려면 위로 스와이프" + "현재 통화를 종료하고 수신 전화를 받으려면 아이콘에서 스와이프" "직접 메시지 쓰기…" "핸드셋" "스피커폰" @@ -11,8 +14,10 @@ "보내기" "메시지를 사용하여 이 전화 거부" "음성 통화로 받기" + "현재 통화를 종료하고 수신 전화 받기" "메시지를 사용하여 전화 거부" "음성 통화로 받기" + "현재 통화를 종료하고 수신 전화 받기" "동영상이 꺼져 있습니다." "받으려면 두 손가락을 위로 스와이프하고 거부하려면 두 손가락을 아래로 스와이프하세요." "중요 전화" -- cgit v1.2.3