[Commits] [SCM] claws branch, master, updated. 3.10.1-51-gc5bf669

claws at claws-mail.org claws at claws-mail.org
Fri Jun 13 13:21:46 CEST 2014


The branch master of project "claws" (Claws Mail) has been updated
       via  c5bf669084880928dcc910820e3bbc968d4e0133 (commit)
      from  8ac91cd9662e70115f9631604269a16d18374005 (commit)

Summary of changes:
 po/POTFILES.in                                     |   34 ++++++++++++++++++--
 src/plugins/acpi_notifier/Makefile.am              |   11 ++++---
 ...ml => claws-mail-acpi_notifier.metainfo.xml.in} |    4 +--
 src/plugins/address_keeper/Makefile.am             |   11 ++++---
 ...l => claws-mail-address_keeper.metainfo.xml.in} |    4 +--
 src/plugins/archive/Makefile.am                    |   11 ++++---
 ...info.xml => claws-mail-archive.metainfo.xml.in} |    4 +--
 src/plugins/att_remover/Makefile.am                |   10 +++---
 ....xml => claws-mail-att_remover.metainfo.xml.in} |    4 +--
 src/plugins/attachwarner/Makefile.am               |    9 +++---
 ...xml => claws-mail-attachwarner.metainfo.xml.in} |    4 +--
 src/plugins/bogofilter/Makefile.am                 |   11 ++++---
 ...o.xml => claws-mail-bogofilter.metainfo.xml.in} |    4 +--
 ...nfo.xml => claws-mail-bsfilter.metainfo.xml.in} |    4 +--
 src/plugins/clamd/Makefile.am                      |   11 ++++---
 ...tainfo.xml => claws-mail-clamd.metainfo.xml.in} |    4 +--
 src/plugins/fancy/Makefile.am                      |   11 ++++---
 ...tainfo.xml => claws-mail-fancy.metainfo.xml.in} |    4 +--
 src/plugins/fetchinfo/Makefile.am                  |   10 +++---
 ...fo.xml => claws-mail-fetchinfo.metainfo.xml.in} |    4 +--
 src/plugins/gdata/Makefile.am                      |   11 ++++---
 ...tainfo.xml => claws-mail-gdata.metainfo.xml.in} |    4 +--
 src/plugins/geolocation/Makefile.am                |   11 ++++---
 ....xml => claws-mail-geolocation.metainfo.xml.in} |    4 +--
 src/plugins/libravatar/Makefile.am                 |   11 ++++---
 ...o.xml => claws-mail-libravatar.metainfo.xml.in} |    4 +--
 src/plugins/mailmbox/Makefile.am                   |   11 ++++---
 ...nfo.xml => claws-mail-mailmbox.metainfo.xml.in} |    4 +--
 src/plugins/newmail/Makefile.am                    |   11 ++++---
 ...info.xml => claws-mail-newmail.metainfo.xml.in} |    4 +--
 src/plugins/notification/Makefile.am               |   10 +++---
 ...xml => claws-mail-notification.metainfo.xml.in} |    4 +--
 src/plugins/pdf_viewer/Makefile.am                 |   11 ++++---
 ...o.xml => claws-mail-pdf_viewer.metainfo.xml.in} |    4 +--
 src/plugins/perl/Makefile.am                       |   10 +++---
 ...etainfo.xml => claws-mail-perl.metainfo.xml.in} |    4 +--
 src/plugins/pgpcore/Makefile.am                    |    8 ++++-
 .../claws-mail-pgpcore.metainfo.xml.in}            |    8 ++---
 src/plugins/pgpinline/Makefile.am                  |   11 ++++---
 ...fo.xml => claws-mail-pgpinline.metainfo.xml.in} |    4 +--
 src/plugins/pgpmime/Makefile.am                    |   11 ++++---
 ...info.xml => claws-mail-pgpmime.metainfo.xml.in} |    4 +--
 src/plugins/python/Makefile.am                     |   11 ++++---
 ...ainfo.xml => claws-mail-python.metainfo.xml.in} |    4 +--
 src/plugins/rssyl/Makefile.am                      |   11 ++++---
 ...tainfo.xml => claws-mail-rssyl.metainfo.xml.in} |    4 +--
 src/plugins/smime/Makefile.am                      |   11 ++++---
 ...tainfo.xml => claws-mail-smime.metainfo.xml.in} |    4 +--
 src/plugins/spam_report/Makefile.am                |   11 ++++---
 ....xml => claws-mail-spam_report.metainfo.xml.in} |    4 +--
 src/plugins/spamassassin/Makefile.am               |   10 +++---
 ....xml => claws-mail-spamassasin.metainfo.xml.in} |    4 +--
 src/plugins/tnef_parse/Makefile.am                 |   11 ++++---
 ...o.xml => claws-mail-tnef_parse.metainfo.xml.in} |    4 +--
 src/plugins/vcalendar/Makefile.am                  |   10 +++---
 ...fo.xml => claws-mail-vcalendar.metainfo.xml.in} |    4 +--
 56 files changed, 270 insertions(+), 166 deletions(-)
 rename src/plugins/acpi_notifier/{claws-mail-acpi_notifier.metainfo.xml => claws-mail-acpi_notifier.metainfo.xml.in} (71%)
 rename src/plugins/address_keeper/{claws-mail-address_keeper.metainfo.xml => claws-mail-address_keeper.metainfo.xml.in} (67%)
 rename src/plugins/archive/{claws-mail-archive.metainfo.xml => claws-mail-archive.metainfo.xml.in} (70%)
 rename src/plugins/att_remover/{claws-mail-att_remover.metainfo.xml => claws-mail-att_remover.metainfo.xml.in} (71%)
 rename src/plugins/attachwarner/{claws-mail-attachwarner.metainfo.xml => claws-mail-attachwarner.metainfo.xml.in} (66%)
 rename src/plugins/bogofilter/{claws-mail-bogofilter.metainfo.xml => claws-mail-bogofilter.metainfo.xml.in} (65%)
 rename src/plugins/bsfilter/{claws-mail-bsfilter.metainfo.xml => claws-mail-bsfilter.metainfo.xml.in} (64%)
 rename src/plugins/clamd/{claws-mail-clamd.metainfo.xml => claws-mail-clamd.metainfo.xml.in} (64%)
 rename src/plugins/fancy/{claws-mail-fancy.metainfo.xml => claws-mail-fancy.metainfo.xml.in} (70%)
 rename src/plugins/fetchinfo/{claws-mail-fetchinfo.metainfo.xml => claws-mail-fetchinfo.metainfo.xml.in} (64%)
 rename src/plugins/gdata/{claws-mail-gdata.metainfo.xml => claws-mail-gdata.metainfo.xml.in} (70%)
 rename src/plugins/geolocation/{claws-mail-geolocation.metainfo.xml => claws-mail-geolocation.metainfo.xml.in} (72%)
 rename src/plugins/libravatar/{claws-mail-libravatar.metainfo.xml => claws-mail-libravatar.metainfo.xml.in} (65%)
 rename src/plugins/mailmbox/{claws-mail-mailmbox.metainfo.xml => claws-mail-mailmbox.metainfo.xml.in} (70%)
 rename src/plugins/newmail/{claws-mail-newmail.metainfo.xml => claws-mail-newmail.metainfo.xml.in} (66%)
 rename src/plugins/notification/{claws-mail-notification.metainfo.xml => claws-mail-notification.metainfo.xml.in} (69%)
 rename src/plugins/pdf_viewer/{claws-mail-pdf_viewer.metainfo.xml => claws-mail-pdf_viewer.metainfo.xml.in} (65%)
 rename src/plugins/perl/{claws-mail-perl.metainfo.xml => claws-mail-perl.metainfo.xml.in} (68%)
 copy src/plugins/{pgpinline/claws-mail-pgpinline.metainfo.xml => pgpcore/claws-mail-pgpcore.metainfo.xml.in} (61%)
 rename src/plugins/pgpinline/{claws-mail-pgpinline.metainfo.xml => claws-mail-pgpinline.metainfo.xml.in} (70%)
 rename src/plugins/pgpmime/{claws-mail-pgpmime.metainfo.xml => claws-mail-pgpmime.metainfo.xml.in} (70%)
 rename src/plugins/python/{claws-mail-python.metainfo.xml => claws-mail-python.metainfo.xml.in} (65%)
 rename src/plugins/rssyl/{claws-mail-rssyl.metainfo.xml => claws-mail-rssyl.metainfo.xml.in} (72%)
 rename src/plugins/smime/{claws-mail-smime.metainfo.xml => claws-mail-smime.metainfo.xml.in} (70%)
 rename src/plugins/spam_report/{claws-mail-spam_report.metainfo.xml => claws-mail-spam_report.metainfo.xml.in} (72%)
 rename src/plugins/spamassassin/{claws-mail-spamassasin.metainfo.xml => claws-mail-spamassasin.metainfo.xml.in} (65%)
 rename src/plugins/tnef_parse/{claws-mail-tnef_parse.metainfo.xml => claws-mail-tnef_parse.metainfo.xml.in} (71%)
 rename src/plugins/vcalendar/{claws-mail-vcalendar.metainfo.xml => claws-mail-vcalendar.metainfo.xml.in} (65%)


