diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 726c68a6c8613546cfdf048322d10168836884d4..b632e66781b66f8b268919aa9d46c4fd7a776b6d 100644
Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index ebc7c59d7f81727f360ad3b7a17419d9ff20f625..45e3ad8864c1d88c0e8031e079667e03922d747d 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: tt-rss git\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-19 18:16+0300\n"
-"PO-Revision-Date: 2016-03-24 08:10+0100\n"
+"PO-Revision-Date: 2016-08-19 17:29+0200\n"
 "Last-Translator: Heiko Adams <heiko.adams@gmail.com>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: -1,557,558,-1,-1,-1,-1,-1,-1,-1\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: backend.php:73
 msgid "Use default"
@@ -55,49 +55,39 @@ msgstr "Nach 3 Monaten"
 msgid "Default interval"
 msgstr "Standard-Intervall"
 
-#: backend.php:83
-#: backend.php:93
+#: backend.php:83 backend.php:93
 msgid "Disable updates"
 msgstr "Nie"
 
-#: backend.php:84
-#: backend.php:94
+#: backend.php:84 backend.php:94
 msgid "15 minutes"
 msgstr "15 Minuten"
 
-#: backend.php:85
-#: backend.php:95
+#: backend.php:85 backend.php:95
 msgid "30 minutes"
 msgstr "30 Minuten"
 
-#: backend.php:86
-#: backend.php:96
+#: backend.php:86 backend.php:96
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: backend.php:87
-#: backend.php:97
+#: backend.php:87 backend.php:97
 msgid "4 hours"
 msgstr "4 Stunden"
 
-#: backend.php:88
-#: backend.php:98
+#: backend.php:88 backend.php:98
 msgid "12 hours"
 msgstr "12 Stunden"
 
-#: backend.php:89
-#: backend.php:99
+#: backend.php:89 backend.php:99
 msgid "Daily"
 msgstr "Täglich"
 
-#: backend.php:90
-#: backend.php:100
+#: backend.php:90 backend.php:100
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: backend.php:103
-#: classes/pref/users.php:42
-#: classes/pref/system.php:51
+#: backend.php:103 classes/pref/users.php:42 classes/pref/system.php:51
 msgid "User"
 msgstr "Benutzer"
 
@@ -165,39 +155,16 @@ msgstr "Methode nicht gefunden."
 msgid "Plugin not found"
 msgstr "Plugin nicht gefunden"
 
-#: index.php:148
-#: index.php:164
-#: index.php:282
-#: prefs.php:117
-#: classes/backend.php:5
-#: classes/pref/labels.php:282
-#: classes/pref/feeds.php:1409
-#: classes/pref/filters.php:779
-#: js/feedlist.js:159
-#: js/functions.js:1293
-#: js/functions.js:1427
-#: js/functions.js:1739
-#: js/prefs.js:658
-#: js/prefs.js:859
-#: js/prefs.js:1765
-#: js/prefs.js:1781
-#: js/prefs.js:1799
-#: js/tt-rss.js:55
-#: js/tt-rss.js:553
-#: js/viewfeed.js:1298
-#: plugins/import_export/import_export.js:17
-#: js/feedlist.js:484
-#: js/feedlist.js:534
-#: js/functions.js:449
-#: js/functions.js:772
-#: js/prefs.js:1446
-#: js/prefs.js:1499
-#: js/prefs.js:1539
-#: js/prefs.js:1556
-#: js/prefs.js:1572
-#: js/prefs.js:1592
-#: js/tt-rss.js:570
-#: js/viewfeed.js:830
+#: index.php:148 index.php:164 index.php:282 prefs.php:117
+#: classes/backend.php:5 classes/pref/labels.php:282
+#: classes/pref/feeds.php:1409 classes/pref/filters.php:779 js/feedlist.js:159
+#: js/functions.js:1293 js/functions.js:1427 js/functions.js:1739
+#: js/prefs.js:658 js/prefs.js:859 js/prefs.js:1765 js/prefs.js:1781
+#: js/prefs.js:1799 js/tt-rss.js:55 js/tt-rss.js:553 js/viewfeed.js:1298
+#: plugins/import_export/import_export.js:17 js/feedlist.js:484
+#: js/feedlist.js:534 js/functions.js:449 js/functions.js:772 js/prefs.js:1446
+#: js/prefs.js:1499 js/prefs.js:1539 js/prefs.js:1556 js/prefs.js:1572
+#: js/prefs.js:1592 js/tt-rss.js:570 js/viewfeed.js:830
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
@@ -217,21 +184,15 @@ msgstr "Adaptiv"
 msgid "All Articles"
 msgstr "Alle Artikel"
 
-#: index.php:190
-#: include/functions2.php:102
-#: classes/feeds.php:104
+#: index.php:190 include/functions2.php:102 classes/feeds.php:104
 msgid "Starred"
 msgstr "Markiert"
 
-#: index.php:191
-#: include/functions2.php:103
-#: classes/feeds.php:105
+#: index.php:191 include/functions2.php:103 classes/feeds.php:105
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: index.php:192
-#: classes/feeds.php:91
-#: classes/feeds.php:103
+#: index.php:192 classes/feeds.php:91 classes/feeds.php:103
 msgid "Unread"
 msgstr "Ungelesen"
 
@@ -263,12 +224,8 @@ msgstr "älteste zuerst"
 msgid "Title"
 msgstr "Titel"
 
-#: index.php:207
-#: index.php:248
-#: include/functions2.php:90
-#: classes/feeds.php:109
-#: js/FeedTree.js:132
-#: js/FeedTree.js:160
+#: index.php:207 index.php:248 include/functions2.php:90 classes/feeds.php:109
+#: js/FeedTree.js:132 js/FeedTree.js:160
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
@@ -304,8 +261,7 @@ msgstr "Suchen..."
 msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
-#: index.php:243
-#: classes/handler/public.php:672
+#: index.php:243 classes/handler/public.php:672
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
@@ -317,9 +273,7 @@ msgstr "Feed bearbeiten..."
 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
-#: index.php:246
-#: classes/pref/feeds.php:785
-#: classes/pref/feeds.php:1364
+#: index.php:246 classes/pref/feeds.php:785 classes/pref/feeds.php:1364
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Feed abbestellen"
@@ -336,8 +290,7 @@ msgstr "Gelesene zeigen/verstecken"
 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
-#: index.php:251
-#: include/functions2.php:76
+#: index.php:251 include/functions2.php:76
 msgid "Toggle widescreen mode"
 msgstr "Breitbild-Modus umschalten"
 
@@ -361,9 +314,7 @@ msgstr "Abmelden"
 msgid "Updates are available from Git."
 msgstr "Git-Updates sind verfügbar"
 
-#: prefs.php:33
-#: prefs.php:135
-#: include/functions2.php:105
+#: prefs.php:33 prefs.php:135 include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -376,21 +327,16 @@ msgstr "Tastaturkürzel"
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
-#: prefs.php:138
-#: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1304
+#: prefs.php:138 classes/pref/feeds.php:112 classes/pref/feeds.php:1304
 #: classes/pref/feeds.php:1353
 msgid "Feeds"
 msgstr "Feeds"
 
-#: prefs.php:141
-#: classes/pref/filters.php:248
+#: prefs.php:141 classes/pref/filters.php:248
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:144
-#: include/functions.php:1287
-#: include/functions.php:1940
+#: prefs.php:144 include/functions.php:1287 include/functions.php:1940
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Label"
@@ -403,8 +349,7 @@ msgstr "Benutzer"
 msgid "System"
 msgstr "System"
 
