diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
| commit | d8046e520a866b9948ee9ba47cf642b441ca8e23 (patch) | |
| tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/incallui/answer/impl/hint | |
| parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) | |
| download | android_packages_apps_Dialer-d8046e520a866b9948ee9ba47cf642b441ca8e23.tar.gz android_packages_apps_Dialer-d8046e520a866b9948ee9ba47cf642b441ca8e23.tar.bz2 android_packages_apps_Dialer-d8046e520a866b9948ee9ba47cf642b441ca8e23.zip | |
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
Diffstat (limited to 'java/com/android/incallui/answer/impl/hint')
6 files changed, 12 insertions, 12 deletions
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml index 1de03a55c..acae6eb26 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="event_activated" msgid="4737012691463830969">"PAW-Modus aktiviert"</string> - <string name="event_deactivated" msgid="4504516573331084650">"PAW-Modus deaktiviert"</string> + <string name="event_activated" msgid="4737012691463830969">"Tierpfoten-Modus aktiviert"</string> + <string name="event_deactivated" msgid="4504516573331084650">"Tierpfoten-Modus deaktiviert"</string> </resources> diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml index ebd8e2f0e..478da3e59 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="event_activated" msgid="4737012691463830969">"Modo PAW habilitado"</string> - <string name="event_deactivated" msgid="4504516573331084650">"Modo PAW inhabilitado"</string> + <string name="event_activated" msgid="4737012691463830969">"Modo pata habilitado"</string> + <string name="event_deactivated" msgid="4504516573331084650">"Modo pata inhabilitado"</string> </resources> diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml index abbeaf15f..845326cfc 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="event_activated" msgid="4737012691463830969">"Omogućen PAW način rada"</string> - <string name="event_deactivated" msgid="4504516573331084650">"Onemoguće način rada PAW"</string> + <string name="event_activated" msgid="4737012691463830969">"Omogućen način rada PAW"</string> + <string name="event_deactivated" msgid="4504516573331084650">"Onemogućen način rada PAW"</string> </resources> diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml index d0ef36f84..a1f2d59fa 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="event_activated" msgid="4737012691463830969">"Modul Paw a fost activat"</string> - <string name="event_deactivated" msgid="4504516573331084650">"Modul Paw a fost dezactivat."</string> + <string name="event_activated" msgid="4737012691463830969">"Modul „lăbuță” a fost activat"</string> + <string name="event_deactivated" msgid="4504516573331084650">"Modul „lăbuță” a fost dezactivat."</string> </resources> diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml index 913a362ec..bb002f382 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="event_activated" msgid="4737012691463830969">"Режим PAW включен"</string> - <string name="event_deactivated" msgid="4504516573331084650">"Режим PAW отключен"</string> + <string name="event_activated" msgid="4737012691463830969">"Режим лапы включен"</string> + <string name="event_deactivated" msgid="4504516573331084650">"Режим лапы отключен"</string> </resources> diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml index eb78565a5..6be36feef 100644 --- a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml +++ b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="event_activated" msgid="4737012691463830969">"PAW режим је омогућен"</string> - <string name="event_deactivated" msgid="4504516573331084650">"PAW режим је онемогућен"</string> + <string name="event_activated" msgid="4737012691463830969">"Омогућен је режим шапе"</string> + <string name="event_deactivated" msgid="4504516573331084650">"Онемогућен је режим шапе"</string> </resources> |