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

2 files changed, 243 insertions, 210 deletions

diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 6dc3df986..33f7978a1 100755
--- a/locale/de_DE/LC_MESSAGES/messages.mo
+++ b/locale/de_DE/LC_MESSAGES/messages.mo
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index e18c44518..624d7f3f1 100755
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-17 09:26+0400\n"
+"POT-Creation-Date: 2013-09-02 13:07+0400\n"
 "PO-Revision-Date: 2013-07-11 20:20+0100\n"
 "Last-Translator: Heiko Adams <[email protected]>\n"
 "Language-Team: \n"
@@ -165,8 +165,8 @@ msgstr "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PH
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:683
 #: classes/pref/feeds.php:1361
-#: js/feedlist.js:129
-#: js/feedlist.js:453
+#: js/feedlist.js:126
+#: js/feedlist.js:450
 #: js/functions.js:446
 #: js/functions.js:784
 #: js/functions.js:1194
@@ -209,13 +209,13 @@ msgid "All Articles"
 msgstr "Alle Artikel"
 
 #: index.php:168
-#: include/functions.php:2035
+#: include/functions.php:2064
 #: classes/feeds.php:101
 msgid "Starred"
 msgstr "Markiert"
 
 #: index.php:169
-#: include/functions.php:2036
+#: include/functions.php:2065
 #: classes/feeds.php:102
 msgid "Published"
 msgstr "Veröffentlicht"
@@ -260,9 +260,9 @@ msgstr "Titel"
 
 #: index.php:186
 #: index.php:234
-#: include/functions.php:2025
+#: include/functions.php:2054
 #: classes/feeds.php:106
-#: classes/feeds.php:432
+#: classes/feeds.php:433
 #: js/FeedTree.js:128
 #: js/FeedTree.js:156
 msgid "Mark as read"
@@ -305,7 +305,7 @@ msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
 #: index.php:229
-#: classes/handler/public.php:589
+#: classes/handler/public.php:594
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
@@ -337,7 +337,7 @@ msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
 #: index.php:237
-#: include/functions.php:2011
+#: include/functions.php:2040
 msgid "Toggle widescreen mode"
 msgstr "Breitbild-Modus umschalten"
 
@@ -363,7 +363,7 @@ msgstr "Abmelden"
 
 #: prefs.php:33
 #: prefs.php:116
-#: include/functions.php:2038
+#: include/functions.php:2067
 #: classes/pref/prefs.php:440
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -389,8 +389,8 @@ msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:125
-#: include/functions.php:1197
-#: include/functions.php:1860
+#: include/functions.php:1226
+#: include/functions.php:1889
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Label"
@@ -420,13 +420,13 @@ msgstr "Die Registrierung für neue Benutzer wurde administrativ deaktiviert."
 #: 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 "Zu Tiny Tiny RSS zurückkehren"
 
@@ -443,12 +443,12 @@ msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
 #: register.php:228
-#: classes/handler/public.php:792
+#: classes/handler/public.php:797
 msgid "Email:"
 msgstr "E-Mail:"
 
 #: register.php:231
-#: classes/handler/public.php:797
+#: classes/handler/public.php:802
 msgid "How much is two plus two:"
 msgstr "Wieviel ist zwei plus zwei:"
 
@@ -481,10 +481,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Skript zum Updaten von Tiny Tiny RSS."
 
 #: include/digest.php:109
-#: include/functions.php:1206
-#: include/functions.php:1761
-#: include/functions.php:1846
-#: include/functions.php:1868
+#: 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"
@@ -501,302 +501,316 @@ msgstr[1] "%d archivierte Artikel"
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
-#: include/functions.php:1195
-#: include/functions.php:1858
+#: include/functions.php:1224
+#: include/functions.php:1887
 msgid "Special"
 msgstr "Sonderfeeds"
 
-#: 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 "Alle Feeds"
 
-#: include/functions.php:1913
+#: include/functions.php:1942
 msgid "Starred articles"
 msgstr "Markierte Artikel"
 
