aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/tnef-attachments
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-22 06:23:14 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-22 06:23:14 +0800
commitcbaa9eb7432b11d9bd6cb38fe5ef027612720623 (patch)
tree6a02c49c11cc58d98b9950543480eb9d554bf89a /plugins/tnef-attachments
parent84c2e3735ce6e4df88142e86446f9179b6e341e4 (diff)
parent1f65552d0dd6e8635ef0926a0f750c4f0bd34230 (diff)
downloadgsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.gz
gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.zst
gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.zip
Merge branch 'master' into kill-bonobo
Conflicts: plugins/audio-inline/org-gnome-audio-inline.eplug.xml plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml plugins/select-one-source/org-gnome-select-one-source.eplug.xml
Diffstat (limited to 'plugins/tnef-attachments')
-rw-r--r--plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
index eca319cf5e..5bfb0e65c0 100644
--- a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
+++ b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
@@ -4,8 +4,8 @@
type="shlib"
id="org.gnome.evolution.mail.tnefattachments"
location="@PLUGINDIR@/liborg-gnome-tnef-attachments@SOEXT@"
- _name="TNEF Attachment decoder">
- <_description>A simple plugin which uses yTNEF to decode TNEF attachments.</_description>
+ _name="TNEF Decoder">
+ <_description>Decode TNEF (winmail.dat) attachments from Microsoft Outlook.</_description>
<author name="Lucky Wankhede" email="wlakke@novell.com"/>
<hook class="org.gnome.evolution.mail.format:1.0">