-#: register.php:187
-#: include/login_form.php:252
+#: register.php:187 include/login_form.php:252
 msgid "Create new account"
 msgstr "Neues Konto erstellen"
 
@@ -412,20 +357,11 @@ msgstr "Neues Konto erstellen"
 msgid "New user registrations are administratively disabled."
 msgstr "Die Registrierung für neue Benutzer wurde administrativ deaktiviert."
 
-#: register.php:197
-#: register.php:242
-#: register.php:255
-#: register.php:270
-#: register.php:289
-#: register.php:337
-#: register.php:347
-#: register.php:359
-#: classes/handler/public.php:742
-#: classes/handler/public.php:813
-#: classes/handler/public.php:911
-#: classes/handler/public.php:990
-#: classes/handler/public.php:1004
-#: classes/handler/public.php:1011
+#: register.php:197 register.php:242 register.php:255 register.php:270
+#: register.php:289 register.php:337 register.php:347 register.php:359
+#: classes/handler/public.php:742 classes/handler/public.php:813
+#: classes/handler/public.php:911 classes/handler/public.php:990
+#: classes/handler/public.php:1004 classes/handler/public.php:1011
 #: classes/handler/public.php:1036
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
@@ -442,13 +378,11 @@ msgstr "Gewünschter Benutzername:"
 msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
-#: register.php:229
-#: classes/handler/public.php:829
+#: register.php:229 classes/handler/public.php:829
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: register.php:232
-#: classes/handler/public.php:834
+#: register.php:232 classes/handler/public.php:834
 msgid "How much is two plus two:"
 msgstr "Wieviel ist zwei plus zwei:"
 
@@ -480,12 +414,8 @@ msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 msgid "Tiny Tiny RSS data update script."
 msgstr "Skript zum Updaten von Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1296
-#: include/functions.php:1841
-#: include/functions.php:1926
-#: include/functions.php:1948
-#: classes/opml.php:421
+#: include/digest.php:109 include/functions.php:1296 include/functions.php:1841
+#: include/functions.php:1926 include/functions.php:1948 classes/opml.php:421
 #: classes/pref/feeds.php:228
 msgid "Uncategorized"
 msgstr "Unkategorisiert"
@@ -506,13 +436,11 @@ msgstr "Keine Feeds gefunden."
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1285
-#: include/functions.php:1938
+#: include/functions.php:1285 include/functions.php:1938
 msgid "Special"
 msgstr "Sonderfeeds"
 
-#: include/functions.php:1789
-#: classes/pref/filters.php:229
+#: include/functions.php:1789 classes/pref/filters.php:229
 #: classes/pref/filters.php:507
 msgid "All feeds"
 msgstr "Alle Feeds"
@@ -529,8 +457,7 @@ msgstr "Veröffentlichte Artikel"
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: include/functions.php:1999
-#: include/functions2.php:100
+#: include/functions.php:1999 include/functions2.php:100
 msgid "All articles"
 msgstr "Alle Artikel"
 
@@ -586,18 +513,15 @@ msgstr "Suchdialog anzeigen"
 msgid "Article"
 msgstr "Artikel"
 
-#: include/functions2.php:63
-#: js/viewfeed.js:1883
+#: include/functions2.php:63 js/viewfeed.js:1883
 msgid "Toggle starred"
 msgstr "Markierung ein-/ausschalten"
 
-#: include/functions2.php:64
-#: js/viewfeed.js:1894
+#: include/functions2.php:64 js/viewfeed.js:1894
 msgid "Toggle published"
 msgstr "Veröffentlichung ein-/ausschalten"
 
-#: include/functions2.php:65
-#: js/viewfeed.js:1872
+#: include/functions2.php:65 js/viewfeed.js:1872
 msgid "Toggle unread"
 msgstr "Gelesen-Status umschalten"
 
@@ -609,13 +533,11 @@ msgstr "Tags bearbeiten"
 msgid "Open in new window"
 msgstr "In neuem Fenster öffnen"
 
-#: include/functions2.php:68
-#: js/viewfeed.js:1913
+#: include/functions2.php:68 js/viewfeed.js:1913
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
-#: include/functions2.php:69
-#: js/viewfeed.js:1907
+#: include/functions2.php:69 js/viewfeed.js:1907
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
@@ -643,8 +565,7 @@ msgstr "Artikel schließen/verbergen"
 msgid "Toggle article expansion (combined mode)"
 msgstr "Kombinierte Feed-Anzeige umschalten"
 
-#: include/functions2.php:77
-#: plugins/embed_original/init.php:31
+#: include/functions2.php:77 plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "\"Original einbetten\" umschalten"
 
@@ -676,8 +597,7 @@ msgstr "Auswahl umkehren"
 msgid "Deselect everything"
 msgstr "Auswahl aufheben"
 
-#: include/functions2.php:85
-#: classes/pref/feeds.php:555
+#: include/functions2.php:85 classes/pref/feeds.php:555
 #: classes/pref/feeds.php:823
 msgid "Feed"
 msgstr "Feed"
@@ -690,14 +610,11 @@ msgstr "Aktuellen Feed aktualisieren"
 msgid "Un/hide read feeds"
 msgstr "Gelesene Feeds zeigen/verstecken"
 
-#: include/functions2.php:88
-#: classes/pref/feeds.php:1356
+#: include/functions2.php:88 classes/pref/feeds.php:1356
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
-#: include/functions2.php:89
-#: js/FeedTree.js:139
-#: js/PrefFeedTree.js:68
+#: include/functions2.php:89 js/FeedTree.js:139 js/PrefFeedTree.js:68
 #: js/viewfeed.js:2080
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
@@ -708,7 +625,7 @@ msgstr "Schlagzeilensortierung umkehren"
 
 #: include/functions2.php:92
 msgid "Toggle headline grouping"
-msgstr ""
+msgstr "Gruppierung der Kopfzeilen umschalten"
 
 #: include/functions2.php:93
 msgid "Debug feed update"
@@ -718,8 +635,7 @@ msgstr "Aktualisierung im Diagnose-Modus durchführen"
 msgid "Debug viewfeed()"
 msgstr "viewfeed() debuggen"
 
-#: include/functions2.php:95
-#: js/FeedTree.js:182
+#: include/functions2.php:95 js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Alle Feeds als gelesen markieren"
 
@@ -743,9 +659,7 @@ msgstr "Gehe zu"
 msgid "Fresh"
 msgstr "Neu"
 
-#: include/functions2.php:104
-#: js/tt-rss.js:497
-#: js/tt-rss.js:673
+#: include/functions2.php:104 js/tt-rss.js:497 js/tt-rss.js:673
 msgid "Tag cloud"
 msgstr "Tagwolke"
 
@@ -753,13 +667,11 @@ msgstr "Tagwolke"
 msgid "Other"
 msgstr "Sonstiges"
 
-#: include/functions2.php:107
-#: classes/pref/labels.php:267
+#: include/functions2.php:107 classes/pref/labels.php:267
 msgid "Create label"
 msgstr "Label erstellen"
 
-#: include/functions2.php:108
-#: classes/pref/filters.php:753
+#: include/functions2.php:108 classes/pref/filters.php:753
 msgid "Create filter"
 msgstr "Filter erstellen"
 
@@ -776,15 +688,13 @@ msgstr "Hilfe anzeigen"
 msgid "Search results: %s"
 msgstr "Suchergebnisse: %s"
 