-#: include/functions.php:1915
+#: include/functions.php:1944
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
-#: include/functions.php:1917
+#: include/functions.php:1946
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: include/functions.php:1919
-#: include/functions.php:2033
+#: include/functions.php:1948
+#: include/functions.php:2062
 msgid "All articles"
 msgstr "Alle Artikel"
 
-#: include/functions.php:1921
+#: include/functions.php:1950
 msgid "Archived articles"
 msgstr "Archivierte Artikel"
 
-#: include/functions.php:1923
+#: include/functions.php:1952
 msgid "Recently read"
 msgstr "Kürzlich gelesen"
 
-#: include/functions.php:1985
+#: include/functions.php:2014
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1986
+#: include/functions.php:2015
 msgid "Open next feed"
 msgstr "Nächsten Feed öffnen"
 
-#: include/functions.php:1987
+#: include/functions.php:2016
 msgid "Open previous feed"
 msgstr "Vorherigen Feed öffnen"
 
-#: include/functions.php:1988
+#: include/functions.php:2017
 msgid "Open next article"
 msgstr "Nächsten Artikel öffnen"
 
-#: include/functions.php:1989
+#: include/functions.php:2018
 msgid "Open previous article"
 msgstr "Vorherigen Artikel öffnen"
 
-#: include/functions.php:1990
+#: include/functions.php:2019
 msgid "Open next article (don't scroll long articles)"
 msgstr "Nächsten Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions.php:1991
+#: include/functions.php:2020
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Vorherigen Artikel laden (lange Artikel werden nicht gescrollt)"
 
-#: include/functions.php:1992
+#: include/functions.php:2021
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Zum nächsten Artikel springen (nicht als gelesen markieren oder ausklappen)"
 
-#: include/functions.php:1993
+#: include/functions.php:2022
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Zum vorherigen Artikel springen (nicht als gelesen markieren oder ausklappen)"
 
-#: include/functions.php:1994
+#: include/functions.php:2023
 msgid "Show search dialog"
 msgstr "Suchdialog anzeigen"
 
-#: include/functions.php:1995
+#: include/functions.php:2024
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions.php:1996
+#: include/functions.php:2025
 #: js/viewfeed.js:1973
 msgid "Toggle starred"
 msgstr "Markierung ein-/ausschalten"
 
-#: include/functions.php:1997
+#: include/functions.php:2026
 #: js/viewfeed.js:1984
 msgid "Toggle published"
 msgstr "Veröffentlichung ein-/ausschalten"
 
-#: include/functions.php:1998
+#: include/functions.php:2027
 #: js/viewfeed.js:1962
 msgid "Toggle unread"
 msgstr "Gelesen-Status umschalten"
 
-#: include/functions.php:1999
+#: include/functions.php:2028
 msgid "Edit tags"
 msgstr "Tags bearbeiten"
 
-#: include/functions.php:2000
+#: include/functions.php:2029
 msgid "Dismiss selected"
 msgstr "Ausgewählte Artikel verwerfen"
 
-#: include/functions.php:2001
+#: include/functions.php:2030
 msgid "Dismiss read"
 msgstr "gelesene Artikel verwerfen"
 
-#: include/functions.php:2002
+#: include/functions.php:2031
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#: include/functions.php:2003
+#: include/functions.php:2032
 #: js/viewfeed.js:2003
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
-#: include/functions.php:2004
+#: include/functions.php:2033
 #: js/viewfeed.js:1997
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
-#: include/functions.php:2005
+#: include/functions.php:2034
 msgid "Scroll down"
 msgstr "Nach unten scrollen"
 
-#: include/functions.php:2006
+#: include/functions.php:2035
 msgid "Scroll up"
 msgstr "Nach oben scrollen"
 
-#: include/functions.php:2007
+#: include/functions.php:2036
 msgid "Select article under cursor"
 msgstr "Artikel unter Mauszeiger auswählen"
 
-#: include/functions.php:2008
+#: include/functions.php:2037
 msgid "Email article"
 msgstr "Artikel per E-Mail versenden"
 
-#: include/functions.php:2009
+#: include/functions.php:2038
 msgid "Close/collapse article"
 msgstr "Artikel schließen/verbergen"
 