- Log -----------------------------------------------------------------
commit c5bf669084880928dcc910820e3bbc968d4e0133
Author: Paul <paul at claws-mail.org>
Date:   Fri Jun 13 12:21:24 2014 +0100

    internationalise plugin appdata files

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f87844a..3fc673c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -88,37 +88,53 @@ src/mimeview.c
 src/news.c
 src/news_gtk.c
 src/plugins/acpi_notifier/acpi_notifier.c
+src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in
 src/plugins/address_keeper/address_keeper.c
 src/plugins/address_keeper/address_keeper.h
 src/plugins/address_keeper/address_keeper_prefs.c
+src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in
 src/plugins/archive/archiver.c
 src/plugins/archive/archiver_gtk.c
 src/plugins/archive/archiver_prefs.c
+src/plugins/archive/claws-mail-archive.metainfo.xml.in
+src/plugins/att_remover/att_remover.c
+src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in
 src/plugins/attachwarner/attachwarner.c
 src/plugins/attachwarner/attachwarner_prefs.c
-src/plugins/att_remover/att_remover.c
+src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in
 src/plugins/bogofilter/bogofilter.c
 src/plugins/bogofilter/bogofilter_gtk.c
+src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in
 src/plugins/bsfilter/bsfilter.c
 src/plugins/bsfilter/bsfilter_gtk.c