-#: include/functions2.php:1330
-#: classes/feeds.php:749
+#: include/functions2.php:1330 classes/feeds.php:749
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "Kommentar"
 msgstr[1] "Kommentare"
 
-#: include/functions2.php:1334
-#: classes/feeds.php:753
+#: include/functions2.php:1334 classes/feeds.php:753
 msgid "comments"
 msgstr "Kommentare"
 
@@ -792,43 +702,29 @@ msgstr "Kommentare"
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1393
-#: include/functions2.php:1644
+#: include/functions2.php:1393 include/functions2.php:1644
 #: classes/article.php:311
 msgid "no tags"
 msgstr "Keine Tags"
 
-#: include/functions2.php:1403
-#: classes/feeds.php:735
+#: include/functions2.php:1403 classes/feeds.php:735
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: include/functions2.php:1435
-#: classes/feeds.php:682
+#: include/functions2.php:1435 classes/feeds.php:682
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: include/functions2.php:1448
-#: classes/pref/feeds.php:574
-#: classes/feeds.php:695
+#: include/functions2.php:1448 classes/pref/feeds.php:574 classes/feeds.php:695
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: include/functions2.php:1485
-#: classes/backend.php:105
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: classes/pref/feeds.php:1658
-#: classes/pref/feeds.php:1724
-#: classes/pref/filters.php:204
-#: classes/pref/prefs.php:1105
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/import_export/init.php:415
-#: plugins/import_export/init.php:461
-#: plugins/share/init.php:121
+#: include/functions2.php:1485 classes/backend.php:105 classes/dlg.php:37
+#: classes/dlg.php:60 classes/dlg.php:93 classes/dlg.php:159
+#: classes/dlg.php:186 classes/pref/feeds.php:1658 classes/pref/feeds.php:1724
+#: classes/pref/filters.php:204 classes/pref/prefs.php:1105
+#: plugins/af_psql_trgm/init.php:102 plugins/import_export/init.php:415
+#: plugins/import_export/init.php:461 plugins/share/init.php:121
 msgid "Close this window"
 msgstr "Fenster schließen"
 
@@ -846,45 +742,42 @@ msgstr "Anhänge"
 
 #: include/functions2.php:2456
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Kein Fehler. Datei erfolgreich hochgeladen"
 
 #: include/functions2.php:2457
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Direktive in der php.ini"
 
 #: include/functions2.php:2458
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
-msgstr ""
+msgstr "Die hochgeladene Datei überschreitet die MAX_FILE_SIZE Direktive des HTML-Formulars"
 
 #: include/functions2.php:2459
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Die Datei wurde nur teilweise hochgeladen"
 
 #: include/functions2.php:2460
-#, fuzzy
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
 #: include/functions2.php:2461
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Fehlender temporärer Ordner"
 
 #: include/functions2.php:2462
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Konnte Datei nicht speichern."
 
 #: include/functions2.php:2463
 msgid "A PHP extension stopped the file upload."
-msgstr ""
+msgstr "Eine PHP-Erweiterung hat den Upload unterbrochen."
 
-#: include/login_form.php:197
-#: classes/handler/public.php:569
+#: include/login_form.php:197 classes/handler/public.php:569
 #: classes/handler/public.php:824
 msgid "Login:"
 msgstr "Benutzername:"
 
-#: include/login_form.php:207
-#: classes/handler/public.php:572
+#: include/login_form.php:207 classes/handler/public.php:572
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -896,10 +789,8 @@ msgstr "Ich habe mein Passwort vergessen"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: include/login_form.php:223
-#: classes/handler/public.php:311
-#: classes/pref/prefs.php:1043
-#: classes/rpc.php:63
+#: include/login_form.php:223 classes/handler/public.php:311
+#: classes/pref/prefs.php:1043 classes/rpc.php:63
 msgid "Default profile"
 msgstr "Standardprofil"
 
@@ -915,8 +806,7 @@ msgstr "Zeigt keine Bilder in Artikeln, reduziert die automatischen Aktualisieru
 msgid "Remember me"
 msgstr "Erinnere dich an mich"
 
-#: include/login_form.php:249
-#: classes/handler/public.php:577
+#: include/login_form.php:249 classes/handler/public.php:577
 msgid "Log in"
 msgstr "Anmelden"
 
@@ -940,48 +830,30 @@ msgstr "Artikel nicht gefunden."
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (durch Komma getrennt):"
 
-#: classes/article.php:222
-#: classes/pref/labels.php:79
-#: classes/pref/users.php:98
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:943
-#: classes/pref/filters.php:485
-#: classes/pref/prefs.php:989
-#: plugins/instances/init.php:245
-#: plugins/nsfw/init.php:85
-#: plugins/note/init.php:51
-#: plugins/af_readability/init.php:71
-#: plugins/af_redditimgur/init.php:68
-#: plugins/af_psql_trgm/init.php:184
+#: classes/article.php:222 classes/pref/labels.php:79 classes/pref/users.php:98
+#: classes/pref/feeds.php:801 classes/pref/feeds.php:943
+#: classes/pref/filters.php:485 classes/pref/prefs.php:989
+#: plugins/instances/init.php:245 plugins/nsfw/init.php:85
+#: plugins/note/init.php:51 plugins/af_readability/init.php:71
+#: plugins/af_redditimgur/init.php:68 plugins/af_psql_trgm/init.php:184
 #: plugins/mail/init.php:64
 msgid "Save"
 msgstr "Speichern"
 
-#: classes/article.php:224
-#: classes/handler/public.php:546
-#: classes/handler/public.php:580
-#: classes/pref/labels.php:81
-#: classes/pref/users.php:100
-#: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:946
-#: classes/pref/feeds.php:1865
-#: classes/pref/filters.php:488
-#: classes/pref/filters.php:902
-#: classes/pref/filters.php:983
-#: classes/pref/filters.php:1076
-#: classes/pref/prefs.php:991
-#: classes/feeds.php:1100
-#: classes/feeds.php:1150
-#: classes/feeds.php:1187
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-#: plugins/note/init.php:53
+#: classes/article.php:224 classes/handler/public.php:546
+#: classes/handler/public.php:580 classes/pref/labels.php:81
+#: classes/pref/users.php:100 classes/pref/feeds.php:802
+#: classes/pref/feeds.php:946 classes/pref/feeds.php:1865
+#: classes/pref/filters.php:488 classes/pref/filters.php:902
+#: classes/pref/filters.php:983 classes/pref/filters.php:1076
+#: classes/pref/prefs.php:991 classes/feeds.php:1100 classes/feeds.php:1150
+#: classes/feeds.php:1187 plugins/instances/init.php:248
+#: plugins/instances/init.php:436 plugins/note/init.php:53
 #: plugins/mail/init.php:172
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: classes/opml.php:28
-#: classes/opml.php:33
+#: classes/opml.php:28 classes/opml.php:33
 msgid "OPML Utility"
 msgstr "OPML Werkzeug"
 
@@ -1032,13 +904,11 @@ msgstr "Verarbeite Kategorie: %s"
 msgid "Upload failed with error code %d"
 msgstr "Upload schlug fehl. Fehlercode: %d"
 
-#: classes/opml.php:484
-#: plugins/import_export/init.php:442
+#: classes/opml.php:484 plugins/import_export/init.php:442
 msgid "Unable to move uploaded file."
 msgstr "Fehler: konnte die hochgeladene Datei nicht verschieben."
 
