ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 6c9e2125: Merge change 2264 into donut 

Merge commit '6c9e21254c65a16a9847f7dd5f4c05b61f6e6dc0'

* commit '6c9e21254c65a16a9847f7dd5f4c05b61f6e6dc0':
  Remove the msgId string-stealing-hacks because we will do new translations for donut.
This commit is contained in:
Android (Google) Code Review 2009-05-22 14:59:55 -07:00 committed by The Android Open Source Project
parent 0f4ea703cd 6c9e21254c
commit a0aec704b6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/strings.xml
View File

@ -157,9 +157,8 @@
<string name="message_compose_error_no_recipients">You must add at least one recipient.</string>
<!-- Toast that appears in the context of forwarding a message with attachment(s) -->
<string name="message_compose_attachments_skipped_toast">Some attachments cannot be forwarded because they have not downloaded.</string>
<!-- Toast that appears when an attachment is too big to send. Note, translation temporarily
borrowed from camera app (msgid="8944461117941172986") -->
<string name="message_compose_attachment_size" msgid="8944461117941172986">File too large to attach.</string>
<!-- Toast that appears when an attachment is too big to send. -->
<string name="message_compose_attachment_size">File too large to attach.</string>
<!-- Label for To field in read message view -->
<string name="message_view_to_label">To:</string>
<!-- Label for CC field in read message view -->
@ -190,10 +189,8 @@
the email address, e.g. "Add xyz@foo.com to contacts" -->
<string name="add_contact_dlg_message_fmt">Add \"<xliff:g id="email">%s</xliff:g>\" to contacts
</string>
<!-- String that is displayed when the attachment could not be displayed. TODO: Make local
version and remove use of "borrowed" string. -->
<string name="message_view_display_attachment_toast"
msgid="2079093904785941494">This attachment cannot be displayed.</string>
<!-- String that is displayed when the attachment could not be displayed. -->
<string name="message_view_display_attachment_toast">This attachment cannot be displayed.</string>
<!-- Title of screen when setting up new email account -->
<string name="account_setup_basics_title">Set up email</string>