From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 6 Apr 2017 09:41:50 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/152373142. 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/151342913 (3/27/2017) to cl/152373142 (4/06/2017). 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. Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217 --- java/com/android/incallui/answer/impl/res/values-sl/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/com/android/incallui/answer/impl/res/values-sl') diff --git a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml index 67f31f393..819999aaf 100644 --- a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml @@ -5,7 +5,7 @@ "Povlecite z ikone, da klic sprejmete kot zvočni klic" "Povlecite navzgor, da sprejmete klic in zadržite aktivni klic" "Povlecite navzgor, da sprejmete klic in končate zadržani klic" - "Povlecite z ikone, da sprejmete dohodni klic in končate aktivni klic" + "Povlecite z ikone, da sprejmete klic in končate aktivni klic" "Napišite lastno besedilo …" "Slušalka" "Zvočnik" @@ -14,10 +14,10 @@ "Pošlji" "Zavrnite ta klic s sporočilom" "Sprejmite kot zvočni klic" - "Sprejmi dohodni klic in končaj aktivni klic" + "Sprejmi klic in končaj aktivni klic" "Zavrnitev s sporočilom" "Sprejmite kot zvočni klic" - "Sprejmi dohodni klic in končaj aktivni klic" + "Sprejmi klic in končaj aktivni klic" "Video je izklopljen" "Z dvema prstoma povlecite navzgor, da sprejmete klic. Z dvema prstoma povlecite navzdol, da zavrnete klic." "Pomemben klic" -- cgit v1.2.3