+src/plugins/bsfilter/claws-mail-acpi_notifier.metainfo.xml.in
 src/plugins/clamd/clamav_plugin.c
 src/plugins/clamd/clamav_plugin_gtk.c
+src/plugins/clamd/claws-mail-clamd.metainfo.xml.in
 src/plugins/clamd/libclamd/clamd-plugin.c
 src/plugins/demo/demo.c
+src/plugins/fancy/claws-mail-fancy.metainfo.xml.in
 src/plugins/fancy/fancy_prefs.c
 src/plugins/fancy/fancy_viewer.c
+src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in
 src/plugins/fetchinfo/fetchinfo_plugin.c
 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
+src/plugins/gdata/claws-mail-gdata.metainfo.xml.in
 src/plugins/gdata/cm_gdata_contacts.c
 src/plugins/gdata/cm_gdata_prefs.c
 src/plugins/gdata/gdata_plugin.c
+src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in
 src/plugins/geolocation/geolocation_plugin.c
+src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in
 src/plugins/libravatar/libravatar.c
 src/plugins/libravatar/libravatar_prefs.c
+src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in
 src/plugins/mailmbox/mailmbox_folder.c
 src/plugins/mailmbox/plugin.c
 src/plugins/mailmbox/plugin_gtk.c
+src/plugins/newmail/claws-mail-newmail.metainfo.xml.in
 src/plugins/newmail/newmail.c
+src/plugins/notification/claws-mail-notification.metainfo.xml.in
 src/plugins/notification/notification_banner.c
 src/plugins/notification/notification_foldercheck.c
 src/plugins/notification/notification_lcdproc.c
@@ -126,21 +142,28 @@ src/plugins/notification/notification_plugin.c
 src/plugins/notification/notification_popup.c
 src/plugins/notification/notification_prefs.c
 src/plugins/notification/notification_trayicon.c
+src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in
 src/plugins/pdf_viewer/poppler_viewer.c
+src/plugins/perl/claws-mail-perl.metainfo.xml.in
 src/plugins/perl/perl_gtk.c
 src/plugins/pgpcore/autocompletion.c
+src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in
 src/plugins/pgpcore/passphrase.c
 src/plugins/pgpcore/pgp_viewer.c
 src/plugins/pgpcore/plugin.c
 src/plugins/pgpcore/prefs_gpg.c
 src/plugins/pgpcore/select-keys.c
 src/plugins/pgpcore/sgpgme.c
+src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in
 src/plugins/pgpinline/pgpinline.c
 src/plugins/pgpinline/plugin.c
+src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in
 src/plugins/pgpmime/pgpmime.c
 src/plugins/pgpmime/plugin.c
+src/plugins/python/claws-mail-python.metainfo.xml.in
 src/plugins/python/composewindowtype.c
 src/plugins/python/python_plugin.c
+src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in
 src/plugins/rssyl/feed.c
 src/plugins/rssyl/feed.h
 src/plugins/rssyl/plugin.c
