Browse Source

fix xgettext extraction of plural forms, replace wrong ngettext() calls with _ngettext(), rebase translations

Andrew Dolgov 6 years ago
parent
commit
d3b0e3487e
40 changed files with 4284 additions and 3595 deletions
  1. 1 1
      include/feedbrowser.php
  2. BIN
      locale/ca_CA/LC_MESSAGES/messages.mo
  3. 197 184
      locale/ca_CA/LC_MESSAGES/messages.po
  4. BIN
      locale/cs_CZ/LC_MESSAGES/messages.mo
  5. 231 189
      locale/cs_CZ/LC_MESSAGES/messages.po
  6. BIN
      locale/de_DE/LC_MESSAGES/messages.mo
  7. 228 189
      locale/de_DE/LC_MESSAGES/messages.po
  8. BIN
      locale/es_ES/LC_MESSAGES/messages.mo
  9. 227 189
      locale/es_ES/LC_MESSAGES/messages.po
  10. BIN
      locale/fi_FI/LC_MESSAGES/messages.mo
  11. 227 189
      locale/fi_FI/LC_MESSAGES/messages.po
  12. BIN
      locale/fr_FR/LC_MESSAGES/messages.mo
  13. 228 189
      locale/fr_FR/LC_MESSAGES/messages.po
  14. BIN
      locale/hu_HU/LC_MESSAGES/messages.mo
  15. 227 189
      locale/hu_HU/LC_MESSAGES/messages.po
  16. BIN
      locale/it_IT/LC_MESSAGES/messages.mo
  17. 212 184
      locale/it_IT/LC_MESSAGES/messages.po
  18. BIN
      locale/ja_JP/LC_MESSAGES/messages.mo
  19. 223 189
      locale/ja_JP/LC_MESSAGES/messages.po
  20. BIN
      locale/ko_KR/LC_MESSAGES/messages.mo
  21. 224 189
      locale/ko_KR/LC_MESSAGES/messages.po
  22. BIN
      locale/lv_LV/LC_MESSAGES/messages.mo
  23. 212 184
      locale/lv_LV/LC_MESSAGES/messages.po
  24. BIN
      locale/nb_NO/LC_MESSAGES/messages.mo
  25. 197 184
      locale/nb_NO/LC_MESSAGES/messages.po
  26. BIN
      locale/nl_NL/LC_MESSAGES/messages.mo
  27. 227 189
      locale/nl_NL/LC_MESSAGES/messages.po
  28. BIN
      locale/pl_PL/LC_MESSAGES/messages.mo
  29. 232 189
      locale/pl_PL/LC_MESSAGES/messages.po
  30. BIN
      locale/pt_BR/LC_MESSAGES/messages.mo
  31. 347 239
      locale/pt_BR/LC_MESSAGES/messages.po
  32. BIN
      locale/ru_RU/LC_MESSAGES/messages.mo
  33. 198 184
      locale/ru_RU/LC_MESSAGES/messages.po
  34. BIN
      locale/sv_SE/LC_MESSAGES/messages.mo
  35. 228 189
      locale/sv_SE/LC_MESSAGES/messages.po
  36. BIN
      locale/zh_CN/LC_MESSAGES/messages.mo
  37. 209 184
      locale/zh_CN/LC_MESSAGES/messages.po
  38. 205 168
      messages.pot
  39. 3 3
      plugins/import_export/init.php
  40. 1 1
      utils/update-translations.sh

+ 1 - 1
include/feedbrowser.php