-#: include/functions.php:2010
+#: include/functions.php:2039
 msgid "Toggle article expansion (combined mode)"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions.php:2012
+#: include/functions.php:2041
 #: plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "\"Original einbetten\" umschalten"
 
-#: include/functions.php:2013
+#: include/functions.php:2042
 msgid "Article selection"
 msgstr "Artikelauswahl"
 
-#: include/functions.php:2014
+#: include/functions.php:2043
 msgid "Select all articles"
 msgstr "Alle Artikel auswählen"
 
-#: include/functions.php:2015
+#: include/functions.php:2044
 msgid "Select unread"
 msgstr "Ungelesene Artikel auswählen"
 
-#: include/functions.php:2016
+#: include/functions.php:2045
 msgid "Select starred"
 msgstr "Markierte Artikel auswählen"
 
-#: include/functions.php:2017
+#: include/functions.php:2046
 msgid "Select published"
 msgstr "Veröffentlichte Artikel auswählen"
 
-#: include/functions.php:2018
+#: include/functions.php:2047
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: include/functions.php:2019
+#: include/functions.php:2048
 msgid "Deselect everything"
 msgstr "Auswahl aufheben"
 
-#: include/functions.php:2020
+#: include/functions.php:2049
 #: classes/pref/feeds.php:549
 #: classes/pref/feeds.php:793
 msgid "Feed"
 msgstr "Feed"
 
-#: include/functions.php:2021
+#: include/functions.php:2050
 msgid "Refresh current feed"
 msgstr "Aktuellen Feed aktualisieren"
 
-#: include/functions.php:2022
+#: include/functions.php:2051
 msgid "Un/hide read feeds"
 msgstr "Gelesene Feeds zeigen/verstecken"
 
-#: include/functions.php:2023
+#: include/functions.php:2052
 #: classes/pref/feeds.php:1308
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: include/functions.php:2024
+#: include/functions.php:2053
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:68
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 
-#: include/functions.php:2026
+#: include/functions.php:2055
 msgid "Reverse headlines"
 msgstr "Schlagzeilensortierung umkehren"
 
-#: include/functions.php:2027
+#: include/functions.php:2056
 msgid "Debug feed update"
 msgstr "Aktualisierung im Diagnose-Modus durchführen"
 
-#: include/functions.php:2028
+#: include/functions.php:2057
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Alle Feeds als gelesen markieren"
 
-#: include/functions.php:2029
+#: include/functions.php:2058
 msgid "Un/collapse current category"
 msgstr "Aktuelle Kategorie ein-/ausklappen:"
 
-#: include/functions.php:2030
+#: include/functions.php:2059
 msgid "Toggle combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions.php:2031
+#: include/functions.php:2060
 msgid "Toggle auto expand in combined mode"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions.php:2032
+#: include/functions.php:2061
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: include/functions.php:2034
+#: include/functions.php:2063
 msgid "Fresh"
 msgstr "Neu"
 
-#: include/functions.php:2037
+#: include/functions.php:2066
 #: js/tt-rss.js:460
-#: js/tt-rss.js:645
+#: js/tt-rss.js:649
 msgid "Tag cloud"
 msgstr "Tagwolke"
 
-#: include/functions.php:2039
+#: include/functions.php:2068
 msgid "Other"
 msgstr "Sonstiges"
 
-#: include/functions.php:2040
+#: include/functions.php:2069
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: include/functions.php:2041
+#: include/functions.php:2070
 #: classes/pref/filters.php:657
 msgid "Create filter"
 msgstr "Filter erstellen"
 
-#: include/functions.php:2042
+#: include/functions.php:2071
 msgid "Un/collapse sidebar"
 msgstr "Seitenleiste ein-/ausklappen"
 
-#: include/functions.php:2043
+#: include/functions.php:2072
 msgid "Show help dialog"
 msgstr "Hilfe anzeigen"
 
-#: include/functions.php:2579
+#: include/functions.php:2617
 #, php-format
 msgid "Search results: %s"
 msgstr "Suchergebnisse: %s"
 
