diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-24 09:31:16 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-27 08:56:19 -0700 |
commit | 9050823ccf6f512e06ad65c8a741cb17cbc4a833 (patch) | |
tree | e454c9e0fa20b8384fa87d4e6309bb8b9e3aa2a4 /java/com/android/incallui/answer/impl/res/values-gl/strings.xml | |
parent | dd9d50805f1b49dff1fe3787740393d726124cdb (diff) |
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
Diffstat (limited to 'java/com/android/incallui/answer/impl/res/values-gl/strings.xml')
-rw-r--r-- | java/com/android/incallui/answer/impl/res/values-gl/strings.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml index 876ad136b..2025f41d9 100644 --- a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml @@ -3,6 +3,9 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Pasar o dedo desde a icona para rexeitar cunha mensaxe"</string> <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Pasar o dedo desde a icona para responder como chamada de audio"</string> + <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Pasa o dedo cara arriba para responder e poñer en espera a chamada en curso"</string> + <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pasa o dedo cara arriba para responder e finalizar a chamada en espera"</string> + <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Pasa o dedo desde a icona para responder á chamada entrante e finalizar a chamada en curso"</string> <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe a túa propia…"</string> <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Teléfono"</string> <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Altofalante"</string> @@ -11,8 +14,10 @@ <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string> <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rexeitar a chamada cunha mensaxe"</string> <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responder como chamada de audio"</string> + <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Responder á chamada entrante e finalizar chamada en curso"</string> <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rexeitar con mensaxe"</string> <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responder como chamada de audio"</string> + <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Responde á chamada entrante e finaliza a chamada en curso"</string> <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desactivado"</string> <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Pasa dous dedos cara arriba para responder a chamada ou cara abaixo para rexeitala."</string> <string name="call_incoming_important" msgid="6477906345540334049">"Chamada importante"</string> |