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

resolved conflicts for merge of 2f580362 to master 

Change-Id: If74e59216d368012115d422a40328a27a20ed74c
This commit is contained in:
Eric Fischer 2010-09-30 11:22:05 -07:00
parent 4e400caab4 2f580362a6
commit 216a5eb4de
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@ -301,10 +301,12 @@
<string name="message_view_attachment_save_action">Save</string>
<!-- Button name, to cancel a queued attachment download [CHAR LIMIT=10]-->
<string name="message_view_attachment_cancel_action">Stop</string>
<!-- Toast after saving attachment -->
<string name="message_view_status_attachment_saved">Attachment saved to SD card as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- Toast after attachment could not be saved-->
<string name="message_view_status_attachment_not_saved">Unable to save attachment to SD card.</string>
<!-- Toast after saving attachment [CHAR LIMIT=30] -->
<string name="message_view_status_attachment_saved">Attachment saved
as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- Toast after attachment could not be saved [CHAR LIMIT=30] -->
<string name="message_view_status_attachment_not_saved">Unable to
save attachment.</string>
<!-- Toast upon using "send" when one or more attachments will need to be background loaded
[CHAR LIMIT=none]-->
<string name="message_view_attachment_background_load">Note: One or more attachments in your