-#: classes/opml.php:488
-#: plugins/import_export/init.php:446
+#: classes/opml.php:488 plugins/import_export/init.php:446
 msgid "Error: please upload OPML file."
 msgstr "Fehler: bitte eine OPML-Datei hochladen."
 
@@ -1078,9 +948,7 @@ msgstr "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen
 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 
-#: classes/dlg.php:57
-#: classes/dlg.php:183
-#: plugins/share/init.php:118
+#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:118
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
@@ -1088,8 +956,7 @@ msgstr "Erzeuge neue URL"
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Der Aktualisierungs-Daemon ist in den Einstellungen aktiviert, aber der Daemon Prozess läuft nicht, weshalb keine Feeds aktualisiert werden können. Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer der Instanz."
 
-#: classes/dlg.php:75
-#: classes/dlg.php:84
+#: classes/dlg.php:75 classes/dlg.php:84
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
@@ -1101,8 +968,7 @@ msgstr "Der Aktualisierungs Daemon braucht zu lange, um eine Aktualisierung durc
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: classes/handler/public.php:510
-#: plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:510 plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Teilen mit Tiny Tiny RSS"
 
@@ -1110,10 +976,8 @@ msgstr "Teilen mit Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titel:"
 
-#: classes/handler/public.php:520
-#: classes/pref/feeds.php:572
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
+#: classes/handler/public.php:520 classes/pref/feeds.php:572
+#: plugins/instances/init.php:212 plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
@@ -1186,8 +1050,7 @@ msgstr "Passwort-Wiederherstellung"
 msgid "You will need to provide valid account name and email. A password reset link will be sent to 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:839
-#: classes/pref/users.php:350
+#: classes/handler/public.php:839 classes/pref/users.php:350
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -1195,8 +1058,7 @@ msgstr "Passwort zurücksetzen"
 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:853
-#: classes/handler/public.php:919
+#: classes/handler/public.php:853 classes/handler/public.php:919
 msgid "Go back"
 msgstr "Zurück"
 
@@ -1220,8 +1082,7 @@ msgstr "Datenbank-Updater"
 msgid "Perform updates"
 msgstr "Aktualisierungen durchführen"
 
-#: classes/pref/labels.php:22
-#: classes/pref/filters.php:348
+#: classes/pref/labels.php:22 classes/pref/filters.php:348
 #: classes/pref/filters.php:823
 msgid "Caption"
 msgstr "Titel"
@@ -1243,59 +1104,38 @@ msgstr "Hintergrund"
 msgid "Created label <b>%s</b>"
 msgstr "Label <b>%s</b> erstellt"
 
-#: classes/pref/labels.php:258
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1344
-#: classes/pref/feeds.php:1606
-#: classes/pref/feeds.php:1670
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:407
-#: classes/pref/filters.php:744
-#: classes/pref/filters.php:832
-#: classes/pref/filters.php:859
-#: classes/pref/prefs.php:1000
-#: plugins/instances/init.php:284
+#: classes/pref/labels.php:258 classes/pref/users.php:334
+#: classes/pref/feeds.php:1344 classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1670 classes/pref/filters.php:359
+#: classes/pref/filters.php:407 classes/pref/filters.php:744
+#: classes/pref/filters.php:832 classes/pref/filters.php:859
+#: classes/pref/prefs.php:1000 plugins/instances/init.php:284
 msgid "Select"
 msgstr "Auswahl"
 
-#: classes/pref/labels.php:261
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1347
-#: classes/pref/feeds.php:1609
-#: classes/pref/feeds.php:1673
-#: classes/pref/filters.php:362
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:747
-#: classes/pref/filters.php:835
-#: classes/pref/filters.php:862
-#: classes/pref/prefs.php:1003
-#: classes/feeds.php:90
+#: classes/pref/labels.php:261 classes/pref/users.php:337
+#: classes/pref/feeds.php:1347 classes/pref/feeds.php:1609
+#: classes/pref/feeds.php:1673 classes/pref/filters.php:362
+#: classes/pref/filters.php:410 classes/pref/filters.php:747
+#: classes/pref/filters.php:835 classes/pref/filters.php:862
+#: classes/pref/prefs.php:1003 classes/feeds.php:90
 #: plugins/instances/init.php:287
 msgid "All"
 msgstr "Alle"
 
-#: classes/pref/labels.php:263
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1349
-#: classes/pref/feeds.php:1611
-#: classes/pref/feeds.php:1675
-#: classes/pref/filters.php:364
-#: classes/pref/filters.php:412
-#: classes/pref/filters.php:749
-#: classes/pref/filters.php:837
-#: classes/pref/filters.php:864
-#: classes/pref/prefs.php:1005
-#: classes/feeds.php:93
+#: classes/pref/labels.php:263 classes/pref/users.php:339
+#: classes/pref/feeds.php:1349 classes/pref/feeds.php:1611
+#: classes/pref/feeds.php:1675 classes/pref/filters.php:364
+#: classes/pref/filters.php:412 classes/pref/filters.php:749
+#: classes/pref/filters.php:837 classes/pref/filters.php:864
+#: classes/pref/prefs.php:1005 classes/feeds.php:93
 #: plugins/instances/init.php:289
 msgid "None"
 msgstr "Keine"
 
-#: classes/pref/labels.php:270
-#: classes/pref/users.php:348
-#: classes/pref/feeds.php:767
-#: classes/pref/filters.php:478
-#: classes/pref/filters.php:766
-#: classes/feeds.php:1149
+#: classes/pref/labels.php:270 classes/pref/users.php:348
+#: classes/pref/feeds.php:767 classes/pref/filters.php:478
+#: classes/pref/filters.php:766 classes/feeds.php:1149
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Entfernen"
@@ -1304,8 +1144,7 @@ msgstr "Entfernen"
 msgid "Clear colors"
 msgstr "Farben löschen"
 
-#: classes/pref/users.php:6
-#: classes/pref/system.php:8
+#: classes/pref/users.php:6 classes/pref/system.php:8
 #: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Sie haben nicht die benötigten Rechte, um diese Registerkarte zu öffnen."
@@ -1314,10 +1153,8 @@ msgstr "Sie haben nicht die benötigten Rechte, um diese Registerkarte zu öffne
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: classes/pref/users.php:56
-#: classes/pref/feeds.php:637
-#: classes/pref/feeds.php:878
-#: classes/feeds.php:1070
+#: classes/pref/users.php:56 classes/pref/feeds.php:637
+#: classes/pref/feeds.php:878 classes/feeds.php:1070
 msgid "Authentication"
 msgstr "Authentifizierung"
 
@@ -1325,14 +1162,12 @@ msgstr "Authentifizierung"
 msgid "Access level: "
 msgstr "Zugriffsberechtigung: "
 
-#: classes/pref/users.php:77
-#: classes/pref/feeds.php:667
+#: classes/pref/users.php:77 classes/pref/feeds.php:667
 #: classes/pref/feeds.php:896
 msgid "Options"
 msgstr "Optionen"
 
-#: classes/pref/users.php:91
-#: js/prefs.js:570
+#: classes/pref/users.php:91 js/prefs.js:570
 msgid "User details"
 msgstr "Benutzerdetails"
 
@@ -1340,8 +1175,7 @@ msgstr "Benutzerdetails"
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: classes/pref/users.php:132
-#: classes/pref/users.php:400
+#: classes/pref/users.php:132 classes/pref/users.php:400
 msgid "Registered"
 msgstr "Registriert"
 
@@ -1357,8 +1191,7 @@ msgstr "Anzahl abonnierter Feeds"
 msgid "Stored articles"
 msgstr "gespeicherte Artikel"
 