@@ -80,7 +80,7 @@
 				$class = ($feedctr % 2) ? "even" : "odd";
 
 				if ($line['articles_archived'] > 0) {
-					$archived = sprintf(ngettext("%d archived article", "%d archived articles", $line['articles_archived']), $line['articles_archived']);
+					$archived = sprintf(_ngettext("%d archived article", "%d archived articles", $line['articles_archived']), $line['articles_archived']);
 					$archived = "&nbsp;<span class='subscribers'>($archived)</span>";
 				} else {
 					$archived = '';

BIN
locale/ca_CA/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 197 - 184
locale/ca_CA/LC_MESSAGES/messages.po


BIN
locale/cs_CZ/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 231 - 189
locale/cs_CZ/LC_MESSAGES/messages.po


BIN
locale/de_DE/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 228 - 189
locale/de_DE/LC_MESSAGES/messages.po


BIN
locale/es_ES/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 227 - 189
locale/es_ES/LC_MESSAGES/messages.po


BIN
locale/fi_FI/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 227 - 189
locale/fi_FI/LC_MESSAGES/messages.po


BIN
locale/fr_FR/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 228 - 189
locale/fr_FR/LC_MESSAGES/messages.po


BIN
locale/hu_HU/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 227 - 189
locale/hu_HU/LC_MESSAGES/messages.po


BIN
locale/it_IT/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 212 - 184
locale/it_IT/LC_MESSAGES/messages.po


BIN
locale/ja_JP/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 223 - 189
locale/ja_JP/LC_MESSAGES/messages.po


BIN
locale/ko_KR/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 224 - 189
locale/ko_KR/LC_MESSAGES/messages.po


BIN
locale/lv_LV/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 212 - 184
locale/lv_LV/LC_MESSAGES/messages.po


BIN
locale/nb_NO/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 197 - 184
locale/nb_NO/LC_MESSAGES/messages.po


BIN
locale/nl_NL/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 227 - 189
locale/nl_NL/LC_MESSAGES/messages.po


BIN
locale/pl_PL/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 232 - 189
locale/pl_PL/LC_MESSAGES/messages.po


BIN
locale/pt_BR/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 347 - 239
locale/pt_BR/LC_MESSAGES/messages.po


BIN
locale/ru_RU/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 198 - 184
locale/ru_RU/LC_MESSAGES/messages.po


BIN
locale/sv_SE/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 228 - 189
locale/sv_SE/LC_MESSAGES/messages.po


BIN
locale/zh_CN/LC_MESSAGES/messages.mo


File diff suppressed because it is too large
+ 209 - 184
locale/zh_CN/LC_MESSAGES/messages.po


+ 205 - 168
messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-17 12:31+0400\n"
+"POT-Creation-Date: 2013-09-02 13:07+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -154,8 +154,8 @@ msgstr ""
 
 #: index.php:129 index.php:146 index.php:268 prefs.php:98
 #: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:683 classes/pref/feeds.php:1361 js/feedlist.js:129
-#: js/feedlist.js:453 js/functions.js:446 js/functions.js:784
+#: classes/pref/filters.php:683 classes/pref/feeds.php:1361 js/feedlist.js:126
+#: js/feedlist.js:450 js/functions.js:446 js/functions.js:784
 #: js/functions.js:1194 js/functions.js:1330 js/functions.js:1642
 #: 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
@@ -181,11 +181,11 @@ msgstr ""
 msgid "All Articles"
 msgstr ""
 
-#: index.php:168 include/functions.php:2035 classes/feeds.php:101
+#: index.php:168 include/functions.php:2064 classes/feeds.php:101
 msgid "Starred"
 msgstr ""
 
-#: index.php:169 include/functions.php:2036 classes/feeds.php:102
+#: index.php:169 include/functions.php:2065 classes/feeds.php:102
 msgid "Published"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: index.php:186 index.php:234 include/functions.php:2025
-#: classes/feeds.php:106 classes/feeds.php:432 js/FeedTree.js:128
+#: index.php:186 index.php:234 include/functions.php:2054
+#: classes/feeds.php:106 classes/feeds.php:433 js/FeedTree.js:128
 #: js/FeedTree.js:156
 msgid "Mark as read"
 msgstr ""
@@ -267,7 +267,7 @@ msgstr ""
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:229 classes/handler/public.php:589
+#: index.php:229 classes/handler/public.php:594
 msgid "Subscribe to feed..."
 msgstr ""
 
@@ -296,7 +296,7 @@ msgstr ""
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:237 include/functions.php:2011
+#: index.php:237 include/functions.php:2040
 msgid "Toggle widescreen mode"
 msgstr ""
 
@@ -320,7 +320,7 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:33 prefs.php:116 include/functions.php:2038
+#: prefs.php:33 prefs.php:116 include/functions.php:2067
 #: classes/pref/prefs.php:440
 msgid "Preferences"
 msgstr ""
@@ -342,7 +342,7 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:125 include/functions.php:1197 include/functions.php:1860
+#: prefs.php:125 include/functions.php:1226 include/functions.php:1889
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
@@ -365,10 +365,10 @@ msgstr ""
 
 #: register.php:196 register.php:241 register.php:254 register.php:269
 #: register.php:288 register.php:336 register.php:346 register.php:358
-#: classes/handler/public.php:659 classes/handler/public.php:750
-#: classes/handler/public.php:834 classes/handler/public.php:911
-#: classes/handler/public.php:925 classes/handler/public.php:932
-#: classes/handler/public.php:957
+#: classes/handler/public.php:664 classes/handler/public.php:755
+#: classes/handler/public.php:839 classes/handler/public.php:916
+#: classes/handler/public.php:930 classes/handler/public.php:937
+#: classes/handler/public.php:962
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -387,11 +387,11 @@ msgstr ""
 msgid "Check availability"
 msgstr ""
 
-#: register.php:228 classes/handler/public.php:792
+#: register.php:228 classes/handler/public.php:797
 msgid "Email:"
 msgstr ""
 
-#: register.php:231 classes/handler/public.php:797
+#: register.php:231 classes/handler/public.php:802
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -423,9 +423,9 @@ msgstr ""
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: include/digest.php:109 include/functions.php:1206
-#: include/functions.php:1761 include/functions.php:1846
-#: include/functions.php:1868 classes/opml.php:421 classes/pref/feeds.php:225
+#: include/digest.php:109 include/functions.php:1235
+#: include/functions.php:1790 include/functions.php:1875
+#: include/functions.php:1897 classes/opml.php:421 classes/pref/feeds.php:225
 msgid "Uncategorized"
 msgstr ""
 
@@ -440,279 +440,289 @@ msgstr[1] ""
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:1195 include/functions.php:1858
+#: include/functions.php:1224 include/functions.php:1887
 msgid "Special"
 msgstr ""
 
-#: include/functions.php:1709 classes/feeds.php:1103
+#: include/functions.php:1738 classes/feeds.php:1116
 #: classes/pref/filters.php:429
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1942
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1915
+#: include/functions.php:1944
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1917
+#: include/functions.php:1946
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1919 include/functions.php:2033
+#: include/functions.php:1948 include/functions.php:2062
 msgid "All articles"
 msgstr ""
 
-#: include/functions.php:1921
+#: include/functions.php:1950
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1923
+#: include/functions.php:1952
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1985
+#: include/functions.php:2014
 msgid "Navigation"
 msgstr ""
 
-#: include/functions.php:1986
+#: include/functions.php:2015
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1987
+#: include/functions.php:2016
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1988
+#: include/functions.php:2017
 msgid "Open next article"
 msgstr ""
 
-#: include/functions.php:1989
+#: include/functions.php:2018
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions.php:1990
+#: include/functions.php:2019
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1991
+#: include/functions.php:2020
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1992
+#: include/functions.php:2021
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1993
+#: include/functions.php:2022
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1994
+#: include/functions.php:2023
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions.php:1995
+#: include/functions.php:2024
 msgid "Article"
 msgstr ""
 
-#: include/functions.php:1996 js/viewfeed.js:1973
+#: include/functions.php:2025 js/viewfeed.js:1973
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions.php:1997 js/viewfeed.js:1984
+#: include/functions.php:2026 js/viewfeed.js:1984
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions.php:1998 js/viewfeed.js:1962
+#: include/functions.php:2027 js/viewfeed.js:1962
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1999
+#: include/functions.php:2028
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions.php:2000
+#: include/functions.php:2029
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions.php:2001
+#: include/functions.php:2030
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions.php:2002
+#: include/functions.php:2031
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:2003 js/viewfeed.js:2003
+#: include/functions.php:2032 js/viewfeed.js:2003
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:2004 js/viewfeed.js:1997
+#: include/functions.php:2033 js/viewfeed.js:1997
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:2005
+#: include/functions.php:2034
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:2006
+#: include/functions.php:2035
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:2007
+#: include/functions.php:2036
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions.php:2008
+#: include/functions.php:2037
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:2009
+#: include/functions.php:2038
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions.php:2010
+#: include/functions.php:2039
 msgid "Toggle article expansion (combined mode)"
 msgstr ""
 
-#: include/functions.php:2012 plugins/embed_original/init.php:31
+#: include/functions.php:2041 plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions.php:2013
+#: include/functions.php:2042
 msgid "Article selection"
 msgstr ""
 
-#: include/functions.php:2014
+#: include/functions.php:2043
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:2015
+#: include/functions.php:2044
 msgid "Select unread"
 msgstr ""
 
-#: include/functions.php:2016
+#: include/functions.php:2045
 msgid "Select starred"
 msgstr ""
 
-#: include/functions.php:2017
+#: include/functions.php:2046
 msgid "Select published"
 msgstr ""
 
-#: include/functions.php:2018
+#: include/functions.php:2047
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions.php:2019
+#: include/functions.php:2048
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:2020 classes/pref/feeds.php:549
+#: include/functions.php:2049 classes/pref/feeds.php:549
 #: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr ""
 
-#: include/functions.php:2021
+#: include/functions.php:2050
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions.php:2022
+#: include/functions.php:2051
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions.php:2023 classes/pref/feeds.php:1308
+#: include/functions.php:2052 classes/pref/feeds.php:1308
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:2024 js/FeedTree.js:135 js/PrefFeedTree.js:68
+#: include/functions.php:2053 js/FeedTree.js:135 js/PrefFeedTree.js:68
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions.php:2026
+#: include/functions.php:2055
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:2027
+#: include/functions.php:2056
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions.php:2028 js/FeedTree.js:178
+#: include/functions.php:2057 js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions.php:2029
+#: include/functions.php:2058
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions.php:2030
+#: include/functions.php:2059
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions.php:2031
+#: include/functions.php:2060
 msgid "Toggle auto expand in combined mode"
 msgstr ""
 
-#: include/functions.php:2032
+#: include/functions.php:2061
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:2034
+#: include/functions.php:2063
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:2037 js/tt-rss.js:460 js/tt-rss.js:645
+#: include/functions.php:2066 js/tt-rss.js:460 js/tt-rss.js:649
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions.php:2039
+#: include/functions.php:2068
 msgid "Other"
 msgstr ""
 
-#: include/functions.php:2040 classes/pref/labels.php:281
+#: include/functions.php:2069 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:2041 classes/pref/filters.php:657
+#: include/functions.php:2070 classes/pref/filters.php:657
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:2042
+#: include/functions.php:2071
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions.php:2043
+#: include/functions.php:2072
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions.php:2579
+#: include/functions.php:2617
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:3194
+#: include/functions.php:3224 classes/feeds.php:706
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/functions.php:3228 classes/feeds.php:710
+msgid "comments"
+msgstr ""
+
+#: include/functions.php:3263
 msgid " - "
 msgstr ""
 
-#: include/functions.php:3216 include/functions.php:3457
+#: include/functions.php:3296 include/functions.php:3544
 #: classes/article.php:281
 msgid "no tags"
 msgstr ""
 
-#: include/functions.php:3226 classes/feeds.php:682
+#: include/functions.php:3306 classes/feeds.php:692
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions.php:3258 classes/feeds.php:634
+#: include/functions.php:3338 classes/feeds.php:644
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3271 classes/feeds.php:647 classes/pref/feeds.php:568
+#: include/functions.php:3351 classes/feeds.php:657 classes/pref/feeds.php:568
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions.php:3303 classes/dlg.php:37 classes/dlg.php:60
+#: include/functions.php:3385 classes/dlg.php:37 classes/dlg.php:60
 #: classes/dlg.php:93 classes/dlg.php:159 classes/dlg.php:190
 #: classes/dlg.php:217 classes/dlg.php:250 classes/dlg.php:262
 #: classes/backend.php:105 classes/pref/users.php:95
@@ -724,29 +734,29 @@ msgstr ""
 msgid "Close this window"
 msgstr ""
 
-#: include/functions.php:3494
+#: include/functions.php:3581
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3729
+#: include/functions.php:3817
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:3785
+#: include/functions.php:3877
 msgid "Attachments"
 msgstr ""
 
-#: include/functions.php:4304
+#: include/functions.php:4357
 #, php-format
 msgid "LibXML error %s at line %d (column %d): %s"
 msgstr ""
 
-#: include/login_form.php:183 classes/handler/public.php:501
-#: classes/handler/public.php:787
+#: include/login_form.php:183 classes/handler/public.php:506
+#: classes/handler/public.php:792
 msgid "Login:"
 msgstr ""
 
-#: include/login_form.php:193 classes/handler/public.php:504
+#: include/login_form.php:193 classes/handler/public.php:509
 msgid "Password:"
 msgstr ""
 
@@ -758,7 +768,7 @@ msgstr ""
 msgid "Profile:"
 msgstr ""
 
-#: include/login_form.php:209 classes/handler/public.php:257
+#: include/login_form.php:209 classes/handler/public.php:258
 #: classes/rpc.php:63 classes/pref/prefs.php:1038
 msgid "Default profile"
 msgstr ""
@@ -775,7 +785,7 @@ msgstr ""
 msgid "Remember me"
 msgstr ""
 
-#: include/login_form.php:235 classes/handler/public.php:509
+#: include/login_form.php:235 classes/handler/public.php:514
 msgid "Log in"
 msgstr ""
 
@@ -815,9 +825,9 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: classes/article.php:206 classes/handler/public.php:478
-#: classes/handler/public.php:512 classes/feeds.php:1030
-#: classes/feeds.php:1082 classes/feeds.php:1142 classes/pref/users.php:170
+#: classes/article.php:206 classes/handler/public.php:483
+#: classes/handler/public.php:517 classes/feeds.php:1043
+#: classes/feeds.php:1095 classes/feeds.php:1155 classes/pref/users.php:170
 #: classes/pref/labels.php:81 classes/pref/filters.php:410
 #: classes/pref/filters.php:806 classes/pref/filters.php:882
 #: classes/pref/filters.php:949 classes/pref/prefs.php:986
@@ -828,115 +838,115 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: classes/handler/public.php:442 plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:447 plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr ""
 
-#: classes/handler/public.php:450
+#: classes/handler/public.php:455
 msgid "Title:"
 msgstr ""
 
-#: classes/handler/public.php:452 classes/pref/feeds.php:566
+#: classes/handler/public.php:457 classes/pref/feeds.php:566
 #: plugins/instances/init.php:212 plugins/instances/init.php:401
 msgid "URL:"
 msgstr ""
 
-#: classes/handler/public.php:454
+#: classes/handler/public.php:459
 msgid "Content:"
 msgstr ""
 
-#: classes/handler/public.php:456
+#: classes/handler/public.php:461
 msgid "Labels:"
 msgstr ""
 
-#: classes/handler/public.php:475
+#: classes/handler/public.php:480
 msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:482
 msgid "Share"
 msgstr ""
 
-#: classes/handler/public.php:499
+#: classes/handler/public.php:504
 msgid "Not logged in"
 msgstr ""
 
-#: classes/handler/public.php:558
+#: classes/handler/public.php:563
 msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/handler/public.php:595 classes/handler/public.php:693
+#: classes/handler/public.php:600 classes/handler/public.php:698
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:598 classes/handler/public.php:684
+#: classes/handler/public.php:603 classes/handler/public.php:689
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:601 classes/handler/public.php:687
+#: classes/handler/public.php:606 classes/handler/public.php:692
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:604 classes/handler/public.php:690
+#: classes/handler/public.php:609 classes/handler/public.php:695
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/handler/public.php:607 classes/handler/public.php:696
+#: classes/handler/public.php:612 classes/handler/public.php:701
 msgid "Multiple feed URLs found."
 msgstr ""
 
-#: classes/handler/public.php:611 classes/handler/public.php:703
+#: classes/handler/public.php:616 classes/handler/public.php:708
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/handler/public.php:629 classes/handler/public.php:721
+#: classes/handler/public.php:634 classes/handler/public.php:726
 msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/handler/public.php:654 classes/handler/public.php:745
+#: classes/handler/public.php:659 classes/handler/public.php:750
 msgid "Edit subscription options"
 msgstr ""
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:779
 msgid "Password recovery"
 msgstr ""
 
-#: classes/handler/public.php:780
+#: classes/handler/public.php:785
 msgid ""
 "You will need to provide valid account name and email. New password will be "
 "sent on your email address."
 msgstr ""
 
-#: classes/handler/public.php:802 classes/pref/users.php:352
+#: classes/handler/public.php:807 classes/pref/users.php:352
 msgid "Reset password"
 msgstr ""
 
-#: classes/handler/public.php:812
+#: classes/handler/public.php:817
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/handler/public.php:816 classes/handler/public.php:842
+#: classes/handler/public.php:821 classes/handler/public.php:847
 msgid "Go back"
 msgstr ""
 
-#: classes/handler/public.php:838
+#: classes/handler/public.php:843
 msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/handler/public.php:860
+#: classes/handler/public.php:865
 msgid "Your access level is insufficient to run this script."
 msgstr ""
 
-#: classes/handler/public.php:884
+#: classes/handler/public.php:889
 msgid "Database Updater"
 msgstr ""
 
-#: classes/handler/public.php:949
+#: classes/handler/public.php:954
 msgid "Perform updates"
 msgstr ""
 
@@ -1097,7 +1107,7 @@ msgstr ""
 msgid "Feed:"
 msgstr ""
 
-#: classes/feeds.php:200 classes/feeds.php:830
+#: classes/feeds.php:200 classes/feeds.php:843
 msgid "Feed not found."
 msgstr ""
 
@@ -1105,130 +1115,130 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: classes/feeds.php:373
+#: classes/feeds.php:374
 #, php-format
 msgid "Imported at %s"
 msgstr ""
 
-#: classes/feeds.php:526
+#: classes/feeds.php:527
 msgid "mark as read"
 msgstr ""
 
-#: classes/feeds.php:576
+#: classes/feeds.php:584
 msgid "Collapse article"
 msgstr ""
 
-#: classes/feeds.php:731
+#: classes/feeds.php:744
 msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/feeds.php:734
+#: classes/feeds.php:747
 msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/feeds.php:737
+#: classes/feeds.php:750
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:741
+#: classes/feeds.php:754
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "from article header context menu (applies to all selected articles) or use a "
 "filter."
 msgstr ""
 
-#: classes/feeds.php:743
+#: classes/feeds.php:756
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:758 classes/feeds.php:925
+#: classes/feeds.php:771 classes/feeds.php:938
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:768 classes/feeds.php:935
+#: classes/feeds.php:781 classes/feeds.php:948
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:915
+#: classes/feeds.php:928
 msgid "No feed selected."
 msgstr ""
 
-#: classes/feeds.php:968 classes/feeds.php:976
+#: classes/feeds.php:981 classes/feeds.php:989
 msgid "Feed or site URL"
 msgstr ""
 
-#: classes/feeds.php:982 classes/pref/feeds.php:589 classes/pref/feeds.php:800
+#: classes/feeds.php:995 classes/pref/feeds.php:589 classes/pref/feeds.php:800
 #: classes/pref/feeds.php:1779
 msgid "Place in category:"
 msgstr ""
 
-#: classes/feeds.php:990
+#: classes/feeds.php:1003
 msgid "Available feeds"
 msgstr ""
 
-#: classes/feeds.php:1002 classes/pref/users.php:133
+#: classes/feeds.php:1015 classes/pref/users.php:133
 #: classes/pref/feeds.php:619 classes/pref/feeds.php:836
 msgid "Authentication"
 msgstr ""
 
-#: classes/feeds.php:1006 classes/pref/users.php:397
+#: classes/feeds.php:1019 classes/pref/users.php:397
 #: classes/pref/feeds.php:625 classes/pref/feeds.php:840
 #: classes/pref/feeds.php:1793
 msgid "Login"
 msgstr ""
 
-#: classes/feeds.php:1009 classes/pref/prefs.php:260
+#: classes/feeds.php:1022 classes/pref/prefs.php:260
 #: classes/pref/feeds.php:638 classes/pref/feeds.php:846
 #: classes/pref/feeds.php:1796
 msgid "Password"
 msgstr ""
 
-#: classes/feeds.php:1019
+#: classes/feeds.php:1032
 msgid "This feed requires authentication."
 msgstr ""
 
-#: classes/feeds.php:1024 classes/feeds.php:1080 classes/pref/feeds.php:1814
+#: classes/feeds.php:1037 classes/feeds.php:1093 classes/pref/feeds.php:1814
 msgid "Subscribe"
 msgstr ""
 
-#: classes/feeds.php:1027
+#: classes/feeds.php:1040
 msgid "More feeds"
 msgstr ""
 
-#: classes/feeds.php:1050 classes/feeds.php:1141 classes/pref/users.php:324
+#: classes/feeds.php:1063 classes/feeds.php:1154 classes/pref/users.php:324
 #: classes/pref/filters.php:644 classes/pref/feeds.php:1292 js/tt-rss.js:174
 msgid "Search"
 msgstr ""
 
-#: classes/feeds.php:1054
+#: classes/feeds.php:1067
 msgid "Popular feeds"
 msgstr ""
 
-#: classes/feeds.php:1055
+#: classes/feeds.php:1068
 msgid "Feed archive"
 msgstr ""
 
-#: classes/feeds.php:1058
+#: classes/feeds.php:1071
 msgid "limit:"
 msgstr ""
 
-#: classes/feeds.php:1081 classes/pref/users.php:350
+#: classes/feeds.php:1094 classes/pref/users.php:350
 #: classes/pref/labels.php:284 classes/pref/filters.php:400
 #: classes/pref/filters.php:670 classes/pref/feeds.php:743
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr ""
 
-#: classes/feeds.php:1092
+#: classes/feeds.php:1105
 msgid "Look for"
 msgstr ""
 
-#: classes/feeds.php:1100
+#: classes/feeds.php:1113
 msgid "Limit search to:"
 msgstr ""
 
-#: classes/feeds.php:1116
+#: classes/feeds.php:1129
 msgid "This feed"
 msgstr ""
 
@@ -1563,6 +1573,20 @@ msgstr ""
 msgid "[No caption]"
 msgstr ""
 
+#: classes/pref/filters.php:971
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: classes/pref/filters.php:986
+#, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] ""
+msgstr[1] ""
+
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr ""
@@ -2035,6 +2059,15 @@ msgstr ""
 msgid "Check to enable field"
 msgstr ""
 
+#: classes/pref/feeds.php:62 classes/pref/feeds.php:211
+#: classes/pref/feeds.php:255 classes/pref/feeds.php:261
+#: classes/pref/feeds.php:287
+#, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] ""
+msgstr[1] ""
+
 #: classes/pref/feeds.php:555
 msgid "Feed Title"
 msgstr ""
@@ -2574,19 +2607,19 @@ msgstr ""
 msgid "Start update"
 msgstr ""
 
-#: js/feedlist.js:409 js/feedlist.js:437
+#: js/feedlist.js:406 js/feedlist.js:434
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
-#: js/feedlist.js:428
+#: js/feedlist.js:425
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr ""
 
-#: js/feedlist.js:431
+#: js/feedlist.js:428
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr ""
 
-#: js/feedlist.js:434
+#: js/feedlist.js:431
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr ""
 
@@ -2698,7 +2731,7 @@ msgstr ""
 msgid "Subscription reset."
 msgstr ""
 
-#: js/functions.js:1212 js/tt-rss.js:680
+#: js/functions.js:1212 js/tt-rss.js:684
 msgid "Unsubscribe from %s?"
 msgstr ""
 
@@ -2718,7 +2751,7 @@ msgstr ""
 msgid "Trying to change address..."
 msgstr ""
 
-#: js/functions.js:1546 js/tt-rss.js:425 js/tt-rss.js:661
+#: js/functions.js:1546 js/tt-rss.js:425 js/tt-rss.js:665
 msgid "You can't edit this kind of feed."
 msgstr ""
 
@@ -3055,31 +3088,31 @@ msgstr ""
 msgid "Please enable embed_original plugin first."
 msgstr ""
 
-#: js/tt-rss.js:648
+#: js/tt-rss.js:652
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: js/tt-rss.js:669
+#: js/tt-rss.js:673
 msgid "You can't unsubscribe from the category."
 msgstr ""
 
-#: js/tt-rss.js:674 js/tt-rss.js:823
+#: js/tt-rss.js:678 js/tt-rss.js:827
 msgid "Please select some feed first."
 msgstr ""
 
-#: js/tt-rss.js:818
+#: js/tt-rss.js:822
 msgid "You can't rescore this kind of feed."
 msgstr ""
 
-#: js/tt-rss.js:828
+#: js/tt-rss.js:832
 msgid "Rescore articles in %s?"
 msgstr ""
 
-#: js/tt-rss.js:831
+#: js/tt-rss.js:835
 msgid "Rescoring articles..."
 msgstr ""
 
-#: js/tt-rss.js:972
+#: js/tt-rss.js:976
 msgid "New version available!"
 msgstr ""
 
@@ -3235,6 +3268,10 @@ msgstr ""
 msgid "Saving article note..."
 msgstr ""
 
+#: plugins/shorten_expanded/init.js:37
+msgid "Click to expand article"
+msgstr ""
+
 #: plugins/googlereaderimport/init.js:18
 msgid "Google Reader Import"
 msgstr ""

+ 3 - 3
plugins/import_export/init.php

@@ -381,9 +381,9 @@ class Import_Export extends Plugin implements IHandler {
 
 			print "<p>" .
 				__("Finished: ").
-				vsprintf(ngettext("%d article processed, ", "%d articles processed, ", $num_processed), $num_processed).
-				vsprintf(ngettext("%d imported, ", "%d imported, ", $num_imported), $num_imported).
-				vsprintf(ngettext("%d feed created.", "%d feeds created.", $num_feeds_created), $num_feeds_created).
+				vsprintf(_ngettext("%d article processed, ", "%d articles processed, ", $num_processed), $num_processed).
+				vsprintf(_ngettext("%d imported, ", "%d imported, ", $num_imported), $num_imported).
+				vsprintf(_ngettext("%d feed created.", "%d feeds created.", $num_feeds_created), $num_feeds_created).
 					"</p>";
 
 		} else {

+ 1 - 1
utils/update-translations.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 TEMPLATE=messages.pot
 
-xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
+xgettext -kT_js_decl -kT_sprintf -k_ngettext:1,2 -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
 
 xgettext --from-code utf-8 -k__ -knotify_info -knotify_progress -kngettext -L Java -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
 

Some files were not shown because too many files changed in this diff