talons

commit 80a4bf8386305896d042dcc3763743cd8ae967dc
parent 34f23bba1c219297bf8d60d0487918f23660a18b
Author: Paul <paul@claws-mail.org>
Date:   Mon, 27 Oct 2014 17:21:34 +0000

Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

Conflicts:
	po/bg.po

Diffstat:
M
po/bg.po
 | 
35
+++++++++++++++++++++++++++++++++++
M
po/de.po
 | 
2
+-
M
src/plugins/rssyl/libfeed/feed.c
 | 
1
+

3 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/po/bg.po b/po/bg.po
@@ -18922,3 +18922,38 @@ msgid ""
 msgstr ""
 "Програмата е готова\n"
 "Натиснете \"Запазване\""
+
+#~ msgid "E-mail client"
+#~ msgstr "Пощенски клиент"
+
+#~ msgid "Lightweight and Fast GTK+ based Mail Client"
+#~ msgstr "Лек и бърз пощенски клиент"
+
+#~ msgid ""
+#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
+#~ msgstr ""
+#~ "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;лек;"
+#~ "бърз;поща"
+
+#~ msgid "Claws Mail is a fast, powerful and very extensible email client."
+#~ msgstr "Claws Mail е бърз, мощен и настройваем пощенски клиент."
+
+#~ msgid ""
+#~ "Allows saving outgoing addresses to a designated folder in the address "
+#~ "book"
+#~ msgstr "Позволява запазване на изходящите адреси в указана папка в адресник"
+
+#~ msgid "Allows to make tars or zips of old folders"
+#~ msgstr "Позволява създаване на архиви на старите папки"
+
+#~ msgid "Lets you remove attachments from emails"
+#~ msgstr "Премахване на прикрепени файлове от писмата"
+
+#~ msgid "Provides an interface to Google services"
+#~ msgstr "Осигуряване на връзка с услугите на Гугъл"
+
+#~ msgid "Provides GeoLocation functionality"
+#~ msgstr "Осигуряване на възможност за геолокация"
+
+#~ msgid "Reports spam to various places"
+#~ msgstr "Докладване за спам на различни места"
diff --git a/po/de.po b/po/de.po
@@ -37,7 +37,7 @@ msgstr "Schlankes und sehr schnelles GTK+-basiertes Email-Programm"
 
 #: ../claws-mail.desktop.in.h:3
 msgid "lightweight;fast;gui;extensible;plugin;pop;pop3;imap;imap4;nntp;news;"
-msgstr "schlank;schnell;gui;erweiterbar;plugin;pop;pop3;imap;imap4;nntp;news"
+msgstr "schlank;schnell;gui;erweiterbar;plugin;pop;pop3;imap;imap4;nntp;news;"
 
 #: ../appdata/claws-mail.appdata.xml.in.h:1
 msgid "Claws Mail is a fast, powerful and very extensible email client."
diff --git a/src/plugins/rssyl/libfeed/feed.c b/src/plugins/rssyl/libfeed/feed.c
@@ -250,6 +250,7 @@ guint feed_update(Feed *feed, time_t last_update)
 	curl_easy_setopt(eh, CURLOPT_NOSIGNAL, 1);
 	curl_easy_setopt(eh, CURLOPT_ENCODING, "");
 	curl_easy_setopt(eh, CURLOPT_USERAGENT, "libfeed 0.1");
+	curl_easy_setopt(eh, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
 
 	/* Use HTTP's If-Modified-Since feature, if application provided
 	 * the timestamp of last update. */