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/res/values-am | |
parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) |
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/res/values-am')
-rw-r--r-- | java/com/android/incallui/res/values-am/strings.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/java/com/android/incallui/res/values-am/strings.xml b/java/com/android/incallui/res/values-am/strings.xml index 4cbb2344c..4bbbe3a9e 100644 --- a/java/com/android/incallui/res/values-am/strings.xml +++ b/java/com/android/incallui/res/values-am/strings.xml @@ -37,6 +37,23 @@ <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"በሂደት ላይ ያለ የWi-Fi የሥራ ጥሪ"</string> <string name="notification_on_hold" msgid="7141827443379205682">"ያዝናቆይ"</string> <string name="notification_incoming_call" msgid="7520580807513849283">"ገቢ ጥሪ"</string> + <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ገቢ ጥሪ ከፎቶ ጋር"</string> + <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ገቢ ጥሪ ከመልዕክት ጋር"</string> + <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ገቢ ጥሪ ከአካባቢ ጋር"</string> + <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር"</string> + <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር"</string> + <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር"</string> + <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string> + <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ገቢ ጥሪ ከአባሪዎች ጋር"</string> + <string name="important_notification_incoming_call" msgid="2867013954509930989">"አስፈላጊ ገቢ ጥሪ"</string> + <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"አስፈላጊ ገቢ ጥሪ ከፎቶ ጋር"</string> + <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"አስፈላጊ ገቢ ጥሪ ከመልዕክት ጋር"</string> + <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"አስፈላጊ ገቢ ጥሪ ከአካባቢ ጋር"</string> + <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"አስፈላጊ ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር"</string> + <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"አስፈላጊ ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር"</string> + <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"አስፈላጊ ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር"</string> + <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"አስፈላጊ ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string> + <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"አስፈላጊ ገቢ ጥሪ ከአባሪ ጋር"</string> <string name="notification_incoming_work_call" msgid="5291275092734261918">"ገቢ የሥራ ጥሪ"</string> <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"ገቢ የWi-Fi ጥሪ"</string> <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"ገቢ የWi-Fi የሥራ ጥሪ"</string> |