-#: classes/pref/users.php:145
-#: classes/pref/users.php:399
+#: classes/pref/users.php:145 classes/pref/users.php:399
 msgid "Subscribed feeds"
 msgstr "Abonnierte Feeds"
 
@@ -1391,11 +1224,8 @@ msgstr "Sende das neue Passwort von Benutzer <b>%s</b> an <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
 
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1340
-#: classes/pref/filters.php:740
-#: classes/feeds.php:1120
-#: classes/feeds.php:1186
+#: classes/pref/users.php:324 classes/pref/feeds.php:1340
+#: classes/pref/filters.php:740 classes/feeds.php:1120 classes/feeds.php:1186
 #: js/tt-rss.js:174
 msgid "Search"
 msgstr "Suchen"
@@ -1404,16 +1234,13 @@ msgstr "Suchen"
 msgid "Create user"
 msgstr "Benutzer anlegen"
 
-#: classes/pref/users.php:346
-#: classes/pref/filters.php:759
+#: classes/pref/users.php:346 classes/pref/filters.php:759
 #: plugins/instances/init.php:293
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: classes/pref/users.php:397
-#: classes/pref/feeds.php:643
-#: classes/pref/feeds.php:882
-#: classes/pref/feeds.php:1842
+#: classes/pref/users.php:397 classes/pref/feeds.php:643
+#: classes/pref/feeds.php:882 classes/pref/feeds.php:1842
 #: classes/feeds.php:1074
 msgid "Login"
 msgstr "Benutzername"
@@ -1426,8 +1253,7 @@ msgstr "Zugriffsberechtigung"
 msgid "Last login"
 msgstr "Zuletzt angemeldet"
 
-#: classes/pref/users.php:420
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:420 plugins/instances/init.php:334
 msgid "Click to edit"
 msgstr "Zum Bearbeiten klicken"
 
@@ -1471,10 +1297,8 @@ msgstr "Datum"
 msgid "Check to enable field"
 msgstr "Ankreuzen, um das Feld zu aktivieren"
 
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
 #: classes/pref/feeds.php:290
 #, php-format
 msgid "(%d feed)"
@@ -1482,8 +1306,7 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d Feed)"
 msgstr[1] "(%d Feeds)"
 
-#: classes/pref/feeds.php:537
-#: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537 classes/pref/prefs.php:18
 msgid "General"
 msgstr "Allgemein"
 
@@ -1491,32 +1314,25 @@ msgstr "Allgemein"
 msgid "Feed Title"
 msgstr "Feed-Titel"
 
-#: classes/pref/feeds.php:595
-#: classes/pref/feeds.php:830
-#: classes/pref/feeds.php:1828
-#: classes/feeds.php:1050
+#: classes/pref/feeds.php:595 classes/pref/feeds.php:830
+#: classes/pref/feeds.php:1828 classes/feeds.php:1050
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
-#: classes/pref/feeds.php:608
-#: classes/pref/feeds.php:844
+#: classes/pref/feeds.php:608 classes/pref/feeds.php:844
 msgid "Language:"
 msgstr "Sprache:"
 
-#: classes/pref/feeds.php:615
-#: classes/pref/feeds.php:853
+#: classes/pref/feeds.php:615 classes/pref/feeds.php:853
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:869
+#: classes/pref/feeds.php:630 classes/pref/feeds.php:869
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: classes/pref/feeds.php:658
-#: classes/pref/feeds.php:890
-#: classes/pref/feeds.php:1845
-#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658 classes/pref/feeds.php:890
+#: classes/pref/feeds.php:1845 classes/pref/prefs.php:245
 #: classes/feeds.php:1078
 msgid "Password"
 msgstr "Passwort"
@@ -1525,33 +1341,27 @@ msgstr "Passwort"
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Hinweis:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed eine Authentifizierung erfordert (außer Twitter-Feeds)."
 
-#: classes/pref/feeds.php:681
-#: classes/pref/feeds.php:900
+#: classes/pref/feeds.php:681 classes/pref/feeds.php:900
 msgid "Hide from Popular feeds"
 msgstr "Nicht unter beliebten Feeds aufführen"
 
-#: classes/pref/feeds.php:693
-#: classes/pref/feeds.php:906
+#: classes/pref/feeds.php:693 classes/pref/feeds.php:906
 msgid "Include in e-mail digest"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: classes/pref/feeds.php:706
-#: classes/pref/feeds.php:912
+#: classes/pref/feeds.php:706 classes/pref/feeds.php:912
 msgid "Always display image attachments"
 msgstr "Angehängte Bilder immer anzeigen"
 
-#: classes/pref/feeds.php:719
-#: classes/pref/feeds.php:920
+#: classes/pref/feeds.php:719 classes/pref/feeds.php:920
 msgid "Do not embed images"
 msgstr "Bilder nicht einbetten"
 
-#: classes/pref/feeds.php:732
-#: classes/pref/feeds.php:928
+#: classes/pref/feeds.php:732 classes/pref/feeds.php:928
 msgid "Cache images locally"
 msgstr "Bilder lokal zwischenspeichern"
 
-#: classes/pref/feeds.php:744
-#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:744 classes/pref/feeds.php:934
 msgid "Mark updated articles as unread"
 msgstr "Aktualisierte Artikel als ungelesen markieren"
 
@@ -1563,8 +1373,7 @@ msgstr "Symbol"
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: classes/pref/feeds.php:772
-#: classes/pref/prefs.php:706
+#: classes/pref/feeds.php:772 classes/pref/prefs.php:706
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -1576,8 +1385,7 @@ msgstr "Abonnierte Feeds:"
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "PubSubHubbub-Abonnementstatus für Push-fähige Feeds zurücksetzen."
 
-#: classes/pref/feeds.php:1207
-#: classes/pref/feeds.php:1260
+#: classes/pref/feeds.php:1207 classes/pref/feeds.php:1260
 msgid "All done."
 msgstr "Fertig."
 
@@ -1593,14 +1401,12 @@ msgstr "Inaktive Feeds"
 msgid "Edit selected feeds"
 msgstr "Bearbeite ausgewählte Feeds"
 
-#: classes/pref/feeds.php:1360
-#: classes/pref/feeds.php:1374
+#: classes/pref/feeds.php:1360 classes/pref/feeds.php:1374
 #: classes/pref/filters.php:762
 msgid "Reset sort order"
 msgstr "Sortierreihenfolge zurücksetzen"
 
-#: classes/pref/feeds.php:1362
-#: js/prefs.js:1737
+#: classes/pref/feeds.php:1362 js/prefs.js:1737
 msgid "Batch subscribe"
 msgstr "Mehrere Feeds abonnieren"
 
@@ -1628,8 +1434,7 @@ msgstr "Manuelles Löschen"
 msgid "Clear feed data"
 msgstr "Feed-Daten löschen"
 
-#: classes/pref/feeds.php:1396
-#: classes/pref/filters.php:770
+#: classes/pref/feeds.php:1396 classes/pref/filters.php:770
 msgid "Rescore articles"
 msgstr "Artikel neu bewerten"
 
@@ -1693,9 +1498,7 @@ msgstr "Veröffentlichte & geteilte Artikel / erzeugte Feeds"
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und können von jedem abonniert werden, der die nachstehende URL kennt."
 
-#: classes/pref/feeds.php:1520
-#: classes/feeds.php:54
-#: classes/feeds.php:134
+#: classes/pref/feeds.php:1520 classes/feeds.php:54 classes/feeds.php:134
 msgid "View as RSS"
 msgstr "Als RSS anzeigen"
 