@@ -149,13 +172,18 @@ src/plugins/rssyl/rssyl_cb_menu.c
 src/plugins/rssyl/rssyl_gtk.c
 src/plugins/rssyl/rssyl.h
 src/plugins/rssyl/rssyl_prefs.c
+src/plugins/smime/claws-mail-smime.metainfo.xml.in
 src/plugins/smime/plugin.c
 src/plugins/smime/smime.c
-src/plugins/spamassassin/spamassassin.c
-src/plugins/spamassassin/spamassassin_gtk.c
+src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in
 src/plugins/spam_report/spam_report.c
 src/plugins/spam_report/spam_report_prefs.c
+src/plugins/spamassassin/claws-mail-spamassasin.metainfo.xml.in
+src/plugins/spamassassin/spamassassin.c
+src/plugins/spamassassin/spamassassin_gtk.c
+src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in
 src/plugins/tnef_parse/tnef_parse.c
+src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in
 src/plugins/vcalendar/common-views.c
 src/plugins/vcalendar/day-view.c
 src/plugins/vcalendar/month-view.c
diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index 9595978..706a203 100644
--- a/src/plugins/acpi_notifier/Makefile.am
+++ b/src/plugins/acpi_notifier/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-acpi_notifier.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-acpi_notifier.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml b/src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in
similarity index 71%
rename from src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml
rename to src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in
index f9dd543..83c07d0 100644
--- a/src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml
+++ b/src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-acpi_notifier</id>
 <extends>claws-mail.desktop</extends>
 <name>AcpiNotifier</name>
-<summary>Enables mail notification via LEDs on some laptops</summary>
+<_summary>Enables mail notification via LEDs on some laptops</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=acpinotifier</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 32e51fa..54fbb32 100644
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-address_keeper.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-address_keeper.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml b/src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in
similarity index 67%
rename from src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml
rename to src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in
index bafb43a..c5a1e82 100644
--- a/src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml
+++ b/src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-address_keeper</id>
 <extends>claws-mail.desktop</extends>
 <name>AddressKeeper</name>
-<summary>Allows saving outgoing addresses to a designated folder in the address book</summary>
+<_summary>Allows saving outgoing addresses to a designated folder in the address book</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index a76a589..6752e67 100644
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 #
-appdata_files = claws-mail-archive.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-archive.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/archive/claws-mail-archive.metainfo.xml b/src/plugins/archive/claws-mail-archive.metainfo.xml.in
similarity index 70%
rename from src/plugins/archive/claws-mail-archive.metainfo.xml
rename to src/plugins/archive/claws-mail-archive.metainfo.xml.in
index e431ba2..4700341 100644
--- a/src/plugins/archive/claws-mail-archive.metainfo.xml
+++ b/src/plugins/archive/claws-mail-archive.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-archive</id>
 <extends>claws-mail.desktop</extends>
 <name>Mail Archiver</name>
-<summary>Allows to make tars or zips of old folders</summary>
+<_summary>Allows to make tars or zips of old folders</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 39ab4f5..5609912 100644
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -2,10 +2,12 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-att_remover.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-att_remover.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/att_remover/claws-mail-att_remover.metainfo.xml b/src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in
similarity index 71%
rename from src/plugins/att_remover/claws-mail-att_remover.metainfo.xml
rename to src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in
index 86fd9b5..ba68a94 100644
--- a/src/plugins/att_remover/claws-mail-att_remover.metainfo.xml
+++ b/src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-att_remover</id>
 <extends>claws-mail.desktop</extends>
 <name>AttRemover</name>
-<summary>Lets you remove attachments from emails</summary>
+<_summary>Lets you remove attachments from emails</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index 29b0076..317a3b2 100644
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -2,10 +2,11 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-attachwarner.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-attachwarner.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml b/src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in
similarity index 66%
rename from src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml
rename to src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in
index 965ce44..c61f3aa 100644
--- a/src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml
+++ b/src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-attachwarner</id>
 <extends>claws-mail.desktop</extends>
 <name>AttachWarner</name>
-<summary>Warns when a message mentioning an attachment in the message body without attaching any files</summary>
+<_summary>Warns when a message mentioning an attachment in the message body without attaching any files</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=attachwarner</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index 9419d08..9d01cde 100644
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-bogofilter.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_files = claws-mail-bogofilter.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml b/src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in
similarity index 65%
rename from src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml
rename to src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in
index 98797f4..f40dfed 100644
--- a/src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml
+++ b/src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-bogofilter</id>
 <extends>claws-mail.desktop</extends>
 <name>Bogofilter</name>
