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 | 776d937b539b9e9b3672a1d860adec309f65d0ad (patch) | |
| tree | d08693d028ceeab100fcccb2c090854731f98042 /res/values-da/strings.xml | |
| parent | e306b703259683799ade122458f6b05a03949800 (diff) | |
| parent | 46a309dac03b11180f4deffb5316892736796e6e (diff) | |
| download | packages_apps_InCallUI-776d937b539b9e9b3672a1d860adec309f65d0ad.tar.gz packages_apps_InCallUI-776d937b539b9e9b3672a1d860adec309f65d0ad.tar.bz2 packages_apps_InCallUI-776d937b539b9e9b3672a1d860adec309f65d0ad.zip | |
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 'res/values-da/strings.xml')
| -rw-r--r-- | res/values-da/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index be7d2bff..07451f6f 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -124,6 +124,12 @@ <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv dit eget svar..."</string> <string name="custom_message_cancel" msgid="7516406059429609296">"Annuller"</string> <string name="custom_message_send" msgid="5795754217085747742">"Send"</string> + <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hurtige svar"</string> + <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Rediger hurtige svar"</string> + <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string> + <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hurtigt svar"</string> + <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Nulstil standardapp"</string> + <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Meddelelsen er sendt til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string> <string name="description_image_button_one" msgid="5502718871331943463">"en"</string> <string name="description_image_button_two" msgid="4903738528222924522">"to"</string> <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string> |