diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-15 16:02:21 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-15 16:22:56 -0700 |
| commit | 8aac1a358f2caf6c21c603bae9c9d4bd075eb155 (patch) | |
| tree | 3baa868a0552d36d8d74bdaf2e1a5cfddd2212a1 /InCallUI/res/values-in/strings.xml | |
| parent | 8ef5cf3987ab9f7988d0ce7b033270095e05481d (diff) | |
| parent | c8caa6b8ca6fbfe58f5f61160f7b08b1f00be025 (diff) | |
Merge remote-tracking branch 'goog/master-nova' into merge
Conflicts:
res/layout/call_card.xml
res/values-da/strings.xml
res/values-hi/strings.xml
src/com/android/incallui/CallButtonPresenter.java
src/com/android/incallui/CallCardFragment.java
src/com/android/incallui/CallCardPresenter.java
src/com/android/incallui/DialpadFragment.java
Change-Id: I6b3a2b063a2efd76330d4833cd95be3132f01462
Diffstat (limited to 'InCallUI/res/values-in/strings.xml')
| -rw-r--r-- | InCallUI/res/values-in/strings.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml index 83c57d02a..df9722bd3 100644 --- a/InCallUI/res/values-in/strings.xml +++ b/InCallUI/res/values-in/strings.xml @@ -121,9 +121,19 @@ <string name="contactPhoto" msgid="4713193418046639466">"foto kontak"</string> <string name="goPrivate" msgid="865837794424530980">"aktifkan pribadi"</string> <string name="selectContact" msgid="781975788478987237">"pilih kontak"</string> + <string name="respond_via_sms_canned_response_1" msgid="2461606462788380215">"Tak bisa bicara sekarang. Ada apa?"</string> + <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Saya segera telepon balik."</string> + <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Nanti saya telepon balik."</string> + <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Tak bisa bicara skrg. Tlp lg nanti?"</string> <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Tulis respons Anda sendiri…"</string> <string name="custom_message_cancel" msgid="7516406059429609296">"Batal"</string> <string name="custom_message_send" msgid="5795754217085747742">"Kirim"</string> + <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Tanggapan cepat"</string> + <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit tanggapan cepat"</string> + <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string> + <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Tanggapan cepat"</string> + <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Setel ulang aplikasi default"</string> + <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Pesan dikirim ke <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string> <string name="description_image_button_one" msgid="5502718871331943463">"satu"</string> <string name="description_image_button_two" msgid="4903738528222924522">"dua"</string> <string name="description_image_button_three" msgid="5570985408463782329">"tiga"</string> |