rebase translations

1 files changed, 72 insertions, 59 deletions

diff --git a/messages.pot b/messages.pot
index 9dd566b4e..d1248886c 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-18 16:09+0400\n"
+"POT-Creation-Date: 2014-07-17 20:09+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -160,7 +160,7 @@ msgstr ""
 #: js/prefs.js:653 js/prefs.js:854 js/prefs.js:1441 js/prefs.js:1494
 #: js/prefs.js:1534 js/prefs.js:1551 js/prefs.js:1567 js/prefs.js:1587
 #: js/prefs.js:1760 js/prefs.js:1776 js/prefs.js:1794 js/tt-rss.js:510
-#: js/tt-rss.js:527 js/viewfeed.js:854 js/viewfeed.js:1311
+#: js/tt-rss.js:527 js/viewfeed.js:855 js/viewfeed.js:1312
 #: plugins/import_export/import_export.js:17 plugins/updater/updater.js:17
 msgid "Loading, please wait..."
 msgstr ""
@@ -483,15 +483,15 @@ msgstr ""
 msgid "Article"
 msgstr ""
 
-#: include/functions2.php:60 js/viewfeed.js:1975
+#: include/functions2.php:60 js/viewfeed.js:1992
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions2.php:61 js/viewfeed.js:1986
+#: include/functions2.php:61 js/viewfeed.js:2003
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions2.php:62 js/viewfeed.js:1964
+#: include/functions2.php:62 js/viewfeed.js:1981
 msgid "Toggle unread"
 msgstr ""
 
@@ -511,11 +511,11 @@ msgstr ""
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions2.php:67 js/viewfeed.js:2005
+#: include/functions2.php:67 js/viewfeed.js:2022
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions2.php:68 js/viewfeed.js:1999
+#: include/functions2.php:68 js/viewfeed.js:2016
 msgid "Mark above as read"
 msgstr ""
 
@@ -656,44 +656,44 @@ msgstr ""
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions2.php:649
+#: include/functions2.php:651
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions2.php:1261 classes/feeds.php:708
+#: include/functions2.php:1263 classes/feeds.php:708
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/functions2.php:1265 classes/feeds.php:712
+#: include/functions2.php:1267 classes/feeds.php:712
 msgid "comments"
 msgstr ""
 
-#: include/functions2.php:1306
+#: include/functions2.php:1308
 msgid " - "
 msgstr ""
 
-#: include/functions2.php:1339 include/functions2.php:1587
+#: include/functions2.php:1341 include/functions2.php:1589
 #: classes/article.php:280
 msgid "no tags"
 msgstr ""
 
-#: include/functions2.php:1349 classes/feeds.php:694
+#: include/functions2.php:1351 classes/feeds.php:694
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions2.php:1381 classes/feeds.php:646
+#: include/functions2.php:1383 classes/feeds.php:646
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions2.php:1394 classes/feeds.php:659
+#: include/functions2.php:1396 classes/feeds.php:659
 #: classes/pref/feeds.php:569
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions2.php:1428 classes/dlg.php:36 classes/dlg.php:59
+#: include/functions2.php:1430 classes/dlg.php:36 classes/dlg.php:59
 #: classes/dlg.php:92 classes/dlg.php:158 classes/dlg.php:189
 #: classes/dlg.php:216 classes/dlg.php:249 classes/dlg.php:261
 #: classes/backend.php:105 classes/pref/users.php:95
@@ -705,19 +705,19 @@ msgstr ""
 msgid "Close this window"
 msgstr ""
 
-#: include/functions2.php:1624
+#: include/functions2.php:1626
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions2.php:1870
+#: include/functions2.php:1874
 msgid "unknown type"
 msgstr ""
 
-#: include/functions2.php:1930
+#: include/functions2.php:1942
 msgid "Attachments"
 msgstr ""
 
-#: include/functions2.php:2381
+#: include/functions2.php:2394
 #, php-format
 msgid "LibXML error %s at line %d (column %d): %s"
 msgstr ""
@@ -821,7 +821,8 @@ msgstr ""
 #: classes/pref/labels.php:79 classes/pref/filters.php:423
 #: classes/pref/prefs.php:986 classes/pref/feeds.php:773
 #: classes/pref/feeds.php:900 plugins/nsfw/init.php:85
-#: plugins/note/init.php:51 plugins/instances/init.php:245
+#: plugins/mail/init.php:64 plugins/note/init.php:51
+#: plugins/instances/init.php:245
 msgid "Save"
 msgstr ""
 
@@ -832,7 +833,7 @@ msgstr ""
 #: classes/pref/filters.php:825 classes/pref/filters.php:906
 #: classes/pref/filters.php:973 classes/pref/prefs.php:988
 #: classes/pref/feeds.php:774 classes/pref/feeds.php:903
-#: classes/pref/feeds.php:1817 plugins/mail/init.php:129
+#: classes/pref/feeds.php:1817 plugins/mail/init.php:181
 #: plugins/note/init.php:53 plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 msgid "Cancel"
@@ -1099,7 +1100,7 @@ msgid "Delete"
 msgstr ""
 
 #: classes/feeds.php:119 classes/feeds.php:124 plugins/mailto/init.php:25