-#: include/functions.php:3194
+#: include/functions.php:3224
+#: classes/feeds.php:706
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentare?"
+msgstr[1] "Kommentare?"
+
+#: include/functions.php:3228
+#: classes/feeds.php:710
+#, fuzzy
+msgid "comments"
+msgstr "Kommentare?"
+
+#: 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 "Keine Tags"
 
-#: include/functions.php:3226
-#: classes/feeds.php:682
+#: include/functions.php:3306
+#: classes/feeds.php:692
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: include/functions.php:3258
-#: classes/feeds.php:634
+#: include/functions.php:3338
+#: classes/feeds.php:644
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: include/functions.php:3271
-#: classes/feeds.php:647
+#: include/functions.php:3351
+#: classes/feeds.php:657
 #: classes/pref/feeds.php:568
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions.php:3303
+#: include/functions.php:3385
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
@@ -819,31 +833,31 @@ msgstr "Feed URL"
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: include/functions.php:3494
+#: include/functions.php:3581
 msgid "(edit note)"
 msgstr "(Notiz bearbeiten)"
 
-#: include/functions.php:3729
+#: include/functions.php:3817
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: include/functions.php:3785
+#: include/functions.php:3877
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: include/functions.php:4304
+#: include/functions.php:4357
 #, php-format
 msgid "LibXML error %s at line %d (column %d): %s"
 msgstr "LibXML Fehler %s in Zeile %d (Spalte %d): %s"
 
 #: include/login_form.php:183
-#: classes/handler/public.php:501
-#: classes/handler/public.php:787
+#: classes/handler/public.php:506
+#: classes/handler/public.php:792
 msgid "Login:"
 msgstr "Benutzername:"
 
 #: include/login_form.php:193
-#: classes/handler/public.php:504
+#: classes/handler/public.php:509
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -856,7 +870,7 @@ msgid "Profile:"
 msgstr "Profil:"
 
 #: include/login_form.php:209
-#: classes/handler/public.php:257
+#: classes/handler/public.php:258
 #: classes/rpc.php:63
 #: classes/pref/prefs.php:1038
 msgid "Default profile"
@@ -875,7 +889,7 @@ msgid "Remember me"
 msgstr "Erinnere dich an mich"
 
 #: include/login_form.php:235
-#: classes/handler/public.php:509
+#: classes/handler/public.php:514
 msgid "Log in"
 msgstr "Anmelden"
 
@@ -921,11 +935,11 @@ msgid "Save"
 msgstr "Speichern"
 
 #: 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/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
@@ -943,126 +957,126 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: classes/handler/public.php:442
+#: classes/handler/public.php:447
 #: plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Teilen mit Tiny Tiny RSS"
 
-#: classes/handler/public.php:450
+#: classes/handler/public.php:455
 msgid "Title:"
 msgstr "Titel:"
 
-#: classes/handler/public.php:452
+#: classes/handler/public.php:457
 #: classes/pref/feeds.php:566
 #: plugins/instances/init.php:212
 #: plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
-#: classes/handler/public.php:454
+#: classes/handler/public.php:459
 msgid "Content:"
 msgstr "Inhalt:"
 
-#: classes/handler/public.php:456
+#: classes/handler/public.php:461
 msgid "Labels:"
 msgstr "Label:"
 
-#: classes/handler/public.php:475
+#: classes/handler/public.php:480
 msgid "Shared article will appear in the Published feed."
 msgstr "Geteilte Artikel erscheinen unter 'Veröffentlichte Artikel'."
 
-#: classes/handler/public.php:477
+#: classes/handler/public.php:482
 msgid "Share"
 msgstr "Teilen"
 
-#: classes/handler/public.php:499
+#: classes/handler/public.php:504
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#: classes/handler/public.php:558
+#: classes/handler/public.php:563
 msgid "Incorrect username or password"
 msgstr "Benutzername oder Passwort falsch"
 
-#: 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 "<b>%s</b> bereits abonniert."
 
-#: 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 "<b>%s</b> abonniert."
 
-#: 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 "Konnte <b>%s</b> nicht abonnieren."
 