@@ -1711,13 +1514,11 @@ msgstr "Alle generierten URLs löschen"
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste zuerst):"
 
-#: classes/pref/feeds.php:1636
-#: classes/pref/feeds.php:1700
+#: classes/pref/feeds.php:1636 classes/pref/feeds.php:1700
 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 
-#: classes/pref/feeds.php:1654
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1654 classes/pref/feeds.php:1720
 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 
@@ -1733,9 +1534,7 @@ msgstr "Zu abonnierende Feeds, Einen pro Zeile"
 msgid "Feeds require authentication."
 msgstr "Feeds benötigen Authentifizierung."
 
-#: classes/pref/feeds.php:1864
-#: classes/feeds.php:1094
-#: classes/feeds.php:1148
+#: classes/pref/feeds.php:1864 classes/feeds.php:1094 classes/feeds.php:1148
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -1743,60 +1542,48 @@ msgstr "Abonnieren"
 msgid "Preview article"
 msgstr "Artikel-Vorschau"
 
-#: classes/pref/filters.php:239
-#: classes/pref/filters.php:518
+#: classes/pref/filters.php:239 classes/pref/filters.php:518
 msgid "(inverse)"
 msgstr "Invertiert"
 
-#: classes/pref/filters.php:235
-#: classes/pref/filters.php:517
+#: classes/pref/filters.php:235 classes/pref/filters.php:517
 #, php-format
 msgid "%s on %s in %s %s"
 msgstr "%s innerhalb %s von %s %s"
 
-#: classes/pref/filters.php:354
-#: classes/pref/filters.php:827
+#: classes/pref/filters.php:354 classes/pref/filters.php:827
 #: classes/pref/filters.php:942
 msgid "Match"
 msgstr "Kriterien"
 
-#: classes/pref/filters.php:368
-#: classes/pref/filters.php:416
-#: classes/pref/filters.php:841
-#: classes/pref/filters.php:868
+#: classes/pref/filters.php:368 classes/pref/filters.php:416
+#: classes/pref/filters.php:841 classes/pref/filters.php:868
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: classes/pref/filters.php:371
-#: classes/pref/filters.php:419
-#: classes/pref/filters.php:844
-#: classes/pref/filters.php:871
+#: classes/pref/filters.php:371 classes/pref/filters.php:419
+#: classes/pref/filters.php:844 classes/pref/filters.php:871
 #: classes/feeds.php:116
 msgid "Delete"
 msgstr "Löschen"
 
-#: classes/pref/filters.php:402
-#: classes/pref/filters.php:854
+#: classes/pref/filters.php:402 classes/pref/filters.php:854
 msgid "Apply actions"
 msgstr "Aktionen anwenden"
 
-#: classes/pref/filters.php:452
-#: classes/pref/filters.php:883
+#: classes/pref/filters.php:452 classes/pref/filters.php:883
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: classes/pref/filters.php:461
-#: classes/pref/filters.php:886
+#: classes/pref/filters.php:461 classes/pref/filters.php:886
 msgid "Match any rule"
 msgstr "Ein erfülltes Kriterium ist ausreichend"
 
-#: classes/pref/filters.php:470
-#: classes/pref/filters.php:889
+#: classes/pref/filters.php:470 classes/pref/filters.php:889
 msgid "Inverse matching"
 msgstr "Invertierte Ãœbereinstimmung"
 
-#: classes/pref/filters.php:482
-#: classes/pref/filters.php:896
+#: classes/pref/filters.php:482 classes/pref/filters.php:896
 msgid "Test"
 msgstr "Test"
 
@@ -1816,8 +1603,7 @@ msgstr "Invertiere reguläre Ausdrücke"
 msgid "on field"
 msgstr "in Feld"
 
-#: classes/pref/filters.php:962
-#: js/PrefFilterTree.js:64
+#: classes/pref/filters.php:962 js/PrefFilterTree.js:64
 msgid "in"
 msgstr "in"
 
@@ -1829,8 +1615,7 @@ msgstr "Wiki:Filter"
 msgid "Save rule"
 msgstr "Regel speichern"
 
-#: classes/pref/filters.php:980
-#: js/functions.js:1012
+#: classes/pref/filters.php:980 js/functions.js:1012
 msgid "Add rule"
 msgstr "Regel hinzufügen"
 
@@ -1846,8 +1631,7 @@ msgstr "keine Aktionen verfügbar"
 msgid "Save action"
 msgstr "Aktion speichern"
 
-#: classes/pref/filters.php:1073
-#: js/functions.js:1038
+#: classes/pref/filters.php:1073 js/functions.js:1038
 msgid "Add action"
 msgstr "Aktion hinzufügen"
 
@@ -2045,8 +1829,7 @@ msgstr "Unsichere Tags aus Artikeln entfernen"
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Alle außer den meist verwendeten HTML Tags beim Lesen entfernen."
 
-#: classes/pref/prefs.php:53
-#: js/prefs.js:1692
+#: classes/pref/prefs.php:53 js/prefs.js:1692
 msgid "Customize stylesheet"
 msgstr "Benutzerdefiniertes Stylesheet"
 
@@ -2146,8 +1929,7 @@ msgstr "Einmalpasswörter (OTP) / Authentifikator"
 msgid "One time passwords are currently enabled. Enter your current password below to disable."
 msgstr "Einmalpasswörter sind aktiviert. Gib dein aktuelles Passwort ein, um diese zu deaktivieren."
 
-#: classes/pref/prefs.php:347
-#: classes/pref/prefs.php:398
+#: classes/pref/prefs.php:347 classes/pref/prefs.php:398
 msgid "Enter your password"
 msgstr "Geben Sie Ihr Passwort ein"
 
@@ -2224,33 +2006,27 @@ msgstr "Mehr Plugins im tt-rss.org <a class=\"visibleLink\" target=\"_blank\" hr
 msgid "System plugins"
 msgstr "System-Plugins"
 
-#: classes/pref/prefs.php:744
-#: classes/pref/prefs.php:800
+#: classes/pref/prefs.php:744 classes/pref/prefs.php:800
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:745
-#: classes/pref/prefs.php:801
+#: classes/pref/prefs.php:745 classes/pref/prefs.php:801
 msgid "Description"
 msgstr "Beschreibung"
 
-#: classes/pref/prefs.php:746
-#: classes/pref/prefs.php:802
+#: classes/pref/prefs.php:746 classes/pref/prefs.php:802
 msgid "Version"
 msgstr "Version"
 
-#: classes/pref/prefs.php:747
-#: classes/pref/prefs.php:803
+#: classes/pref/prefs.php:747 classes/pref/prefs.php:803
 msgid "Author"
 msgstr "Autor"
 
-#: classes/pref/prefs.php:778
-#: classes/pref/prefs.php:837
+#: classes/pref/prefs.php:778 classes/pref/prefs.php:837
 msgid "more info"
 msgstr "weitere Informationen"
 
-#: classes/pref/prefs.php:787
-#: classes/pref/prefs.php:846
+#: classes/pref/prefs.php:787 classes/pref/prefs.php:846
 msgid "Clear data"
 msgstr "Daten löschen"
 
@@ -2266,8 +2042,7 @@ msgstr "Ausgewählte Plugins aktivieren"
 msgid "Incorrect one time password"
 msgstr "Falsches Einmalpasswort"
 