-#: plugins/mail/init.php:26
+#: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr ""
 
@@ -2347,11 +2348,11 @@ msgid "Old password is incorrect."
 msgstr ""
 
 #: plugins/mailto/init.php:49 plugins/mailto/init.php:55
-#: plugins/mail/init.php:64 plugins/mail/init.php:70
+#: plugins/mail/init.php:112 plugins/mail/init.php:118
 msgid "[Forwarded]"
 msgstr ""
 
-#: plugins/mailto/init.php:49 plugins/mail/init.php:64
+#: plugins/mailto/init.php:49 plugins/mail/init.php:112
 msgid "Multiple articles"
 msgstr ""
 
@@ -2458,19 +2459,31 @@ msgstr ""
 msgid "No file uploaded."
 msgstr ""
 
-#: plugins/mail/init.php:90
+#: plugins/mail/init.php:28
+msgid "Mail addresses saved."
+msgstr ""
+
+#: plugins/mail/init.php:34
+msgid "Mail plugin"
+msgstr ""
+
+#: plugins/mail/init.php:36
+msgid "You can set predefined email addressed here (comma-separated list):"
+msgstr ""
+
+#: plugins/mail/init.php:138
 msgid "From:"
 msgstr ""
 
-#: plugins/mail/init.php:99
+#: plugins/mail/init.php:149
 msgid "To:"
 msgstr ""
 
-#: plugins/mail/init.php:112
+#: plugins/mail/init.php:164
 msgid "Subject:"
 msgstr ""
 
-#: plugins/mail/init.php:128
+#: plugins/mail/init.php:180
 msgid "Send e-mail"
 msgstr ""
 
@@ -3143,133 +3156,133 @@ msgstr ""
 msgid "New version available!"
 msgstr ""
 
-#: js/viewfeed.js:113
+#: js/viewfeed.js:114
 msgid "Cancel search"
 msgstr ""
 
-#: js/viewfeed.js:471
+#: js/viewfeed.js:472
 msgid "Unstar article"
 msgstr ""
 
-#: js/viewfeed.js:475
+#: js/viewfeed.js:476
 msgid "Star article"
 msgstr ""
 
-#: js/viewfeed.js:529
+#: js/viewfeed.js:530
 msgid "Unpublish article"
 msgstr ""
 
-#: js/viewfeed.js:533
+#: js/viewfeed.js:534
 msgid "Publish article"
 msgstr ""
 
-#: js/viewfeed.js:685
+#: js/viewfeed.js:686
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:757 js/viewfeed.js:785 js/viewfeed.js:812 js/viewfeed.js:877
-#: js/viewfeed.js:911 js/viewfeed.js:1033 js/viewfeed.js:1076
-#: js/viewfeed.js:1129 js/viewfeed.js:2255 plugins/mailto/init.js:7
+#: js/viewfeed.js:758 js/viewfeed.js:786 js/viewfeed.js:813 js/viewfeed.js:878
+#: js/viewfeed.js:912 js/viewfeed.js:1034 js/viewfeed.js:1077
+#: js/viewfeed.js:1130 js/viewfeed.js:2272 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr ""
 
-#: js/viewfeed.js:1041
+#: js/viewfeed.js:1042
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1043
+#: js/viewfeed.js:1044
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1085
+#: js/viewfeed.js:1086
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1088
+#: js/viewfeed.js:1089
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1090
+#: js/viewfeed.js:1091
 msgid ""
 "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1135
+#: js/viewfeed.js:1136
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1159
+#: js/viewfeed.js:1160
 msgid "Edit article Tags"
 msgstr ""
 
-#: js/viewfeed.js:1165
+#: js/viewfeed.js:1166
 msgid "Saving article tags..."
 msgstr ""
 
-#: js/viewfeed.js:1404
+#: js/viewfeed.js:1421
 msgid "No article is selected."
 msgstr ""
 
-#: js/viewfeed.js:1439
+#: js/viewfeed.js:1456
 msgid "No articles found to mark"
 msgstr ""
 
-#: js/viewfeed.js:1441
+#: js/viewfeed.js:1458
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/viewfeed.js:1950
+#: js/viewfeed.js:1967
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1956
+#: js/viewfeed.js:1973
 msgid "Display article URL"
 msgstr ""
 
-#: js/viewfeed.js:2056
+#: js/viewfeed.js:2073
 msgid "Assign label"
 msgstr ""
 
-#: js/viewfeed.js:2061
+#: js/viewfeed.js:2078
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:2148
+#: js/viewfeed.js:2165
 msgid "Select articles in group"
 msgstr ""
 
-#: js/viewfeed.js:2157
+#: js/viewfeed.js:2174
 msgid "Mark group as read"
 msgstr ""
 
-#: js/viewfeed.js:2169
+#: js/viewfeed.js:2186
 msgid "Mark feed as read"
 msgstr ""
 
-#: js/viewfeed.js:2224
+#: js/viewfeed.js:2241
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:2266
+#: js/viewfeed.js:2283
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/viewfeed.js:2299
+#: js/viewfeed.js:2316
 msgid "Article URL:"
 msgstr ""