-<summary>Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL account using Bogofilter</summary>
+<_summary>Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL account using Bogofilter</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=bogofilter</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml b/src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in
similarity index 64%
rename from src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml
rename to src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in
index d0238da..2e171b2 100644
--- a/src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml
+++ b/src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-bsfilter</id>
 <extends>claws-mail.desktop</extends>
 <name>BSfilter</name>
-<summary>Check all messages that are received from an IMAP, LOCAL or POP account for spam using Bsfilter</summary>
+<_summary>Check all messages that are received from an IMAP, LOCAL or POP account for spam using Bsfilter</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 29a6b36..d38d37f 100644
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-clamd.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-clamd.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 SUBDIRS = libclamd
 plugindir = $(pkglibdir)/plugins
diff --git a/src/plugins/clamd/claws-mail-clamd.metainfo.xml b/src/plugins/clamd/claws-mail-clamd.metainfo.xml.in
similarity index 64%
rename from src/plugins/clamd/claws-mail-clamd.metainfo.xml
rename to src/plugins/clamd/claws-mail-clamd.metainfo.xml.in
index 706e615..c0c6a4f 100644
--- a/src/plugins/clamd/claws-mail-clamd.metainfo.xml
+++ b/src/plugins/clamd/claws-mail-clamd.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-clamd</id>
 <extends>claws-mail.desktop</extends>
 <name>Clamd</name>
-<summary>Scans all messages that are received from an IMAP, LOCAL or POP account using clamd (Clam AV)</summary>
+<_summary>Scans all messages that are received from an IMAP, LOCAL or POP account using clamd (Clam AV)</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index be21805..96389cf 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-fancy.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-fancy.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/fancy/claws-mail-fancy.metainfo.xml b/src/plugins/fancy/claws-mail-fancy.metainfo.xml.in
similarity index 70%
rename from src/plugins/fancy/claws-mail-fancy.metainfo.xml
rename to src/plugins/fancy/claws-mail-fancy.metainfo.xml.in
index b9e005d..3409881 100644
--- a/src/plugins/fancy/claws-mail-fancy.metainfo.xml
+++ b/src/plugins/fancy/claws-mail-fancy.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-fancy</id>
 <extends>claws-mail.desktop</extends>
 <name>Fancy</name>
-<summary>Renders HTML e-mail using the WebKit library</summary>
+<_summary>Renders HTML e-mail using the WebKit library</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index 20b4c89..cba9e53 100644
--- a/src/plugins/fetchinfo/Makefile.am
+++ b/src/plugins/fetchinfo/Makefile.am
@@ -2,9 +2,11 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-fetchinfo.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-fetchinfo.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
 
 if OS_WIN32
 
@@ -79,4 +81,4 @@ fetchinfo_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
diff --git a/src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml b/src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in
similarity index 64%
rename from src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml
rename to src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in
index 5357255..e915cae 100644
--- a/src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml
+++ b/src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-fetchinfo</id>
 <extends>claws-mail.desktop</extends>
 <name>Fetchinfo</name>
-<summary>Inserts headers containing: UIDL, Claws' account name, POP server, user ID and retrieval time</summary>
+<_summary>Inserts headers containing: UIDL, Claws' account name, POP server, user ID and retrieval time</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index 30bac6e..4632af5 100644
--- a/src/plugins/gdata/Makefile.am
+++ b/src/plugins/gdata/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-gdata.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-gdata.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/gdata/claws-mail-gdata.metainfo.xml b/src/plugins/gdata/claws-mail-gdata.metainfo.xml.in
similarity index 70%
rename from src/plugins/gdata/claws-mail-gdata.metainfo.xml
rename to src/plugins/gdata/claws-mail-gdata.metainfo.xml.in
index db1862d..ab6f35a 100644
--- a/src/plugins/gdata/claws-mail-gdata.metainfo.xml
+++ b/src/plugins/gdata/claws-mail-gdata.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-gdata</id>
 <extends>claws-mail.desktop</extends>
 <name>GData</name>
-<summary>Provides an interface to Google services</summary>
+<_summary>Provides an interface to Google services</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/geolocation/Makefile.am b/src/plugins/geolocation/Makefile.am
index db13f21..47ffab5 100644
--- a/src/plugins/geolocation/Makefile.am
+++ b/src/plugins/geolocation/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-geolocation.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-geolocation.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/geolocation/claws-mail-geolocation.metainfo.xml b/src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in
similarity index 72%
rename from src/plugins/geolocation/claws-mail-geolocation.metainfo.xml
rename to src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in
index b74d506..bfbed10 100644
--- a/src/plugins/geolocation/claws-mail-geolocation.metainfo.xml
+++ b/src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-geolocation</id>
 <extends>claws-mail.desktop</extends>
 <name>GeoLocation</name>