-#: classes/pref/prefs.php:932
-#: classes/pref/prefs.php:949
+#: classes/pref/prefs.php:932 classes/pref/prefs.php:949
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
@@ -2280,8 +2055,7 @@ msgstr "Sie können Farben, Schriftarten und das Layout Ihres aktuell gewählten
 msgid "Create profile"
 msgstr "Profil erstellen"
 
-#: classes/pref/prefs.php:1037
-#: classes/pref/prefs.php:1065
+#: classes/pref/prefs.php:1037 classes/pref/prefs.php:1065
 msgid "(active)"
 msgstr "(aktiv)"
 
@@ -2330,9 +2104,7 @@ msgstr "Archiv"
 msgid "Move back"
 msgstr "Zurückgehen"
 
-#: classes/feeds.php:121
-#: classes/feeds.php:126
-#: plugins/mail/init.php:75
+#: classes/feeds.php:121 classes/feeds.php:126 plugins/mail/init.php:75
 #: plugins/mailto/init.php:25
 msgid "Forward by email"
 msgstr "Per E-Mail weiterleiten"
@@ -2341,8 +2113,7 @@ msgstr "Per E-Mail weiterleiten"
 msgid "Feed:"
 msgstr "Feed:"
 
-#: classes/feeds.php:223
-#: classes/feeds.php:889
+#: classes/feeds.php:223 classes/feeds.php:889
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
@@ -2355,8 +2126,7 @@ msgstr "Niemals"
 msgid "Imported at %s"
 msgstr "Importiert nach %s"
 
-#: classes/feeds.php:466
-#: classes/feeds.php:563
+#: classes/feeds.php:466 classes/feeds.php:563
 msgid "mark feed as read"
 msgstr "Feed als gelesen markieren"
 
@@ -2384,14 +2154,12 @@ msgstr "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manue
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: classes/feeds.php:815
-#: classes/feeds.php:989
+#: classes/feeds.php:815 classes/feeds.php:989
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
-#: classes/feeds.php:825
-#: classes/feeds.php:999
+#: classes/feeds.php:825 classes/feeds.php:999
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
@@ -2399,8 +2167,7 @@ msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 msgid "No feed selected."
 msgstr "Keinen Feed ausgewählt."
 
-#: classes/feeds.php:1036
-#: classes/feeds.php:1044
+#: classes/feeds.php:1036 classes/feeds.php:1044
 msgid "Feed or site URL"
 msgstr "URL von Feed oder Seite"
 
@@ -2449,35 +2216,29 @@ msgstr "Such-Syntax"
 msgid "Linked"
 msgstr "Verbunden"
 
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
+#: plugins/instances/init.php:204 plugins/instances/init.php:395
 msgid "Instance"
 msgstr "Instanz"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
+#: plugins/instances/init.php:215 plugins/instances/init.php:312
 #: plugins/instances/init.php:404
 msgid "Instance URL"
 msgstr "Instanz-URL"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
+#: plugins/instances/init.php:226 plugins/instances/init.php:414
 msgid "Access key:"
 msgstr "Zugriffsberechtigung:"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
+#: plugins/instances/init.php:229 plugins/instances/init.php:313
 #: plugins/instances/init.php:417
 msgid "Access key"
 msgstr "Zugriffsberechtigung"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
+#: plugins/instances/init.php:233 plugins/instances/init.php:421
 msgid "Use one access key for both linked instances."
 msgstr "Benutzen Sie den selben Zugriffschlüssel für beide verbundenen Instanzen."
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
+#: plugins/instances/init.php:241 plugins/instances/init.php:429
 msgid "Generate new key"
 msgstr "Neuen Zugriffsschlüssel erzeugen"
 
@@ -2505,8 +2266,7 @@ msgstr "Gespeicherte Feeds"
 msgid "Create link"
 msgstr "Verbindung herstellen"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
+#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
 msgid "Not work safe (click to toggle)"
 msgstr "NSFW (Klicken zum Anzeigen)"
 
@@ -2522,13 +2282,11 @@ msgstr "Liste von NSFW-Tags (kommagetrennt)"
 msgid "Configuration saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
+#: plugins/note/init.php:26 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Artikelnotizen bearbeiten"
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
 msgid "Shared articles"
 msgstr "Geteilte Artikel"
 
@@ -2560,8 +2318,7 @@ msgstr "af_readability Einstellungen"
 msgid "Use Readability for pages shared via bookmarklet."
 msgstr "Verwende Readability für über das Bookmarklet geteilte Seiten."
 
-#: plugins/af_readability/init.php:82
-#: plugins/af_psql_trgm/init.php:195
+#: plugins/af_readability/init.php:82 plugins/af_psql_trgm/init.php:195
 msgid "Currently enabled for (click to edit):"
 msgstr "Zur Zeit aktiviert für (klicken zum Bearbeiten):"
 
@@ -2602,8 +2359,7 @@ msgstr "Daten gespeichert (%s, %d)"
 msgid "Show related articles"
 msgstr "zeige verwandte Artikel"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:223
+#: plugins/af_psql_trgm/init.php:118 plugins/af_psql_trgm/init.php:223
 msgid "Mark similar articles as read"
 msgstr "markiere ähnliche Artikel als gelesen"
 
@@ -2697,9 +2453,9 @@ msgid "Prepare data"
 msgstr "Bereite Daten vor"
 
 #: plugins/import_export/init.php:428
-#, fuzzy, php-format
+#, php-format
 msgid "Upload failed with error code %d (%s)"
-msgstr "Upload schlug fehl. Fehlercode: %d"
+msgstr "Upload schlug fehl. Fehlercode: %d (%s)"
 
 #: plugins/import_export/init.php:454
 msgid "No file uploaded."
@@ -2717,15 +2473,12 @@ msgstr "Mail-Plugin"
 msgid "You can set predefined email addressed here (comma-separated list):"
 msgstr "Sie können hier Mailadressen vordefinieren (Komma getrennte Liste):"
 
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
+#: plugins/mail/init.php:112 plugins/mail/init.php:118
+#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
 msgid "[Forwarded]"
 msgstr "[Weitergeleitet]"
 
-#: plugins/mail/init.php:112
-#: plugins/mailto/init.php:49
+#: plugins/mail/init.php:112 plugins/mailto/init.php:49
 msgid "Multiple articles"
 msgstr "Mehrere Artikel"
 
@@ -2860,8 +2613,7 @@ msgstr "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nä
 msgid "Subscription reset."
 msgstr "Abonnement zurückgesetzt."
 
-#: js/functions.js:1311
-#: js/tt-rss.js:705
+#: js/functions.js:1311 js/tt-rss.js:705
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
@@ -2878,19 +2630,12 @@ msgstr "Bitte geben Sie den Kategorietitel ein:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#: js/functions.js:1456
-#: js/prefs.js:1223
+#: js/functions.js:1456 js/prefs.js:1223
 msgid "Trying to change address..."
 msgstr "Versuche, die Adresse zu ändern..."
 
-#: js/functions.js:1757
-#: js/functions.js:1867
-#: js/prefs.js:419
-#: js/prefs.js:449
-#: js/prefs.js:481
-#: js/prefs.js:634
-#: js/prefs.js:654
-#: js/prefs.js:1199
+#: js/functions.js:1757 js/functions.js:1867 js/prefs.js:419 js/prefs.js:449
+#: js/prefs.js:481 js/prefs.js:634 js/prefs.js:654 js/prefs.js:1199
 #: js/prefs.js:1344
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
@@ -2903,13 +2648,11 @@ msgstr "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten
 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 
