[Commits] [SCM] claws branch, new-rssyl, updated. 3.10.1-66-gaa39527
ticho at claws-mail.org
ticho at claws-mail.org
Sat Jun 14 17:49:48 CEST 2014
The branch new-rssyl of project "claws" (Claws Mail) has been updated
via aa39527c2b9e140df4afe62668d97ab2c544c65a (commit)
via eaf1e7a4176909b64ccea6dd43360eb3db73ce44 (commit)
via 99b9864050cdd500530743923c4d3de626f97f22 (commit)
via 4f405b0b6de3d11b610d3ebba5c7c28b046d6c34 (commit)
via c5bf669084880928dcc910820e3bbc968d4e0133 (commit)
via 8ac91cd9662e70115f9631604269a16d18374005 (commit)
via 384094e227d83f57c181b14b7a3d5349615fb691 (commit)
via 61caaa133793d0426731293ff8f815b0bf3ae650 (commit)
via 924b0a219b5b9fe627eec7ffae5584e35c6a8753 (commit)
via 3365505a87ec1701a72d444eb2bb9c33f09996e8 (commit)
via 88ca6fba85e1be41cf362cfa08c390e5a5eb934f (commit)
via 629049dc30bbab2517b57a811f47770d8ca0775e (commit)
via 732e1bb51df3568ffb9321d1f03d748b67a3a679 (commit)
from 8ae13785648bab36e191b84edb0ce86aa959c5f5 (commit)
Summary of changes:
.gitignore | 5 +
INSTALL | 2 +-
Makefile.am | 26 +-
autogen.sh | 6 +
...s-mail.appdata.xml => claws-mail.appdata.xml.in | 12 +-
claws-mail.desktop | 55 -
claws-mail.desktop.in | 27 +
configure.ac | 3 +-
po/Makefile.in.in | 453 -
po/POTFILES.in | 69 +-
po/POTFILES.skip | 5 +
po/bg.po |11954 +++++----
po/ca.po |12005 +++++----
po/cs.po |12064 +++++----
po/de.po |12077 +++++----
po/el.po |27165 +++++++++++++------
po/en_GB.po |11803 +++++----
po/eo.po |12056 +++++----
po/es.po |12074 +++++----
po/fi.po |12060 +++++----
po/fr.po |13567 +++++-----
po/he.po |12023 +++++----
po/hr.po |25201 +++++++++++++-----
po/hu.po |14144 +++++-----
po/id_ID.po |12069 +++++----
po/it.po |11998 +++++----
po/ja.po |12014 +++++----
po/ko.po |24761 +++++++++++++-----
po/lt.po |12026 +++++----
po/nb.po |27509 ++++++++++++++------
po/nl.po |12073 +++++----
po/pl.po |11919 +++++----
po/pt_BR.po |12089 +++++----
po/pt_PT.po |12014 +++++----
po/ru.po |12043 +++++----
po/sk.po |12072 +++++----
po/sr.po |21734 +++++++++++-----
po/sv.po |12078 +++++----
po/uk.po |12069 +++++----
po/zh_CN.po |12024 +++++----
po/zh_TW.po |12039 +++++----
src/avatars.c | 2 +-
src/ldapupdate.c | 6 +-
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 | 11 +-
...xml => claws-mail-attachwarner.metainfo.xml.in} | 4 +-
src/plugins/bogofilter/Makefile.am | 11 +-
...o.xml => claws-mail-bogofilter.metainfo.xml.in} | 4 +-
src/plugins/bsfilter/Makefile.am | 5 +-
...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 +-
99 files changed, 266717 insertions(+), 165087 deletions(-)
rename claws-mail.appdata.xml => claws-mail.appdata.xml.in (95%)
delete mode 100644 claws-mail.desktop
create mode 100644 claws-mail.desktop.in
delete mode 100644 po/Makefile.in.in
create mode 100644 po/POTFILES.skip
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 aa39527c2b9e140df4afe62668d97ab2c544c65a
Merge: 8ae1378 eaf1e7a
Author: Andrej Kacian <andrej at kacian.sk>
Date: Sat Jun 14 17:49:01 2014 +0200
Update from master
diff --cc po/POTFILES.in
index 55c4488,3fc673c..0c843af
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -124,43 -154,45 +154,54 @@@ src/plugins/pgpcore/plugin.
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/old_feeds.c
+src/plugins/rssyl/opml_import.c
src/plugins/rssyl/plugin.c
+src/plugins/rssyl/rssyl_add_item.c
src/plugins/rssyl/rssyl.c
src/plugins/rssyl/rssyl_cb_menu.c
+src/plugins/rssyl/rssyl_feed.c
+src/plugins/rssyl/rssyl_feed.h
+src/plugins/rssyl/rssyl_feed_props.c
src/plugins/rssyl/rssyl_gtk.c
src/plugins/rssyl/rssyl.h
src/plugins/rssyl/rssyl_prefs.c
+src/plugins/rssyl/rssyl_subscribe.c
+src/plugins/rssyl/rssyl_subscribe_gtk.c
+src/plugins/rssyl/rssyl_update_comments.c
+src/plugins/rssyl/rssyl_update_feed.c
+src/plugins/rssyl/rssyl_update_format.c
+ src/plugins/smime/claws-mail-smime.metainfo.xml.in
src/plugins/smime/plugin.c
src/plugins/smime/smime.c
- src/plugins/spam_report/spam_report_prefs.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
+ src/plugins/vcalendar/plugin.c
src/plugins/vcalendar/vcalendar.c
- src/plugins/vcalendar/vcal_prefs.c
src/plugins/vcalendar/vcal_folder.c
- src/plugins/vcalendar/vcal_meeting_gtk.c
src/plugins/vcalendar/vcal_manager.c
- src/plugins/vcalendar/day-view.c
- src/plugins/vcalendar/plugin.c
- src/plugins/vcalendar/month-view.c
+ src/plugins/vcalendar/vcal_meeting_gtk.c
+ src/plugins/vcalendar/vcal_prefs.c
src/pop.c
src/prefs_account.c
src/prefs_actions.c
diff --cc src/plugins/rssyl/Makefile.am
index 7d66184,ffc66c3..e116010
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@@ -2,12 -2,13 +2,15 @@@
# This file is part of Claws Mail package.
# See COPYING file for license details.
+SUBDIRS = libfeed
+
- 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)
+
+ @INTLTOOL_XML_RULE@
+
+ EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
IFLAGS = \
-I$(top_srcdir)/src \
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list