-<summary>Provides GeoLocation functionality</summary>
+<_summary>Provides GeoLocation functionality</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index e8fbbe4..19d38ed 100644
--- a/src/plugins/libravatar/Makefile.am
+++ b/src/plugins/libravatar/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-libravatar.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-libravatar.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/libravatar/claws-mail-libravatar.metainfo.xml b/src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in
similarity index 65%
rename from src/plugins/libravatar/claws-mail-libravatar.metainfo.xml
rename to src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in
index e07ccb7..36b50ab 100644
--- a/src/plugins/libravatar/claws-mail-libravatar.metainfo.xml
+++ b/src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-libravatar</id>
 <extends>claws-mail.desktop</extends>
 <name>Libravatar</name>
-<summary>Displays libravatar/gravatar profiles' images or a dynamically generated or predefined alternative</summary>
+<_summary>Displays libravatar/gravatar profiles' images or a dynamically generated or predefined alternative</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=libravatar</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 423fa2f..20608bc 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-mailmbox.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-mailmbox.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml b/src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in
similarity index 70%
rename from src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml
rename to src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in
index 6dc4b95..89b5900 100644
--- a/src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml
+++ b/src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-mailmbox</id>
 <extends>claws-mail.desktop</extends>
 <name>mailMBOX</name>
-<summary>Direct support for mailboxes in mbox format</summary>
+<_summary>Direct support for mailboxes in mbox format</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am
index 36b183d..8d363c0 100644
--- a/src/plugins/newmail/Makefile.am
+++ b/src/plugins/newmail/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-newmail.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-newmail.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/newmail/claws-mail-newmail.metainfo.xml b/src/plugins/newmail/claws-mail-newmail.metainfo.xml.in
similarity index 66%
rename from src/plugins/newmail/claws-mail-newmail.metainfo.xml
rename to src/plugins/newmail/claws-mail-newmail.metainfo.xml.in
index f68b472..9be5690 100644
--- a/src/plugins/newmail/claws-mail-newmail.metainfo.xml
+++ b/src/plugins/newmail/claws-mail-newmail.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-newmail</id>
 <extends>claws-mail.desktop</extends>
 <name>NewMail</name>
-<summary>Writes a msg header summary to a log file on arrival of new mail after sorting</summary>
+<_summary>Writes a msg header summary to a log file on arrival of new mail after sorting</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 4521a81..d7d1d34 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -2,9 +2,11 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-notification.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-notification.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
 
 if BUILD_HOTKEYS
 hotkey_lib = libcmnpgtkhotkey.la
@@ -15,7 +17,7 @@ hotkey_lib_path =
 endif
 
 SUBDIRS=gtkhotkey
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 CFLAGS += "-Wall"
 
 IFLAGS = \
diff --git a/src/plugins/notification/claws-mail-notification.metainfo.xml b/src/plugins/notification/claws-mail-notification.metainfo.xml.in
similarity index 69%
rename from src/plugins/notification/claws-mail-notification.metainfo.xml
rename to src/plugins/notification/claws-mail-notification.metainfo.xml.in
index 8b8712f..a54256b 100644
--- a/src/plugins/notification/claws-mail-notification.metainfo.xml
+++ b/src/plugins/notification/claws-mail-notification.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-notification</id>
 <extends>claws-mail.desktop</extends>
 <name>Notification</name>
-<summary>Provides various ways to notify the user of new and unread email</summary>
+<_summary>Provides various ways to notify the user of new and unread email</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=notification</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 275e7fc..44ab32f 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-pdf_viewer.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-pdf_viewer.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml b/src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in
similarity index 65%
rename from src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml
rename to src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in
index 3dff7ed..396eb11 100644
--- a/src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml
+++ b/src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-pdf_viewer</id>
 <extends>claws-mail.desktop</extends>
 <name>PDF Viewer</name>
-<summary>Enables the viewing of PDF and PostScript attachments using the Poppler library and GhostScript</summary>
+<_summary>Enables the viewing of PDF and PostScript attachments using the Poppler library and GhostScript</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=pdf_viewer</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 7d92785..bee013d 100644
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -2,9 +2,11 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-perl.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-perl.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
 
 SUBDIRS = tools
 