-#: 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 "Keine Feeds in <b>%s</b> gefunden."
 
-#: 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 "Mehrere Feed-URLs gefunden."
 
-#: 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 "Das Abonnieren von <b>%s</b> ist fehlgeschlagen.<br>Der Feed konnte nicht heruntergeladen werden."
 
-#: 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 "Ausgewählte Feeds abonnieren"
 
-#: 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 "Abonnementoptionen bearbeiten"
 
-#: classes/handler/public.php:774
+#: classes/handler/public.php:779
 msgid "Password recovery"
 msgstr "Passwort-Wiederherstellung"
 
-#: 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 "Sie müssen einen gültigen Benutzernamen und EMail angeben. Das neue Passwort wird an Ihre EMail gesendet."
 
-#: classes/handler/public.php:802
+#: classes/handler/public.php:807
 #: classes/pref/users.php:352
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: classes/handler/public.php:812
+#: classes/handler/public.php:817
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Einige der benötigten Eingaben fehlen oder sind falsch."
 
-#: classes/handler/public.php:816
-#: classes/handler/public.php:842
+#: classes/handler/public.php:821
+#: classes/handler/public.php:847
 msgid "Go back"
 msgstr "Zurück"
 
-#: classes/handler/public.php:838
+#: classes/handler/public.php:843
 msgid "Sorry, login and email combination not found."
 msgstr "Entschuldigung, diese Kombination von Benutzername und E-Mail konnte nicht gefunden werden."
 
-#: classes/handler/public.php:860
+#: classes/handler/public.php:865
 msgid "Your access level is insufficient to run this script."
 msgstr "Sie haben nicht die benötigten Rechte, um dieses Skript auszuführen."
 
-#: classes/handler/public.php:884
+#: classes/handler/public.php:889
 msgid "Database Updater"
 msgstr "Datenbank-Updater"
 
-#: classes/handler/public.php:949
+#: classes/handler/public.php:954
 msgid "Perform updates"
 msgstr "Aktualisierungen durchführen"
 
@@ -1239,7 +1253,7 @@ msgid "Feed:"
 msgstr "Feed:"
 
 #: classes/feeds.php:200
-#: classes/feeds.php:830
+#: classes/feeds.php:843
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
@@ -1247,78 +1261,78 @@ msgstr "Feed nicht gefunden."
 msgid "Never"
 msgstr "Niemals"
 
-#: classes/feeds.php:373
+#: classes/feeds.php:374
 #, php-format
 msgid "Imported at %s"
 msgstr "Importiert nach %s"
 
-#: classes/feeds.php:526
+#: classes/feeds.php:527
 msgid "mark as read"
 msgstr "als gelesen markieren"
 
-#: classes/feeds.php:576
+#: classes/feeds.php:584
 msgid "Collapse article"
 msgstr "Artikel einklappen"
 
-#: classes/feeds.php:731
+#: classes/feeds.php:744
 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:734
+#: classes/feeds.php:747
 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:737
+#: classes/feeds.php:750
 msgid "No starred articles found to display."
 msgstr "Keine markierten Artikel zum Anzeigen gefunden."
 
-#: 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 "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell hinzufügen (siehe obiges Aktionsmenü) oder durch das Benutzen von Filtern."
 
-#: classes/feeds.php:743
+#: classes/feeds.php:756
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: 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 "Feeds zuletzt aktualisiert am %s"
 
-#: 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 "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
-#: classes/feeds.php:915
+#: classes/feeds.php:928
 msgid "No feed selected."
 msgstr "Keinen Feed ausgewählt."
 
-#: classes/feeds.php:968
-#: classes/feeds.php:976
+#: classes/feeds.php:981
+#: classes/feeds.php:989
 msgid "Feed or site URL"
 msgstr "URL von Feed oder Seite"
 