-#: js/functions.js:1849
-#: js/prefs.js:1181
+#: js/functions.js:1849 js/prefs.js:1181
 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 
-#: js/functions.js:1852
-#: js/prefs.js:1184
+#: js/functions.js:1852 js/prefs.js:1184
 msgid "Removing selected feeds..."
 msgstr "Ausgewählte Feeds werden entfernt..."
 
@@ -2929,11 +2672,8 @@ msgstr "Füge Benutzer hinzu..."
 msgid "User Editor"
 msgstr "Benutzereditor"
 
-#: js/prefs.js:112
-#: js/prefs.js:216
-#: js/prefs.js:741
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
+#: js/prefs.js:112 js/prefs.js:216 js/prefs.js:741
+#: plugins/instances/instances.js:26 plugins/instances/instances.js:89
 #: js/functions.js:1664
 msgid "Saving data..."
 msgstr "Speichere Daten..."
@@ -2958,8 +2698,7 @@ msgstr "Ausgewählte Label entfernen?"
 msgid "Removing selected labels..."
 msgstr "Ausgewählte Label werden entfernt..."
 
-#: js/prefs.js:317
-#: js/prefs.js:1385
+#: js/prefs.js:317 js/prefs.js:1385
 msgid "No labels are selected."
 msgstr "Keine Label ausgewählt."
 
@@ -2971,10 +2710,7 @@ msgstr "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes
 msgid "Removing selected users..."
 msgstr "Ausgewählte Benutzer werden entfernt..."
 
-#: js/prefs.js:348
-#: js/prefs.js:492
-#: js/prefs.js:513
-#: js/prefs.js:552
+#: js/prefs.js:348 js/prefs.js:492 js/prefs.js:513 js/prefs.js:552
 msgid "No users are selected."
 msgstr "Keine Benutzer ausgewählt."
 
@@ -2986,9 +2722,7 @@ msgstr "Ausgewählte Filter entfernen?"
 msgid "Removing selected filters..."
 msgstr "Ausgewählte Filter werden entfernt..."
 
-#: js/prefs.js:381
-#: js/prefs.js:589
-#: js/prefs.js:608
+#: js/prefs.js:381 js/prefs.js:589 js/prefs.js:608
 msgid "No filters are selected."
 msgstr "Keine Filter ausgewählt."
 
@@ -3020,9 +2754,7 @@ msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
 msgid "Purging selected feed..."
 msgstr "Lösche ausgewählten Feed..."
 
-#: js/prefs.js:497
-#: js/prefs.js:518
-#: js/prefs.js:557
+#: js/prefs.js:497 js/prefs.js:518 js/prefs.js:557
 msgid "Please select only one user."
 msgstr "Bitte nur einen Benutzer auswählen."
 
@@ -3062,8 +2794,7 @@ msgstr "OPML Import"
 msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
-#: js/prefs.js:807
-#: plugins/import_export/import_export.js:115
+#: js/prefs.js:807 plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importiere, bitte warten..."
 
@@ -3095,9 +2826,7 @@ msgstr "Alle Feeds werden als gelesen markiert..."
 msgid "Please enable mail plugin first."
 msgstr "Bitte erst das Mail-Plugin aktivieren."
 
-#: js/tt-rss.js:452
-#: js/functions.js:1643
-#: js/tt-rss.js:686
+#: js/tt-rss.js:452 js/functions.js:1643 js/tt-rss.js:686
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
@@ -3105,8 +2834,7 @@ msgstr "Sie können diese Art von Feed nicht bearbeiten."
 msgid "Please enable embed_original plugin first."
 msgstr "Bitte erst das \"Original einbetten\" Plugin aktivieren."
 
-#: js/tt-rss.js:546
-#: js/tt-rss.js:736
+#: js/tt-rss.js:546 js/tt-rss.js:736
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen ist in der kombinierten Ansicht nicht verfügbar"
 
@@ -3114,8 +2842,7 @@ msgstr "Widescreen ist in der kombinierten Ansicht nicht verfügbar"
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#: js/tt-rss.js:855
-#: js/tt-rss.js:699
+#: js/tt-rss.js:855 js/tt-rss.js:699
 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 
@@ -3128,16 +2855,9 @@ msgstr "Artikel in %s neu bewerten?"
 msgid "Rescoring articles..."
 msgstr "Artikel werden neu bewertet..."
 
-#: js/viewfeed.js:1011
-#: js/viewfeed.js:1054
-#: js/viewfeed.js:1107
-#: js/viewfeed.js:2166
-#: plugins/mail/mail.js:7
-#: plugins/mailto/init.js:7
-#: js/viewfeed.js:733
-#: js/viewfeed.js:761
-#: js/viewfeed.js:788
-#: js/viewfeed.js:853
+#: js/viewfeed.js:1011 js/viewfeed.js:1054 js/viewfeed.js:1107
+#: js/viewfeed.js:2166 plugins/mail/mail.js:7 plugins/mailto/init.js:7
+#: js/viewfeed.js:733 js/viewfeed.js:761 js/viewfeed.js:788 js/viewfeed.js:853
 #: js/viewfeed.js:887
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
@@ -3245,8 +2965,7 @@ msgstr "Ausgewählte Instanzen entfernen?"
 msgid "Removing selected instances..."
 msgstr "Ausgewählte Instanzen werden entfernt..."
 
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
+#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
 msgid "No instances are selected."
 msgstr "Keine Instanzen ausgewählt."
 
@@ -3281,8 +3000,7 @@ msgstr "Daten importieren"
 msgid "Please choose the file first."
 msgstr "Bitte zuerst die Datei auswählen."
 
-#: plugins/mail/mail.js:21
-#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
 msgid "Forward article by email"
 msgstr "Artikel via E-Mail weiterleiten"
 
@@ -3326,8 +3044,7 @@ msgstr "Versuche, Teilen rückgängig zu machen..."
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Alle bisher geteilten Artikel URLs werden ungültig. Fortfahren?"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1523
+#: plugins/share/share_prefs.js:6 js/prefs.js:1523
 msgid "Clearing URLs..."
 msgstr "Leere URLs..."
 
@@ -3335,8 +3052,7 @@ msgstr "Leere URLs..."
 msgid "Shared URLs cleared."
 msgstr "Geteilte URLs geleert."
 
-#: js/feedlist.js:446
-#: js/feedlist.js:518
+#: js/feedlist.js:446 js/feedlist.js:518
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
@@ -3520,13 +3236,11 @@ msgstr "Ausgewählte Profile werden entfernt..."
 msgid "No profiles are selected."
 msgstr "Keine Profile ausgewählt."
 
-#: js/prefs.js:1443
-#: js/prefs.js:1496
+#: js/prefs.js:1443 js/prefs.js:1496
 msgid "Activate selected profile?"
 msgstr "Ausgewählte Profile entfernen?"
 
-#: js/prefs.js:1459
-#: js/prefs.js:1512
+#: js/prefs.js:1459 js/prefs.js:1512
 msgid "Please choose a profile to activate."
 msgstr "Bitte ein Profil zum Aktivieren auswählen."
 
@@ -3550,9 +3264,7 @@ msgstr "Label-Editor"
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
-#: js/viewfeed.js:128
-#: js/viewfeed.js:178
-#: js/viewfeed.js:195
+#: js/viewfeed.js:128 js/viewfeed.js:178 js/viewfeed.js:195
 msgid "Click to open next unread feed."
 msgstr "Hier klicken, um den nächsten ungelesenen Feed zu öffnen"