@@ -34,5 +36,5 @@ perl_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(PERL_CFLAGS)
 
-EXTRA_DIST = cm_perl.pod $(appdata_files)
+EXTRA_DIST = cm_perl.pod $(appdata_in_files)
 
diff --git a/src/plugins/perl/claws-mail-perl.metainfo.xml b/src/plugins/perl/claws-mail-perl.metainfo.xml.in
similarity index 68%
rename from src/plugins/perl/claws-mail-perl.metainfo.xml
rename to src/plugins/perl/claws-mail-perl.metainfo.xml.in
index 6c48c87..ea43683 100644
--- a/src/plugins/perl/claws-mail-perl.metainfo.xml
+++ b/src/plugins/perl/claws-mail-perl.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-perl</id>
 <extends>claws-mail.desktop</extends>
 <name>Perl</name>
-<summary>Allowing the use of full Perl power in email filters</summary>
+<_summary>Allowing the use of full Perl power in email filters</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index 50abc80..a3a51d1 100644
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -2,7 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-EXTRA_DIST = version.rc plugin.def claws.def
+appdata_in_files = claws-mail-pgpcore.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = version.rc plugin.def claws.def $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml b/src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in
similarity index 61%
copy from src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml
copy to src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in
index 71e6549..bcfc65b 100644
--- a/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml
+++ b/src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
-<id>claws-mail-pgpinline</id>
+<id>claws-mail-pgpcore</id>
 <extends>claws-mail.desktop</extends>