-#: classes/feeds.php:982
+#: classes/feeds.php:995
 #: classes/pref/feeds.php:589
 #: classes/pref/feeds.php:800
 #: classes/pref/feeds.php:1779
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
-#: classes/feeds.php:990
+#: classes/feeds.php:1003
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: classes/feeds.php:1002
+#: classes/feeds.php:1015
 #: classes/pref/users.php:133
 #: classes/pref/feeds.php:619
 #: classes/pref/feeds.php:836
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: classes/feeds.php:1006
+#: classes/feeds.php:1019
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:625
 #: classes/pref/feeds.php:840
@@ -1326,7 +1340,7 @@ msgstr "Authentifizierung"
 msgid "Login"
 msgstr "Benutzername"
 
-#: classes/feeds.php:1009
+#: classes/feeds.php:1022
 #: classes/pref/prefs.php:260
 #: classes/pref/feeds.php:638
 #: classes/pref/feeds.php:846
@@ -1334,22 +1348,22 @@ msgstr "Benutzername"
 msgid "Password"
 msgstr "Passwort"
 
-#: classes/feeds.php:1019
+#: classes/feeds.php:1032
 msgid "This feed requires authentication."
 msgstr "Dieser Feed erfordert Authentifizierung."
 
-#: classes/feeds.php:1024
-#: classes/feeds.php:1080
+#: classes/feeds.php:1037
+#: classes/feeds.php:1093
 #: classes/pref/feeds.php:1814
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: classes/feeds.php:1027
+#: classes/feeds.php:1040
 msgid "More feeds"
 msgstr "Weitere Feeds"
 
-#: classes/feeds.php:1050
-#: classes/feeds.php:1141
+#: classes/feeds.php:1063
+#: classes/feeds.php:1154
 #: classes/pref/users.php:324
 #: classes/pref/filters.php:644
 #: classes/pref/feeds.php:1292
@@ -1357,19 +1371,19 @@ msgstr "Weitere Feeds"
 msgid "Search"
 msgstr "Suchen"
 
-#: classes/feeds.php:1054
+#: classes/feeds.php:1067
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
-#: classes/feeds.php:1055
+#: classes/feeds.php:1068
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
-#: classes/feeds.php:1058
+#: classes/feeds.php:1071
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: classes/feeds.php:1081
+#: classes/feeds.php:1094
 #: classes/pref/users.php:350
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:400
@@ -1379,15 +1393,15 @@ msgstr "Grenzwert:"
 msgid "Remove"
 msgstr "Entfernen"
 
-#: classes/feeds.php:1092
+#: classes/feeds.php:1105
 msgid "Look for"
 msgstr "Suche nach"
 
-#: classes/feeds.php:1100
+#: classes/feeds.php:1113
 msgid "Limit search to:"
 msgstr "Suche begrenzen auf:"
 
-#: classes/feeds.php:1116
+#: classes/feeds.php:1129
 msgid "This feed"
 msgstr "Diesen Feed"
 
@@ -1750,6 +1764,20 @@ msgstr "Aktion hinzufügen"
 msgid "[No caption]"
 msgstr "[kein Titel]"
 
+#: classes/pref/filters.php:971
+#, fuzzy, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] "Regel hinzufügen"
+msgstr[1] "Regel hinzufügen"
+
+#: classes/pref/filters.php:986
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "Aktion hinzufügen"
+msgstr[1] "Aktion hinzufügen"
+
 #: classes/pref/prefs.php:18
 msgid "General"
 msgstr "Allgemein"
@@ -2207,6 +2235,17 @@ msgstr "Profil aktivieren"
 msgid "Check to enable field"
 msgstr "Ankreuzen um das Feld zu aktivieren"
 
+#: 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] "(%d Feed)"
+msgstr[1] "(%d Feeds)"
+
 #: classes/pref/feeds.php:555
 msgid "Feed Title"
 msgstr "Feed-Titel"
@@ -2748,20 +2787,20 @@ msgstr "Bereit zum Updaten."
 msgid "Start update"
 msgstr "Starte update"
 
-#: 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 "Alle Artikel in %s als gelesen markieren?"
 
-#: js/feedlist.js:428
+#: js/feedlist.js:425
 msgid "Mark all articles in %s older than 1 day as read?"
 msgstr "Alle Artikel in %s, die älter als einen Tag sind, als gelesen markieren?"
 
