summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locale/ca_CA/LC_MESSAGES/messages.mobin23564 -> 23564 bytes
-rw-r--r--locale/ca_CA/LC_MESSAGES/messages.po195
-rw-r--r--locale/cs_CZ/LC_MESSAGES/messages.mobin60876 -> 60876 bytes
-rw-r--r--locale/cs_CZ/LC_MESSAGES/messages.po193
-rwxr-xr-xlocale/de_DE/LC_MESSAGES/messages.mobin66480 -> 66480 bytes
-rwxr-xr-xlocale/de_DE/LC_MESSAGES/messages.po1396
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.mobin67752 -> 67752 bytes
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.po193
-rw-r--r--locale/fi_FI/LC_MESSAGES/messages.mobin40621 -> 40621 bytes
-rw-r--r--locale/fi_FI/LC_MESSAGES/messages.po193
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin67077 -> 67077 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po193
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.mobin67004 -> 67004 bytes
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.po193
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin34251 -> 34251 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po195
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin71123 -> 71123 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po193
-rw-r--r--locale/ko_KR/LC_MESSAGES/messages.mobin45791 -> 45791 bytes
-rw-r--r--locale/ko_KR/LC_MESSAGES/messages.po193
-rw-r--r--locale/lv_LV/LC_MESSAGES/messages.mobin42386 -> 42386 bytes
-rw-r--r--locale/lv_LV/LC_MESSAGES/messages.po195
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin22356 -> 22356 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po195
-rw-r--r--locale/nl_NL/LC_MESSAGES/messages.mobin61621 -> 61621 bytes
-rw-r--r--locale/nl_NL/LC_MESSAGES/messages.po193
-rw-r--r--locale/pl_PL/LC_MESSAGES/messages.mobin66176 -> 66176 bytes
-rw-r--r--locale/pl_PL/LC_MESSAGES/messages.po193
-rwxr-xr-xlocale/pt_BR/LC_MESSAGES/messages.mobin59675 -> 59675 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po193
-rw-r--r--locale/pt_PT/LC_MESSAGES/messages.po193
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin38680 -> 38680 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po195
-rw-r--r--locale/sv_SE/LC_MESSAGES/messages.mobin59973 -> 59973 bytes
-rw-r--r--locale/sv_SE/LC_MESSAGES/messages.po193
-rw-r--r--locale/tr_TR/LC_MESSAGES/messages.mobin64749 -> 64749 bytes
-rw-r--r--locale/tr_TR/LC_MESSAGES/messages.po193
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin32155 -> 32155 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po195
-rw-r--r--locale/zh_TW/LC_MESSAGES/messages.mobin42062 -> 42062 bytes
-rw-r--r--locale/zh_TW/LC_MESSAGES/messages.po193
-rw-r--r--messages.pot150
42 files changed, 2732 insertions, 2686 deletions
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 2709eca3c..6111dda87 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.mo
+++ b/locale/ca_CA/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 9029817d1..ff95b88ab 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.po
+++ b/locale/ca_CA/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2009-11-19 09:40+0100\n"
"Last-Translator: Alfred Galitó <[email protected]>\n"
"Language-Team: Català <[email protected]>\n"
@@ -162,7 +162,7 @@ msgstr "Ha fallat la sortida de prova de SQL, reviseu la base configuració de l
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -388,13 +388,13 @@ msgid "Feeds"
msgstr "Canals"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtres"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Etiquetes"
@@ -486,10 +486,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -733,7 +733,7 @@ msgid "Go to"
msgstr "Vés a..."
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Tots els articles"
@@ -759,7 +759,7 @@ msgid "Create label"
msgstr "Crea una etiqueta"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Crea un filtre"
@@ -861,35 +861,36 @@ msgstr "Adjuncions:"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Especial"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Tots els canals"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Articles marcats"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Articles publicats"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Articles nous"
-#: include/functions.php:1976
+#: include/functions.php:1979
#, fuzzy
msgid "Archived articles"
msgstr "Articles mémorisés"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr ""
@@ -975,7 +976,7 @@ msgstr "Etiquetes per aquest article (separades per comes):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -993,10 +994,10 @@ msgstr "Desa"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1234,11 +1235,11 @@ msgstr "Dernière mise à jour&nbsp;:"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1254,11 +1255,11 @@ msgstr "Inverteix"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1296,10 +1297,10 @@ msgid "Move back"
msgstr "Vés enrere"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
#, fuzzy
msgid "Delete"
msgstr "Per defecte"
@@ -1438,7 +1439,7 @@ msgstr "Més canals"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1462,8 +1463,8 @@ msgstr "Límit:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1657,11 +1658,11 @@ msgstr "[tt-rss] Notificació de canvi de contrasenya"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1681,7 +1682,7 @@ msgid "Details"
msgstr "Diàriament"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Edita"
@@ -1708,8 +1709,8 @@ msgid "No matching users found."
msgstr "No s'ha trobat cap usuari que coinicideixi. "
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Descriptif"
@@ -1751,138 +1752,140 @@ msgstr "No s'ha trobat cap fitxer que coincideixi."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+#, fuzzy
+msgid "(inverse)"
+msgstr "(Invers)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Coincidència"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr ""
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
#, fuzzy
msgid "Apply actions"
msgstr "Accions dels canals"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Activat"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
#, fuzzy
msgid "Match any rule"
msgstr "Basat en:"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "Coincidència inversa"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Tester"
-#: classes/pref/filters.php:420
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Invers)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
#, fuzzy
msgid "Reset sort order"
msgstr "Reinicia la contrasenya"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Canvia la puntuació dels articles"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Crea"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "al camp"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "a"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtres"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#, fuzzy
msgid "Save rule"
msgstr "Desa"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
#, fuzzy
msgid "Add rule"
msgstr "S'està afegint la categoria..."
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Acció a realitzar:"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "amb els paràmetres:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#, fuzzy
msgid "Save action"
msgstr "Quadre d'accions"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
#, fuzzy
msgid "Add action"
msgstr "Accions dels canals"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
#, fuzzy
msgid "[No caption]"
msgstr "Descriptif"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "S'està afegint la categoria..."
msgstr[1] "S'està afegint la categoria..."
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3243,7 +3246,7 @@ msgstr "Edita les categories"
msgid "Remove category"
msgstr "Crea una categoria"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
#, fuzzy
msgid "Inverse"
msgstr "(Invers)"
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo
index 617df3f63..d34068084 100644
--- a/locale/cs_CZ/LC_MESSAGES/messages.mo
+++ b/locale/cs_CZ/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po
index 52a919a51..5ed1db6b5 100644
--- a/locale/cs_CZ/LC_MESSAGES/messages.po
+++ b/locale/cs_CZ/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-05-13 18:50+0200\n"
"Last-Translator: Tomáš Chvátal <[email protected]>\n"
"Language-Team: Czech <[email protected]>\n"
@@ -158,7 +158,7 @@ msgstr "Test ochrany proti podvratným SQL dotazům (SQL Injection) selhal, zkon
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -378,13 +378,13 @@ msgid "Feeds"
msgstr "Kanály"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtry"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Štítky"
@@ -475,10 +475,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Skript aktualizace dat Tiny Tiny RSS."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -693,7 +693,7 @@ msgid "Go to"
msgstr "Přejít na"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Všechny články"
@@ -717,7 +717,7 @@ msgid "Create label"
msgstr "Vytvořit štítek"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Vytvořit filtr"
@@ -814,34 +814,35 @@ msgstr "Přílohy"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "Chyba LibXML %s na řádku %d (sloupec %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Speciální"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Všechny kanály"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Články s hvězdičkou"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Publikované články"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Nové články"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Archivované články"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Nedávno přečtené"
@@ -923,7 +924,7 @@ msgstr "Značky článku (oddělené čárkami):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -941,10 +942,10 @@ msgstr "Uložit"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1169,11 +1170,11 @@ msgstr "Poslední aktualizace: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1189,11 +1190,11 @@ msgstr "Invertovat"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1227,10 +1228,10 @@ msgid "Move back"
msgstr "Zpět"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Smazat"
@@ -1360,7 +1361,7 @@ msgstr "Více kanálů"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1381,8 +1382,8 @@ msgstr "omezení:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1568,11 +1569,11 @@ msgstr "[tt-rss] Oznámení o změně hesla"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1590,7 +1591,7 @@ msgid "Details"
msgstr "Podrobnosti"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Upravit"
@@ -1617,8 +1618,8 @@ msgid "No matching users found."
msgstr "Nebyl nalezen žádný odpovídající uživatel."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Titulek"
@@ -1655,121 +1656,123 @@ msgstr "Nebyly nalezeny žádné nedávné články odpovídající filtru."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Komplexní výrazy nemusejí navrátit výsledky při testování kvůli problémům s implementací regulárních výrazů databázového serveru."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(inverzní)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s na %s v %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Odpovídá"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Přidat"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Vykonat činnosti"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Povoleno"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Odpovídá kterémukoliv pravidlu"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr ""
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Test"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(inverzní)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s na %s v %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Kombinovat"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Zrušit pořadí řazení"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Přehodnotit články"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Vytvořit"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "pole"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "v"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtry"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Uložit pravidlo"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Přidat pravidlo"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Provést činnost"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "s parametry:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Uložit činnost"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Přidat činnost"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Bez titulku]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
@@ -1777,7 +1780,7 @@ msgstr[0] "Přidat pravidlo"
msgstr[1] "Přidat pravidlo"
msgstr[2] "Přidat pravidlo"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3024,7 +3027,7 @@ msgstr "Upravit kategorii"
msgid "Remove category"
msgstr "Odstranit kategorii"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Inverzní"
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 15f7f11c5..74bca5c0e 100755
--- a/locale/de_DE/LC_MESSAGES/messages.mo
+++ b/locale/de_DE/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index ccea89fa6..b072a14e1 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: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2014-03-19 21:01+0100\n"
"Last-Translator: Heiko Adams <[email protected]>\n"
"Language-Team: \n"
@@ -55,39 +55,49 @@ 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 "Each 15 minutes"
msgstr "Alle 15 Minuten"
-#: backend.php:85 backend.php:95
+#: backend.php:85
+#: backend.php:95
msgid "Each 30 minutes"
msgstr "Alle 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 "Each 4 hours"
msgstr "Alle 4 Stunden"
-#: backend.php:88 backend.php:98
+#: backend.php:88
+#: backend.php:98
msgid "Each 12 hours"
msgstr "Alle 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:119 classes/pref/system.php:51
+#: backend.php:103
+#: classes/pref/users.php:119
+#: classes/pref/system.php:51
msgid "User"
msgstr "Benutzer"
@@ -100,20 +110,12 @@ msgid "Administrator"
msgstr "Administrator"
#: errors.php:9
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
-"Dieses Programm benötigt XmlHttpRequest um ordnungsgemäß zu funktionieren. "
-"Ihr Browser scheint dies nicht zu unterstützen."
+msgid "This program requires XmlHttpRequest to function properly. Your browser doesn't seem to support it."
+msgstr "Dieses Programm benötigt XmlHttpRequest um ordnungsgemäß zu funktionieren. Ihr Browser scheint dies nicht zu unterstützen."
#: errors.php:12
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
-"Dieses Programm benötigt Cookies um ordungsgemäß zu funktionieren. Ihr "
-"Browser scheint diese nicht zu unterstützen."
+msgid "This program requires cookies to function properly. Your browser doesn't seem to support them."
+msgstr "Dieses Programm benötigt Cookies um ordungsgemäß zu funktionieren. Ihr Browser scheint diese nicht zu unterstützen."
#: errors.php:15
msgid "Backend sanity check failed."
@@ -124,12 +126,8 @@ msgid "Frontend sanity check failed."
msgstr "Frontend Sicherheitsprüfung fehlgeschlagen."
#: errors.php:19
-msgid ""
-"Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
-"update&lt;/a&gt;."
-msgstr ""
-"Falsche Version des Datenbankschemas. &lt;a href='update.php'&gt;Bitte "
-"aktualisieren&lt;/a&gt;."
+msgid "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please update&lt;/a&gt;."
+msgstr "Falsche Version des Datenbankschemas. &lt;a href='update.php'&gt;Bitte aktualisieren&lt;/a&gt;."
#: errors.php:21
msgid "Request not authorized."
@@ -140,47 +138,57 @@ msgid "No operation to perform."
msgstr "Keine Funktion ausgewählt."
#: errors.php:25
-msgid ""
-"Could not display feed: query failed. Please check label match syntax or "
-"local configuration."
-msgstr ""
-"Kann Feed nicht angezeigen: Abfrage fehlgeschlagen. Bitte überprüfen Sie die "
-"Label Such-Syntax oder die lokale Konfiguration."
+msgid "Could not display feed: query failed. Please check label match syntax or local configuration."
+msgstr "Kann Feed nicht angezeigen: Abfrage fehlgeschlagen. Bitte überprüfen Sie die Label Such-Syntax oder die lokale Konfiguration."
#: errors.php:27
msgid "Denied. Your access level is insufficient to access this page."
-msgstr ""
-"Zugriff verweigert. Sie haben nicht die benötigten Rechte um auf diese Seite "
-"zuzugreifen."
+msgstr "Zugriff verweigert. Sie haben nicht die benötigten Rechte um auf diese Seite zuzugreifen."
#: errors.php:29
msgid "Configuration check failed"
msgstr "Konfigurationsprüfung fehlgeschlagen"
#: errors.php:31
-msgid ""
-"Your version of MySQL is not currently supported. Please see official site "
-"for more information."
-msgstr ""
-"Ihre Version von MySQL wird zur Zeit nicht unterstüzt. Für weitere "
-"Informationen schauen Sie sich die offiziellen Website an."
+msgid "Your version of MySQL is not currently supported. Please see official site for more information."
+msgstr "Ihre Version von MySQL wird zur Zeit nicht unterstüzt. Für weitere Informationen schauen Sie sich die offiziellen Website an."
#: errors.php:35
msgid "SQL escaping test failed, check your database and PHP configuration"
-msgstr ""
-"SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
-"Konfiguration"
-
-#: index.php:133 index.php:150 index.php:273 prefs.php:102
-#: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:666 classes/pref/feeds.php:1361 js/feedlist.js:126
-#: js/feedlist.js:450 js/functions.js:445 js/functions.js:783
-#: js/functions.js:1217 js/functions.js:1351 js/functions.js:1663
-#: js/prefs.js:653 js/prefs.js:854 js/prefs.js:1441 js/prefs.js:1494
-#: js/prefs.js:1534 js/prefs.js:1551 js/prefs.js:1567 js/prefs.js:1587
-#: js/prefs.js:1760 js/prefs.js:1776 js/prefs.js:1794 js/tt-rss.js:510
-#: js/tt-rss.js:527 js/viewfeed.js:854 js/viewfeed.js:1311
-#: plugins/import_export/import_export.js:17 plugins/updater/updater.js:17
+msgstr "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP Konfiguration"
+
+#: index.php:133
+#: index.php:150
+#: index.php:273
+#: prefs.php:102
+#: classes/backend.php:5
+#: classes/pref/labels.php:296
+#: classes/pref/filters.php:702
+#: classes/pref/feeds.php:1361
+#: js/feedlist.js:126
+#: js/feedlist.js:450
+#: js/functions.js:445
+#: js/functions.js:783
+#: js/functions.js:1217
+#: js/functions.js:1351
+#: js/functions.js:1663
+#: js/prefs.js:653
+#: js/prefs.js:854
+#: js/prefs.js:1441
+#: js/prefs.js:1494
+#: js/prefs.js:1534
+#: js/prefs.js:1551
+#: js/prefs.js:1567
+#: js/prefs.js:1587
+#: js/prefs.js:1760
+#: js/prefs.js:1776
+#: js/prefs.js:1794
+#: js/tt-rss.js:510
+#: js/tt-rss.js:527
+#: js/viewfeed.js:854
+#: js/viewfeed.js:1311
+#: plugins/import_export/import_export.js:17
+#: plugins/updater/updater.js:17
msgid "Loading, please wait..."
msgstr "Ladevorgang, bitte warten..."
@@ -200,15 +208,21 @@ msgstr "Adaptiv"
msgid "All Articles"
msgstr "Alle Artikel"
-#: index.php:176 include/functions2.php:99 classes/feeds.php:102
+#: index.php:176
+#: include/functions2.php:99
+#: classes/feeds.php:102
msgid "Starred"
msgstr "Markiert"
-#: index.php:177 include/functions2.php:100 classes/feeds.php:103
+#: index.php:177
+#: include/functions2.php:100
+#: classes/feeds.php:103
msgid "Published"
msgstr "Veröffentlicht"
-#: index.php:178 classes/feeds.php:89 classes/feeds.php:101
+#: index.php:178
+#: classes/feeds.php:89
+#: classes/feeds.php:101
msgid "Unread"
msgstr "Ungelesen"
@@ -244,8 +258,12 @@ msgstr "älteste zuerst"
msgid "Title"
msgstr "Titel"
-#: index.php:194 index.php:242 include/functions2.php:89 classes/feeds.php:107
-#: js/FeedTree.js:128 js/FeedTree.js:156
+#: index.php:194
+#: index.php:242
+#: include/functions2.php:89
+#: classes/feeds.php:107
+#: js/FeedTree.js:128
+#: js/FeedTree.js:156
msgid "Mark as read"
msgstr "Als gelesen markieren"
@@ -285,7 +303,8 @@ msgstr "Suchen..."
msgid "Feed actions:"
msgstr "Feed-Aktionen:"
-#: index.php:237 classes/handler/public.php:628
+#: index.php:237
+#: classes/handler/public.php:628
msgid "Subscribe to feed..."
msgstr "Feed abonnieren..."
@@ -297,7 +316,9 @@ msgstr "Feed bearbeiten..."
msgid "Rescore feed"
msgstr "Feed neu bewerten"
-#: index.php:240 classes/pref/feeds.php:756 classes/pref/feeds.php:1316
+#: index.php:240
+#: classes/pref/feeds.php:756
+#: classes/pref/feeds.php:1316
#: js/PrefFeedTree.js:74
msgid "Unsubscribe"
msgstr "Feed abbestellen"
@@ -314,7 +335,8 @@ msgstr "Gelesene zeigen/verstecken"
msgid "Other actions:"
msgstr "Andere Aktionen:"
-#: index.php:245 include/functions2.php:75
+#: index.php:245
+#: include/functions2.php:75
msgid "Toggle widescreen mode"
msgstr "Breitbild-Modus umschalten"
@@ -338,7 +360,9 @@ msgstr "Tastaturkürzel..."
msgid "Logout"
msgstr "Abmelden"
-#: prefs.php:33 prefs.php:120 include/functions2.php:102
+#: prefs.php:33
+#: prefs.php:120
+#: include/functions2.php:102
#: classes/pref/prefs.php:440
msgid "Preferences"
msgstr "Einstellungen"
@@ -351,16 +375,21 @@ msgstr "Tastaturkürzel"
msgid "Exit preferences"
msgstr "Einstellungen verlassen"
-#: prefs.php:123 classes/pref/feeds.php:109 classes/pref/feeds.php:1242
+#: prefs.php:123
+#: classes/pref/feeds.php:109
+#: classes/pref/feeds.php:1242
#: classes/pref/feeds.php:1305
msgid "Feeds"
msgstr "Feeds"
-#: prefs.php:126 classes/pref/filters.php:154
+#: prefs.php:126
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filter"
-#: prefs.php:129 include/functions.php:1255 include/functions.php:1915
+#: prefs.php:129
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Label"
@@ -373,7 +402,8 @@ msgstr "Benutzer"
msgid "System"
msgstr "System"
-#: register.php:187 include/login_form.php:245
+#: register.php:187
+#: include/login_form.php:245
msgid "Create new account"
msgstr "Neues Konto erstellen"
@@ -381,24 +411,27 @@ 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:698 classes/handler/public.php:769
-#: classes/handler/public.php:867 classes/handler/public.php:946
-#: classes/handler/public.php:960 classes/handler/public.php:967
+#: 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:698
+#: classes/handler/public.php:769
+#: classes/handler/public.php:867
+#: classes/handler/public.php:946
+#: classes/handler/public.php:960
+#: classes/handler/public.php:967
#: classes/handler/public.php:992
msgid "Return to Tiny Tiny RSS"
msgstr "Zu Tiny Tiny RSS zurückkehren"
#: register.php:218
-msgid ""
-"Your temporary password will be sent to the specified email. Accounts, which "
-"were not logged in once, are erased automatically 24 hours after temporary "
-"password is sent."
-msgstr ""
-"Ihr vorübergehendes Passwort wird an Ihre angegebene E-Mail-Adresse "
-"gesendet. Konten, die nicht innerhalb von 24 Stunden aktiviert wurden, "
-"werden gelöscht."
+msgid "Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent."
+msgstr "Ihr vorübergehendes Passwort wird an Ihre angegebene E-Mail-Adresse gesendet. Konten, die nicht innerhalb von 24 Stunden aktiviert wurden, werden gelöscht."
#: register.php:224
msgid "Desired login:"
@@ -408,11 +441,13 @@ msgstr "Gewünschter Benutzername:"
msgid "Check availability"
msgstr "Verfügbarkeit prüfen"
-#: register.php:229 classes/handler/public.php:785
+#: register.php:229
+#: classes/handler/public.php:785
msgid "Email:"
msgstr "E-Mail:"
-#: register.php:232 classes/handler/public.php:790
+#: register.php:232
+#: classes/handler/public.php:790
msgid "How much is two plus two:"
msgstr "Wieviel ist zwei plus zwei:"
@@ -444,9 +479,13 @@ 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:1264
-#: include/functions.php:1816 include/functions.php:1901
-#: include/functions.php:1923 classes/opml.php:421 classes/pref/feeds.php:225
+#: include/digest.php:109
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
+#: classes/opml.php:421
+#: classes/pref/feeds.php:225
msgid "Uncategorized"
msgstr "Unkategorisiert"
@@ -491,13 +530,11 @@ msgstr "Vorherigen Artikel laden (lange Artikel werden nicht gescrollt)"
#: include/functions2.php:56
msgid "Move to next article (don't expand or mark read)"
-msgstr ""
-"Zum nächsten Artikel springen (nicht als gelesen markieren oder ausklappen)"
+msgstr "Zum nächsten Artikel springen (nicht als gelesen markieren oder ausklappen)"
#: include/functions2.php:57
msgid "Move to previous article (don't expand or mark read)"
-msgstr ""
-"Zum vorherigen Artikel springen (nicht als gelesen markieren oder ausklappen)"
+msgstr "Zum vorherigen Artikel springen (nicht als gelesen markieren oder ausklappen)"
#: include/functions2.php:58
msgid "Show search dialog"
@@ -507,15 +544,18 @@ msgstr "Suchdialog anzeigen"
msgid "Article"
msgstr "Artikel"
-#: include/functions2.php:60 js/viewfeed.js:1974
+#: include/functions2.php:60
+#: js/viewfeed.js:1974
msgid "Toggle starred"
msgstr "Markierung ein-/ausschalten"
-#: include/functions2.php:61 js/viewfeed.js:1985
+#: include/functions2.php:61
+#: js/viewfeed.js:1985
msgid "Toggle published"
msgstr "Veröffentlichung ein-/ausschalten"
-#: include/functions2.php:62 js/viewfeed.js:1963
+#: include/functions2.php:62
+#: js/viewfeed.js:1963
msgid "Toggle unread"
msgstr "Gelesen-Status umschalten"
@@ -535,11 +575,13 @@ msgstr "gelesene Artikel verwerfen"
msgid "Open in new window"
msgstr "In neuem Fenster öffnen"
-#: include/functions2.php:67 js/viewfeed.js:2004
+#: include/functions2.php:67
+#: js/viewfeed.js:2004
msgid "Mark below as read"
msgstr "Untere als gelesen markieren"
-#: include/functions2.php:68 js/viewfeed.js:1998
+#: include/functions2.php:68
+#: js/viewfeed.js:1998
msgid "Mark above as read"
msgstr "Obige als gelesen markieren"
@@ -567,7 +609,8 @@ msgstr "Artikel schließen/verbergen"
msgid "Toggle article expansion (combined mode)"
msgstr "Kombinierte Feed-Anzeige umschalten"
-#: include/functions2.php:76 plugins/embed_original/init.php:31
+#: include/functions2.php:76
+#: plugins/embed_original/init.php:31
msgid "Toggle embed original"
msgstr "\"Original einbetten\" umschalten"
@@ -599,7 +642,8 @@ msgstr "Auswahl umkehren"
msgid "Deselect everything"
msgstr "Auswahl aufheben"
-#: include/functions2.php:84 classes/pref/feeds.php:549
+#: include/functions2.php:84
+#: classes/pref/feeds.php:549
#: classes/pref/feeds.php:793
msgid "Feed"
msgstr "Feed"
@@ -612,11 +656,14 @@ msgstr "Aktuellen Feed aktualisieren"
msgid "Un/hide read feeds"
msgstr "Gelesene Feeds zeigen/verstecken"
-#: include/functions2.php:87 classes/pref/feeds.php:1308
+#: include/functions2.php:87
+#: classes/pref/feeds.php:1308
msgid "Subscribe to feed"
msgstr "Feed abonnieren"
-#: include/functions2.php:88 js/FeedTree.js:135 js/PrefFeedTree.js:68
+#: include/functions2.php:88
+#: js/FeedTree.js:135
+#: js/PrefFeedTree.js:68
msgid "Edit feed"
msgstr "Feed bearbeiten"
@@ -628,7 +675,8 @@ msgstr "Schlagzeilensortierung umkehren"
msgid "Debug feed update"
msgstr "Aktualisierung im Diagnose-Modus durchführen"
-#: include/functions2.php:92 js/FeedTree.js:178
+#: include/functions2.php:92
+#: js/FeedTree.js:178
msgid "Mark all feeds as read"
msgstr "Alle Feeds als gelesen markieren"
@@ -648,7 +696,8 @@ msgstr "Kombinierte Feed-Anzeige umschalten"
msgid "Go to"
msgstr "Gehe zu"
-#: include/functions2.php:97 include/functions.php:1974
+#: include/functions2.php:97
+#: include/functions.php:1977
msgid "All articles"
msgstr "Alle Artikel"
@@ -656,7 +705,9 @@ msgstr "Alle Artikel"
msgid "Fresh"
msgstr "Neu"
-#: include/functions2.php:101 js/tt-rss.js:460 js/tt-rss.js:649
+#: include/functions2.php:101
+#: js/tt-rss.js:460
+#: js/tt-rss.js:649
msgid "Tag cloud"
msgstr "Tagwolke"
@@ -664,11 +715,13 @@ msgstr "Tagwolke"
msgid "Other"
msgstr "Sonstiges"
-#: include/functions2.php:104 classes/pref/labels.php:281
+#: include/functions2.php:104
+#: classes/pref/labels.php:281
msgid "Create label"
msgstr "Label erstellen"
-#: include/functions2.php:105 classes/pref/filters.php:640
+#: include/functions2.php:105
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Filter erstellen"
@@ -685,13 +738,15 @@ msgstr "Hilfe anzeigen"
msgid "Search results: %s"
msgstr "Suchergebnisse: %s"
-#: include/functions2.php:1265 classes/feeds.php:708
+#: include/functions2.php:1265
+#: classes/feeds.php:708
msgid "comment"
msgid_plural "comments"
msgstr[0] "Kommentar"
msgstr[1] "Kommentare"
-#: include/functions2.php:1269 classes/feeds.php:712
+#: include/functions2.php:1269
+#: classes/feeds.php:712
msgid "comments"
msgstr "Kommentare"
@@ -699,32 +754,47 @@ msgstr "Kommentare"
msgid " - "
msgstr " - "
-#: include/functions2.php:1343 include/functions2.php:1591
+#: include/functions2.php:1343
+#: include/functions2.php:1591
#: classes/article.php:280
msgid "no tags"
msgstr "Keine Tags"
-#: include/functions2.php:1353 classes/feeds.php:694
+#: include/functions2.php:1353
+#: classes/feeds.php:694
msgid "Edit tags for this article"
msgstr "Tags für diesen Artikel bearbeiten"
-#: include/functions2.php:1385 classes/feeds.php:646
+#: include/functions2.php:1385
+#: classes/feeds.php:646
msgid "Originally from:"
msgstr "Original von:"
-#: include/functions2.php:1398 classes/feeds.php:659
+#: include/functions2.php:1398
+#: classes/feeds.php:659
#: classes/pref/feeds.php:568
msgid "Feed URL"
msgstr "Feed URL"
-#: include/functions2.php:1432 classes/dlg.php:36 classes/dlg.php:59
-#: classes/dlg.php:92 classes/dlg.php:158 classes/dlg.php:189
-#: classes/dlg.php:216 classes/dlg.php:249 classes/dlg.php:261
-#: classes/backend.php:105 classes/pref/users.php:95
-#: classes/pref/filters.php:145 classes/pref/prefs.php:1101
-#: classes/pref/feeds.php:1605 classes/pref/feeds.php:1671
-#: plugins/import_export/init.php:407 plugins/import_export/init.php:452
-#: plugins/googlereaderimport/init.php:194 plugins/share/init.php:123
+#: include/functions2.php:1432
+#: classes/dlg.php:36
+#: classes/dlg.php:59
+#: classes/dlg.php:92
+#: classes/dlg.php:158
+#: classes/dlg.php:189
+#: classes/dlg.php:216
+#: classes/dlg.php:249
+#: classes/dlg.php:261
+#: classes/backend.php:105
+#: classes/pref/users.php:95
+#: classes/pref/filters.php:145
+#: classes/pref/prefs.php:1101
+#: classes/pref/feeds.php:1605
+#: classes/pref/feeds.php:1671
+#: plugins/import_export/init.php:407
+#: plugins/import_export/init.php:452
+#: plugins/googlereaderimport/init.php:194
+#: plugins/share/init.php:123
#: plugins/updater/init.php:374
msgid "Close this window"
msgstr "Fenster schließen"
@@ -746,41 +816,46 @@ msgstr "Anhänge"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "LibXML Fehler %s in Zeile %d (Spalte %d): %s"
-#: include/functions.php:1253 include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Sonderfeeds"
-#: include/functions.php:1764 classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: include/functions.php:1765
+#: include/functions.php:1969
+#: classes/feeds.php:1118
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Alle Feeds"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Markierte Artikel"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Veröffentlichte Artikel"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Neue Artikel"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Archivierte Artikel"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Kürzlich gelesen"
-#: include/login_form.php:190 classes/handler/public.php:525
+#: include/login_form.php:190
+#: classes/handler/public.php:525
#: classes/handler/public.php:780
msgid "Login:"
msgstr "Benutzername:"
-#: include/login_form.php:200 classes/handler/public.php:528
+#: include/login_form.php:200
+#: classes/handler/public.php:528
msgid "Password:"
msgstr "Passwort:"
@@ -792,8 +867,10 @@ msgstr "Ich habe mein Passwort vergessen"
msgid "Profile:"
msgstr "Profil:"
-#: include/login_form.php:216 classes/handler/public.php:266
-#: classes/rpc.php:63 classes/pref/prefs.php:1039
+#: include/login_form.php:216
+#: classes/handler/public.php:266
+#: classes/rpc.php:63
+#: classes/pref/prefs.php:1039
msgid "Default profile"
msgstr "Standardprofil"
@@ -803,14 +880,14 @@ msgstr "Weniger Datenverkehr nutzen"
#: include/login_form.php:228
msgid "Does not display images in articles, reduces automatic refreshes."
-msgstr ""
-"Zeigt keine Bilder in Artikeln, reduziert die automatischen Aktualisierungen."
+msgstr "Zeigt keine Bilder in Artikeln, reduziert die automatischen Aktualisierungen."
#: include/login_form.php:236
msgid "Remember me"
msgstr "Erinnere dich an mich"
-#: include/login_form.php:242 classes/handler/public.php:533
+#: include/login_form.php:242
+#: classes/handler/public.php:533
msgid "Log in"
msgstr "Anmelden"
@@ -842,28 +919,44 @@ msgstr "Artikel nicht gefunden."
msgid "Tags for this article (separated by commas):"
msgstr "Tags für diesen Artikel (durch Komma getrennt):"
-#: classes/article.php:203 classes/pref/users.php:168
-#: classes/pref/labels.php:79 classes/pref/filters.php:390
-#: classes/pref/prefs.php:985 classes/pref/feeds.php:772
-#: classes/pref/feeds.php:899 plugins/nsfw/init.php:85
-#: plugins/note/init.php:51 plugins/instances/init.php:245
+#: classes/article.php:203
+#: classes/pref/users.php:168
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:423
+#: classes/pref/prefs.php:985
+#: classes/pref/feeds.php:772
+#: classes/pref/feeds.php:899
+#: plugins/nsfw/init.php:85
+#: plugins/note/init.php:51
+#: plugins/instances/init.php:245
msgid "Save"
msgstr "Speichern"
-#: classes/article.php:205 classes/handler/public.php:502
-#: classes/handler/public.php:536 classes/feeds.php:1047
-#: classes/feeds.php:1097 classes/feeds.php:1157 classes/pref/users.php:170
-#: classes/pref/labels.php:81 classes/pref/filters.php:393
-#: classes/pref/filters.php:789 classes/pref/filters.php:870
-#: classes/pref/filters.php:937 classes/pref/prefs.php:987
-#: classes/pref/feeds.php:773 classes/pref/feeds.php:902
-#: classes/pref/feeds.php:1811 plugins/mail/init.php:129
-#: plugins/note/init.php:53 plugins/instances/init.php:248
+#: classes/article.php:205
+#: classes/handler/public.php:502
+#: classes/handler/public.php:536
+#: classes/feeds.php:1047
+#: classes/feeds.php:1097
+#: classes/feeds.php:1157
+#: classes/pref/users.php:170
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
+#: classes/pref/prefs.php:987
+#: classes/pref/feeds.php:773
+#: classes/pref/feeds.php:902
+#: classes/pref/feeds.php:1811
+#: plugins/mail/init.php:129
+#: plugins/note/init.php:53
+#: plugins/instances/init.php:248
#: plugins/instances/init.php:436
msgid "Cancel"
msgstr "Abbrechen"
-#: classes/handler/public.php:466 plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:466
+#: plugins/bookmarklets/init.php:40
msgid "Share with Tiny Tiny RSS"
msgstr "Teilen mit Tiny Tiny RSS"
@@ -871,8 +964,10 @@ msgstr "Teilen mit Tiny Tiny RSS"
msgid "Title:"
msgstr "Titel:"
-#: classes/handler/public.php:476 classes/pref/feeds.php:566
-#: plugins/instances/init.php:212 plugins/instances/init.php:401
+#: classes/handler/public.php:476
+#: classes/pref/feeds.php:566
+#: plugins/instances/init.php:212
+#: plugins/instances/init.php:401
msgid "URL:"
msgstr "URL:"
@@ -927,9 +1022,7 @@ msgstr "Mehrere Feed-URLs gefunden."
#: classes/handler/public.php:650
#, 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."
+msgstr "Das Abonnieren von <b>%s</b> ist fehlgeschlagen.<br>Der Feed konnte nicht heruntergeladen werden."
#: classes/handler/public.php:668
msgid "Subscribe to selected feed"
@@ -944,14 +1037,11 @@ msgid "Password recovery"
msgstr "Passwort-Wiederherstellung"
#: classes/handler/public.php:773
-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."
+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:795 classes/pref/users.php:352
+#: classes/handler/public.php:795
+#: classes/pref/users.php:352
msgid "Reset password"
msgstr "Passwort zurücksetzen"
@@ -959,7 +1049,8 @@ 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:809 classes/handler/public.php:875
+#: classes/handler/public.php:809
+#: classes/handler/public.php:875
msgid "Go back"
msgstr "Zurück"
@@ -969,9 +1060,7 @@ msgstr "[tt-rss] neues Passwort anfordern"
#: classes/handler/public.php:871
msgid "Sorry, login and email combination not found."
-msgstr ""
-"Entschuldigung, diese Kombination von Benutzername und E-Mail konnte nicht "
-"gefunden werden."
+msgstr "Entschuldigung, diese Kombination von Benutzername und E-Mail konnte nicht gefunden werden."
#: classes/handler/public.php:893
msgid "Your access level is insufficient to run this script."
@@ -986,46 +1075,31 @@ msgid "Perform updates"
msgstr "Aktualisierungen durchführen"
#: classes/dlg.php:16
-msgid ""
-"If you have imported labels and/or filters, you might need to reload "
-"preferences to see your new data."
-msgstr ""
-"Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen "
-"erneut geladen werden, um alle neuen Einstellungen zu sehen."
+msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
+msgstr "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen erneut geladen werden, um alle neuen Einstellungen zu sehen."
#: classes/dlg.php:47
msgid "Your Public OPML URL is:"
msgstr "Ihre öffentliche OPML-URL lautet:"
-#: classes/dlg.php:56 classes/dlg.php:213 plugins/share/init.php:120
+#: classes/dlg.php:56
+#: classes/dlg.php:213
+#: plugins/share/init.php:120
msgid "Generate new URL"
msgstr "Erzeuge neue URL"
#: classes/dlg.php:70
-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."
+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:74 classes/dlg.php:83
+#: classes/dlg.php:74
+#: classes/dlg.php:83
msgid "Last update:"
msgstr "Letzte Aktualisierung:"
#: classes/dlg.php:79
-msgid ""
-"Update daemon is taking too long to perform a feed update. This could "
-"indicate a problem like crash or a hang. Please check the daemon process or "
-"contact instance owner."
-msgstr ""
-"Der Aktualisierungs Daemon braucht zu lange um eine Aktualisierung "
-"durchzuführen. Dies könnte auf ein Problem wie einen Absturz oder eine "
-"Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
-"benachrichtigen Sie den Besitzer des Instanz."
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "Der Aktualisierungs Daemon braucht zu lange um eine Aktualisierung durchzuführen. Dies könnte auf ein Problem wie einen Absturz oder eine Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder benachrichtigen Sie den Besitzer des Instanz."
#: classes/dlg.php:165
msgid "Match:"
@@ -1051,20 +1125,18 @@ msgstr "Einträge anzeigen"
msgid "You can view this feed as RSS using the following URL:"
msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
-#: classes/dlg.php:232 plugins/updater/init.php:333
+#: classes/dlg.php:232
+#: plugins/updater/init.php:333
#, php-format
msgid "New version of Tiny Tiny RSS is available (%s)."
msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
#: classes/dlg.php:240
-msgid ""
-"You can update using built-in updater in the Preferences or by using update."
-"php"
-msgstr ""
-"Um ein Update durchzuführen können Sie den eingebauten Updater in den "
-"Einstellungen oder die update.php benutzen"
+msgid "You can update using built-in updater in the Preferences or by using update.php"
+msgstr "Um ein Update durchzuführen können Sie den eingebauten Updater in den Einstellungen oder die update.php benutzen"
-#: classes/dlg.php:244 plugins/updater/init.php:337
+#: classes/dlg.php:244
+#: plugins/updater/init.php:337
msgid "See the release notes"
msgstr "Release notes anzeigen"
@@ -1074,15 +1146,15 @@ msgstr "Download"
#: classes/dlg.php:254
msgid "Error receiving version information or no new version available."
-msgstr ""
-"Das Abrufen von Update-Informationen ist fehlgeschlagen oder es ist bereits "
-"die neuste Version installiert."
+msgstr "Das Abrufen von Update-Informationen ist fehlgeschlagen oder es ist bereits die neuste Version installiert."
#: classes/feeds.php:51
msgid "View as RSS feed"
msgstr "Als RSS-Feed anzeigen"
-#: classes/feeds.php:52 classes/feeds.php:132 classes/pref/feeds.php:1467
+#: classes/feeds.php:52
+#: classes/feeds.php:132
+#: classes/pref/feeds.php:1467
msgid "View as RSS"
msgstr "Als RSS anzeigen"
@@ -1091,12 +1163,19 @@ msgstr "Als RSS anzeigen"
msgid "Last updated: %s"
msgstr "Letzte Aktualisierung: %s"
-#: classes/feeds.php:88 classes/pref/users.php:337 classes/pref/labels.php:275
-#: classes/pref/filters.php:267 classes/pref/filters.php:315
-#: classes/pref/filters.php:634 classes/pref/filters.php:722
-#: classes/pref/filters.php:749 classes/pref/prefs.php:999
-#: classes/pref/feeds.php:1299 classes/pref/feeds.php:1556
-#: classes/pref/feeds.php:1620 plugins/instances/init.php:287
+#: classes/feeds.php:88
+#: classes/pref/users.php:337
+#: classes/pref/labels.php:275
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
+#: classes/pref/prefs.php:999
+#: classes/pref/feeds.php:1299
+#: classes/pref/feeds.php:1556
+#: classes/pref/feeds.php:1620
+#: plugins/instances/init.php:287
msgid "All"
msgstr "Alle"
@@ -1104,12 +1183,19 @@ msgstr "Alle"
msgid "Invert"
msgstr "Umkehren"
-#: classes/feeds.php:91 classes/pref/users.php:339 classes/pref/labels.php:277
-#: classes/pref/filters.php:269 classes/pref/filters.php:317
-#: classes/pref/filters.php:636 classes/pref/filters.php:724
-#: classes/pref/filters.php:751 classes/pref/prefs.php:1001
-#: classes/pref/feeds.php:1301 classes/pref/feeds.php:1558
-#: classes/pref/feeds.php:1622 plugins/instances/init.php:289
+#: classes/feeds.php:91
+#: classes/pref/users.php:339
+#: classes/pref/labels.php:277
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
+#: classes/pref/prefs.php:1001
+#: classes/pref/feeds.php:1301
+#: classes/pref/feeds.php:1558
+#: classes/pref/feeds.php:1622
+#: plugins/instances/init.php:289
msgid "None"
msgstr "Keine"
@@ -1137,13 +1223,17 @@ msgstr "Archiv"
msgid "Move back"
msgstr "Zurückgehen"
-#: classes/feeds.php:114 classes/pref/filters.php:276
-#: classes/pref/filters.php:324 classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/feeds.php:114
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Löschen"
-#: classes/feeds.php:119 classes/feeds.php:124 plugins/mailto/init.php:25
+#: classes/feeds.php:119
+#: classes/feeds.php:124
+#: plugins/mailto/init.php:25
#: plugins/mail/init.php:26
msgid "Forward by email"
msgstr "Per E-Mail weiterleiten"
@@ -1152,7 +1242,8 @@ msgstr "Per E-Mail weiterleiten"
msgid "Feed:"
msgstr "Feed:"
-#: classes/feeds.php:201 classes/feeds.php:843
+#: classes/feeds.php:201
+#: classes/feeds.php:843
msgid "Feed not found."
msgstr "Feed nicht gefunden."
@@ -1165,7 +1256,8 @@ msgstr "Niemals"
msgid "Imported at %s"
msgstr "Importiert nach %s"
-#: classes/feeds.php:434 classes/feeds.php:529
+#: classes/feeds.php:434
+#: classes/feeds.php:529
msgid "mark feed as read"
msgstr "Feed als gelesen markieren"
@@ -1186,24 +1278,21 @@ msgid "No starred articles found to display."
msgstr "Keine markierten Artikel zum Anzeigen gefunden."
#: classes/feeds.php:756
-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."
+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:758
msgid "No articles found to display."
msgstr "Keine Artikel zum Anzeigen gefunden."
-#: classes/feeds.php:773 classes/feeds.php:938
+#: classes/feeds.php:773
+#: classes/feeds.php:938
#, php-format
msgid "Feeds last updated at %s"
msgstr "Feeds zuletzt aktualisiert am %s"
-#: classes/feeds.php:783 classes/feeds.php:948
+#: classes/feeds.php:783
+#: classes/feeds.php:948
msgid "Some feeds have update errors (click for details)"
msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
@@ -1211,11 +1300,14 @@ msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
msgid "No feed selected."
msgstr "Keinen Feed ausgewählt."
-#: classes/feeds.php:985 classes/feeds.php:993
+#: classes/feeds.php:985
+#: classes/feeds.php:993
msgid "Feed or site URL"
msgstr "URL von Feed oder Seite"
-#: classes/feeds.php:999 classes/pref/feeds.php:589 classes/pref/feeds.php:800
+#: classes/feeds.php:999
+#: classes/pref/feeds.php:589
+#: classes/pref/feeds.php:800
#: classes/pref/feeds.php:1775
msgid "Place in category:"
msgstr "In Kategorie einordnen:"
@@ -1224,19 +1316,25 @@ msgstr "In Kategorie einordnen:"
msgid "Available feeds"
msgstr "Verfügbare Feeds"
-#: classes/feeds.php:1019 classes/pref/users.php:133
-#: classes/pref/feeds.php:619 classes/pref/feeds.php:836
+#: classes/feeds.php:1019
+#: classes/pref/users.php:133
+#: classes/pref/feeds.php:619
+#: classes/pref/feeds.php:836
msgid "Authentication"
msgstr "Authentifizierung"
-#: classes/feeds.php:1023 classes/pref/users.php:397
-#: classes/pref/feeds.php:625 classes/pref/feeds.php:840
+#: classes/feeds.php:1023
+#: classes/pref/users.php:397
+#: classes/pref/feeds.php:625
+#: classes/pref/feeds.php:840
#: classes/pref/feeds.php:1789
msgid "Login"
msgstr "Benutzername"
-#: classes/feeds.php:1026 classes/pref/prefs.php:260
-#: classes/pref/feeds.php:638 classes/pref/feeds.php:846
+#: classes/feeds.php:1026
+#: classes/pref/prefs.php:260
+#: classes/pref/feeds.php:638
+#: classes/pref/feeds.php:846
#: classes/pref/feeds.php:1792
msgid "Password"
msgstr "Passwort"
@@ -1245,7 +1343,9 @@ msgstr "Passwort"
msgid "This feed requires authentication."
msgstr "Dieser Feed erfordert Authentifizierung."
-#: classes/feeds.php:1041 classes/feeds.php:1095 classes/pref/feeds.php:1810
+#: classes/feeds.php:1041
+#: classes/feeds.php:1095
+#: classes/pref/feeds.php:1810
msgid "Subscribe"
msgstr "Abonnieren"
@@ -1253,8 +1353,12 @@ msgstr "Abonnieren"
msgid "More feeds"
msgstr "Weitere Feeds"
-#: classes/feeds.php:1067 classes/feeds.php:1156 classes/pref/users.php:324
-#: classes/pref/filters.php:627 classes/pref/feeds.php:1292 js/tt-rss.js:174
+#: classes/feeds.php:1067
+#: classes/feeds.php:1156
+#: classes/pref/users.php:324
+#: classes/pref/filters.php:663
+#: classes/pref/feeds.php:1292
+#: js/tt-rss.js:174
msgid "Search"
msgstr "Suchen"
@@ -1270,9 +1374,12 @@ msgstr "Feed-Archiv"
msgid "limit:"
msgstr "Grenzwert:"
-#: classes/feeds.php:1096 classes/pref/users.php:350
-#: classes/pref/labels.php:284 classes/pref/filters.php:383
-#: classes/pref/filters.php:653 classes/pref/feeds.php:743
+#: classes/feeds.php:1096
+#: classes/pref/users.php:350
+#: classes/pref/labels.php:284
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
+#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
msgstr "Entfernen"
@@ -1313,7 +1420,8 @@ msgstr "Strg"
msgid "Help topic not found."
msgstr "Hilfethema nicht gefunden."
-#: classes/opml.php:28 classes/opml.php:33
+#: classes/opml.php:28
+#: classes/opml.php:33
msgid "OPML Utility"
msgstr "OPML Werkzeug"
@@ -1359,18 +1467,21 @@ msgstr "Füge Filter hinzu..."
msgid "Processing category: %s"
msgstr "Verarbeite Kategorie: %s"
-#: classes/opml.php:470 plugins/import_export/init.php:420
+#: classes/opml.php:470
+#: plugins/import_export/init.php:420
#: plugins/googlereaderimport/init.php:66
#, php-format
msgid "Upload failed with error code %d"
msgstr "Upload schlug fehl. Fehlercode: %d"
-#: classes/opml.php:484 plugins/import_export/init.php:434
+#: classes/opml.php:484
+#: plugins/import_export/init.php:434
#: plugins/googlereaderimport/init.php:80
msgid "Unable to move uploaded file."
msgstr "Fehler: konnte die hochgeladene Datei nicht verschieben."
-#: classes/opml.php:488 plugins/import_export/init.php:438
+#: classes/opml.php:488
+#: plugins/import_export/init.php:438
#: plugins/googlereaderimport/init.php:84
msgid "Error: please upload OPML file."
msgstr "Fehler: bitte eine OPML-Datei hochladen."
@@ -1379,21 +1490,23 @@ msgstr "Fehler: bitte eine OPML-Datei hochladen."
msgid "Error: unable to find moved OPML file."
msgstr "Fehler: konnte die verschobene OPML-Datei nicht finden."
-#: classes/opml.php:504 plugins/googlereaderimport/init.php:187
+#: classes/opml.php:504
+#: plugins/googlereaderimport/init.php:187
msgid "Error while parsing document."
msgstr "Fehler beim Parsen des Dokuments."
-#: 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."
+msgstr "Sie haben nicht die benötigten Rechte um diese Registerkarte zu öffnen."
#: classes/pref/users.php:34
msgid "User not found"
msgstr "Benutzer nicht gefunden"
-#: classes/pref/users.php:53 classes/pref/users.php:399
+#: classes/pref/users.php:53
+#: classes/pref/users.php:399
msgid "Registered"
msgstr "Registriert"
@@ -1413,7 +1526,8 @@ msgstr "Abonnierte Feeds"
msgid "Access level: "
msgstr "Zugriffsberechtigung: "
-#: classes/pref/users.php:154 classes/pref/feeds.php:646
+#: classes/pref/users.php:154
+#: classes/pref/feeds.php:646
#: classes/pref/feeds.php:852
msgid "Options"
msgstr "Optionen"
@@ -1447,12 +1561,18 @@ 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:334 classes/pref/labels.php:272
-#: classes/pref/filters.php:264 classes/pref/filters.php:312
-#: classes/pref/filters.php:631 classes/pref/filters.php:719
-#: classes/pref/filters.php:746 classes/pref/prefs.php:996
-#: classes/pref/feeds.php:1296 classes/pref/feeds.php:1553
-#: classes/pref/feeds.php:1617 plugins/instances/init.php:284
+#: classes/pref/users.php:334
+#: classes/pref/labels.php:272
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
+#: classes/pref/prefs.php:996
+#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1553
+#: classes/pref/feeds.php:1617
+#: plugins/instances/init.php:284
msgid "Select"
msgstr "Auswahl"
@@ -1464,7 +1584,8 @@ msgstr "Benutzer anlegen"
msgid "Details"
msgstr "Details"
-#: classes/pref/users.php:348 classes/pref/filters.php:646
+#: classes/pref/users.php:348
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Bearbeiten"
@@ -1477,7 +1598,8 @@ msgstr "Zugriffsberechtigung"
msgid "Last login"
msgstr "Zuletzt angemeldet"
-#: classes/pref/users.php:419 plugins/instances/init.php:334
+#: classes/pref/users.php:419
+#: plugins/instances/init.php:334
msgid "Click to edit"
msgstr "Zum Bearbeiten klicken"
@@ -1489,8 +1611,9 @@ msgstr "Keine Benutzer definiert."
msgid "No matching users found."
msgstr "Keine zugehörigen Benutzer gefunden."
-#: classes/pref/labels.php:22 classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/labels.php:22
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Titel"
@@ -1521,125 +1644,135 @@ msgstr "Artikel, die auf diesen Filter passen: "
#: classes/pref/filters.php:131
msgid "No recent articles matching this filter have been found."
-msgstr ""
-"Keine kürzlich erschienenen Artikel gefunden, die auf diesen Filter passen."
+msgstr "Keine kürzlich erschienenen Artikel gefunden, die auf diesen Filter passen."
#: classes/pref/filters.php:135
-msgid ""
-"Complex expressions might not give results while testing due to issues with "
-"database server regexp implementation."
-msgstr ""
-"Komplexe Filter liefern im Testmodus möglichweise keine Ergebnisse, da es "
-"Probleme mit der RegExp-Implementierung des Datenbankservers gibt."
+msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
+msgstr "Komplexe Filter liefern im Testmodus möglichweise keine Ergebnisse, da es Probleme mit der RegExp-Implementierung des Datenbankservers gibt."
-#: classes/pref/filters.php:259 classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "Invertiert"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s innerhalb %s von %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Kriterien"
-#: classes/pref/filters.php:273 classes/pref/filters.php:321
-#: classes/pref/filters.php:728 classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Hinzufügen"
-#: classes/pref/filters.php:307 classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Aktionen anwenden"
-#: classes/pref/filters.php:357 classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Aktiviert"
-#: classes/pref/filters.php:366 classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Ein erfülltes Kriterium ist ausreichend"
-#: classes/pref/filters.php:375 classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Invertierte Übereinstimmung"
-#: classes/pref/filters.php:387 classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Test"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "Invertiert"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s innerhalb %s von %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Zusammenfügen"
-#: classes/pref/filters.php:649 classes/pref/feeds.php:1312
+#: classes/pref/filters.php:685
+#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Sortierreihenfolge zurücksetzen"
-#: classes/pref/filters.php:657 classes/pref/feeds.php:1348
+#: classes/pref/filters.php:693
+#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Artikel neu bewerten"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Erstellen"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Invertiere reguläre Ausdrücke"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "in Feld"
-#: classes/pref/filters.php:849 js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "in"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
msgid "Wiki: Filters"
msgstr "Wiki:Filter"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Regel speichern"
-#: classes/pref/filters.php:867 js/functions.js:1021
+#: classes/pref/filters.php:903
+#: js/functions.js:1021
msgid "Add rule"
msgstr "Regel hinzufügen"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Aktion ausführen"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "mit Parametern:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Aktion speichern"
-#: classes/pref/filters.php:934 js/functions.js:1047
+#: classes/pref/filters.php:970
+#: js/functions.js:1047
msgid "Add action"
msgstr "Aktion hinzufügen"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[kein Titel]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "%s (%d Regel)"
msgstr[1] "%s (%d Regeln)"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -1675,25 +1808,16 @@ msgid "Blacklisted tags"
msgstr "Gesperrte Tags"
#: classes/pref/prefs.php:27
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Bei der automatischen Erkennung von Tags in Artikeln werden die folgenden "
-"nicht verwendet (durch Komma getrennte Liste)."
+msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
+msgstr "Bei der automatischen Erkennung von Tags in Artikeln werden die folgenden nicht verwendet (durch Komma getrennte Liste)."
#: classes/pref/prefs.php:28
msgid "Automatically mark articles as read"
msgstr "Artikel automatisch als gelesen markieren"
#: classes/pref/prefs.php:28
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Diese Option aktiviert das automatische \"Als gelesen markieren\" im "
-"kombinierten Anzeigemodus (ausgenommen ist der Neue-Artikel-Feed), während "
-"Sie durch die Artikelliste scrollen."
+msgid "This option enables marking articles as read automatically while you scroll article list."
+msgstr "Diese Option aktiviert das automatische \"Als gelesen markieren\" im kombinierten Anzeigemodus (ausgenommen ist der Neue-Artikel-Feed), während Sie durch die Artikelliste scrollen."
#: classes/pref/prefs.php:29
msgid "Automatically expand articles in combined mode"
@@ -1704,12 +1828,8 @@ msgid "Combined feed display"
msgstr "Kombinierte Feed-Anzeige"
#: classes/pref/prefs.php:30
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Erweiterte Anzeigeliste für Artikel, anstelle von einzelnen Fenstern für "
-"Schlagzeilen und Artikelinhalt"
+msgid "Display expanded list of feed articles, instead of separate displays for headlines and article content"
+msgstr "Erweiterte Anzeigeliste für Artikel, anstelle von einzelnen Fenstern für Schlagzeilen und Artikelinhalt"
#: classes/pref/prefs.php:31
msgid "Confirm marking feed as read"
@@ -1724,12 +1844,8 @@ msgid "Default feed update interval"
msgstr "Standard-Intervall für Feed-Updates"
#: classes/pref/prefs.php:33
-msgid ""
-"Shortest interval at which a feed will be checked for updates regardless of "
-"update method"
-msgstr ""
-"Kürzestes Intervall, in dem ein Feed, unabhängig von der gewählten Update-"
-"Methode, auf neue Beiträge überprüft wird"
+msgid "Shortest interval at which a feed will be checked for updates regardless of update method"
+msgstr "Kürzestes Intervall, in dem ein Feed, unabhängig von der gewählten Update-Methode, auf neue Beiträge überprüft wird"
#: classes/pref/prefs.php:34
msgid "Mark articles in e-mail digest as read"
@@ -1740,12 +1856,8 @@ msgid "Enable e-mail digest"
msgstr "Aktiviere E-Mail-Zusammenfassung"
#: classes/pref/prefs.php:35
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Diese Option aktiviert das Senden einer täglichen Zusammenfassung über neue "
-"(und ungelesene) Schlagzeilen an Ihre angegebene E-Mail-Adresse"
+msgid "This option enables sending daily digest of new (and unread) headlines on your configured e-mail address"
+msgstr "Diese Option aktiviert das Senden einer täglichen Zusammenfassung über neue (und ungelesene) Schlagzeilen an Ihre angegebene E-Mail-Adresse"
#: classes/pref/prefs.php:36
msgid "Try to send digests around specified time"
@@ -1788,23 +1900,16 @@ msgid "Long date format"
msgstr "Langes Datumsformat"
#: classes/pref/prefs.php:43
-msgid ""
-"The syntax used is identical to the PHP <a href='http://php.net/manual/"
-"function.date.php'>date()</a> function."
-msgstr ""
-"Die verwendete Syntax ist mit der, der PHP <a href='http://php.net/manual/"
-"function.date.php'>date()</a> Funktion identisch."
+msgid "The syntax used is identical to the PHP <a href='http://php.net/manual/function.date.php'>date()</a> function."
+msgstr "Die verwendete Syntax ist mit der, der PHP <a href='http://php.net/manual/function.date.php'>date()</a> Funktion identisch."
#: classes/pref/prefs.php:44
msgid "On catchup show next feed"
msgstr "Den nächsten Feed anzeigen"
#: classes/pref/prefs.php:44
-msgid ""
-"Automatically open next feed with unread articles after marking one as read"
-msgstr ""
-"Automatisch nächsten Feed mit ungelesenen Artikeln laden, nachdem ein Feed "
-"als gelesen markiert wurde"
+msgid "Automatically open next feed with unread articles after marking one as read"
+msgstr "Automatisch nächsten Feed mit ungelesenen Artikeln laden, nachdem ein Feed als gelesen markiert wurde"
#: classes/pref/prefs.php:45
msgid "Purge articles after this number of days (0 - disables)"
@@ -1832,9 +1937,7 @@ msgstr "Feeds nach Schlagzeilendatum sortieren"
#: classes/pref/prefs.php:50
msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-"Benutze feed-spezifisches Datum statt des lokalen Importdatums um "
-"Schlagzeilen zu sortieren."
+msgstr "Benutze feed-spezifisches Datum statt des lokalen Importdatums um Schlagzeilen zu sortieren."
#: classes/pref/prefs.php:51
msgid "Login with an SSL certificate"
@@ -1856,7 +1959,8 @@ 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:54 js/prefs.js:1687
+#: classes/pref/prefs.php:54
+#: js/prefs.js:1687
msgid "Customize stylesheet"
msgstr "Benutzerdefiniertes Stylesheet"
@@ -1874,9 +1978,7 @@ msgstr "Schlagzeilen in virtuellen Feeds gruppieren"
#: classes/pref/prefs.php:56
msgid "Special feeds, labels, and categories are grouped by originating feeds"
-msgstr ""
-"Spezial-Feeds, Labels und Kategorien sind nach den ursprünglichen Feeds "
-"gruppiert"
+msgstr "Spezial-Feeds, Labels und Kategorien sind nach den ursprünglichen Feeds gruppiert"
#: classes/pref/prefs.php:57
msgid "Language"
@@ -1976,14 +2078,11 @@ msgid "One time passwords / Authenticator"
msgstr "Einmalpasswörter (OTP) / Authentifikator"
#: classes/pref/prefs.php:327
-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."
+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:352 classes/pref/prefs.php:403
+#: classes/pref/prefs.php:352
+#: classes/pref/prefs.php:403
msgid "Enter your password"
msgstr "Geben Sie Ihr Passwort ein"
@@ -1992,12 +2091,8 @@ msgid "Disable OTP"
msgstr "Einmalpasswörter ausschalten"
#: classes/pref/prefs.php:369
-msgid ""
-"You will need a compatible Authenticator to use this. Changing your password "
-"would automatically disable OTP."
-msgstr ""
-"Sie benötigen einen kompatiblen Authentifikator. Sollten Sie Ihr Passwort "
-"ändern, wird diese Funktion automatisch ausgeschaltet."
+msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
+msgstr "Sie benötigen einen kompatiblen Authentifikator. Sollten Sie Ihr Passwort ändern, wird diese Funktion automatisch ausgeschaltet."
#: classes/pref/prefs.php:371
msgid "Scan the following code by the Authenticator application:"
@@ -2057,48 +2152,44 @@ msgid "Plugins"
msgstr "Plugins"
#: classes/pref/prefs.php:708
-msgid ""
-"You will need to reload Tiny Tiny RSS for plugin changes to take effect."
-msgstr ""
-"Du musst Tiny Tiny RSS neu laden, damit Pluginänderungen angewandt werden."
+msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
+msgstr "Du musst Tiny Tiny RSS neu laden, damit Pluginänderungen angewandt werden."
#: classes/pref/prefs.php:710
-msgid ""
-"Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank"
-"\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a "
-"target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
-"\">wiki</a>."
-msgstr ""
-"Mehr Plugins im tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href="
-"\"http://tt-rss.org/forum/viewforum.php?f=22\">Forum</a> oder im <a target="
-"\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins"
-"\">Wiki</a>."
+msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
+msgstr "Mehr Plugins im tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">Forum</a> oder im <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">Wiki</a>."
#: classes/pref/prefs.php:736
msgid "System plugins"
msgstr "System-Plugins"
-#: classes/pref/prefs.php:740 classes/pref/prefs.php:796
+#: classes/pref/prefs.php:740
+#: classes/pref/prefs.php:796
msgid "Plugin"
msgstr "Plugin"
-#: classes/pref/prefs.php:741 classes/pref/prefs.php:797
+#: classes/pref/prefs.php:741
+#: classes/pref/prefs.php:797
msgid "Description"
msgstr "Beschreibung"
-#: classes/pref/prefs.php:742 classes/pref/prefs.php:798
+#: classes/pref/prefs.php:742
+#: classes/pref/prefs.php:798
msgid "Version"
msgstr "Version"
-#: classes/pref/prefs.php:743 classes/pref/prefs.php:799
+#: classes/pref/prefs.php:743
+#: classes/pref/prefs.php:799
msgid "Author"
msgstr "Autor"
-#: classes/pref/prefs.php:774 classes/pref/prefs.php:833
+#: classes/pref/prefs.php:774
+#: classes/pref/prefs.php:833
msgid "more info"
msgstr "weitere Informationen"
-#: classes/pref/prefs.php:783 classes/pref/prefs.php:842
+#: classes/pref/prefs.php:783
+#: classes/pref/prefs.php:842
msgid "Clear data"
msgstr "Daten löschen"
@@ -2114,27 +2205,22 @@ msgstr "Ausgewählte Plugins aktivieren"
msgid "Incorrect one time password"
msgstr "Falsches Einmalpasswort"
-#: classes/pref/prefs.php:928 classes/pref/prefs.php:945
+#: classes/pref/prefs.php:928
+#: classes/pref/prefs.php:945
msgid "Incorrect password"
msgstr "Falsches Passwort"
#: classes/pref/prefs.php:970
#, php-format
-msgid ""
-"You can override colors, fonts and layout of your currently selected theme "
-"with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink"
-"\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr ""
-"Sie können Farben, Schriftarten und das Layout Ihres aktuell gewählten "
-"Themas mit einem eigenen CSS-Stylesheet überschreiben. <a target=\"_blank\" "
-"class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Grundlage benutzt "
-"werden."
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "Sie können Farben, Schriftarten und das Layout Ihres aktuell gewählten Themas mit einem eigenen CSS-Stylesheet überschreiben. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Grundlage benutzt werden."
#: classes/pref/prefs.php:1010
msgid "Create profile"
msgstr "Profil erstellen"
-#: classes/pref/prefs.php:1033 classes/pref/prefs.php:1061
+#: classes/pref/prefs.php:1033
+#: classes/pref/prefs.php:1061
msgid "(active)"
msgstr "(aktiv)"
@@ -2150,8 +2236,10 @@ 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: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)"
@@ -2163,43 +2251,47 @@ msgstr[1] "(%d Feeds)"
msgid "Feed Title"
msgstr "Feed-Titel"
-#: classes/pref/feeds.php:597 classes/pref/feeds.php:811
+#: classes/pref/feeds.php:597
+#: classes/pref/feeds.php:811
msgid "Update"
msgstr "Aktualisieren"
-#: classes/pref/feeds.php:612 classes/pref/feeds.php:827
+#: classes/pref/feeds.php:612
+#: classes/pref/feeds.php:827
msgid "Article purging:"
msgstr "Artikel löschen:"
#: classes/pref/feeds.php:642
-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)."
+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:658 classes/pref/feeds.php:856
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:856
msgid "Hide from Popular feeds"
msgstr "Nicht unter beliebten Feeds aufführen"
-#: classes/pref/feeds.php:670 classes/pref/feeds.php:862
+#: classes/pref/feeds.php:670
+#: classes/pref/feeds.php:862
msgid "Include in e-mail digest"
msgstr "In E-Mail-Zusammenfassung aufnehmen"
-#: classes/pref/feeds.php:683 classes/pref/feeds.php:868
+#: classes/pref/feeds.php:683
+#: classes/pref/feeds.php:868
msgid "Always display image attachments"
msgstr "Angehängte Bilder immer anzeigen"
-#: classes/pref/feeds.php:696 classes/pref/feeds.php:876
+#: classes/pref/feeds.php:696
+#: classes/pref/feeds.php:876
msgid "Do not embed images"
msgstr "Bilder nicht einbetten"
-#: classes/pref/feeds.php:709 classes/pref/feeds.php:884
+#: classes/pref/feeds.php:709
+#: classes/pref/feeds.php:884
msgid "Cache images locally"
msgstr "Bilder lokal zwischenspeichern"
-#: classes/pref/feeds.php:721 classes/pref/feeds.php:890
+#: classes/pref/feeds.php:721
+#: classes/pref/feeds.php:890
msgid "Mark updated articles as unread"
msgstr "Aktualisierte Artikel als ungelesen markieren"
@@ -2219,7 +2311,8 @@ 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:1145 classes/pref/feeds.php:1198
+#: classes/pref/feeds.php:1145
+#: classes/pref/feeds.php:1198
msgid "All done."
msgstr "Fertig."
@@ -2235,7 +2328,8 @@ msgstr "Inaktive Feeds"
msgid "Edit selected feeds"
msgstr "Bearbeite ausgewählte Feeds"
-#: classes/pref/feeds.php:1314 js/prefs.js:1732
+#: classes/pref/feeds.php:1314
+#: js/prefs.js:1732
msgid "Batch subscribe"
msgstr "Mehrere Feeds abonnieren"
@@ -2268,12 +2362,8 @@ msgid "OPML"
msgstr "OPML"
#: classes/pref/feeds.php:1400
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-"Über OPML können Feeds, Filter, Label und Tiny-Tiny-RSS-Einstellungen "
-"importiert und exportiert werden."
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "Über OPML können Feeds, Filter, Label und Tiny-Tiny-RSS-Einstellungen importiert und exportiert werden."
#: classes/pref/feeds.php:1400
msgid "Only main settings profile can be migrated using OPML."
@@ -2296,21 +2386,12 @@ msgid "Export OPML"
msgstr "OPML exportieren"
#: classes/pref/feeds.php:1427
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Ihre OPML können veröffentlicht werden, so dass jeder, der die URL kennt, "
-"diese abonnieren kann."
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "Ihre OPML können veröffentlicht werden, so dass jeder, der die URL kennt, diese abonnieren kann."
#: classes/pref/feeds.php:1429
-msgid ""
-"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
-"require authentication or feeds hidden from Popular feeds."
-msgstr ""
-"Eine öffentliche OPML enthält keine Tiny-Tiny-RSS-Einstellungen, "
-"passwortgeschützte Feeds oder Feeds, die nicht in den beliebten Feeds "
-"auftauchen sollen."
+msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
+msgstr "Eine öffentliche OPML enthält keine Tiny-Tiny-RSS-Einstellungen, passwortgeschützte Feeds oder Feeds, die nicht in den beliebten Feeds auftauchen sollen."
#: classes/pref/feeds.php:1431
msgid "Public OPML URL"
@@ -2325,12 +2406,8 @@ msgid "Firefox integration"
msgstr "Firefox-Integration"
#: classes/pref/feeds.php:1443
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox "
-"verwendet werden."
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox verwendet werden."
#: classes/pref/feeds.php:1450
msgid "Click here to register this site as a feed reader."
@@ -2341,12 +2418,8 @@ msgid "Published & shared articles / Generated feeds"
msgstr "Veröffentlichte & geteilte Artikel / erzeugte Feeds"
#: classes/pref/feeds.php:1460
-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."
+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:1468
msgid "Display URL"
@@ -2357,26 +2430,22 @@ msgid "Clear all generated URLs"
msgstr "Alle generierten URLs löschen"
#: classes/pref/feeds.php:1549
-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):"
+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:1583 classes/pref/feeds.php:1647
+#: classes/pref/feeds.php:1583
+#: classes/pref/feeds.php:1647
msgid "Click to edit feed"
msgstr "Zum Bearbeiten klicken"
-#: classes/pref/feeds.php:1601 classes/pref/feeds.php:1667
+#: classes/pref/feeds.php:1601
+#: classes/pref/feeds.php:1667
msgid "Unsubscribe from selected feeds"
msgstr "Ausgewählte Feeds abbestellen"
#: classes/pref/feeds.php:1772
msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr ""
-"Einen gültigen RSS Feed pro Zeile hinzufügen (Es findet keine Feederkennung "
-"statt)"
+msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Es findet keine Feederkennung statt)"
#: classes/pref/feeds.php:1781
msgid "Feeds to subscribe, One per line"
@@ -2418,7 +2487,8 @@ msgstr "Datum"
msgid "Close article"
msgstr "Artikel schließen"
-#: 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)"
@@ -2446,12 +2516,15 @@ msgstr "Passwort wurde geändert."
msgid "Old password is incorrect."
msgstr "Altes Passwort ist falsch."
-#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
-#: plugins/mail/init.php:64 plugins/mail/init.php:70
+#: plugins/mailto/init.php:49
+#: plugins/mailto/init.php:55
+#: plugins/mail/init.php:64
+#: plugins/mail/init.php:70
msgid "[Forwarded]"
msgstr "[Weitergeleitet]"
-#: plugins/mailto/init.php:49 plugins/mail/init.php:64
+#: plugins/mailto/init.php:49
+#: plugins/mail/init.php:64
msgid "Multiple articles"
msgstr "Mehrere Artikel"
@@ -2464,11 +2537,8 @@ msgid "Forward selected article(s) by email."
msgstr "Markierte(n) Artikel per E-Mail weiterleiten"
#: plugins/mailto/init.php:78
-msgid ""
-"You should be able to edit the message before sending in your mail client."
-msgstr ""
-"Sie können die Nachricht bearbeiten, bevor Sie diese mit Ihrem Mailclienten "
-"abschicken."
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "Sie können die Nachricht bearbeiten, bevor Sie diese mit Ihrem Mailclienten abschicken."
#: plugins/mailto/init.php:83
msgid "Close this dialog"
@@ -2479,13 +2549,8 @@ msgid "Bookmarklets"
msgstr "Lesezeichen"
#: plugins/bookmarklets/init.php:22
-msgid ""
-"Drag the link below to your browser toolbar, open the feed you're interested "
-"in in your browser and click on the link to subscribe to it."
-msgstr ""
-"Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen Sie den Feed, "
-"an dem Sie interessiert sind, in Ihren Browser und klicken auf den Link, um "
-"ihn zu abonnieren."
+msgid "Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."
+msgstr "Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen Sie den Feed, an dem Sie interessiert sind, in Ihren Browser und klicken auf den Link, um ihn zu abonnieren."
#: plugins/bookmarklets/init.php:26
#, php-format
@@ -2498,21 +2563,15 @@ msgstr "Abonnieren in Tiny Tiny RSS"
#: plugins/bookmarklets/init.php:34
msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
-msgstr ""
-"Benutzen Sie dieses Lesezeichen, um beliebige Seiten mit Tiny Tiny RSS zu "
-"teilen"
+msgstr "Benutzen Sie dieses Lesezeichen, um beliebige Seiten mit Tiny Tiny RSS zu teilen"
#: plugins/import_export/init.php:58
msgid "Import and export"
msgstr "Import und Export"
#: plugins/import_export/init.php:60
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances of same version."
-msgstr ""
-"Die markierten und archivierten Artikel können zur Aufbewahrung oder "
-"Migration zwischen verschiedenen Tiny Tiny RSS Instanzen exportiert werden."
+msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
+msgstr "Die markierten und archivierten Artikel können zur Aufbewahrung oder Migration zwischen verschiedenen Tiny Tiny RSS Instanzen exportiert werden."
#: plugins/import_export/init.php:65
msgid "Export my data"
@@ -2563,7 +2622,8 @@ msgstr "Konnte XML-Datei nicht laden."
msgid "Prepare data"
msgstr "Bereite Daten vor"
-#: plugins/import_export/init.php:446 plugins/googlereaderimport/init.php:92
+#: plugins/import_export/init.php:446
+#: plugins/googlereaderimport/init.php:92
msgid "No file uploaded."
msgstr "Es wurde keine Datei hochgeladen."
@@ -2583,7 +2643,8 @@ msgstr "Betreff:"
msgid "Send e-mail"
msgstr "E-Mail versenden"
-#: 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"
@@ -2616,7 +2677,8 @@ msgstr "von af_comics unterstützte Feeds"
msgid "The following comics are currently supported:"
msgstr "Die folgenden Comics werden momentan unterstützt:"
-#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:54
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:54
msgid "Shared articles"
msgstr "Geteilte Artikel"
@@ -2624,30 +2686,35 @@ msgstr "Geteilte Artikel"
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."
+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"
@@ -2656,13 +2723,8 @@ msgid "Link instance"
msgstr "Instanz verbinden"
#: plugins/instances/init.php:304
-msgid ""
-"You can connect other instances of Tiny Tiny RSS to this one to share "
-"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr ""
-"Sie können andere Instanzen von Tiny Tiny RSS mit dieser verbinden, um "
-"beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS mit "
-"folgender URL:"
+msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr "Sie können andere Instanzen von Tiny Tiny RSS mit dieser verbinden, um beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS mit folgender URL:"
#: plugins/instances/init.php:314
msgid "Last connected"
@@ -2700,7 +2762,8 @@ msgstr "Sie können diesen Artikel über folgende eindeutige URL teilen:"
msgid "Unshare article"
msgstr "Artikel nicht mehr teilen"
-#: plugins/updater/init.php:323 plugins/updater/init.php:340
+#: plugins/updater/init.php:323
+#: plugins/updater/init.php:340
#: plugins/updater/updater.js:10
msgid "Update Tiny Tiny RSS"
msgstr "Tiny Tiny RSS updaten"
@@ -2719,22 +2782,15 @@ msgstr "Diesen Dialog nicht Schließen, bis das Update abgeschlossen ist."
#: plugins/updater/init.php:364
msgid "It is suggested to backup your tt-rss directory first."
-msgstr ""
-"Es wird empfohlen, das tt-rss Verzeichnis zu sichern, bevor Sie fortfahren."
+msgstr "Es wird empfohlen, das tt-rss Verzeichnis zu sichern, bevor Sie fortfahren."
#: plugins/updater/init.php:365
msgid "Your database will not be modified."
msgstr "Ihre Datenbank wird nicht verändert"
#: plugins/updater/init.php:366
-msgid ""
-"Your current tt-rss installation directory will not be modified. It will be "
-"renamed and left in the parent directory. You will be able to migrate all "
-"your customized files after update finishes."
-msgstr ""
-"Ihre aktuelle tt-rss Installation wird nicht verändert. Sie wird umbenannt "
-"und bleibt somit erhalten. Ihre Anpassungen können Sie nach dem Update "
-"migrieren."
+msgid "Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."
+msgstr "Ihre aktuelle tt-rss Installation wird nicht verändert. Sie wird umbenannt und bleibt somit erhalten. Ihre Anpassungen können Sie nach dem Update migrieren."
#: plugins/updater/init.php:367
msgid "Ready to update."
@@ -2744,38 +2800,30 @@ msgstr "Bereit zum Updaten."
msgid "Start update"
msgstr "Starte update"
-#: js/feedlist.js:406 js/feedlist.js:434
+#: 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: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?"
+msgstr "Alle Artikel in %s, die älter als einen Tag sind, als gelesen markieren?"
#: 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?"
+msgstr "Alle Artikel in %s, die älter als eine Woche sind, als gelesen markieren?"
#: 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?"
+msgstr "Alle Artikel in %s, die älter als 2 Wochen sind, als gelesen markieren?"
#: js/functions.js:62
msgid "The error will be reported to the configured log destination."
msgstr "Der Fehler wird im Fehlerprotokoll gespeichert"
#: js/functions.js:104
-msgid ""
-"Are you sure to report this exception to tt-rss.org? The report will include "
-"information about your web browser and tt-rss configuration. Your IP will be "
-"saved in the database."
-msgstr ""
-"Sind Sie sicher, dass Sie diesen Fehler an tt-rss.org melden wollen? Der "
-"Bericht enthält Ihre Browser-Informationen. Ihre IP-Adresse würde in der "
-"Datenbank gespeichert werden."
+msgid "Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."
+msgstr "Sind Sie sicher, dass Sie diesen Fehler an tt-rss.org melden wollen? Der Bericht enthält Ihre Browser-Informationen. Ihre IP-Adresse würde in der Datenbank gespeichert werden."
#: js/functions.js:235
msgid "Click to close"
@@ -2826,13 +2874,8 @@ msgid "Subscribe to Feed"
msgstr "Feed abonnieren"
#: js/functions.js:835
-msgid ""
-"Failed to parse output. This can indicate server timeout and/or network "
-"issues. Backend output was logged to browser console."
-msgstr ""
-"Fehler beim Verarbeiten der Ausgabe. Dies kann auf einen Server-Timeout oder "
-"Netzwerkprobleme deuten. Die Ausgabe des Backends wurde in der Browser-"
-"Konsole protokolliert."
+msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
+msgstr "Fehler beim Verarbeiten der Ausgabe. Dies kann auf einen Server-Timeout oder Netzwerkprobleme deuten. Die Ausgabe des Backends wurde in der Browser-Konsole protokolliert."
#: js/functions.js:850
msgid "Subscribed to %s"
@@ -2875,18 +2918,15 @@ msgid "Create Filter"
msgstr "Filter erstellen"
#: js/functions.js:1214
-msgid ""
-"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
-"hub again on next feed update."
-msgstr ""
-"Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten "
-"Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
+msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+msgstr "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
#: js/functions.js:1225
msgid "Subscription reset."
msgstr "Abonnement zurückgesetzt."
-#: js/functions.js:1235 js/tt-rss.js:684
+#: js/functions.js:1235
+#: js/tt-rss.js:684
msgid "Unsubscribe from %s?"
msgstr "%s abbestellen?"
@@ -2902,11 +2942,14 @@ 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:1380 js/prefs.js:1218
+#: js/functions.js:1380
+#: js/prefs.js:1218
msgid "Trying to change address..."
msgstr "Versuche, die Adresse zu ändern..."
-#: js/functions.js:1567 js/tt-rss.js:425 js/tt-rss.js:665
+#: js/functions.js:1567
+#: js/tt-rss.js:425
+#: js/tt-rss.js:665
msgid "You can't edit this kind of feed."
msgstr "Sie können diese Art von Feed nicht bearbeiten."
@@ -2914,7 +2957,10 @@ msgstr "Sie können diese Art von Feed nicht bearbeiten."
msgid "Edit Feed"
msgstr "Feed bearbeiten"
-#: js/functions.js:1588 js/prefs.js:99 js/prefs.js:211 js/prefs.js:736
+#: js/functions.js:1588
+#: js/prefs.js:99
+#: js/prefs.js:211
+#: js/prefs.js:736
msgid "Saving data..."
msgstr "Speichere Daten..."
@@ -2922,29 +2968,33 @@ msgstr "Speichere Daten..."
msgid "More Feeds"
msgstr "Weitere Feeds"
-#: js/functions.js:1681 js/functions.js:1791 js/prefs.js:414 js/prefs.js:444
-#: js/prefs.js:476 js/prefs.js:629 js/prefs.js:649 js/prefs.js:1194
+#: js/functions.js:1681
+#: js/functions.js:1791
+#: js/prefs.js:414
+#: js/prefs.js:444
+#: js/prefs.js:476
+#: js/prefs.js:629
+#: js/prefs.js:649
+#: js/prefs.js:1194
#: js/prefs.js:1339
msgid "No feeds are selected."
msgstr "Keine Feeds ausgewählt."
#: js/functions.js:1723
-msgid ""
-"Remove selected feeds from the archive? Feeds with stored articles will not "
-"be removed."
-msgstr ""
-"Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten "
-"Artikeln werden nicht gelöscht"
+msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
+msgstr "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten Artikeln werden nicht gelöscht"
#: js/functions.js:1762
msgid "Feeds with update errors"
msgstr "Feeds mit Aktualisierungsfehlern"
-#: js/functions.js:1773 js/prefs.js:1176
+#: js/functions.js:1773
+#: js/prefs.js:1176
msgid "Remove selected feeds?"
msgstr "Ausgewählte Feeds entfernen?"
-#: js/functions.js:1776 js/prefs.js:1179
+#: js/functions.js:1776
+#: js/prefs.js:1179
msgid "Removing selected feeds..."
msgstr "Ausgewählte Feeds werden entfernt..."
@@ -2960,7 +3010,7 @@ msgstr "Kategorie bearbeiten"
msgid "Remove category"
msgstr "Kategorie entfernen"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Invertiert"
@@ -3000,23 +3050,23 @@ msgstr "Ausgewählte Label entfernen?"
msgid "Removing selected labels..."
msgstr "Ausgewählte Label werden entfernt..."
-#: js/prefs.js:312 js/prefs.js:1380
+#: js/prefs.js:312
+#: js/prefs.js:1380
msgid "No labels are selected."
msgstr "Keine Label ausgewählt."
#: js/prefs.js:326
-msgid ""
-"Remove selected users? Neither default admin nor your account will be "
-"removed."
-msgstr ""
-"Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes Konto "
-"werden gelöscht."
+msgid "Remove selected users? Neither default admin nor your account will be removed."
+msgstr "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes Konto werden gelöscht."
#: js/prefs.js:329
msgid "Removing selected users..."
msgstr "Ausgewählte Benutzer werden entfernt..."
-#: js/prefs.js:343 js/prefs.js:487 js/prefs.js:508 js/prefs.js:547
+#: js/prefs.js:343
+#: js/prefs.js:487
+#: js/prefs.js:508
+#: js/prefs.js:547
msgid "No users are selected."
msgstr "Keine Benutzer ausgewählt."
@@ -3028,7 +3078,9 @@ msgstr "Ausgewählte Filter entfernen?"
msgid "Removing selected filters..."
msgstr "Ausgewählte Filter werden entfernt..."
-#: js/prefs.js:376 js/prefs.js:584 js/prefs.js:603
+#: js/prefs.js:376
+#: js/prefs.js:584
+#: js/prefs.js:603
msgid "No filters are selected."
msgstr "Keine Filter ausgewählt."
@@ -3060,7 +3112,9 @@ msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
msgid "Purging selected feed..."
msgstr "Lösche ausgewählten Feed..."
-#: js/prefs.js:492 js/prefs.js:513 js/prefs.js:552
+#: js/prefs.js:492
+#: js/prefs.js:513
+#: js/prefs.js:552
msgid "Please select only one user."
msgstr "Bitte nur einen Benutzer auswählen."
@@ -3104,7 +3158,8 @@ msgstr "OPML Import"
msgid "Please choose an OPML file first."
msgstr "Bitte zuerst eine OPML-Datei auswählen."
-#: js/prefs.js:802 plugins/import_export/import_export.js:115
+#: js/prefs.js:802
+#: plugins/import_export/import_export.js:115
#: plugins/googlereaderimport/init.js:45
msgid "Importing, please wait..."
msgstr "Importiere, bitte warten..."
@@ -3114,11 +3169,8 @@ msgid "Reset to defaults?"
msgstr "Auf Standardwerte zurücksetzen?"
#: js/prefs.js:1083
-msgid ""
-"Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
-"Kategorie %s löschen? Feeds dieser Kategorie werden dann nach "
-"Unkategorisiert verschoben."
+msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr "Kategorie %s löschen? Feeds dieser Kategorie werden dann nach Unkategorisiert verschoben."
#: js/prefs.js:1089
msgid "Removing category..."
@@ -3166,8 +3218,7 @@ msgstr "Ausgewählte Feed werden neu bewertet..."
#: js/prefs.js:1346
msgid "Rescore all articles? This operation may take a lot of time."
-msgstr ""
-"Alle Artikel neu bewerten? Dieser Vorgang kann viel Zeit in Anspruch nehmen."
+msgstr "Alle Artikel neu bewerten? Dieser Vorgang kann viel Zeit in Anspruch nehmen."
#: js/prefs.js:1349
msgid "Rescoring feeds..."
@@ -3182,11 +3233,8 @@ msgid "Settings Profiles"
msgstr "Einstellungsprofile"
#: js/prefs.js:1412
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-"Ausgewählte Profile löschen? Das aktive und das Standardprofil werden nicht "
-"gelöscht."
+msgid "Remove selected profiles? Active and default profiles will not be removed."
+msgstr "Ausgewählte Profile löschen? Das aktive und das Standardprofil werden nicht gelöscht."
#: js/prefs.js:1415
msgid "Removing selected profiles..."
@@ -3196,11 +3244,13 @@ msgstr "Ausgewählte Profile werden entfernt..."
msgid "No profiles are selected."
msgstr "Keine Profile ausgewählt."
-#: js/prefs.js:1438 js/prefs.js:1491
+#: js/prefs.js:1438
+#: js/prefs.js:1491
msgid "Activate selected profile?"
msgstr "Ausgewählte Profile entfernen?"
-#: js/prefs.js:1454 js/prefs.js:1507
+#: js/prefs.js:1454
+#: js/prefs.js:1507
msgid "Please choose a profile to activate."
msgstr "Bitte ein Profil zum Aktivieren auswählen."
@@ -3212,7 +3262,8 @@ msgstr "Profil wird erstellt..."
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr "Alle zuvor erstellten Feed-URLs werden ungültig. Fortfahren?"
-#: js/prefs.js:1518 plugins/share/share_prefs.js:6
+#: js/prefs.js:1518
+#: plugins/share/share_prefs.js:6
msgid "Clearing URLs..."
msgstr "Leere URLs..."
@@ -3260,7 +3311,8 @@ msgstr "Artikel nach Tag auswählen"
msgid "You can't unsubscribe from the category."
msgstr "Sie können die Kategorie nicht abbestellen."
-#: js/tt-rss.js:678 js/tt-rss.js:827
+#: js/tt-rss.js:678
+#: js/tt-rss.js:827
msgid "Please select some feed first."
msgstr "Bitte erst einen Feed auswählen."
@@ -3306,9 +3358,16 @@ msgid_plural "%d articles selected"
msgstr[0] "%d Artikel ausgewählt."
msgstr[1] "%d Artikel ausgewählt."
-#: js/viewfeed.js:757 js/viewfeed.js:785 js/viewfeed.js:812 js/viewfeed.js:877
-#: js/viewfeed.js:911 js/viewfeed.js:1033 js/viewfeed.js:1076
-#: js/viewfeed.js:1129 js/viewfeed.js:2254 plugins/mailto/init.js:7
+#: js/viewfeed.js:757
+#: js/viewfeed.js:785
+#: js/viewfeed.js:812
+#: js/viewfeed.js:877
+#: js/viewfeed.js:911
+#: js/viewfeed.js:1033
+#: js/viewfeed.js:1076
+#: js/viewfeed.js:1129
+#: js/viewfeed.js:2254
+#: plugins/mailto/init.js:7
#: plugins/mail/mail.js:7
msgid "No articles are selected."
msgstr "Keine Artikel ausgewählt."
@@ -3338,11 +3397,8 @@ msgstr[0] "%d archivierten Artikel zurück verschieben?"
msgstr[1] "%d archivierte Artikel zurück verschieben?"
#: js/viewfeed.js:1090
-msgid ""
-"Please note that unstarred articles might get purged on next feed update."
-msgstr ""
-"Bitte beachten Sie, das nicht markierte Artikel beim nächsten Update der "
-"Feeds gelöscht werden könnten."
+msgid "Please note that unstarred articles might get purged on next feed update."
+msgstr "Bitte beachten Sie, das nicht markierte Artikel beim nächsten Update der Feeds gelöscht werden könnten."
#: js/viewfeed.js:1135
msgid "Mark %d selected article in %s as read?"
@@ -3414,10 +3470,10 @@ msgstr "Artikel-URL:"
#: plugins/embed_original/init.js:6
msgid "Sorry, your browser does not support sandboxed iframes."
-msgstr ""
-"Entschuldigung, dein Browser unterstützt keine \"Sandbox\" für iframes."
+msgstr "Entschuldigung, dein Browser unterstützt keine \"Sandbox\" für iframes."
-#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
msgid "Forward article by email"
msgstr "Artikel via E-Mail weiterleiten"
@@ -3426,18 +3482,10 @@ msgid "Export Data"
msgstr "Daten exportieren"
#: plugins/import_export/import_export.js:40
-msgid ""
-"Finished, exported %d article. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgid_plural ""
-"Finished, exported %d articles. You can download the data <a "
-"class='visibleLink' href='%u'>here</a>."
-msgstr[0] ""
-"Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> "
-"herunterladen."
-msgstr[1] ""
-"Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> "
-"herunterladen."
+msgid "Finished, exported %d article. You can download the data <a class='visibleLink' href='%u'>here</a>."
+msgid_plural "Finished, exported %d articles. You can download the data <a class='visibleLink' href='%u'>here</a>."
+msgstr[0] "Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> herunterladen."
+msgstr[1] "Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> herunterladen."
#: plugins/import_export/import_export.js:93
msgid "Data Import"
@@ -3479,7 +3527,8 @@ 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."
@@ -3516,12 +3565,8 @@ msgid "Trying to unshare..."
msgstr "Versuche, Teilen rückgängig zu machen..."
#: plugins/updater/updater.js:58
-msgid ""
-"Backup your tt-rss directory before continuing. Please type 'yes' to "
-"continue."
-msgstr ""
-"Bitte sichern Sie ihr tt-rss Verzeichnis, bevor Sie fortfahren. Geben Sie "
-"'yes' ein, um fortzufahren."
+msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
+msgstr "Bitte sichern Sie ihr tt-rss Verzeichnis, bevor Sie fortfahren. Geben Sie 'yes' ein, um fortzufahren."
#~ msgid "Select:"
#~ msgstr "Auswahl:"
@@ -3554,15 +3599,10 @@ msgstr ""
#~ msgstr "Per URL geteilte Artikel"
#~ msgid "These feeds have not been updated because of errors:"
-#~ msgstr ""
-#~ "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
+#~ msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
-#~ msgid ""
-#~ "Your browser doesn't support Javascript, which is required for this "
-#~ "application to function properly. Please check your browser settings."
-#~ msgstr ""
-#~ "Diese Anwendung benötigt Javascript um ordnungsgemäß zu funktionieren. "
-#~ "Bitte überprüfen Sie Ihre Browser-Einstellungen."
+#~ msgid "Your browser doesn't support Javascript, which is required for this application to function properly. Please check your browser settings."
+#~ msgstr "Diese Anwendung benötigt Javascript um ordnungsgemäß zu funktionieren. Bitte überprüfen Sie Ihre Browser-Einstellungen."
#~ msgid "Hello,"
#~ msgstr "Hallo,"
@@ -3650,9 +3690,7 @@ msgstr ""
#~ msgstr "Thema auswählen"
#~ msgid "I have scanned the code and would like to enable OTP"
-#~ msgstr ""
-#~ "Ich habe den Code gescannt und möchte die Anmeldung mit Einmalpasswörtern "
-#~ "jetzt aktivieren"
+#~ msgstr "Ich habe den Code gescannt und möchte die Anmeldung mit Einmalpasswörtern jetzt aktivieren"
#~ msgid "close"
#~ msgstr "schließen"
@@ -3660,12 +3698,8 @@ msgstr ""
#~ msgid "Playing..."
#~ msgstr "Abspielen..."
-#~ msgid ""
-#~ "Could not upload file. You might need to adjust upload_max_filesize in "
-#~ "PHP.ini (current value = %s)"
-#~ msgstr ""
-#~ "Datei konnte nicht hochgeladen werden. Möglicherweise muss "
-#~ "upload_max_filesize in der PHP.ini angepasst werden. (Aktueller Wert = %s)"
+#~ msgid "Could not upload file. You might need to adjust upload_max_filesize in PHP.ini (current value = %s)"
+#~ msgstr "Datei konnte nicht hochgeladen werden. Möglicherweise muss upload_max_filesize in der PHP.ini angepasst werden. (Aktueller Wert = %s)"
#~ msgid "Default interval between feed updates"
#~ msgstr "Standard Intervall zwischen Feed-Aktualisierungen"
@@ -3685,12 +3719,8 @@ msgstr ""
#~ msgid "Please backup your database before proceeding."
#~ msgstr "Bitte sichern Sie Ihre Datenbank bevor Sie fortfahren."
-#~ msgid ""
-#~ "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> "
-#~ "to <b>%d</b>)."
-#~ msgstr ""
-#~ "Ihre Tiny Tiny RSS Datenbank benötigt eine Aktualisierung auf die neuste "
-#~ "Version (<b>%d</b> nach <b>%d</b>)."
+#~ msgid "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>)."
+#~ msgstr "Ihre Tiny Tiny RSS Datenbank benötigt eine Aktualisierung auf die neuste Version (<b>%d</b> nach <b>%d</b>)."
#~ msgid "Performing updates..."
#~ msgstr "Führe Aktualisierungen durch..."
@@ -3708,14 +3738,9 @@ msgstr ""
#~ msgstr "FEHLER!"
#~ msgid "Finished. Performed <b>%d</b> update up to schema version <b>%d</b>."
-#~ msgid_plural ""
-#~ "Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
-#~ msgstr[0] ""
-#~ "Beendet. <b>%d</b> Aktualisierung auf Schema Version <b>%d</b> "
-#~ "durchgeführt."
-#~ msgstr[1] ""
-#~ "Beendet. <b>%d</b> Aktualisierungen auf Schema Version <b>%d</b> "
-#~ "durchgeführt."
+#~ msgid_plural "Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
+#~ msgstr[0] "Beendet. <b>%d</b> Aktualisierung auf Schema Version <b>%d</b> durchgeführt."
+#~ msgstr[1] "Beendet. <b>%d</b> Aktualisierungen auf Schema Version <b>%d</b> durchgeführt."
#~ msgid "Your database schema is from a newer version of Tiny Tiny RSS."
#~ msgstr "Ihr Datenbankschema stammt von einer neueren Tiny Tiny RSS Version."
@@ -3723,12 +3748,8 @@ msgstr ""
#~ msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
#~ msgstr "Gefundene Schemaversion: <b>%d</b>, benötigt: <b>%d</b>."
-#~ msgid ""
-#~ "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
-#~ "version and continue."
-#~ msgstr ""
-#~ "Aktualisierung des Schemas nicht möglich. Bitte aktualisieren Sie die "
-#~ "Tiny Tiny RSS Dateien auf die neuere Version und fahren Sie fort."
+#~ msgid "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer version and continue."
+#~ msgstr "Aktualisierung des Schemas nicht möglich. Bitte aktualisieren Sie die Tiny Tiny RSS Dateien auf die neuere Version und fahren Sie fort."
#~ msgid "Title or Content"
#~ msgstr "Titel oder Inhalt"
@@ -3754,21 +3775,11 @@ msgstr ""
#~ msgid "Modify score"
#~ msgstr "Bewertung ändern"
-#~ msgid ""
-#~ "This option is useful when you are reading several planet-type "
-#~ "aggregators with partially colliding userbase. When disabled, it forces "
-#~ "same posts from different feeds to appear only once."
-#~ msgstr ""
-#~ "Diese Option dient zum Lesen von Feedsammlungen mit teilweise "
-#~ "wiederkehrenden Artikeln. Ist diese Option deaktiviert, wird ein Artikel "
-#~ "von unterschiedlichen Feedsquellen nur einmal angezeigt."
-
-#~ msgid ""
-#~ "When this option is enabled, headlines in Special feeds and Labels are "
-#~ "grouped by feeds"
-#~ msgstr ""
-#~ "Wenn diese Option aktiviert ist, werden Schlagzeilen in Sonderfeeds und "
-#~ "Labels nach Feeds gruppiert"
+#~ msgid "This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once."
+#~ msgstr "Diese Option dient zum Lesen von Feedsammlungen mit teilweise wiederkehrenden Artikeln. Ist diese Option deaktiviert, wird ein Artikel von unterschiedlichen Feedsquellen nur einmal angezeigt."
+
+#~ msgid "When this option is enabled, headlines in Special feeds and Labels are grouped by feeds"
+#~ msgstr "Wenn diese Option aktiviert ist, werden Schlagzeilen in Sonderfeeds und Labels nach Feeds gruppiert"
#~ msgid "Enable external API"
#~ msgstr "Externe API aktivieren"
@@ -3798,9 +3809,7 @@ msgstr ""
#~ msgstr "Fertig."
#~ msgid "Enable the options you wish to apply using checkboxes on the right:"
-#~ msgstr ""
-#~ "Benutzen Sie die Auswahlkästchen auf der rechten Seite um die gewünschen "
-#~ "Optionen anzuwenden:"
+#~ msgstr "Benutzen Sie die Auswahlkästchen auf der rechten Seite um die gewünschen Optionen anzuwenden:"
#~ msgid "New articles available in this feed (click to show)"
#~ msgstr "Neue Artikel verfügbar (klicken zum Anzeigen)"
@@ -3838,12 +3847,8 @@ msgstr ""
#~ msgid "Back to feeds"
#~ msgstr "Zurück zu den Feeds"
-#~ msgid ""
-#~ "This will clear your stored authentication information for Twitter. "
-#~ "Continue?"
-#~ msgstr ""
-#~ "Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter "
-#~ "löschen. Fortfahren?"
+#~ msgid "This will clear your stored authentication information for Twitter. Continue?"
+#~ msgstr "Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter löschen. Fortfahren?"
#~ msgid "Clearing credentials..."
#~ msgstr "Berechtigungen werden gelöscht..."
@@ -3939,12 +3944,8 @@ msgstr ""
#~ msgid "Focus search (if present)"
#~ msgstr "Fokussierte Suche (wenn gewählt)"
-#~ msgid ""
-#~ "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-#~ "configuration and your access level."
-#~ msgstr ""
-#~ "<b>Anmerkung:</b> Abhängig von Ihren Tiny-Tiny-RSS-Einstellungen und "
-#~ "Zugriffsrechten könnten nicht alle Aktionen verfügbar sein."
+#~ msgid "<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS configuration and your access level."
+#~ msgstr "<b>Anmerkung:</b> Abhängig von Ihren Tiny-Tiny-RSS-Einstellungen und Zugriffsrechten könnten nicht alle Aktionen verfügbar sein."
#~ msgid "Open article in new tab"
#~ msgstr "Artikel in neuem Reiter öffnen"
@@ -4019,9 +4020,7 @@ msgstr ""
#~ msgstr "Mit Twitter verbinden"
#~ msgid "Could not connect to Twitter. Refresh the page or try again later."
-#~ msgstr ""
-#~ "Konnte nicht zu Twitter verbinden. Aktualisieren Sie die Seite oder "
-#~ "versuchen es später erneut."
+#~ msgstr "Konnte nicht zu Twitter verbinden. Aktualisieren Sie die Seite oder versuchen es später erneut."
#~ msgid "Congratulations! You have successfully registered with Twitter."
#~ msgstr "Glückwunsch! Sie haben sich erfolgreich mit Twitter verbunden."
@@ -4045,8 +4044,7 @@ msgstr ""
#~ msgstr "Keine Feedkategorien definiert."
#~ msgid "<b>Hint:</b> you can drag feeds and categories around."
-#~ msgstr ""
-#~ "<b>Hinweis</b>: Sie können Feeds und Kategorien mit der Maus herumziehen."
+#~ msgstr "<b>Hinweis</b>: Sie können Feeds und Kategorien mit der Maus herumziehen."
#~ msgid "Subscribing using bookmarklet"
#~ msgstr "Mit Bookmarklet abonnieren"
@@ -4054,19 +4052,11 @@ msgstr ""
#~ msgid "Twitter"
#~ msgstr "Twitter"
-#~ msgid ""
-#~ "Before you can update your Twitter feeds, you must register this instance "
-#~ "of Tiny Tiny RSS with Twitter.com."
-#~ msgstr ""
-#~ "Bevor Sie Ihre Twitter-Feeds aktualisieren können, müssen Sie diese "
-#~ "Instanz von Tiny Tiny RSS bei Twitter registrieren."
+#~ msgid "Before you can update your Twitter feeds, you must register this instance of Tiny Tiny RSS with Twitter.com."
+#~ msgstr "Bevor Sie Ihre Twitter-Feeds aktualisieren können, müssen Sie diese Instanz von Tiny Tiny RSS bei Twitter registrieren."
-#~ msgid ""
-#~ "You have been successfully registered with Twitter.com and should be able "
-#~ "to access your Twitter feeds."
-#~ msgstr ""
-#~ "Sie haben diese Instanz erfolgreich mit Twitter verbunden und sollten nun "
-#~ "auf Ihre Twitter-Feeds zugreifen können."
+#~ msgid "You have been successfully registered with Twitter.com and should be able to access your Twitter feeds."
+#~ msgstr "Sie haben diese Instanz erfolgreich mit Twitter verbunden und sollten nun auf Ihre Twitter-Feeds zugreifen können."
#~ msgid "Register with Twitter.com"
#~ msgstr "Mit Twitter registrieren"
@@ -4083,9 +4073,5 @@ msgstr ""
#~ msgid "Filter Test Results"
#~ msgstr "Filtertestergebnis"
-#~ msgid ""
-#~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
-#~ "next feed with unread articles."
-#~ msgstr ""
-#~ "Beim Klick auf \"Als gelesen markieren\" in der Toolbar, automatisch "
-#~ "nächsten Feed mit ungelesenen Artikeln öffnen."
+#~ msgid "When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles."
+#~ msgstr "Beim Klick auf \"Als gelesen markieren\" in der Toolbar, automatisch nächsten Feed mit ungelesenen Artikeln öffnen."
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 2406d50f7..d59388d56 100644
--- a/locale/es_ES/LC_MESSAGES/messages.mo
+++ b/locale/es_ES/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 57e44a8ec..3721b8634 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2014-03-10 14:18+0100\n"
"Last-Translator: DavidM <[email protected]>\n"
"Language-Team: Español <[email protected]>\n"
@@ -158,7 +158,7 @@ msgstr "La prueba de escape SQL ha fallado. Por favor, revise la configuración
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -378,13 +378,13 @@ msgid "Feeds"
msgstr "Fuentes"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtros"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Marcadores"
@@ -475,10 +475,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Script para actualizar datos de Tiny Tiny RSS."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -692,7 +692,7 @@ msgid "Go to"
msgstr "Ir a"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Todos"
@@ -716,7 +716,7 @@ msgid "Create label"
msgstr "Crear marcador"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Crear filtro"
@@ -811,34 +811,35 @@ msgstr "Adjuntos"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "Error de LibXML %s en la línea %d (columna %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Especial"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Todas las fuentes"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Favoritos"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Publicados"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Recientes"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Artículos archivados"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Leídos recientemente"
@@ -916,7 +917,7 @@ msgstr "Etiquetas para este artículo (separadas por comas):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -934,10 +935,10 @@ msgstr "Guardar"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1160,11 +1161,11 @@ msgstr "Última actualización: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1180,11 +1181,11 @@ msgstr "Invertir"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1218,10 +1219,10 @@ msgid "Move back"
msgstr "Mover a la fuente original"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Borrar"
@@ -1350,7 +1351,7 @@ msgstr "Más fuentes"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1371,8 +1372,8 @@ msgstr "límite:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1557,11 +1558,11 @@ msgstr "[tt-rss] Notificación de cambio de contraseña"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1579,7 +1580,7 @@ msgid "Details"
msgstr "Detalles"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Editar"
@@ -1606,8 +1607,8 @@ msgid "No matching users found."
msgstr "No se han encontrado usuarios coincidentes."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Leyenda"
@@ -1644,127 +1645,129 @@ msgstr "No se han encontrado artículos recientes que coincidan con el filtro."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Es posible que expresiones complejas no devuelvan resultados en la prueba, a causa de problemas técnicos con la base de datos (implementación de expresiones regulares)."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(inverso)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s en %s en %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Coincidir"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Añadir"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Aplicar acciones"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Habilitado"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Coincidencia con cualquier regla"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Coincidencia inversa"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Probar"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(inverso)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s en %s en %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Combinar"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Reiniciar orden"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Reiniciar la puntuación de los artículos"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Crear"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Coincidencia inversa con la expresión regular"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "en el campo"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "en"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
msgid "Wiki: Filters"
msgstr "Wiki: Filtros"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Guardar regla"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Añadir regla"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Realizar la acción"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "con los parámetros:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Guardar acción"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Añadir acción"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Sin leyenda]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "%s (%d regla)"
msgstr[1] "%s (%d reglas)"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3003,7 +3006,7 @@ msgstr "Editar categoría"
msgid "Remove category"
msgstr "Borrar categoría"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Inverso"
diff --git a/locale/fi_FI/LC_MESSAGES/messages.mo b/locale/fi_FI/LC_MESSAGES/messages.mo
index 98d4809fc..407012e56 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.mo
+++ b/locale/fi_FI/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/fi_FI/LC_MESSAGES/messages.po b/locale/fi_FI/LC_MESSAGES/messages.po
index 1b0967b78..2550ab738 100644
--- a/locale/fi_FI/LC_MESSAGES/messages.po
+++ b/locale/fi_FI/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss 1.7.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-04-20 10:44+0200\n"
"Last-Translator: Arto Tolonen <[email protected]>\n"
"Language-Team: \n"
@@ -157,7 +157,7 @@ msgstr ""
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -377,13 +377,13 @@ msgid "Feeds"
msgstr "Syötteet"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Suodattimet"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Tunnisteet"
@@ -475,10 +475,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr ""
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -693,7 +693,7 @@ msgid "Go to"
msgstr "Mene"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Kaikki artikkelit"
@@ -717,7 +717,7 @@ msgid "Create label"
msgstr "Luo tunniste"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Luo suodatin"
@@ -813,34 +813,35 @@ msgstr "Litteet"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Erikoiset"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Kaikki syötteet"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Tähdelliset artikkelit"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Julkiset artikkelit"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Tuoreet artikkelit"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Arkistoidut artikkelit"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Viimeksi luetut"
@@ -918,7 +919,7 @@ msgstr "Tämän syötteen avainsanat (pilkulla erotettuina)"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -936,10 +937,10 @@ msgstr "Tallenna"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1164,11 +1165,11 @@ msgstr "Syötteet päivitetty viimeksi %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1184,11 +1185,11 @@ msgstr "Käännä"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1222,10 +1223,10 @@ msgid "Move back"
msgstr "Siirrä takaisin"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Poista"
@@ -1357,7 +1358,7 @@ msgstr "Lisää syötteitä"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1378,8 +1379,8 @@ msgstr "raja:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1567,11 +1568,11 @@ msgstr ""
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1589,7 +1590,7 @@ msgid "Details"
msgstr "Tarkemmat tiedot"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Muokkaa"
@@ -1616,8 +1617,8 @@ msgid "No matching users found."
msgstr "Hakua vastaavia käyttäjätunnuksia ei löytynyt"
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Nimi"
@@ -1654,129 +1655,131 @@ msgstr "Suodatinta vastaavia artikkeleita ei löytynyt. "
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(käänteinen)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Täsmäys"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Lisää"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Suorita toiminnot"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Aktivoitu"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Täsmää ainakin yhteen säännöistä"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Käänteinen täsmäys"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Kokeilu"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(käänteinen)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Yhdistä"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Järjestä oletuksen mukaisesti"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Uudelleenpisteytä artikkelit"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Luo"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Käänteinen täsmäys säännöllisellä lausekkeella"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "kentässä"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "kansiossa"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Suodattimet"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Tallenna sääntö"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Lisää sääntö"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Suorita toiminto"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "parametrit:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Tallenna toiminto"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Lisää toiminto"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
#, fuzzy
msgid "[No caption]"
msgstr "Nimi"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "Lisää sääntö"
msgstr[1] "Lisää sääntö"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3025,7 +3028,7 @@ msgstr "Muokkaa kansiota"
msgid "Remove category"
msgstr "Poista kansio"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Käänteiset valinnat"
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 4d158686d..093e98ada 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 7a24e9e51..3b1ee1b89 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/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: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2014-01-26 13:07+0100\n"
"Last-Translator: Raphael Rochet <[email protected]>\n"
"Language-Team: French\n"
@@ -162,7 +162,7 @@ msgstr "Le test d'échappement SQL a échoué, veuillez vérifier votre configur
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -382,13 +382,13 @@ msgid "Feeds"
msgstr "Flux"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtres"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Etiquettes"
@@ -479,10 +479,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Script de mise à jour des données de Tiny Tiny RSS."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -696,7 +696,7 @@ msgid "Go to"
msgstr "Aller à"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Tous les articles"
@@ -720,7 +720,7 @@ msgid "Create label"
msgstr "Créer une étiquette"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Créer un filtre"
@@ -815,34 +815,35 @@ msgstr "Fichier attaché"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "Erreur LibXML %s ligne %d (colonne %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Spécial"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Tous les flux"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Articles remarquables"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Articles publiés"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Nouveaux articles"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Articles archivés"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Lus récemment"
@@ -920,7 +921,7 @@ msgstr "Tags pour cet article (séparés par des virgules) :"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -938,10 +939,10 @@ msgstr "Enregistrer"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1166,11 +1167,11 @@ msgstr "Dernière mise à jour : %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1186,11 +1187,11 @@ msgstr "Inverse"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1224,10 +1225,10 @@ msgid "Move back"
msgstr "Revenir"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Supprimer"
@@ -1356,7 +1357,7 @@ msgstr "D'autres flux"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1377,8 +1378,8 @@ msgstr "limite :"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1563,11 +1564,11 @@ msgstr "[tt-rss] Notification de changement de mot passe"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1585,7 +1586,7 @@ msgid "Details"
msgstr "Détails"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Modifier"
@@ -1612,8 +1613,8 @@ msgid "No matching users found."
msgstr "Aucun utilisateur correspondant trouvé."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Légende"
@@ -1650,127 +1651,129 @@ msgstr "Aucun article récent correspondant à ce filtre."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Les expressions complexes risquent de ne pas avoir de résulats dans les tests à cause de problèmes avec le serveur."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(inversé)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s sur %s dans %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Correspondance"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Ajouter"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Actions éffectuées"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Activé"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Au moins une correspondance"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Correspondance inverse"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Test"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(inversé)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s sur %s dans %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Combiner"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Réinitialiser le critère de tri"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Recalculer le score des articles"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Créer"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Inverser le résultat de l'expression rationnelle"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "sur le champ"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "dans"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
msgid "Wiki: Filters"
msgstr "Filtres Wiki:"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Enregistrer"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Ajouter une règle"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Exécuter l'action"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "avec les paramètres :"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Enregistrer"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Ajouter une action"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Pas de titre]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "%s (%d règle)"
msgstr[1] "%s (%d règles)"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3009,7 +3012,7 @@ msgstr "Modifier la catégorie"
msgid "Remove category"
msgstr "Supprimer la catégorie"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Inverser"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 8c474668d..335c0fa5a 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.mo
+++ b/locale/hu_HU/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 787149037..327a52ab5 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss-hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-05-15 01:19+0100\n"
"Last-Translator: Faludi Zoltán <[email protected]>\n"
"Language-Team: HUNGARIAN\n"
@@ -158,7 +158,7 @@ msgstr "SQL eszképelési teszt sikertelen, ellenőrizze az adatbázis és a PHP
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -378,13 +378,13 @@ msgid "Feeds"
msgstr "Hírcsatornák"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Szűrők"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Címkék"
@@ -475,10 +475,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "A Tiny Tiny RSS adatbázis frissítő szkript."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -692,7 +692,7 @@ msgid "Go to"
msgstr "Ugrás ide"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Az összes hír"
@@ -716,7 +716,7 @@ msgid "Create label"
msgstr "Címke létrehozása"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Szűrő létrehozása"
@@ -811,34 +811,35 @@ msgstr "Csatolmányok:"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "LibXML hiba %s sor: %d (oszlop: %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Kiemelt"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Összes hírcsatorna"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Csillagozott hírek"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Publikált hírek"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Friss hírek"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Archivált hírek"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Legutóbb olvasott"
@@ -916,7 +917,7 @@ msgstr "A hír címkéi (vesszőkkel elválasztva):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -934,10 +935,10 @@ msgstr "Mentés"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1162,11 +1163,11 @@ msgstr "Legutóbbi frissítés: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1182,11 +1183,11 @@ msgstr "Fordított"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1220,10 +1221,10 @@ msgid "Move back"
msgstr "Visszalépés"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Törlés"
@@ -1353,7 +1354,7 @@ msgstr "További hírcsatornák"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1374,8 +1375,8 @@ msgstr "határ:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1561,11 +1562,11 @@ msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1583,7 +1584,7 @@ msgid "Details"
msgstr "Részletek"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Szerkesztés"
@@ -1610,8 +1611,8 @@ msgid "No matching users found."
msgstr "Nem található a feltételeknek megfelelő felhasználó."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Cím"
@@ -1648,128 +1649,130 @@ msgstr "Nem található a feltételeknek megfelelő hír."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Az adatbázis szerver regexp implementációjával kapcsolatos problémák miatt a összetett kifejezések nem biztos, hogy eredményesek lesznek."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(fordított)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s ebben: %s itt: %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Szabály"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Hozzáad"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Műveletek alkalmazása"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Engedélyezve"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Minden szabálynak megfeleljen"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Fordított egyezés"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Teszt"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(fordított)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s ebben: %s itt: %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Egyesít"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Rendezési sorren visszaállítása"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Hírek újrapontszámozása"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Létrehoz"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Fordított reguláris kifejezés egyezés"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "...szerepeljen ebben a mezőben: "
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "itt"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Szűrők"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Szabály mentés"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Szabály hozzáadás"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Műveletek"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "Beállítás:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Művelet mentés"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Művelet hozzáadás"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Nincs cím]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "%s (%d szabály)"
msgstr[1] "%s (%d szabály)"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3009,7 +3012,7 @@ msgstr "Kategória szerkesztése"
msgid "Remove category"
msgstr "Kategória eltávolítása"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Fordított"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 3935f5c17..7fd94b980 100644
--- a/locale/it_IT/LC_MESSAGES/messages.mo
+++ b/locale/it_IT/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 1aa88fba3..8386177a0 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2012-02-14 08:31+0000\n"
"Last-Translator: gothfox <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -162,7 +162,7 @@ msgstr "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -385,13 +385,13 @@ msgid "Feeds"
msgstr "Notiziari"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtri"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Etichette"
@@ -483,10 +483,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Il database di Tiny Tiny RSS è aggiornato."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -725,7 +725,7 @@ msgid "Go to"
msgstr "Vai a..."
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Tutti gli articoli"
@@ -750,7 +750,7 @@ msgid "Create label"
msgstr "Crea etichetta"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Crea filtro"
@@ -850,34 +850,35 @@ msgstr "Allegati:"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Speciale"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Tutti i notiziari"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Articoli con stella"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Articoli pubblicati"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Articoli nuovi"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Articoli archiviati"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr ""
@@ -960,7 +961,7 @@ msgstr "Etichette per questo articolo (separate da virgole):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -978,10 +979,10 @@ msgstr "Salva"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1214,11 +1215,11 @@ msgstr "Ultimo aggiornamento:"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1234,11 +1235,11 @@ msgstr "Inverti"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1274,10 +1275,10 @@ msgid "Move back"
msgstr "Sposta indietro"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Elimina"
@@ -1411,7 +1412,7 @@ msgstr "Altri notiziari"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1432,8 +1433,8 @@ msgstr "limite:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1622,11 +1623,11 @@ msgstr "[tt-rss] Notifica di cambio password"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1644,7 +1645,7 @@ msgid "Details"
msgstr "Dettagli"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Modifica"
@@ -1671,8 +1672,8 @@ msgid "No matching users found."
msgstr "Nessun utente corrispondente trovato."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Intestazione"
@@ -1710,135 +1711,137 @@ msgstr "Nessun articolo trovato che corrisponde a questo filtro."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+#, fuzzy
+msgid "(inverse)"
+msgstr "Inverso"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Corrisponde"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr ""
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
#, fuzzy
msgid "Apply actions"
msgstr "Azioni notiziari"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Abilitato"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr ""
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "Corrispondenza inversa"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Prova"
-#: classes/pref/filters.php:420
-#, fuzzy
-msgid "(inverse)"
-msgstr "Inverso"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Reimposta ordinamento"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Cambio punteggio degli articoli"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Crea"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "al campo"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "in"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtri"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#, fuzzy
msgid "Save rule"
msgstr "Salva"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr ""
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Esegui azione"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "con parametri:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#, fuzzy
msgid "Save action"
msgstr "Riquadro azioni"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
#, fuzzy
msgid "Add action"
msgstr "Azioni notiziari"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
#, fuzzy
msgid "[No caption]"
msgstr "Intestazione"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] ""
msgstr[1] ""
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3140,7 +3143,7 @@ msgstr "Modifica categorie"
msgid "Remove category"
msgstr "Crea categoria"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Inverso"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 733eb986a..5f0645c6d 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index 8c47c1c79..080b24780 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss unstable\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-07-13 11:05+0900\n"
"Last-Translator: Yak! <[email protected]>\n"
"Language-Team: \n"
@@ -157,7 +157,7 @@ msgstr "SQLのエスケープ処理のテストに失敗しました。データ
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -377,13 +377,13 @@ msgid "Feeds"
msgstr "フィード"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "フィルター"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "ラベル"
@@ -474,10 +474,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS データ更新スクリプト。"
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -690,7 +690,7 @@ msgid "Go to"
msgstr "移動"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "すべての記事"
@@ -714,7 +714,7 @@ msgid "Create label"
msgstr "ラベルを作成する"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "フィルターを作成する"
@@ -809,34 +809,35 @@ msgstr "添付"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "LibXML エラー %s が %d 行 %d 列 で発生しました: %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "特別"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "すべてのフィード"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "お気に入りの記事"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "公開済みの記事"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "新しい記事"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "保管された記事"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "最近読んだ"
@@ -914,7 +915,7 @@ msgstr "この記事のタグ (カンマで区切ります):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -932,10 +933,10 @@ msgstr "保存"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1160,11 +1161,11 @@ msgstr "最終更新: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1180,11 +1181,11 @@ msgstr "反転"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1218,10 +1219,10 @@ msgid "Move back"
msgstr "戻る"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "削除"
@@ -1351,7 +1352,7 @@ msgstr "さらなるフィード"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1372,8 +1373,8 @@ msgstr "制限:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1559,11 +1560,11 @@ msgstr "[tt-rss] パスワード変更通知"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1581,7 +1582,7 @@ msgid "Details"
msgstr "詳細"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "編集"
@@ -1608,8 +1609,8 @@ msgid "No matching users found."
msgstr "ユーザーが見つかりません。"
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "キャプション"
@@ -1646,127 +1647,129 @@ msgstr "このフィルタに一致する最近の記事がありません。"
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "データベースサーバの正規表現実装の問題により、テスト中は複雑な正規表現は結果が得られないかもしれません。"
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(反転)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "「%3$s」の %2$s に対して %1$s %4$s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "一致"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "追加"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "適用する操作"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "有効にする"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "いずれかのルールに一致"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "一致結果の反転"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "テスト"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(反転)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "「%3$s」の %2$s に対して %1$s %4$s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "組み合わせ"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "ソート順のリセット"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "記事のスコアの再集計"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "作成"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "正規表現の一致結果を反転する"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "対象項目"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "フィード"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "フィルター"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "ルールの保存"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "ルールの追加"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "操作の実行"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "パラメーター:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "操作の保存"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "操作の追加"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[キャプションなし]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "ルールの追加"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3001,7 +3004,7 @@ msgstr "カテゴリーの編集"
msgid "Remove category"
msgstr "カテゴリーの削除"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "反転"
diff --git a/locale/ko_KR/LC_MESSAGES/messages.mo b/locale/ko_KR/LC_MESSAGES/messages.mo
index 8c1a2cc66..a404822c1 100644
--- a/locale/ko_KR/LC_MESSAGES/messages.mo
+++ b/locale/ko_KR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ko_KR/LC_MESSAGES/messages.po b/locale/ko_KR/LC_MESSAGES/messages.po
index 876b9dbde..1f0ee95ad 100644
--- a/locale/ko_KR/LC_MESSAGES/messages.po
+++ b/locale/ko_KR/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss unstable\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-06-19 10:45+0900\n"
"Last-Translator: YoungMin Park <[email protected]>\n"
"Language-Team: YoungMin Park <[email protected]>\n"
@@ -158,7 +158,7 @@ msgstr "SQL escaping 테스트에 실패했습니다. 데이터베이스 및 PHP
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -378,13 +378,13 @@ msgid "Feeds"
msgstr "피드"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "필터"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "라벨"
@@ -475,10 +475,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS 데이터 업데이트 스크립트."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -691,7 +691,7 @@ msgid "Go to"
msgstr "이동"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "전체 글"
@@ -715,7 +715,7 @@ msgid "Create label"
msgstr "라벨 생성"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "필터 생성"
@@ -810,34 +810,35 @@ msgstr "첨부"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "자동 분류"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "모든 피드"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "중요 표시된 글"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "공개 글"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "새 글"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "보관 처리된 글"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "최근에 읽은 글"
@@ -919,7 +920,7 @@ msgstr "이 글의 태그 (쉼표로 구분)"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -937,10 +938,10 @@ msgstr "저장"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1164,11 +1165,11 @@ msgstr "마지막 업데이트: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1184,11 +1185,11 @@ msgstr "선택 반전"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1222,10 +1223,10 @@ msgid "Move back"
msgstr "돌아가기"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "삭제"
@@ -1355,7 +1356,7 @@ msgstr "기타 피드"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1376,8 +1377,8 @@ msgstr "제한:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1563,11 +1564,11 @@ msgstr "[tt-rss] 암호 변경 안내"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1585,7 +1586,7 @@ msgid "Details"
msgstr "상세 정보"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "편집"
@@ -1612,8 +1613,8 @@ msgid "No matching users found."
msgstr "일치하는 사용자가 없습니다."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "자막"
@@ -1650,127 +1651,129 @@ msgstr "이 필터에 해당하는 최근 글이 없습니다."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "반전"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "일치"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "추가"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "동작 적용"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "활성화"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "아무 규칙이나 적용"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "반대 적용"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "테스트"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "반전"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "병합"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "정렬 순서 초기화"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "글 점수 다시 매기기"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "생성"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "필드"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr ""
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "필터"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "규칙 저장"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "규칙 추가"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "동작 실행"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "파라미터 포함:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "저장 동작"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "동작 추가"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[자막 없음]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "규칙 추가"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3007,7 +3010,7 @@ msgstr "카테고리 편집"
msgid "Remove category"
msgstr "카테고리 제거"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "반전"
diff --git a/locale/lv_LV/LC_MESSAGES/messages.mo b/locale/lv_LV/LC_MESSAGES/messages.mo
index 02d46b90e..c6169c68b 100644
--- a/locale/lv_LV/LC_MESSAGES/messages.mo
+++ b/locale/lv_LV/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/lv_LV/LC_MESSAGES/messages.po b/locale/lv_LV/LC_MESSAGES/messages.po
index 363bd6860..788006833 100644
--- a/locale/lv_LV/LC_MESSAGES/messages.po
+++ b/locale/lv_LV/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-03-18 22:55+0300\n"
"Last-Translator: Valdis Vītoliņš <[email protected]>\n"
"Language-Team: \n"
@@ -160,7 +160,7 @@ msgstr "Neizdevās SQL izņēmumu tests, pārbaudiet jūsu datu bāzes un PHP ie
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -383,13 +383,13 @@ msgid "Feeds"
msgstr "Barotnes"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtri"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Iezīmes"
@@ -480,10 +480,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS datu atjaunošanas skripts."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -723,7 +723,7 @@ msgid "Go to"
msgstr "Doties uz..."
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Visi raksti"
@@ -748,7 +748,7 @@ msgid "Create label"
msgstr "Izveidot etiķeti"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Izveidot filtru"
@@ -847,34 +847,35 @@ msgstr "Pielikumi"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Īpaši"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Visas barotnes"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Zvaigžņotie raksti"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Publicētie raksti"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Jaunākie raksti"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Arhivētie raksti"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Nesen lasītie raksti"
@@ -957,7 +958,7 @@ msgstr "Šī raksta iezīmes (atdalītas ar komatiem):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -975,10 +976,10 @@ msgstr "Saglabāt"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1204,11 +1205,11 @@ msgstr "Pēdējais atjaunojums:"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1224,11 +1225,11 @@ msgstr "Apgriezt"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1263,10 +1264,10 @@ msgid "Move back"
msgstr "Pārvietot atpakaļ"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Dzēst"
@@ -1399,7 +1400,7 @@ msgstr "Vairāk barotnes"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1420,8 +1421,8 @@ msgstr "ierobežojumi:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1613,11 +1614,11 @@ msgstr "[tt-rss] paroles maiņas paziņojums"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1635,7 +1636,7 @@ msgid "Details"
msgstr "Detaļas"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Rediģēt"
@@ -1662,8 +1663,8 @@ msgid "No matching users found."
msgstr "Neatradu atbilstošus lietotājus."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Uzraksts"
@@ -1700,131 +1701,133 @@ msgstr "Neseni raksti ar šādiem atlases nosacījumiem netika atrasti"
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+#, fuzzy
+msgid "(inverse)"
+msgstr "Apgriezt"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, fuzzy, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s kad %s kur %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Atbilstība"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Pievienot"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Pielietot darbības"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Iespējots"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Atbilst jebkuram likumam"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "Apgriezt rakstu iezīmēšanu"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Pārbaudīt"
-#: classes/pref/filters.php:420
-#, fuzzy
-msgid "(inverse)"
-msgstr "Apgriezt"
-
-#: classes/pref/filters.php:419
-#, fuzzy, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s kad %s kur %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Apvienot"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Atstatīt kārtošanas secību"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Pārvērtēt rakstus"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Izveidot"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "laukā"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "kur"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtri"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Saglabāt likumu"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Pievienot likumu"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Pielietot darbību"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "ar parametriem:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Saglabāt darbību"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Pievienot darbību"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
#, fuzzy
msgid "[No caption]"
msgstr "Uzraksts"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "Pievienot likumu"
msgstr[1] "Pievienot likumu"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3099,7 +3102,7 @@ msgstr "Rediģēt kategoriju"
msgid "Remove category"
msgstr "Dzēst kategoriju"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Apgriezt"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 057dc6cf4..6a0cbc08f 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.mo
+++ b/locale/nb_NO/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index e4f84fc4b..52284ba63 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2009-05-02 00:10+0100\n"
"Last-Translator: Christian Lomsdalen <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -161,7 +161,7 @@ msgstr "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine.
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -387,13 +387,13 @@ msgid "Feeds"
msgstr "Nyhetsstrømmer"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtre"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Merkelapper"
@@ -485,10 +485,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS-databasen er oppdatert"
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -732,7 +732,7 @@ msgid "Go to"
msgstr "Gå til..."
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Alle artikler"
@@ -758,7 +758,7 @@ msgid "Create label"
msgstr "Lag merkelapp"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Lag filter"
@@ -860,35 +860,36 @@ msgstr "Vedlegg:"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Snarveier"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Favorittartikler"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Publiserte artikler"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Ferske artikler"
-#: include/functions.php:1976
+#: include/functions.php:1979
#, fuzzy
msgid "Archived articles"
msgstr "Lagrede artikler"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr ""
@@ -974,7 +975,7 @@ msgstr "Denne artikkelens stikkord (separert med kommaer):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -992,10 +993,10 @@ msgstr "Lagre"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1233,11 +1234,11 @@ msgstr "Siste oppdatering:"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1253,11 +1254,11 @@ msgstr "Motsatt"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1295,10 +1296,10 @@ msgid "Move back"
msgstr "Gå tilbake"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
#, fuzzy
msgid "Delete"
msgstr "Standard"
@@ -1437,7 +1438,7 @@ msgstr "Flere nyhetsstrømmer"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1461,8 +1462,8 @@ msgstr "Antall:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1656,11 +1657,11 @@ msgstr "[tt-rss] Varsel om endring av passord"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1680,7 +1681,7 @@ msgid "Details"
msgstr "Daglig"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Rediger"
@@ -1707,8 +1708,8 @@ msgid "No matching users found."
msgstr "Ingen matchende brukere ble funnet"
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Overskrift"
@@ -1750,137 +1751,139 @@ msgstr "Ingen filtre ble funnet."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+#, fuzzy
+msgid "(inverse)"
+msgstr "(Motsatt)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Match"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Legg til"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
#, fuzzy
msgid "Apply actions"
msgstr "Nyhetsstrømshandlinger"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Tillatt"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
#, fuzzy
msgid "Match any rule"
msgstr "Match på:"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "Motsatt markering"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Test"
-#: classes/pref/filters.php:420
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Motsatt)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
#, fuzzy
msgid "Reset sort order"
msgstr "Nullstill passordet"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Tilbakestill poengsummene for artiklene"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Lag"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "På felt:"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "i"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtre"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#, fuzzy
msgid "Save rule"
msgstr "Lagre"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
#, fuzzy
msgid "Add rule"
msgstr "Legger til kategori for nyhetsstrømmer"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Utfør handlingen"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "med parametrene:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#, fuzzy
msgid "Save action"
msgstr "Panelhandlinger"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
#, fuzzy
msgid "Add action"
msgstr "Nyhetsstrømshandlinger"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "Ingen bildetekst"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "Legger til kategori for nyhetsstrømmer"
msgstr[1] "Legger til kategori for nyhetsstrømmer"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3241,7 +3244,7 @@ msgstr "Rediger kategorier"
msgid "Remove category"
msgstr "Lag kategori"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
#, fuzzy
msgid "Inverse"
msgstr "(Motsatt)"
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index 5de4bbd67..4aa922c80 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.mo
+++ b/locale/nl_NL/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index 6c184d77e..c062d9a5d 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/locale/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TT-RSS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-05-02 13:55+0100\n"
"Last-Translator: ArmyOfPirates\n"
"Language-Team: translations <[email protected]>\n"
@@ -161,7 +161,7 @@ msgstr "SQL escaping test mislukt. Controleer uw database en de PHP configuratie
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -381,13 +381,13 @@ msgid "Feeds"
msgstr "Feeds"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filters"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Labels"
@@ -478,10 +478,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS data update script."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -695,7 +695,7 @@ msgid "Go to"
msgstr "Ga naar"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Alle artikelen"
@@ -719,7 +719,7 @@ msgid "Create label"
msgstr "Maak label"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Maak filter"
@@ -815,34 +815,35 @@ msgstr "Bijlagen"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "LibXML fout %s op regel %d (kolom %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Speciaal"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Alle feeds"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Artikelen met ster"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Gepubliceerde artikelen"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Nieuwe artikelen"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Gearchiveerde artikelen"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Recent gelezen"
@@ -924,7 +925,7 @@ msgstr "Tags voor dit artikel (komma gescheiden):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -942,10 +943,10 @@ msgstr "Opslaan"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1170,11 +1171,11 @@ msgstr "Laatst geüpdatet: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1190,11 +1191,11 @@ msgstr "Omkeren"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1228,10 +1229,10 @@ msgid "Move back"
msgstr "Terugzetten"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Verwijderen"
@@ -1361,7 +1362,7 @@ msgstr "Meer feeds"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1382,8 +1383,8 @@ msgstr "beperking:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1569,11 +1570,11 @@ msgstr "[tt-rss] Melding verandering van wachtwoord"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1591,7 +1592,7 @@ msgid "Details"
msgstr "Details"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Bewerken"
@@ -1618,8 +1619,8 @@ msgid "No matching users found."
msgstr "Geen overeenkomstige gebruikers gevonden."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Onderschrift"
@@ -1656,128 +1657,130 @@ msgstr "Er zijn geen recente artikelen die overeenkomen met dit filter gevonden.
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Complexe expressies kunnen geen resultaat geven bij het testen, tengevolge van problemen bij de database server's regexp implementatie."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(omgekeerd)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s op %s in %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Match"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Toevoegen"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Acties toepassen"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Ingeschakeld"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Match elke regel"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Omgekeerde matching"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Test"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(omgekeerd)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s op %s in %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Combineren"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Herstel sorteervolgorde"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Artikelen nieuwe score geven"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Aanmaken"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Omgekeerde regular expression matching"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "op veld"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "in"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filters"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Regel opslaan"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Regel toevoegen"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Actie uitvoeren"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "met parameters:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Actie opslaan"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Actie toevoegen"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Geen onderschrift]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "Regel toevoegen"
msgstr[1] "Regel toevoegen"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3021,7 +3024,7 @@ msgstr "Bewerk categorie"
msgid "Remove category"
msgstr "Categorie verwijderen"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Omgekeerd"
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index 6a95d70bd..f8b198e99 100644
--- a/locale/pl_PL/LC_MESSAGES/messages.mo
+++ b/locale/pl_PL/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po
index f448f1438..22495b5dd 100644
--- a/locale/pl_PL/LC_MESSAGES/messages.po
+++ b/locale/pl_PL/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-08-02 08:25+0100\n"
"Last-Translator: Mirosław Lach <[email protected]>\n"
"Language-Team: \n"
@@ -159,7 +159,7 @@ msgstr "Test escape'owania SQL nie powiódł się. Sprawdź konfigurację swojej
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -379,13 +379,13 @@ msgid "Feeds"
msgstr "Kanały"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtry"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Etykiety"
@@ -476,10 +476,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Skrypt aktualizacji danych Tiny Tiny RSS."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -694,7 +694,7 @@ msgid "Go to"
msgstr "Idź do"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Wszystkie artykuły"
@@ -718,7 +718,7 @@ msgid "Create label"
msgstr "Utwórz etykietę"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Utwórz filtr"
@@ -816,34 +816,35 @@ msgstr "Załączniki"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "Biblioteka LibXML zwróciła błąd %s w linii %d (kolumna %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Specjalne"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Wszystkie kanały"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Artykuły oznaczone gwiazdką"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Opublikowane artykuły"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Świeże artykuły"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Zarchiwizowane artykuły"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Ostatnio czytane"
@@ -921,7 +922,7 @@ msgstr "Tagi dla tego artykułu (oddzielone przecinkami):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -939,10 +940,10 @@ msgstr "Zapisz"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1167,11 +1168,11 @@ msgstr "Ostatnia aktualizacja: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1187,11 +1188,11 @@ msgstr "Odwróć"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1225,10 +1226,10 @@ msgid "Move back"
msgstr "Cofnij"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Usuń"
@@ -1358,7 +1359,7 @@ msgstr "Więcej kanałów"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1379,8 +1380,8 @@ msgstr "limit:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1566,11 +1567,11 @@ msgstr "[tt-rss] Informacja o zmianie hasła"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1588,7 +1589,7 @@ msgid "Details"
msgstr "Szczegóły"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Edytuj"
@@ -1615,8 +1616,8 @@ msgid "No matching users found."
msgstr "Nie odnaleziono pasującego użytkownika."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Opis"
@@ -1653,121 +1654,123 @@ msgstr "Nie znaleziono żadnych ostatnich artykułów pasujących do filtra."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Złozone wyrażenia mogą nie przynosić spodziewanych rezultatów podczas testów ze względu na różnice w implementacji wyrażeń regularnych na serwerze bazy danych."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(odwróć)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s na %s w %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Dopasuj"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Dodaj"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Zastosuj działania"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Włączone"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Pasuje do dowolnej reguły"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Odwróć dopasowanie"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Testuj"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(odwróć)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s na %s w %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Połącz"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Zresetuj porządek sortowania"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Przywróć artykuły"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Utwórz"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Odwróć dopasowywanie wyrażeniami regularnymi"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "pole"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "w"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtry"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Zapisz regułę"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Dodaj regułę"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Wykonaj operację"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "z parametrami:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Zapisz działanie"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Dodaj działania"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Brak opisu]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
@@ -1775,7 +1778,7 @@ msgstr[0] "Dodaj regułę"
msgstr[1] "Dodaj regułę"
msgstr[2] "Dodaj regułę"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3020,7 +3023,7 @@ msgstr "Edytuj kategorię"
msgid "Remove category"
msgstr "Usuń kategorię"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Odwróć"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index ef87a908a..d49cbec64 100755
--- a/locale/pt_BR/LC_MESSAGES/messages.mo
+++ b/locale/pt_BR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index ef3130d08..5aaa53c16 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss 1.2.14.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-08-08 23:19-0300\n"
"Last-Translator: Perry Werneck <[email protected]>\n"
"Language-Team: Portuguese/Brazil <[email protected]>\n"
@@ -160,7 +160,7 @@ msgstr "Teste de conversão de escapes no SQL falhou, verifique sua configuraç�
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -381,13 +381,13 @@ msgid "Feeds"
msgstr "Inscrições"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtros"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Marcadores"
@@ -478,10 +478,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Script de atualização do Tiny Tiny RSS."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -697,7 +697,7 @@ msgid "Go to"
msgstr "Ir para"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Todas as inscrições"
@@ -721,7 +721,7 @@ msgid "Create label"
msgstr "Criar marcador"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Criar filtro"
@@ -819,34 +819,35 @@ msgstr "Anexos"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "Erro LibXML %s na linha %d (coluna %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Especial"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Todos os feeds"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Artigos com estrela"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Artigos publicados"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Últimas notícias"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Artigos arquivados"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Lidos recentemente"
@@ -924,7 +925,7 @@ msgstr "Tags para esse artigo (separadas por vírgula):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -942,10 +943,10 @@ msgstr "Salvar"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1170,11 +1171,11 @@ msgstr "Última atualização em: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1190,11 +1191,11 @@ msgstr "Inverter"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1228,10 +1229,10 @@ msgid "Move back"
msgstr "Retornar"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Apaga"
@@ -1361,7 +1362,7 @@ msgstr "Mais inscrições"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1382,8 +1383,8 @@ msgstr "limite:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1569,11 +1570,11 @@ msgstr "[tt-rss] Notificação de troca de senh"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1591,7 +1592,7 @@ msgid "Details"
msgstr "Detalhes"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Editar"
@@ -1618,8 +1619,8 @@ msgid "No matching users found."
msgstr "Nenhum usuário encontrado."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Título"
@@ -1656,123 +1657,125 @@ msgstr "Nenhum artigo recente que atenda este filtro foi encontrado."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(invertido)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr ""
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr ""
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Aplicar ações"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Ativado"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
#, fuzzy
msgid "Match any rule"
msgstr "Favoritos"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "Favoritos"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Teste"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(invertido)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Reiniciar ordenação"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Reclassificar artigos"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Criar"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Inverter o teste da expressão regular"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "no campo"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "em"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtros"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Salvar regra"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Adicionar regra"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Executar ação"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "Com os parâmetros:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Salvar ação"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Adicionar ação"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Sem título]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
@@ -1780,7 +1783,7 @@ msgstr[0] "Adicionar regra"
msgstr[1] "Adicionar regra"
msgstr[2] "Adicionar regra"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3025,7 +3028,7 @@ msgstr "Editar categoria"
msgid "Remove category"
msgstr "Remover categoria"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Invertido"
diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po
index 11820a045..05e5df6fd 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss 1.2.14.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-08-08 23:19-0300\n"
"Last-Translator: Duarte Velez Grilo <[email protected]>\n"
"Language-Team: Portuguese/Portugal <[email protected]>\n"
@@ -160,7 +160,7 @@ msgstr "Teste de conversão de escapes no SQL falhou, verifique sua configuraç�
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -381,13 +381,13 @@ msgid "Feeds"
msgstr "Inscrições"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtros"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Marcadores"
@@ -478,10 +478,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Script de atualização do Tiny Tiny RSS."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -697,7 +697,7 @@ msgid "Go to"
msgstr "Ir para"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Todas as inscrições"
@@ -721,7 +721,7 @@ msgid "Create label"
msgstr "Criar marcador"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Criar filtro"
@@ -819,34 +819,35 @@ msgstr "Anexos"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "Erro LibXML %s na linha %d (coluna %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Especial"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Todos os feeds"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Artigos com estrela"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Artigos publicados"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Últimas notícias"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Artigos arquivados"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Lidos recentemente"
@@ -924,7 +925,7 @@ msgstr "Tags para esse artigo (separadas por vírgula):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -942,10 +943,10 @@ msgstr "Salvar"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1170,11 +1171,11 @@ msgstr "Última atualização em: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1190,11 +1191,11 @@ msgstr "Inverter"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1228,10 +1229,10 @@ msgid "Move back"
msgstr "Retornar"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Apaga"
@@ -1361,7 +1362,7 @@ msgstr "Mais inscrições"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1382,8 +1383,8 @@ msgstr "limite:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1569,11 +1570,11 @@ msgstr "[tt-rss] Notificação de troca de senh"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1591,7 +1592,7 @@ msgid "Details"
msgstr "Detalhes"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Editar"
@@ -1618,8 +1619,8 @@ msgid "No matching users found."
msgstr "Nenhum usuário encontrado."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Título"
@@ -1656,123 +1657,125 @@ msgstr "Nenhum artigo recente que atenda este filtro foi encontrado."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(invertido)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr ""
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr ""
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Aplicar ações"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Ativado"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
#, fuzzy
msgid "Match any rule"
msgstr "Favoritos"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "Favoritos"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Teste"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(invertido)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Reiniciar ordenação"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Reclassificar artigos"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Criar"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Inverter o teste da expressão regular"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "no campo"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "em"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtros"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Salvar regra"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Adicionar regra"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Executar ação"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "Com os parâmetros:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Salvar ação"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Adicionar ação"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Sem título]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
@@ -1780,7 +1783,7 @@ msgstr[0] "Adicionar regra"
msgstr[1] "Adicionar regra"
msgstr[2] "Adicionar regra"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3025,7 +3028,7 @@ msgstr "Editar categoria"
msgid "Remove category"
msgstr "Remover categoria"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Invertido"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 3b6089f40..293b56825 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 75ae84cde..1f3242b6c 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-07-16 23:45+0400\n"
"Last-Translator: cyberbat <[email protected]>\n"
"Language-Team: Russian <>\n"
@@ -163,7 +163,7 @@ msgstr "неудавшийся тест экранирования SQL, пров
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -391,13 +391,13 @@ msgid "Feeds"
msgstr "Каналы"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Фильтры"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Метки"
@@ -490,10 +490,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Скрипт обновления данных Tiny Tiny RSS"
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -742,7 +742,7 @@ msgid "Go to"
msgstr "Перейти к.."
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Все статьи"
@@ -768,7 +768,7 @@ msgid "Create label"
msgstr "Создать метку"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Создать фильтр"
@@ -870,34 +870,35 @@ msgstr "Вложения"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "Ошибка LibXML %s в строке %d (столбец %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Особые"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Все каналы"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Отмеченные"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Опубликованные"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Свежие"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Архив статей"
-#: include/functions.php:1978
+#: include/functions.php:1981
#, fuzzy
msgid "Recently read"
msgstr "Недавно прочитанные"
@@ -983,7 +984,7 @@ msgstr "Теги для этой статьи (разделенные запят
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -1001,10 +1002,10 @@ msgstr "Сохранить"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1254,11 +1255,11 @@ msgstr "Последнее обновление: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1274,11 +1275,11 @@ msgstr "Инвертировать"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1314,10 +1315,10 @@ msgid "Move back"
msgstr "Переместить назад"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Удалить"
@@ -1451,7 +1452,7 @@ msgstr "Другие каналы"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1475,8 +1476,8 @@ msgstr "Ограничение:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1668,11 +1669,11 @@ msgstr "[tt-rss] Уведомление о смене пароля"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1690,7 +1691,7 @@ msgid "Details"
msgstr "Подробнее"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Редактировать"
@@ -1717,8 +1718,8 @@ msgid "No matching users found."
msgstr "Подходящих пользователей не найдено."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Заголовок"
@@ -1758,131 +1759,133 @@ msgstr "Не найдено недавних статей, удовлетвор�
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Сложные выражения могут не принести желаемый результат во время тестирования из-за реализации регулярных выражений в сервере базы данных."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+#, fuzzy
+msgid "(inverse)"
+msgstr "(Инвертирован)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, fuzzy, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s на %s в %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Искать"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Добавить"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
#, fuzzy
msgid "Apply actions"
msgstr "Применить действия"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Включен"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
#, fuzzy
msgid "Match any rule"
msgstr "Удовлетворяет любому правилу"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "Инвертировать фильтр"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Проверить"
-#: classes/pref/filters.php:420
-#, fuzzy
-msgid "(inverse)"
-msgstr "(Инвертирован)"
-
-#: classes/pref/filters.php:419
-#, fuzzy, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s на %s в %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
#, fuzzy
msgid "Combine"
msgstr "Комбинировать"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Сбросить сортировку"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Заново оценить статьи"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Создать"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
#, fuzzy
msgid "Inverse regular expression matching"
msgstr "Инвертировать совпадение с регулярным выражением"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "по полю:"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "в"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Фильтры"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#, fuzzy
msgid "Save rule"
msgstr "Сохранить"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
#, fuzzy
msgid "Add rule"
msgstr "Добавить метку..."
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Выполнить действия"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "с параметрами:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#, fuzzy
msgid "Save action"
msgstr "Сохранить действие"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
#, fuzzy
msgid "Add action"
msgstr "Добавить действие"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Нет заголовка]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
@@ -1890,7 +1893,7 @@ msgstr[0] "Добавить метку..."
msgstr[1] "Добавить метку..."
msgstr[2] "Добавить метку..."
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3292,7 +3295,7 @@ msgstr "Редактировать категорию"
msgid "Remove category"
msgstr "Удалить категорию"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
#, fuzzy
msgid "Inverse"
msgstr "(Инвертировать)"
diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo
index a37ce234d..219daefc0 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.mo
+++ b/locale/sv_SE/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po
index 59d1ac418..49ceac79f 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/locale/sv_SE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS sv_SE\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-05-24 19:41+0100\n"
"Last-Translator: Mattias Tengblad <[email protected]>\n"
"Language-Team: Mattias Tengblad <[email protected]>\n"
@@ -163,7 +163,7 @@ msgstr "Test för \"SQL escaping\" misslyckades, kontrollera databas och PHP-kon
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -383,13 +383,13 @@ msgid "Feeds"
msgstr "Flöden"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filter"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Etiketter"
@@ -480,10 +480,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Skript för att uppdatera Tiny Tiny RSS."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -697,7 +697,7 @@ msgid "Go to"
msgstr "Gå till"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Alla artiklar"
@@ -721,7 +721,7 @@ msgid "Create label"
msgstr "Skapa etikett"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Skapa filter"
@@ -818,34 +818,35 @@ msgstr "Bilagor"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "LibXML-fel %s på rad %d (kolumn %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Special"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Alla flöden"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Stjärnmärkta artiklar"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Publicerade artiklar"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Nya artiklar"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Arkiverade artiklar"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Nyligen lästa"
@@ -927,7 +928,7 @@ msgstr "Taggar för denna artikel (kommaseparerade):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -945,10 +946,10 @@ msgstr "Spara"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1173,11 +1174,11 @@ msgstr "Senast uppdaterat: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1193,11 +1194,11 @@ msgstr "Invertera"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1231,10 +1232,10 @@ msgid "Move back"
msgstr "Gå tillbaka"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Radera"
@@ -1364,7 +1365,7 @@ msgstr "Fler flöden"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1385,8 +1386,8 @@ msgstr "gräns:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1572,11 +1573,11 @@ msgstr "[tt-rss] Notifikation för ändring av lösenord"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1594,7 +1595,7 @@ msgid "Details"
msgstr "Detaljer"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Redigera"
@@ -1621,8 +1622,8 @@ msgid "No matching users found."
msgstr "Hittade inga matchande användare."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Titel"
@@ -1659,128 +1660,130 @@ msgstr "Inga nya artiklar som matchar detta filter funna."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Komplexa uttryck kanske inte ger några testresultat på grund av problem med databasens regexpimplementation"
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(invertera)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s på %s i %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Matcha"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Lägg till"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Tillämpa åtgärder"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Aktiverat"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Matcha alla regler"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Invertera matchning"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Test"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(invertera)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s på %s i %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Kombinera"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Återställ sorteringsordning"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Poängsätt på nytt"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Skapa"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Invertera matchning av regulära uttryck"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "i fält"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "i"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filter"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Spara regel"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Tillämpa regel"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Utför aktivitet"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "med parametrar:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Spara aktivitet"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Lägg till aktivitet"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[Inge titel]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, fuzzy, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "Tillämpa regel"
msgstr[1] "Tillämpa regel"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3024,7 +3027,7 @@ msgstr "Redigera kategori"
msgid "Remove category"
msgstr "Ta bort kategori"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Invertera"
diff --git a/locale/tr_TR/LC_MESSAGES/messages.mo b/locale/tr_TR/LC_MESSAGES/messages.mo
index 27fa5b3b7..d4aa6369a 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.mo
+++ b/locale/tr_TR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index fc5bbe672..c4f056169 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/locale/tr_TR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS Turkish translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2013-12-08 20:20+0200\n"
"Last-Translator: akapar <[email protected]>\n"
"Language-Team: TURKISH <[email protected]>\n"
@@ -158,7 +158,7 @@ msgstr "SQL kaçış testi başarılı olmadı, lütfen veri tabanınızı ve PH
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -378,13 +378,13 @@ msgid "Feeds"
msgstr "Özet akışları"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "Filtreler"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "Arama başlıkları"
@@ -475,10 +475,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS veri yenileme komut dosyası."
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -692,7 +692,7 @@ msgid "Go to"
msgstr "Git"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "Tüm yazılar"
@@ -716,7 +716,7 @@ msgid "Create label"
msgstr "Arama başlığı tanımla"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "Filtre tanımla"
@@ -811,34 +811,35 @@ msgstr "Ekler"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr "%s de %d satırında LibXML hatası (kolon %d): %s"
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "Özet"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "Tüm özet akışları"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "Favori yazılar"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "Yayınlanmış yazılar"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "Tazeler"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "Arşivlenmiş yazılar"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "Yakın zamanda okunanlar"
@@ -916,7 +917,7 @@ msgstr "Bu yazı için etiketler (virgülle ayrılmış):"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -934,10 +935,10 @@ msgstr "Kaydet"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1162,11 +1163,11 @@ msgstr "Son yenileme: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1182,11 +1183,11 @@ msgstr "Ters çevir"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1220,10 +1221,10 @@ msgid "Move back"
msgstr "Geri git"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "Sil"
@@ -1353,7 +1354,7 @@ msgstr "Daha fazla özet akışı"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1374,8 +1375,8 @@ msgstr "limit:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1561,11 +1562,11 @@ msgstr "[tt-rss] Şifre değiştirme hatırlatması"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1583,7 +1584,7 @@ msgid "Details"
msgstr "Detaylar"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "Düzenle"
@@ -1610,8 +1611,8 @@ msgid "No matching users found."
msgstr "Uyan kullanıcı bulunamadı."
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "Altyazı"
@@ -1648,128 +1649,130 @@ msgstr "Bu filtreye uyan yakın geçmişli yazı bulunamadı."
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr "Veritabanı sunucusu regexp uygulanması kaynaklı sorunlar sebebiyle kompleks tanımlamalar sonuç vermeyebilir."
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "(ters çevir)"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr "%s de %s de %s %s"
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "Eşle"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "Ekle"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
msgid "Apply actions"
msgstr "Uygula"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "Etkin"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr "Herhangi bir kurala eşle"
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
msgid "Inverse matching"
msgstr "Eşlemeyi ters çevir"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "Deneme"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "(ters çevir)"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr "%s de %s de %s %s"
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr "Birleştir"
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "Sıralamayı eski haline getir"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "Yazıları tekrar skorla"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "Tanımla"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr "Düzenli ifade eşlemesini ters duruma getir"
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "alanda"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "de"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "Filtreler"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr "Kuralı kaydet"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "Kural ekle"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "Çalıştır"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "parametrelerle:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr "Kaydet"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
msgid "Add action"
msgstr "Ekle"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr "[altyazısız]"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] "%s (%d kural)"
msgstr[1] "%s (%d kurallar)"
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3006,7 +3009,7 @@ msgstr "Kategoriyi düzenle"
msgid "Remove category"
msgstr "Kategoriyi kaldır"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "Seçimi ters çevir"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 79355ad20..130c4b54a 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index d5873e6fd..61dc50b6c 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2012-02-14 08:32+0000\n"
"Last-Translator: Sai <[email protected]>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/language/zh_CN/)\n"
@@ -162,7 +162,7 @@ msgstr "SQL 脱出测试失败,请检查您的数据库和 PHP 设置。"
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -385,13 +385,13 @@ msgid "Feeds"
msgstr "信息源"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "过滤器"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "预定义标签"
@@ -483,10 +483,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS 数据库是最新版。"
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -725,7 +725,7 @@ msgid "Go to"
msgstr "跳转至……"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "全部文章"
@@ -750,7 +750,7 @@ msgid "Create label"
msgstr "创建预定义标签"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "创建过滤器"
@@ -849,34 +849,35 @@ msgstr "附件:"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "特殊区域"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "全部信息源"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "加星标文章"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "已发布文章"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "最新更新的文章"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "存档的文章"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr ""
@@ -959,7 +960,7 @@ msgstr "本文的标签,请用逗号分开:"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -977,10 +978,10 @@ msgstr "保存"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1213,11 +1214,11 @@ msgstr "上次更新:"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1233,11 +1234,11 @@ msgstr "反选"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1273,10 +1274,10 @@ msgid "Move back"
msgstr "移回原位"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "删除"
@@ -1410,7 +1411,7 @@ msgstr "更多信息源"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1431,8 +1432,8 @@ msgstr "限制:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1621,11 +1622,11 @@ msgstr "[tt-rss] 密码更换提醒"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1643,7 +1644,7 @@ msgid "Details"
msgstr "详细"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "编辑"
@@ -1670,8 +1671,8 @@ msgid "No matching users found."
msgstr "没有匹配的用户。"
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "标题"
@@ -1709,134 +1710,136 @@ msgstr "本过滤器下没有匹配到文章。"
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+#, fuzzy
+msgid "(inverse)"
+msgstr "反选"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "匹配"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr ""
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
#, fuzzy
msgid "Apply actions"
msgstr "信息源动作"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "已启用"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr ""
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "反向匹配"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "测试"
-#: classes/pref/filters.php:420
-#, fuzzy
-msgid "(inverse)"
-msgstr "反选"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "重置排序"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "为文章重新评分"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "创建"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "on field"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "在"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "过滤器"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#, fuzzy
msgid "Save rule"
msgstr "保存"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr ""
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "执行动作"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "指定参数:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#, fuzzy
msgid "Save action"
msgstr "版面动作"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
#, fuzzy
msgid "Add action"
msgstr "信息源动作"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
#, fuzzy
msgid "[No caption]"
msgstr "标题"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] ""
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3129,7 +3132,7 @@ msgstr "编辑类别"
msgid "Remove category"
msgstr "创建类别"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "反选"
diff --git a/locale/zh_TW/LC_MESSAGES/messages.mo b/locale/zh_TW/LC_MESSAGES/messages.mo
index cedb5817c..3abf4858b 100644
--- a/locale/zh_TW/LC_MESSAGES/messages.mo
+++ b/locale/zh_TW/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/zh_TW/LC_MESSAGES/messages.po b/locale/zh_TW/LC_MESSAGES/messages.po
index d82ae484e..9a72275cc 100644
--- a/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/locale/zh_TW/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: 2014-02-17 23:12+0800\n"
"Last-Translator: Yuan Chiu <[email protected]>\n"
"Language-Team: Yuan Chiu <[email protected]>\n"
@@ -160,7 +160,7 @@ msgstr "SQL 脫出測試失敗,請檢查您的資料庫和 PHP 設定。"
#: prefs.php:102
#: classes/backend.php:5
#: classes/pref/labels.php:296
-#: classes/pref/filters.php:666
+#: classes/pref/filters.php:702
#: classes/pref/feeds.php:1361
#: js/feedlist.js:126
#: js/feedlist.js:450
@@ -380,13 +380,13 @@ msgid "Feeds"
msgstr "摘要"
#: prefs.php:126
-#: classes/pref/filters.php:154
+#: classes/pref/filters.php:186
msgid "Filters"
msgstr "過濾器"
#: prefs.php:129
-#: include/functions.php:1255
-#: include/functions.php:1915
+#: include/functions.php:1256
+#: include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr "預定義標籤"
@@ -477,10 +477,10 @@ msgid "Tiny Tiny RSS data update script."
msgstr "Tiny Tiny RSS 資料庫是最新版。"
#: include/digest.php:109
-#: include/functions.php:1264
-#: include/functions.php:1816
-#: include/functions.php:1901
-#: include/functions.php:1923
+#: include/functions.php:1265
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
#: classes/opml.php:421
#: classes/pref/feeds.php:225
msgid "Uncategorized"
@@ -702,7 +702,7 @@ msgid "Go to"
msgstr "跳到……"
#: include/functions2.php:97
-#: include/functions.php:1974
+#: include/functions.php:1977
msgid "All articles"
msgstr "全部文章"
@@ -726,7 +726,7 @@ msgid "Create label"
msgstr "建立預定義標籤"
#: include/functions2.php:105
-#: classes/pref/filters.php:640
+#: classes/pref/filters.php:676
msgid "Create filter"
msgstr "建立過濾器"
@@ -822,34 +822,35 @@ msgstr "附件:"
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253
-#: include/functions.php:1913
+#: include/functions.php:1254
+#: include/functions.php:1914
msgid "Special"
msgstr "特殊區域"
-#: include/functions.php:1764
+#: include/functions.php:1765
+#: include/functions.php:1969
#: classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: classes/pref/filters.php:445
msgid "All feeds"
msgstr "全部摘要"
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr "加星標文章"
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr "已發布文章"
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr "最新更新的文章"
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr "已儲存的文章"
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr "閱讀紀錄"
@@ -930,7 +931,7 @@ msgstr "本文的標籤,請用逗號分開:"
#: classes/article.php:203
#: classes/pref/users.php:168
#: classes/pref/labels.php:79
-#: classes/pref/filters.php:390
+#: classes/pref/filters.php:423
#: classes/pref/prefs.php:985
#: classes/pref/feeds.php:772
#: classes/pref/feeds.php:899
@@ -948,10 +949,10 @@ msgstr "儲存"
#: classes/feeds.php:1157
#: classes/pref/users.php:170
#: classes/pref/labels.php:81
-#: classes/pref/filters.php:393
-#: classes/pref/filters.php:789
-#: classes/pref/filters.php:870
-#: classes/pref/filters.php:937
+#: classes/pref/filters.php:426
+#: classes/pref/filters.php:825
+#: classes/pref/filters.php:906
+#: classes/pref/filters.php:973
#: classes/pref/prefs.php:987
#: classes/pref/feeds.php:773
#: classes/pref/feeds.php:902
@@ -1177,11 +1178,11 @@ msgstr "上次更新: %s"
#: classes/feeds.php:88
#: classes/pref/users.php:337
#: classes/pref/labels.php:275
-#: classes/pref/filters.php:267
-#: classes/pref/filters.php:315
-#: classes/pref/filters.php:634
-#: classes/pref/filters.php:722
-#: classes/pref/filters.php:749
+#: classes/pref/filters.php:300
+#: classes/pref/filters.php:348
+#: classes/pref/filters.php:670
+#: classes/pref/filters.php:758
+#: classes/pref/filters.php:785
#: classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299
#: classes/pref/feeds.php:1556
@@ -1197,11 +1198,11 @@ msgstr "反向選取"
#: classes/feeds.php:91
#: classes/pref/users.php:339
#: classes/pref/labels.php:277
-#: classes/pref/filters.php:269
-#: classes/pref/filters.php:317
-#: classes/pref/filters.php:636
-#: classes/pref/filters.php:724
-#: classes/pref/filters.php:751
+#: classes/pref/filters.php:302
+#: classes/pref/filters.php:350
+#: classes/pref/filters.php:672
+#: classes/pref/filters.php:760
+#: classes/pref/filters.php:787
#: classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301
#: classes/pref/feeds.php:1558
@@ -1235,10 +1236,10 @@ msgid "Move back"
msgstr "移回原位"
#: classes/feeds.php:114
-#: classes/pref/filters.php:276
-#: classes/pref/filters.php:324
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/pref/filters.php:309
+#: classes/pref/filters.php:357
+#: classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr "刪除"
@@ -1371,7 +1372,7 @@ msgstr "更多摘要"
#: classes/feeds.php:1067
#: classes/feeds.php:1156
#: classes/pref/users.php:324
-#: classes/pref/filters.php:627
+#: classes/pref/filters.php:663
#: classes/pref/feeds.php:1292
#: js/tt-rss.js:174
msgid "Search"
@@ -1392,8 +1393,8 @@ msgstr "限制:"
#: classes/feeds.php:1096
#: classes/pref/users.php:350
#: classes/pref/labels.php:284
-#: classes/pref/filters.php:383
-#: classes/pref/filters.php:653
+#: classes/pref/filters.php:416
+#: classes/pref/filters.php:689
#: classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
@@ -1581,11 +1582,11 @@ msgstr "[tt-rss] 密碼更換提醒"
#: classes/pref/users.php:334
#: classes/pref/labels.php:272
-#: classes/pref/filters.php:264
-#: classes/pref/filters.php:312
-#: classes/pref/filters.php:631
-#: classes/pref/filters.php:719
-#: classes/pref/filters.php:746
+#: classes/pref/filters.php:297
+#: classes/pref/filters.php:345
+#: classes/pref/filters.php:667
+#: classes/pref/filters.php:755
+#: classes/pref/filters.php:782
#: classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296
#: classes/pref/feeds.php:1553
@@ -1603,7 +1604,7 @@ msgid "Details"
msgstr "詳細"
#: classes/pref/users.php:348
-#: classes/pref/filters.php:646
+#: classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr "編輯"
@@ -1630,8 +1631,8 @@ msgid "No matching users found."
msgstr "沒有匹配的使用者。"
#: classes/pref/labels.php:22
-#: classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr "標題"
@@ -1669,133 +1670,135 @@ msgstr "本過濾器下沒有匹配到文章。"
msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259
-#: classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177
+#: classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr "反向選取"
+
+#: classes/pref/filters.php:173
+#: classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292
+#: classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr "匹配"
-#: classes/pref/filters.php:273
-#: classes/pref/filters.php:321
-#: classes/pref/filters.php:728
-#: classes/pref/filters.php:755
+#: classes/pref/filters.php:306
+#: classes/pref/filters.php:354
+#: classes/pref/filters.php:764
+#: classes/pref/filters.php:791
msgid "Add"
msgstr "新增"
-#: classes/pref/filters.php:307
-#: classes/pref/filters.php:741
+#: classes/pref/filters.php:340
+#: classes/pref/filters.php:777
#, fuzzy
msgid "Apply actions"
msgstr "摘要動作"
-#: classes/pref/filters.php:357
-#: classes/pref/filters.php:770
+#: classes/pref/filters.php:390
+#: classes/pref/filters.php:806
msgid "Enabled"
msgstr "已啟用"
-#: classes/pref/filters.php:366
-#: classes/pref/filters.php:773
+#: classes/pref/filters.php:399
+#: classes/pref/filters.php:809
msgid "Match any rule"
msgstr ""
-#: classes/pref/filters.php:375
-#: classes/pref/filters.php:776
+#: classes/pref/filters.php:408
+#: classes/pref/filters.php:812
#, fuzzy
msgid "Inverse matching"
msgstr "反向匹配"
-#: classes/pref/filters.php:387
-#: classes/pref/filters.php:783
+#: classes/pref/filters.php:420
+#: classes/pref/filters.php:819
msgid "Test"
msgstr "測試"
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr "反向選取"
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649
+#: classes/pref/filters.php:685
#: classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr "重新排序"
-#: classes/pref/filters.php:657
+#: classes/pref/filters.php:693
#: classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr "為文章重新評分"
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr "建立"
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr "on field"
-#: classes/pref/filters.php:849
-#: js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885
+#: js/PrefFilterTree.js:61
msgid "in"
msgstr "在"
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
#, fuzzy
msgid "Wiki: Filters"
msgstr "過濾器"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#, fuzzy
msgid "Save rule"
msgstr "保存"
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
#: js/functions.js:1021
msgid "Add rule"
msgstr "新增規則"
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr "執行動作"
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr "指定參數:"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#, fuzzy
msgid "Save action"
msgstr "版面動作"
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
#: js/functions.js:1047
#, fuzzy
msgid "Add action"
msgstr "摘要動作"
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
#, fuzzy
msgid "[No caption]"
msgstr "標題"
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] ""
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, fuzzy, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -3050,7 +3053,7 @@ msgstr "編輯類別"
msgid "Remove category"
msgstr "移除類別"
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr "反向選取"
diff --git a/messages.pot b/messages.pot
index f4e22d8a3..e7f9fb469 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-19 15:44+0400\n"
+"POT-Creation-Date: 2014-04-02 08:18+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -154,7 +154,7 @@ msgstr ""
#: index.php:133 index.php:150 index.php:273 prefs.php:102
#: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:666 classes/pref/feeds.php:1361 js/feedlist.js:126
+#: classes/pref/filters.php:702 classes/pref/feeds.php:1361 js/feedlist.js:126
#: js/feedlist.js:450 js/functions.js:445 js/functions.js:783
#: js/functions.js:1217 js/functions.js:1351 js/functions.js:1663
#: js/prefs.js:653 js/prefs.js:854 js/prefs.js:1441 js/prefs.js:1494
@@ -337,11 +337,11 @@ msgstr ""
msgid "Feeds"
msgstr ""
-#: prefs.php:126 classes/pref/filters.php:154
+#: prefs.php:126 classes/pref/filters.php:186
msgid "Filters"
msgstr ""
-#: prefs.php:129 include/functions.php:1255 include/functions.php:1915
+#: prefs.php:129 include/functions.php:1256 include/functions.php:1916
#: classes/pref/labels.php:90
msgid "Labels"
msgstr ""
@@ -422,9 +422,9 @@ msgstr ""
msgid "Tiny Tiny RSS data update script."
msgstr ""
-#: include/digest.php:109 include/functions.php:1264
-#: include/functions.php:1816 include/functions.php:1901
-#: include/functions.php:1923 classes/opml.php:421 classes/pref/feeds.php:225
+#: include/digest.php:109 include/functions.php:1265
+#: include/functions.php:1817 include/functions.php:1902
+#: include/functions.php:1924 classes/opml.php:421 classes/pref/feeds.php:225
msgid "Uncategorized"
msgstr ""
@@ -624,7 +624,7 @@ msgstr ""
msgid "Go to"
msgstr ""
-#: include/functions2.php:97 include/functions.php:1974
+#: include/functions2.php:97 include/functions.php:1977
msgid "All articles"
msgstr ""
@@ -644,7 +644,7 @@ msgstr ""
msgid "Create label"
msgstr ""
-#: include/functions2.php:105 classes/pref/filters.php:640
+#: include/functions2.php:105 classes/pref/filters.php:676
msgid "Create filter"
msgstr ""
@@ -722,32 +722,32 @@ msgstr ""
msgid "LibXML error %s at line %d (column %d): %s"
msgstr ""
-#: include/functions.php:1253 include/functions.php:1913
+#: include/functions.php:1254 include/functions.php:1914
msgid "Special"
msgstr ""
-#: include/functions.php:1764 classes/feeds.php:1118
-#: classes/pref/filters.php:412
+#: include/functions.php:1765 include/functions.php:1969
+#: classes/feeds.php:1118 classes/pref/filters.php:445
msgid "All feeds"
msgstr ""
-#: include/functions.php:1968
+#: include/functions.php:1971
msgid "Starred articles"
msgstr ""
-#: include/functions.php:1970
+#: include/functions.php:1973
msgid "Published articles"
msgstr ""
-#: include/functions.php:1972
+#: include/functions.php:1975
msgid "Fresh articles"
msgstr ""
-#: include/functions.php:1976
+#: include/functions.php:1979
msgid "Archived articles"
msgstr ""
-#: include/functions.php:1978
+#: include/functions.php:1981
msgid "Recently read"
msgstr ""
@@ -818,7 +818,7 @@ msgid "Tags for this article (separated by commas):"
msgstr ""
#: classes/article.php:203 classes/pref/users.php:168
-#: classes/pref/labels.php:79 classes/pref/filters.php:390
+#: classes/pref/labels.php:79 classes/pref/filters.php:423
#: classes/pref/prefs.php:985 classes/pref/feeds.php:772
#: classes/pref/feeds.php:899 plugins/nsfw/init.php:85
#: plugins/note/init.php:51 plugins/instances/init.php:245
@@ -828,9 +828,9 @@ msgstr ""
#: classes/article.php:205 classes/handler/public.php:502
#: classes/handler/public.php:536 classes/feeds.php:1047
#: classes/feeds.php:1097 classes/feeds.php:1157 classes/pref/users.php:170
-#: classes/pref/labels.php:81 classes/pref/filters.php:393
-#: classes/pref/filters.php:789 classes/pref/filters.php:870
-#: classes/pref/filters.php:937 classes/pref/prefs.php:987
+#: classes/pref/labels.php:81 classes/pref/filters.php:426
+#: classes/pref/filters.php:825 classes/pref/filters.php:906
+#: classes/pref/filters.php:973 classes/pref/prefs.php:987
#: classes/pref/feeds.php:773 classes/pref/feeds.php:902
#: classes/pref/feeds.php:1811 plugins/mail/init.php:129
#: plugins/note/init.php:53 plugins/instances/init.php:248
@@ -1047,9 +1047,9 @@ msgid "Last updated: %s"
msgstr ""
#: classes/feeds.php:88 classes/pref/users.php:337 classes/pref/labels.php:275
-#: classes/pref/filters.php:267 classes/pref/filters.php:315
-#: classes/pref/filters.php:634 classes/pref/filters.php:722
-#: classes/pref/filters.php:749 classes/pref/prefs.php:999
+#: classes/pref/filters.php:300 classes/pref/filters.php:348
+#: classes/pref/filters.php:670 classes/pref/filters.php:758
+#: classes/pref/filters.php:785 classes/pref/prefs.php:999
#: classes/pref/feeds.php:1299 classes/pref/feeds.php:1556
#: classes/pref/feeds.php:1620 plugins/instances/init.php:287
msgid "All"
@@ -1060,9 +1060,9 @@ msgid "Invert"
msgstr ""
#: classes/feeds.php:91 classes/pref/users.php:339 classes/pref/labels.php:277
-#: classes/pref/filters.php:269 classes/pref/filters.php:317
-#: classes/pref/filters.php:636 classes/pref/filters.php:724
-#: classes/pref/filters.php:751 classes/pref/prefs.php:1001
+#: classes/pref/filters.php:302 classes/pref/filters.php:350
+#: classes/pref/filters.php:672 classes/pref/filters.php:760
+#: classes/pref/filters.php:787 classes/pref/prefs.php:1001
#: classes/pref/feeds.php:1301 classes/pref/feeds.php:1558
#: classes/pref/feeds.php:1622 plugins/instances/init.php:289
msgid "None"
@@ -1092,9 +1092,9 @@ msgstr ""
msgid "Move back"
msgstr ""
-#: classes/feeds.php:114 classes/pref/filters.php:276
-#: classes/pref/filters.php:324 classes/pref/filters.php:731
-#: classes/pref/filters.php:758
+#: classes/feeds.php:114 classes/pref/filters.php:309
+#: classes/pref/filters.php:357 classes/pref/filters.php:767
+#: classes/pref/filters.php:794
msgid "Delete"
msgstr ""
@@ -1207,7 +1207,7 @@ msgid "More feeds"
msgstr ""
#: classes/feeds.php:1067 classes/feeds.php:1156 classes/pref/users.php:324
-#: classes/pref/filters.php:627 classes/pref/feeds.php:1292 js/tt-rss.js:174
+#: classes/pref/filters.php:663 classes/pref/feeds.php:1292 js/tt-rss.js:174
msgid "Search"
msgstr ""
@@ -1224,8 +1224,8 @@ msgid "limit:"
msgstr ""
#: classes/feeds.php:1096 classes/pref/users.php:350
-#: classes/pref/labels.php:284 classes/pref/filters.php:383
-#: classes/pref/filters.php:653 classes/pref/feeds.php:743
+#: classes/pref/labels.php:284 classes/pref/filters.php:416
+#: classes/pref/filters.php:689 classes/pref/feeds.php:743
#: plugins/instances/init.php:294
msgid "Remove"
msgstr ""
@@ -1400,9 +1400,9 @@ msgid "[tt-rss] Password change notification"
msgstr ""
#: classes/pref/users.php:334 classes/pref/labels.php:272
-#: classes/pref/filters.php:264 classes/pref/filters.php:312
-#: classes/pref/filters.php:631 classes/pref/filters.php:719
-#: classes/pref/filters.php:746 classes/pref/prefs.php:996
+#: classes/pref/filters.php:297 classes/pref/filters.php:345
+#: classes/pref/filters.php:667 classes/pref/filters.php:755
+#: classes/pref/filters.php:782 classes/pref/prefs.php:996
#: classes/pref/feeds.php:1296 classes/pref/feeds.php:1553
#: classes/pref/feeds.php:1617 plugins/instances/init.php:284
msgid "Select"
@@ -1416,7 +1416,7 @@ msgstr ""
msgid "Details"
msgstr ""
-#: classes/pref/users.php:348 classes/pref/filters.php:646
+#: classes/pref/users.php:348 classes/pref/filters.php:682
#: plugins/instances/init.php:293
msgid "Edit"
msgstr ""
@@ -1441,8 +1441,8 @@ msgstr ""
msgid "No matching users found."
msgstr ""
-#: classes/pref/labels.php:22 classes/pref/filters.php:253
-#: classes/pref/filters.php:710
+#: classes/pref/labels.php:22 classes/pref/filters.php:286
+#: classes/pref/filters.php:746
msgid "Caption"
msgstr ""
@@ -1481,114 +1481,114 @@ msgid ""
"database server regexp implementation."
msgstr ""
-#: classes/pref/filters.php:259 classes/pref/filters.php:714
-#: classes/pref/filters.php:829
+#: classes/pref/filters.php:177 classes/pref/filters.php:456
+msgid "(inverse)"
+msgstr ""
+
+#: classes/pref/filters.php:173 classes/pref/filters.php:455
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
+
+#: classes/pref/filters.php:292 classes/pref/filters.php:750
+#: classes/pref/filters.php:865
msgid "Match"
msgstr ""
-#: classes/pref/filters.php:273 classes/pref/filters.php:321
-#: classes/pref/filters.php:728 classes/pref/filters.php:755
+#: classes/pref/filters.php:306 classes/pref/filters.php:354
+#: classes/pref/filters.php:764 classes/pref/filters.php:791
msgid "Add"
msgstr ""
-#: classes/pref/filters.php:307 classes/pref/filters.php:741
+#: classes/pref/filters.php:340 classes/pref/filters.php:777
msgid "Apply actions"
msgstr ""
-#: classes/pref/filters.php:357 classes/pref/filters.php:770
+#: classes/pref/filters.php:390 classes/pref/filters.php:806
msgid "Enabled"
msgstr ""
-#: classes/pref/filters.php:366 classes/pref/filters.php:773
+#: classes/pref/filters.php:399 classes/pref/filters.php:809
msgid "Match any rule"
msgstr ""
-#: classes/pref/filters.php:375 classes/pref/filters.php:776
+#: classes/pref/filters.php:408 classes/pref/filters.php:812
msgid "Inverse matching"
msgstr ""
-#: classes/pref/filters.php:387 classes/pref/filters.php:783
+#: classes/pref/filters.php:420 classes/pref/filters.php:819
msgid "Test"
msgstr ""
-#: classes/pref/filters.php:420
-msgid "(inverse)"
-msgstr ""
-
-#: classes/pref/filters.php:419
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
-
-#: classes/pref/filters.php:643
+#: classes/pref/filters.php:679
msgid "Combine"
msgstr ""
-#: classes/pref/filters.php:649 classes/pref/feeds.php:1312
+#: classes/pref/filters.php:685 classes/pref/feeds.php:1312
#: classes/pref/feeds.php:1326
msgid "Reset sort order"
msgstr ""
-#: classes/pref/filters.php:657 classes/pref/feeds.php:1348
+#: classes/pref/filters.php:693 classes/pref/feeds.php:1348
msgid "Rescore articles"
msgstr ""
-#: classes/pref/filters.php:786
+#: classes/pref/filters.php:822
msgid "Create"
msgstr ""
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:877
msgid "Inverse regular expression matching"
msgstr ""
-#: classes/pref/filters.php:843
+#: classes/pref/filters.php:879
msgid "on field"
msgstr ""
-#: classes/pref/filters.php:849 js/PrefFilterTree.js:53
+#: classes/pref/filters.php:885 js/PrefFilterTree.js:61
msgid "in"
msgstr ""
-#: classes/pref/filters.php:862
+#: classes/pref/filters.php:898
msgid "Wiki: Filters"
msgstr ""
-#: classes/pref/filters.php:867
+#: classes/pref/filters.php:903
msgid "Save rule"
msgstr ""
-#: classes/pref/filters.php:867 js/functions.js:1021
+#: classes/pref/filters.php:903 js/functions.js:1021
msgid "Add rule"
msgstr ""
-#: classes/pref/filters.php:890
+#: classes/pref/filters.php:926
msgid "Perform Action"
msgstr ""
-#: classes/pref/filters.php:916
+#: classes/pref/filters.php:952
msgid "with parameters:"
msgstr ""
-#: classes/pref/filters.php:934
+#: classes/pref/filters.php:970
msgid "Save action"
msgstr ""
-#: classes/pref/filters.php:934 js/functions.js:1047
+#: classes/pref/filters.php:970 js/functions.js:1047
msgid "Add action"
msgstr ""
-#: classes/pref/filters.php:957
+#: classes/pref/filters.php:993
msgid "[No caption]"
msgstr ""
-#: classes/pref/filters.php:959
+#: classes/pref/filters.php:995
#, php-format
msgid "%s (%d rule)"
msgid_plural "%s (%d rules)"
msgstr[0] ""
msgstr[1] ""
-#: classes/pref/filters.php:974
+#: classes/pref/filters.php:1010
#, php-format
msgid "%s (+%d action)"
msgid_plural "%s (+%d actions)"
@@ -2830,7 +2830,7 @@ msgstr ""
msgid "Remove category"
msgstr ""
-#: js/PrefFilterTree.js:56
+#: js/PrefFilterTree.js:64
msgid "Inverse"
msgstr ""