-<name>PGP/Inline</name>
-<summary>Handles PGP/Inline signed and/or encrypted mails</summary>
+<name>PGP/Core</name>
+<_summary>Handles core PGP functions and is a dependency of both the PGP/Inline and PGP/MIME plugins.</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=gpg</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index a471d53..17a0278 100644
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -2,11 +2,14 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-pgpinline.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-pgpinline.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps \
-						 $(appdata_files)
+	$(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml b/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in
similarity index 70%
rename from src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml
rename to src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in
index 71e6549..62ab433 100644
--- a/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml
+++ b/src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-pgpinline</id>
 <extends>claws-mail.desktop</extends>
 <name>PGP/Inline</name>
-<summary>Handles PGP/Inline signed and/or encrypted mails</summary>
+<_summary>Handles PGP/Inline signed and/or encrypted mails</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=gpg</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 124c682..22358bd 100644
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -2,11 +2,14 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-pgpmime.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-pgpmime.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps \
-						 $(appdata_files)
+	$(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml b/src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in
similarity index 70%
rename from src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml
rename to src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in
index ecb5762..e71de2d 100644
--- a/src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml
+++ b/src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-pgpmime</id>
 <extends>claws-mail.desktop</extends>
 <name>PGP/MIME</name>
-<summary>Handles PGP/MIME signed and/or encrypted mails</summary>
+<_summary>Handles PGP/MIME signed and/or encrypted mails</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=gpg</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index 87513f9..800e899 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-python.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
+appdata_in_files = claws-mail-python.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(appdata_in_files)
 
 SUBDIRS = examples
 
diff --git a/src/plugins/python/claws-mail-python.metainfo.xml b/src/plugins/python/claws-mail-python.metainfo.xml.in
similarity index 65%
rename from src/plugins/python/claws-mail-python.metainfo.xml
rename to src/plugins/python/claws-mail-python.metainfo.xml.in
index 7eb55d8..ebf6c61 100644
--- a/src/plugins/python/claws-mail-python.metainfo.xml
+++ b/src/plugins/python/claws-mail-python.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-python</id>
 <extends>claws-mail.desktop</extends>
 <name>Python</name>
-<summary>Offers a Python scripting. Code can be entered into an embedded Python console or stored</summary>
+<_summary>Offers a Python scripting. Code can be entered into an embedded Python console or stored</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=python</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 1c4a44e..7ca8a74 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-rssyl.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-rssyl.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/rssyl/claws-mail-rssyl.metainfo.xml b/src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in
similarity index 72%
rename from src/plugins/rssyl/claws-mail-rssyl.metainfo.xml
rename to src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in
index 5873c8b..2b5f713 100644
--- a/src/plugins/rssyl/claws-mail-rssyl.metainfo.xml
+++ b/src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-rssyl</id>
 <extends>claws-mail.desktop</extends>
 <name>RSSyl</name>
-<summary>Read your RSS favourite newsfeeds</summary>
+<_summary>Read your RSS favourite newsfeeds</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=rssyl</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index fe3661e..2b7a2a9 100644
--- a/src/plugins/smime/Makefile.am
+++ b/src/plugins/smime/Makefile.am
@@ -2,11 +2,14 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-smime.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-smime.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps \
-						 $(appdata_files)
+	$(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/smime/claws-mail-smime.metainfo.xml b/src/plugins/smime/claws-mail-smime.metainfo.xml.in
similarity index 70%
rename from src/plugins/smime/claws-mail-smime.metainfo.xml
rename to src/plugins/smime/claws-mail-smime.metainfo.xml.in
index 0511535..ad42c24 100644
--- a/src/plugins/smime/claws-mail-smime.metainfo.xml
+++ b/src/plugins/smime/claws-mail-smime.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-smime</id>
 <extends>claws-mail.desktop</extends>
 <name>S/MIME</name>
-<summary>Handles S/MIME signed and/or encrypted mails</summary>
+<_summary>Handles S/MIME signed and/or encrypted mails</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index c2ec35e..923f105 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-spam_report.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-spam_report.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/spam_report/claws-mail-spam_report.metainfo.xml b/src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in
similarity index 72%
rename from src/plugins/spam_report/claws-mail-spam_report.metainfo.xml
rename to src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in
index f7190e7..a42fbf8 100644
--- a/src/plugins/spam_report/claws-mail-spam_report.metainfo.xml
+++ b/src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-spam_report</id>
 <extends>claws-mail.desktop</extends>
 <name>SpamReport</name>
-<summary>Reports spam to various places</summary>
+<_summary>Reports spam to various places</_summary>
 <url type="homepage">http://claws-mail.org/plugins.php</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index 6d3996b..cbb56c8 100644
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -2,9 +2,11 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-spamassasin.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-spamassasin.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
 
 plugindir = $(pkglibdir)/plugins
 
@@ -38,4 +40,4 @@ spamassassin_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 
-EXTRA_DIST = README $(appdata_files)
+EXTRA_DIST = README $(appdata_in_files)
diff --git a/src/plugins/spamassassin/claws-mail-spamassasin.metainfo.xml b/src/plugins/spamassassin/claws-mail-spamassasin.metainfo.xml.in
similarity index 65%
rename from src/plugins/spamassassin/claws-mail-spamassasin.metainfo.xml
rename to src/plugins/spamassassin/claws-mail-spamassasin.metainfo.xml.in
index 73bec87..fc56661 100644
--- a/src/plugins/spamassassin/claws-mail-spamassasin.metainfo.xml
+++ b/src/plugins/spamassassin/claws-mail-spamassasin.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-spamassasin</id>
 <extends>claws-mail.desktop</extends>
 <name>SpamAssasin</name>
-<summary>Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL account using SpamAssassin</summary>
+<_summary>Enables the scanning of incoming mail received from a POP, IMAP, or LOCAL account using SpamAssassin</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=spamassasin</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index f1897fc..40fe3fe 100644
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -2,10 +2,13 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-tnef_parse.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+appdata_in_files = claws-mail-tnef_parse.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 if OS_WIN32
 
diff --git a/src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml b/src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in
similarity index 71%
rename from src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml
rename to src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in
index e870e7b..6e6dbbc 100644
--- a/src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml
+++ b/src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-tnef_parse</id>
 <extends>claws-mail.desktop</extends>
 <name>TNEF parse</name>
-<summary>Enables reading application/ms-tnef attachments</summary>
+<_summary>Enables reading application/ms-tnef attachments</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=tnef_parser</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index 759ef6f..b978ebf 100644
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -2,12 +2,14 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_files = claws-mail-vcalendar.metainfo.xml
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_files)
+appdata_in_files = claws-mail-vcalendar.metainfo.xml.in
+appdatadir=$(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+ at INTLTOOL_XML_RULE@
 
 SUBDIRS = libical
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
 
 IFLAGS = \
 	-I$(top_srcdir)/src \
diff --git a/src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml b/src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in
similarity index 65%
rename from src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml
rename to src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in
index 7319543..cfd7f84 100644
--- a/src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml
+++ b/src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain at gmail.com> -->
 <component type="addon">
 <id>claws-mail-vcalendar</id>
 <extends>claws-mail.desktop</extends>
 <name>vCalendar</name>
-<summary>Enables vCalendar message handling and handles webCal subscriptions. Provides a calendar import</summary>
+<_summary>Enables vCalendar message handling and handles webCal subscriptions. Provides a calendar import</_summary>
 <url type="homepage">http://claws-mail.org/plugin.php?plugin=vcalendar</url>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-3.0+</project_license>

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list