-#: js/feedlist.js:431
+#: js/feedlist.js:428
 msgid "Mark all articles in %s older than 1 week as read?"
 msgstr "Alle Artikel in %s, die älter als eine Woche sind, als gelesen markieren?"
 
-#: js/feedlist.js:434
+#: js/feedlist.js:431
 msgid "Mark all articles in %s older than 2 weeks as read?"
 msgstr "Alle Artikel in %s, die älter als 2 Wochen sind, als gelesen markieren?"
 
@@ -2870,7 +2909,7 @@ msgid "Subscription reset."
 msgstr "Abonnement zurückgesetzt."
 
 #: js/functions.js:1212
-#: js/tt-rss.js:680
+#: js/tt-rss.js:684
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
 
@@ -2893,7 +2932,7 @@ msgstr "Versuche, die Adresse zu ändern..."
 
 #: js/functions.js:1546
 #: js/tt-rss.js:425
-#: js/tt-rss.js:661
+#: js/tt-rss.js:665
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
@@ -3247,32 +3286,32 @@ msgstr "Bitte erst das Mail-Plugin aktivieren."
 msgid "Please enable embed_original plugin first."
 msgstr "Bitte erst das \"Original einbetten\" Plugin aktivieren."
 
-#: js/tt-rss.js:648
+#: js/tt-rss.js:652
 msgid "Select item(s) by tags"
 msgstr "Artikel nach Tag auswählen"
 
-#: js/tt-rss.js:669
+#: js/tt-rss.js:673
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: 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 "Bitte erst einen Feed auswählen."
 
-#: js/tt-rss.js:818
+#: js/tt-rss.js:822
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#: js/tt-rss.js:828
+#: js/tt-rss.js:832
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
-#: js/tt-rss.js:831
+#: js/tt-rss.js:835
 msgid "Rescoring articles..."
 msgstr "Artikel werden neu bewertet..."
 
-#: js/tt-rss.js:972
+#: js/tt-rss.js:976
 msgid "New version available!"
 msgstr "Neue Version verfügbar!"
 
@@ -3431,6 +3470,11 @@ msgstr "Bitte zuerst die Datei auswählen."
 msgid "Saving article note..."
 msgstr "Artikelnotiz wird gespeichert..."
 
+#: plugins/shorten_expanded/init.js:37
+#, fuzzy
+msgid "Click to expand article"
+msgstr "Klicken um den Artikel aufzuklappen."
+
 #: plugins/googlereaderimport/init.js:18
 msgid "Google Reader Import"
 msgstr "Google Reader Import"
@@ -3582,9 +3626,6 @@ msgstr "Bitte sichern Sie ihr tt-rss Verzeichnis, bevor Sie fortfahren. Geben Si
 #~ msgid "Error: unable to load article."
 #~ msgstr "Fehler: konnte Artikel nicht laden."
 
-#~ msgid "Click to expand article."
-#~ msgstr "Klicken um den Artikel aufzuklappen."
-
 #~ msgid "%d more..."
 #~ msgid_plural "%d more..."
 #~ msgstr[0] "%d mehr..."
@@ -3718,11 +3759,6 @@ msgstr "Bitte sichern Sie ihr tt-rss Verzeichnis, bevor Sie fortfahren. Geben Si
 #~ msgid "Date syntax is incorrect."
 #~ msgstr "Die Datumssyntax ist falsch."
 
-#~ msgid "(%d feed)"
-#~ msgid_plural "(%d feeds)"
-#~ msgstr[0] "(%d Feed)"
-#~ msgstr[1] "(%d Feeds)"
-
 #~ msgid "Notice"
 #~ msgstr "Anmerkung"
 
@@ -3807,9 +3843,6 @@ msgstr "Bitte sichern Sie ihr tt-rss Verzeichnis, bevor Sie fortfahren. Geben Si
 #~ msgid "No"
 #~ msgstr "Nein"
 
-#~ msgid "Comments?"
-#~ msgstr "Kommentare?"
-
 #~ msgid "News"
 #~ msgstr "Neuigkeiten"