summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2008-08-07 09:13:46 +0100
committerAndrew Dolgov <[email protected]>2008-08-07 09:13:46 +0100
commit37b9528b104edbce5216e5392730291d5cbc92ec (patch)
tree37dec6f9fef3266cef5b188ee803c9d9bd4c1b31 /locale
parent8c96d4b1da8b2628d3e3067217704f7539aee4f9 (diff)
update translations
Diffstat (limited to 'locale')
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin36419 -> 36419 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po265
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.mobin11633 -> 11633 bytes
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.po265
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin38498 -> 38498 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po265
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.mobin12587 -> 12587 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po264
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin23861 -> 23861 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po265
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin26227 -> 26227 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po265
12 files changed, 953 insertions, 636 deletions
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 79de62087..0ec3a8b1a 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 f7655f9ec..7d1a6e528 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 16:43+0400\n"
+"POT-Creation-Date: 2008-08-07 16:13+0400\n"
"PO-Revision-Date: 2007-11-20 23:01+0100\n"
"Last-Translator: Thibaut Cousin <[email protected]>\n"
"Language-Team: Français <[email protected]>\n"
@@ -193,7 +193,7 @@ msgid "Starred articles"
msgstr "Articles remarquables"
#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1154
msgid "Published articles"
msgstr "Articles publiés"
@@ -202,12 +202,12 @@ msgid "Fresh articles"
msgstr "Nouveaux articles"
#: functions.php:2856 modules/popup-dialog.php:175
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:356
msgid "All feeds"
msgstr "Tous les flux"
#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:988
+#: functions.php:4348 modules/pref-feeds.php:985
msgid "Uncategorized"
msgstr "Sans catégorie"
@@ -229,15 +229,15 @@ msgid "Searched for"
msgstr "Recherché"
#: functions.php:3945 functions.php:3994 functions.php:5216
-#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
-#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-feeds.php:766 modules/pref-feeds.php:947
+#: modules/pref-filters.php:308 modules/pref-labels.php:275
#: modules/pref-users.php:302
msgid "Select:"
msgstr "Sélectionner&nbsp;:"
-#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
-#: modules/pref-feeds.php:951 modules/pref-filters.php:306
-#: modules/pref-labels.php:272 modules/pref-users.php:303
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:767
+#: modules/pref-feeds.php:948 modules/pref-filters.php:309
+#: modules/pref-labels.php:276 modules/pref-users.php:303
msgid "All"
msgstr "Tout"
@@ -246,13 +246,13 @@ msgstr "Tout"
msgid "Unread"
msgstr "Non lus"
-#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
-#: modules/pref-feeds.php:952 modules/pref-filters.php:307
-#: modules/pref-labels.php:273 modules/pref-users.php:304
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:768
+#: modules/pref-feeds.php:949 modules/pref-filters.php:310
+#: modules/pref-labels.php:277 modules/pref-users.php:304
msgid "None"
msgstr "Aucun"
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1108
msgid "Actions..."
msgstr "Actions..."
@@ -299,7 +299,7 @@ msgid "Page"
msgstr "Page"
#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
-#: modules/pref-filters.php:342
+#: modules/pref-filters.php:345
msgid "Feed"
msgstr "Flux"
@@ -385,6 +385,55 @@ msgstr "Aucun article à marquer"
msgid "No articles found to display."
msgstr "Aucun article à marquer"
+#: functions.php:5651
+#, fuzzy
+msgid "Match "
+msgstr "Correspondance"
+
+#: functions.php:5659
+#, fuzzy
+msgid "Unread articles"
+msgstr "Articles mémorisés"
+
+#: functions.php:5660
+#, fuzzy
+msgid "Updated articles"
+msgstr "Articles mémorisés"
+
+#: functions.php:5661
+#, fuzzy
+msgid "Title contains"
+msgstr "Titre ou contenu"
+
+#: functions.php:5662
+#, fuzzy
+msgid "Content contains"
+msgstr "Filtrage de contenu"
+
+#: functions.php:5663
+msgid "Score equals"
+msgstr ""
+
+#: functions.php:5664
+msgid "Score is greater than"
+msgstr ""
+
+#: functions.php:5665
+msgid "Score is less than"
+msgstr ""
+
+#: functions.php:5666
+msgid "Articles newer than X hours"
+msgstr ""
+
+#: functions.php:5667
+msgid "Articles newer than X days"
+msgstr ""
+
+#: functions.php:5676
+msgid "Add"
+msgstr ""
+
#: localized_js.php:35
msgid "display feeds"
msgstr "afficher les flux"
@@ -393,7 +442,7 @@ msgstr "afficher les flux"
msgid "display tags"
msgstr "afficher les étiquettes"
-#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
+#: localized_js.php:37 prefs.php:65 prefs.php:151 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Ouverture en cours, veuillez patienter..."
@@ -749,7 +798,7 @@ msgid "Rescoring articles..."
msgstr "Articles mémorisés"
#: localized_schema.php:9 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:960 modules/pref-feeds.php:1021
msgid "Title"
msgstr "Titre"
@@ -1127,7 +1176,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Revenir à la configuration"
-#: prefs.php:73 prefs.php:153 tt-rss.php:74
+#: prefs.php:73 prefs.php:154 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1296,8 +1345,8 @@ msgid "tag cloud"
msgstr "Nuage d'étiquettes"
#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
-#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:862
+#: modules/pref-filters.php:251 modules/pref-labels.php:239
#: modules/pref-users.php:258
msgid "Search"
msgstr "Rechercher"
@@ -1453,7 +1502,7 @@ msgid "Help topic not found."
msgstr "Sujet non trouvé dans l'aide."
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
+#: modules/popup-dialog.php:547 modules/pref-feeds.php:817
msgid "Close this window"
msgstr "Fermer cette fenêtre"
@@ -1557,9 +1606,9 @@ msgid "Subscribe"
msgstr "S'inscrire"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
-#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
-#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/popup-dialog.php:279 modules/popup-dialog.php:427
+#: modules/popup-dialog.php:523 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:371 modules/pref-filters.php:132
#: modules/pref-users.php:79
msgid "Cancel"
msgstr "Annuler"
@@ -1587,7 +1636,7 @@ msgid "Create Label"
msgstr "Créer un intitulé"
#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:278
+#: modules/pref-labels.php:282
msgid "Caption"
msgstr "Descriptif"
@@ -1596,101 +1645,101 @@ msgstr "Descriptif"
msgid "Match SQL"
msgstr "Correspondance"
-#: modules/popup-dialog.php:259 modules/pref-labels.php:64
+#: modules/popup-dialog.php:265 modules/pref-labels.php:68
#, fuzzy
msgid "Help"
msgstr "Bonjour,"
-#: modules/popup-dialog.php:262
+#: modules/popup-dialog.php:268
msgid "Test"
msgstr "Tester"
-#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
+#: modules/popup-dialog.php:275 modules/popup-dialog.php:423
msgid "Create"
msgstr "Créer"
-#: modules/popup-dialog.php:282
+#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
msgstr "Créer un filtre"
-#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/popup-dialog.php:306 modules/popup-dialog.php:387
#: modules/pref-filters.php:38 modules/pref-filters.php:72
msgid "description"
msgstr "description"
-#: modules/popup-dialog.php:351 modules/pref-filters.php:41
-#: modules/pref-filters.php:343
+#: modules/popup-dialog.php:357 modules/pref-filters.php:41
+#: modules/pref-filters.php:346
msgid "Match"
msgstr "Correspondance"
-#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#: modules/popup-dialog.php:366 modules/pref-filters.php:50
#, fuzzy
msgid "on field"
msgstr "Sur le champ&nbsp;:"
-#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#: modules/popup-dialog.php:371 modules/pref-filters.php:55
#, fuzzy
msgid "in"
msgstr "Lien"
-#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#: modules/popup-dialog.php:376 modules/pref-filters.php:60
#, fuzzy
msgid "Perform Action"
msgstr "Exécuter les mises à jour"
-#: modules/popup-dialog.php:386 modules/pref-filters.php:77
-msgid "with params"
+#: modules/popup-dialog.php:393 modules/pref-filters.php:80
+msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
-#: modules/pref-filters.php:86 modules/pref-users.php:60
+#: modules/popup-dialog.php:402 modules/pref-feeds.php:294
+#: modules/pref-filters.php:89 modules/pref-users.php:60
#, fuzzy
msgid "Options"
msgstr "Options&nbsp;:"
-#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+#: modules/popup-dialog.php:408 modules/pref-filters.php:101
msgid "Enabled"
msgstr "Activé"
-#: modules/popup-dialog.php:402 modules/pref-filters.php:107
+#: modules/popup-dialog.php:411 modules/pref-filters.php:110
msgid "Inverse match"
msgstr "Correspondance inverse"
-#: modules/popup-dialog.php:429
+#: modules/popup-dialog.php:438
msgid "Update Errors"
msgstr "Erreurs de mise à jour"
-#: modules/popup-dialog.php:432
+#: modules/popup-dialog.php:441
msgid "These feeds have not been updated because of errors:"
msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs&nbsp;:"
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:460
msgid "Close"
msgstr "Fermer"
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:469
msgid "Edit Tags"
msgstr "Modifier les étiquettes"
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:474
msgid "Tags for this article (separated by commas):"
msgstr "Étiquettes pour cet article (séparées par des virgules)&nbsp;:"
-#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
-#: modules/pref-filters.php:117 modules/pref-users.php:76
+#: modules/popup-dialog.php:519 modules/pref-feeds.php:369
+#: modules/pref-filters.php:128 modules/pref-users.php:76
msgid "Save"
msgstr "Enregistrer"
-#: modules/popup-dialog.php:523
+#: modules/popup-dialog.php:532
msgid "Tag cloud"
msgstr "Nuage d'étiquettes"
-#: modules/popup-dialog.php:526
+#: modules/popup-dialog.php:535
msgid "Showing most popular tags "
msgstr "Affichage des étiquettes les plus populaires "
-#: modules/popup-dialog.php:527
+#: modules/popup-dialog.php:536
msgid "browse more"
msgstr "en afficher plus"
@@ -1791,137 +1840,137 @@ msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
msgid "Cache images locally"
msgstr "Enregistrer localement les images"
-#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+#: modules/pref-feeds.php:366 modules/pref-feeds.php:1115
msgid "Unsubscribe"
msgstr "Se désinscrire"
-#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
+#: modules/pref-feeds.php:522 modules/pref-feeds.php:569
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:603
+#: modules/pref-feeds.php:600
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Inscrit à <b>%s</b>."
-#: modules/pref-feeds.php:605
+#: modules/pref-feeds.php:602
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Déjà inscrit à <b>%s</b>."
-#: modules/pref-feeds.php:687
+#: modules/pref-feeds.php:684
msgid "Category editor"
msgstr "Éditeur de catégorie"
-#: modules/pref-feeds.php:710
+#: modules/pref-feeds.php:707
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
-#: modules/pref-feeds.php:738
+#: modules/pref-feeds.php:735
msgid "Unable to delete non empty feed categories."
msgstr "Impossible de supprimer une catégorie de flux non vide."
-#: modules/pref-feeds.php:755
+#: modules/pref-feeds.php:752
msgid "Create category"
msgstr "Créer la catégorie"
-#: modules/pref-feeds.php:815
+#: modules/pref-feeds.php:812
msgid "No feed categories defined."
msgstr "Aucune catégorie de flux définie."
-#: modules/pref-feeds.php:826 modules/pref-filters.php:128
-#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-feeds.php:823 modules/pref-filters.php:122
+#: modules/pref-filters.php:414 modules/pref-labels.php:330
#: modules/pref-users.php:375
msgid "Remove"
msgstr "Supprimer"
-#: modules/pref-feeds.php:848
+#: modules/pref-feeds.php:845
msgid "Some feeds have update errors (click for details)"
msgstr ""
"Des erreurs sont survenues pendant la mise à jour de certains flux (cliquez "
"ici pour les détails)"
-#: modules/pref-feeds.php:870
+#: modules/pref-feeds.php:867
msgid "Subscribe to feed"
msgstr "S'inscrire à un flux"
-#: modules/pref-feeds.php:875
+#: modules/pref-feeds.php:872
msgid "Top 25"
msgstr "Top 25"
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:946
msgid "Show last article times"
msgstr "Afficher l'heure du dernier article"
-#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1025
msgid "Last&nbsp;Article"
msgstr "Dernier&nbsp;article"
-#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1029
msgid "Updated"
msgstr "Mis à jour"
-#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
-#: modules/pref-labels.php:306 modules/pref-users.php:350
+#: modules/pref-feeds.php:1050 modules/pref-filters.php:388
+#: modules/pref-labels.php:310 modules/pref-users.php:350
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1096 modules/pref-feeds.php:1110
msgid "Selection:"
msgstr "Sélection&nbsp;:"
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1102
msgid "Recategorize"
msgstr "Changer de catégorie"
-#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
-#: modules/pref-labels.php:324 modules/pref-users.php:373
+#: modules/pref-feeds.php:1111 modules/pref-filters.php:412
+#: modules/pref-labels.php:328 modules/pref-users.php:373
msgid "Edit"
msgstr "Modifier"
-#: modules/pref-feeds.php:1115
+#: modules/pref-feeds.php:1112
msgid "Manual purge"
msgstr "Purger manuellement"
-#: modules/pref-feeds.php:1116
+#: modules/pref-feeds.php:1113
msgid "Clear feed data"
msgstr "Purger les données de flux"
-#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:268
#, fuzzy
msgid "Rescore articles"
msgstr "Articles mémorisés"
-#: modules/pref-feeds.php:1123
+#: modules/pref-feeds.php:1120
msgid "Other:"
msgstr "Autre&nbsp;:"
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1121
msgid "Edit categories"
msgstr "Modifier les catégories"
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1128
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1135
+#: modules/pref-feeds.php:1132
msgid "File:"
msgstr "Fichier&nbsp;:"
-#: modules/pref-feeds.php:1138
+#: modules/pref-feeds.php:1135
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1145
+#: modules/pref-feeds.php:1142
msgid "Export OPML"
msgstr "Exporter en OPML"
-#: modules/pref-feeds.php:1148
+#: modules/pref-feeds.php:1145
msgid "Firefox Integration"
msgstr "Intégration à Firefox"
-#: modules/pref-feeds.php:1150
+#: modules/pref-feeds.php:1147
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -1929,11 +1978,11 @@ msgstr ""
"Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
"en cliquant sur le lien ci-dessous."
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1151
msgid "Click here to register this site as a feed reader."
msgstr "Cliquez ici pour enregistrer ce site comme lecteur de flux."
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1160
#, fuzzy
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
@@ -1942,7 +1991,7 @@ msgstr ""
"Les articles publiés sont exportés comme un flux RSS public et toute "
"personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1167
#, fuzzy
msgid "Generate another link"
msgstr "Générer une autre adresse"
@@ -1952,54 +2001,54 @@ msgstr "Générer une autre adresse"
msgid "Filter Editor"
msgstr "Éditeur de filtre"
-#: modules/pref-filters.php:165
+#: modules/pref-filters.php:168
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "Filtre <b>%s</b> enregistré"
-#: modules/pref-filters.php:205
+#: modules/pref-filters.php:208
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Filtre <b>%s</b> créé"
-#: modules/pref-filters.php:258
+#: modules/pref-filters.php:261
msgid "Create filter"
msgstr "Créer un filtre"
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:334
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:335
msgid "action_description"
msgstr ""
-#: modules/pref-filters.php:341
+#: modules/pref-filters.php:344
msgid "Filter expression"
msgstr "Expression du filtre"
-#: modules/pref-filters.php:344
+#: modules/pref-filters.php:347
msgid "Action"
msgstr "Action"
-#: modules/pref-filters.php:345
+#: modules/pref-filters.php:348
#, fuzzy
msgid "Params"
msgstr "Paramètres&nbsp;:"
-#: modules/pref-filters.php:374
+#: modules/pref-filters.php:377
msgid "(Disabled)"
msgstr "(Désactivé)"
-#: modules/pref-filters.php:393
+#: modules/pref-filters.php:396
msgid "(Inverse)"
msgstr "(Inverse)"
-#: modules/pref-filters.php:419
+#: modules/pref-filters.php:422
msgid "No filters defined."
msgstr "Aucun filtre défini."
-#: modules/pref-filters.php:421
+#: modules/pref-filters.php:424
#, fuzzy
msgid "No matching filters found."
msgstr "Aucun article trouvé."
@@ -2011,34 +2060,38 @@ msgid ""
"functionality."
msgstr ""
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:99
+msgid "Error: SQL expression is blank."
+msgstr ""
+
+#: modules/pref-labels.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "Intitulé <b>%s</b> enregistré"
-#: modules/pref-labels.php:207
+#: modules/pref-labels.php:211
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Intitulé <b>%s</b> créé"
-#: modules/pref-labels.php:245
+#: modules/pref-labels.php:249
msgid "Create label"
msgstr "Créer un intitulé"
-#: modules/pref-labels.php:279
+#: modules/pref-labels.php:283
msgid "SQL Expression"
msgstr "Expression SQL"
-#: modules/pref-labels.php:304
+#: modules/pref-labels.php:308
#, fuzzy
msgid "[No caption]"
msgstr "Descriptif"
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:335
msgid "No labels defined."
msgstr "Aucun intitulé défini."
-#: modules/pref-labels.php:333
+#: modules/pref-labels.php:337
#, fuzzy
msgid "No matching labels found."
msgstr "Aucun article trouvé."
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index a3fa4cc89..4e89dba52 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 2db8e7b0b..5b126ade5 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.2.19\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 16:43+0400\n"
+"POT-Creation-Date: 2008-08-07 16:13+0400\n"
"PO-Revision-Date: 2008-02-03 22:22::+0100\n"
"Last-Translator: MiszterX <[email protected]>\n"
"Language-Team: HUNGARIAN <[email protected]>\n"
@@ -185,7 +185,7 @@ msgid "Starred articles"
msgstr "Csillagost hírek"
#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1154
msgid "Published articles"
msgstr "Publikált hírek"
@@ -194,12 +194,12 @@ msgid "Fresh articles"
msgstr "Olvasatlan hírek"
#: functions.php:2856 modules/popup-dialog.php:175
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:356
msgid "All feeds"
msgstr "Minden feed"
#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:988
+#: functions.php:4348 modules/pref-feeds.php:985
msgid "Uncategorized"
msgstr "Kategorizálatlan"
@@ -221,15 +221,15 @@ msgid "Searched for"
msgstr ""
#: functions.php:3945 functions.php:3994 functions.php:5216
-#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
-#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-feeds.php:766 modules/pref-feeds.php:947
+#: modules/pref-filters.php:308 modules/pref-labels.php:275
#: modules/pref-users.php:302
msgid "Select:"
msgstr "Kiválaszt:"
-#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
-#: modules/pref-feeds.php:951 modules/pref-filters.php:306
-#: modules/pref-labels.php:272 modules/pref-users.php:303
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:767
+#: modules/pref-feeds.php:948 modules/pref-filters.php:309
+#: modules/pref-labels.php:276 modules/pref-users.php:303
msgid "All"
msgstr "Mind"
@@ -238,13 +238,13 @@ msgstr "Mind"
msgid "Unread"
msgstr "Olvasatlan"
-#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
-#: modules/pref-feeds.php:952 modules/pref-filters.php:307
-#: modules/pref-labels.php:273 modules/pref-users.php:304
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:768
+#: modules/pref-feeds.php:949 modules/pref-filters.php:310
+#: modules/pref-labels.php:277 modules/pref-users.php:304
msgid "None"
msgstr "Egyiksem"
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1108
msgid "Actions..."
msgstr "Műveletek"
@@ -291,7 +291,7 @@ msgid "Page"
msgstr "Oldal"
#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
-#: modules/pref-filters.php:342
+#: modules/pref-filters.php:345
msgid "Feed"
msgstr ""
@@ -374,6 +374,55 @@ msgstr "Nincs megjeleníthető hír"
msgid "No articles found to display."
msgstr "Nincs megjeleníthető hír"
+#: functions.php:5651
+#, fuzzy
+msgid "Match "
+msgstr "Egyezés"
+
+#: functions.php:5659
+#, fuzzy
+msgid "Unread articles"
+msgstr "Tárolt hírek"
+
+#: functions.php:5660
+#, fuzzy
+msgid "Updated articles"
+msgstr "Tárolt hírek"
+
+#: functions.php:5661
+#, fuzzy
+msgid "Title contains"
+msgstr "Cím vagy tartalom"
+
+#: functions.php:5662
+#, fuzzy
+msgid "Content contains"
+msgstr "Tartalomszűrő"
+
+#: functions.php:5663
+msgid "Score equals"
+msgstr ""
+
+#: functions.php:5664
+msgid "Score is greater than"
+msgstr ""
+
+#: functions.php:5665
+msgid "Score is less than"
+msgstr ""
+
+#: functions.php:5666
+msgid "Articles newer than X hours"
+msgstr ""
+
+#: functions.php:5667
+msgid "Articles newer than X days"
+msgstr ""
+
+#: functions.php:5676
+msgid "Add"
+msgstr ""
+
#: localized_js.php:35
msgid "display feeds"
msgstr ""
@@ -382,7 +431,7 @@ msgstr ""
msgid "display tags"
msgstr ""
-#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
+#: localized_js.php:37 prefs.php:65 prefs.php:151 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Töltés, kérem várjon..."
@@ -736,7 +785,7 @@ msgid "Rescoring articles..."
msgstr "Tárolt hírek"
#: localized_schema.php:9 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:960 modules/pref-feeds.php:1021
msgid "Title"
msgstr "Cím"
@@ -1077,7 +1126,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "VIssza a beállításokhoz"
-#: prefs.php:73 prefs.php:153 tt-rss.php:74
+#: prefs.php:73 prefs.php:154 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1214,8 +1263,8 @@ msgid "tag cloud"
msgstr "tag felhő"
#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
-#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:862
+#: modules/pref-filters.php:251 modules/pref-labels.php:239
#: modules/pref-users.php:258
msgid "Search"
msgstr "Keresés"
@@ -1368,7 +1417,7 @@ msgid "Help topic not found."
msgstr ""
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
+#: modules/popup-dialog.php:547 modules/pref-feeds.php:817
msgid "Close this window"
msgstr ""
@@ -1462,9 +1511,9 @@ msgid "Subscribe"
msgstr "Feliratkozás"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
-#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
-#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/popup-dialog.php:279 modules/popup-dialog.php:427
+#: modules/popup-dialog.php:523 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:371 modules/pref-filters.php:132
#: modules/pref-users.php:79
msgid "Cancel"
msgstr "Mégse"
@@ -1492,7 +1541,7 @@ msgid "Create Label"
msgstr "Címke készítése"
#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:278
+#: modules/pref-labels.php:282
msgid "Caption"
msgstr "Aláírás"
@@ -1501,101 +1550,101 @@ msgstr "Aláírás"
msgid "Match SQL"
msgstr "Egyezés"
-#: modules/popup-dialog.php:259 modules/pref-labels.php:64
+#: modules/popup-dialog.php:265 modules/pref-labels.php:68
msgid "Help"
msgstr "Segítség"
-#: modules/popup-dialog.php:262
+#: modules/popup-dialog.php:268
msgid "Test"
msgstr "Teszt"
-#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
+#: modules/popup-dialog.php:275 modules/popup-dialog.php:423
msgid "Create"
msgstr "Készít"
-#: modules/popup-dialog.php:282
+#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
msgstr "Szárő készítése"
-#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/popup-dialog.php:306 modules/popup-dialog.php:387
#: modules/pref-filters.php:38 modules/pref-filters.php:72
#, fuzzy
msgid "description"
msgstr "Kiválasztottakat"
-#: modules/popup-dialog.php:351 modules/pref-filters.php:41
-#: modules/pref-filters.php:343
+#: modules/popup-dialog.php:357 modules/pref-filters.php:41
+#: modules/pref-filters.php:346
msgid "Match"
msgstr "Egyezés"
-#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#: modules/popup-dialog.php:366 modules/pref-filters.php:50
#, fuzzy
msgid "on field"
msgstr "Ebben a mezőben:"
-#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#: modules/popup-dialog.php:371 modules/pref-filters.php:55
#, fuzzy
msgid "in"
msgstr "Link"
-#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#: modules/popup-dialog.php:376 modules/pref-filters.php:60
#, fuzzy
msgid "Perform Action"
msgstr "Művelet"
-#: modules/popup-dialog.php:386 modules/pref-filters.php:77
-msgid "with params"
+#: modules/popup-dialog.php:393 modules/pref-filters.php:80
+msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
-#: modules/pref-filters.php:86 modules/pref-users.php:60
+#: modules/popup-dialog.php:402 modules/pref-feeds.php:294
+#: modules/pref-filters.php:89 modules/pref-users.php:60
#, fuzzy
msgid "Options"
msgstr "Beállítások:"
-#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+#: modules/popup-dialog.php:408 modules/pref-filters.php:101
msgid "Enabled"
msgstr "Engedélyez"
-#: modules/popup-dialog.php:402 modules/pref-filters.php:107
+#: modules/popup-dialog.php:411 modules/pref-filters.php:110
msgid "Inverse match"
msgstr ""
-#: modules/popup-dialog.php:429
+#: modules/popup-dialog.php:438
msgid "Update Errors"
msgstr "Frissítési hiba"
-#: modules/popup-dialog.php:432
+#: modules/popup-dialog.php:441
msgid "These feeds have not been updated because of errors:"
msgstr ""
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:460
msgid "Close"
msgstr "Bezár"
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:469
msgid "Edit Tags"
msgstr "Tegek szerkesztése"
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:474
msgid "Tags for this article (separated by commas):"
msgstr ""
-#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
-#: modules/pref-filters.php:117 modules/pref-users.php:76
+#: modules/popup-dialog.php:519 modules/pref-feeds.php:369
+#: modules/pref-filters.php:128 modules/pref-users.php:76
msgid "Save"
msgstr "Mentés"
-#: modules/popup-dialog.php:523
+#: modules/popup-dialog.php:532
msgid "Tag cloud"
msgstr "Tag felhő"
-#: modules/popup-dialog.php:526
+#: modules/popup-dialog.php:535
msgid "Showing most popular tags "
msgstr "Mutasd a legnépszerűbb tageket"
-#: modules/popup-dialog.php:527
+#: modules/popup-dialog.php:536
msgid "browse more"
msgstr "tovább böngészik"
@@ -1693,151 +1742,151 @@ msgstr ""
msgid "Cache images locally"
msgstr "Képek helyi tárolása"
-#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+#: modules/pref-feeds.php:366 modules/pref-feeds.php:1115
msgid "Unsubscribe"
msgstr "Leiratkozás"
-#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
+#: modules/pref-feeds.php:522 modules/pref-feeds.php:569
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:603
+#: modules/pref-feeds.php:600
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:605
+#: modules/pref-feeds.php:602
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:687
+#: modules/pref-feeds.php:684
msgid "Category editor"
msgstr ""
-#: modules/pref-feeds.php:710
+#: modules/pref-feeds.php:707
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr ""
-#: modules/pref-feeds.php:738
+#: modules/pref-feeds.php:735
msgid "Unable to delete non empty feed categories."
msgstr ""
-#: modules/pref-feeds.php:755
+#: modules/pref-feeds.php:752
msgid "Create category"
msgstr "Kategória létrehozása"
-#: modules/pref-feeds.php:815
+#: modules/pref-feeds.php:812
msgid "No feed categories defined."
msgstr "Nincs feed kategória definiálva"
-#: modules/pref-feeds.php:826 modules/pref-filters.php:128
-#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-feeds.php:823 modules/pref-filters.php:122
+#: modules/pref-filters.php:414 modules/pref-labels.php:330
#: modules/pref-users.php:375
msgid "Remove"
msgstr "Eltávolít"
-#: modules/pref-feeds.php:848
+#: modules/pref-feeds.php:845
msgid "Some feeds have update errors (click for details)"
msgstr "Néhány feed frissítésével gond akadt (kattints a részletekhez)"
-#: modules/pref-feeds.php:870
+#: modules/pref-feeds.php:867
msgid "Subscribe to feed"
msgstr "Feliratkozás feedre"
-#: modules/pref-feeds.php:875
+#: modules/pref-feeds.php:872
msgid "Top 25"
msgstr "Top 25"
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:946
msgid "Show last article times"
msgstr "Mutasd az utolsó hír időpontját"
-#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1025
msgid "Last&nbsp;Article"
msgstr "Utolsó&nbsp;Hír"
-#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1029
msgid "Updated"
msgstr "Frissítve"
-#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
-#: modules/pref-labels.php:306 modules/pref-users.php:350
+#: modules/pref-feeds.php:1050 modules/pref-filters.php:388
+#: modules/pref-labels.php:310 modules/pref-users.php:350
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1096 modules/pref-feeds.php:1110
msgid "Selection:"
msgstr "Kiválaszt:"
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1102
msgid "Recategorize"
msgstr "Újrakategorizál"
-#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
-#: modules/pref-labels.php:324 modules/pref-users.php:373
+#: modules/pref-feeds.php:1111 modules/pref-filters.php:412
+#: modules/pref-labels.php:328 modules/pref-users.php:373
msgid "Edit"
msgstr "Szerkesztés"
-#: modules/pref-feeds.php:1115
+#: modules/pref-feeds.php:1112
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1116
+#: modules/pref-feeds.php:1113
msgid "Clear feed data"
msgstr "Feed adatok törlése"
-#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:268
#, fuzzy
msgid "Rescore articles"
msgstr "Tárolt hírek"
-#: modules/pref-feeds.php:1123
+#: modules/pref-feeds.php:1120
msgid "Other:"
msgstr "Más:"
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1121
msgid "Edit categories"
msgstr "Kategóriák szerkesztése"
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1128
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1135
+#: modules/pref-feeds.php:1132
msgid "File:"
msgstr "File:"
-#: modules/pref-feeds.php:1138
+#: modules/pref-feeds.php:1135
msgid "Import"
msgstr "Importálás"
-#: modules/pref-feeds.php:1145
+#: modules/pref-feeds.php:1142
msgid "Export OPML"
msgstr "Exportálás OPML-be"
-#: modules/pref-feeds.php:1148
+#: modules/pref-feeds.php:1145
msgid "Firefox Integration"
msgstr "Firefox integráció"
-#: modules/pref-feeds.php:1150
+#: modules/pref-feeds.php:1147
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1151
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1160
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr ""
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1167
#, fuzzy
msgid "Generate another link"
msgstr "Másik cím genrálása"
@@ -1847,54 +1896,54 @@ msgstr "Másik cím genrálása"
msgid "Filter Editor"
msgstr "Szűrő módosítása"
-#: modules/pref-filters.php:165
+#: modules/pref-filters.php:168
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:205
+#: modules/pref-filters.php:208
#, php-format
msgid "Created filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:258
+#: modules/pref-filters.php:261
msgid "Create filter"
msgstr "Szárő készítése"
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:334
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:335
msgid "action_description"
msgstr ""
-#: modules/pref-filters.php:341
+#: modules/pref-filters.php:344
msgid "Filter expression"
msgstr ""
-#: modules/pref-filters.php:344
+#: modules/pref-filters.php:347
msgid "Action"
msgstr "Művelet"
-#: modules/pref-filters.php:345
+#: modules/pref-filters.php:348
#, fuzzy
msgid "Params"
msgstr "Paraméterek"
-#: modules/pref-filters.php:374
+#: modules/pref-filters.php:377
msgid "(Disabled)"
msgstr "(Kikapcsolva)"
-#: modules/pref-filters.php:393
+#: modules/pref-filters.php:396
msgid "(Inverse)"
msgstr "(ellentét)"
-#: modules/pref-filters.php:419
+#: modules/pref-filters.php:422
msgid "No filters defined."
msgstr "Nincs szűrő definiálva."
-#: modules/pref-filters.php:421
+#: modules/pref-filters.php:424
#, fuzzy
msgid "No matching filters found."
msgstr "Nincs szűrő definiálva."
@@ -1906,34 +1955,38 @@ msgid ""
"functionality."
msgstr ""
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:99
+msgid "Error: SQL expression is blank."
+msgstr ""
+
+#: modules/pref-labels.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:207
+#: modules/pref-labels.php:211
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:245
+#: modules/pref-labels.php:249
msgid "Create label"
msgstr "Címke készítése"
-#: modules/pref-labels.php:279
+#: modules/pref-labels.php:283
msgid "SQL Expression"
msgstr ""
-#: modules/pref-labels.php:304
+#: modules/pref-labels.php:308
#, fuzzy
msgid "[No caption]"
msgstr "Aláírás"
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:335
msgid "No labels defined."
msgstr "Nincs címke definiálva."
-#: modules/pref-labels.php:333
+#: modules/pref-labels.php:337
#, fuzzy
msgid "No matching labels found."
msgstr "Nincs címke definiálva."
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 71dc03ee1..a8e8c6c56 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 dd8b9d1ba..1ee1181e7 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.2.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 16:43+0400\n"
+"POT-Creation-Date: 2008-08-07 16:13+0400\n"
"PO-Revision-Date: 2008-05-26 22:15+0100\n"
"Last-Translator: Christian Lomsdalen <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -190,7 +190,7 @@ msgid "Starred articles"
msgstr "Favorittartikler"
#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1154
msgid "Published articles"
msgstr "Publiserte artikler"
@@ -199,12 +199,12 @@ msgid "Fresh articles"
msgstr "Ferske artikler"
#: functions.php:2856 modules/popup-dialog.php:175
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:356
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:988
+#: functions.php:4348 modules/pref-feeds.php:985
msgid "Uncategorized"
msgstr "Ukategorisert"
@@ -226,15 +226,15 @@ msgid "Searched for"
msgstr "Søkte etter"
#: functions.php:3945 functions.php:3994 functions.php:5216
-#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
-#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-feeds.php:766 modules/pref-feeds.php:947
+#: modules/pref-filters.php:308 modules/pref-labels.php:275
#: modules/pref-users.php:302
msgid "Select:"
msgstr "Velg:"
-#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
-#: modules/pref-feeds.php:951 modules/pref-filters.php:306
-#: modules/pref-labels.php:272 modules/pref-users.php:303
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:767
+#: modules/pref-feeds.php:948 modules/pref-filters.php:309
+#: modules/pref-labels.php:276 modules/pref-users.php:303
msgid "All"
msgstr "Alle"
@@ -243,13 +243,13 @@ msgstr "Alle"
msgid "Unread"
msgstr "Ulest"
-#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
-#: modules/pref-feeds.php:952 modules/pref-filters.php:307
-#: modules/pref-labels.php:273 modules/pref-users.php:304
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:768
+#: modules/pref-feeds.php:949 modules/pref-filters.php:310
+#: modules/pref-labels.php:277 modules/pref-users.php:304
msgid "None"
msgstr "Ingen"
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1108
msgid "Actions..."
msgstr "Handlinger..."
@@ -294,7 +294,7 @@ msgid "Page"
msgstr "Side"
#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
-#: modules/pref-filters.php:342
+#: modules/pref-filters.php:345
msgid "Feed"
msgstr "Nyhetsstrøm"
@@ -374,6 +374,55 @@ msgstr "Ingen markerte artikler som kan vises"
msgid "No articles found to display."
msgstr "Ingen artikler funnet som kan vises"
+#: functions.php:5651
+#, fuzzy
+msgid "Match "
+msgstr "Match"
+
+#: functions.php:5659
+#, fuzzy
+msgid "Unread articles"
+msgstr "Lagrede artikler"
+
+#: functions.php:5660
+#, fuzzy
+msgid "Updated articles"
+msgstr "Lagrede artikler"
+
+#: functions.php:5661
+#, fuzzy
+msgid "Title contains"
+msgstr "Tittel eller innhold"
+
+#: functions.php:5662
+#, fuzzy
+msgid "Content contains"
+msgstr "Innholdsfilter"
+
+#: functions.php:5663
+msgid "Score equals"
+msgstr ""
+
+#: functions.php:5664
+msgid "Score is greater than"
+msgstr ""
+
+#: functions.php:5665
+msgid "Score is less than"
+msgstr ""
+
+#: functions.php:5666
+msgid "Articles newer than X hours"
+msgstr ""
+
+#: functions.php:5667
+msgid "Articles newer than X days"
+msgstr ""
+
+#: functions.php:5676
+msgid "Add"
+msgstr ""
+
#: localized_js.php:35
msgid "display feeds"
msgstr "Vis nyhetsstrømmer"
@@ -382,7 +431,7 @@ msgstr "Vis nyhetsstrømmer"
msgid "display tags"
msgstr "Vis tagger"
-#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
+#: localized_js.php:37 prefs.php:65 prefs.php:151 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "laster, vennligst vent"
@@ -733,7 +782,7 @@ msgid "Rescoring articles..."
msgstr "Endrer poengsummen for artiklene..."
#: localized_schema.php:9 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:960 modules/pref-feeds.php:1021
msgid "Title"
msgstr "Tittel"
@@ -1106,7 +1155,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Returner til innstillinger"
-#: prefs.php:73 prefs.php:153 tt-rss.php:74
+#: prefs.php:73 prefs.php:154 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1268,8 +1317,8 @@ msgid "tag cloud"
msgstr "Tag-sky"
#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
-#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:862
+#: modules/pref-filters.php:251 modules/pref-labels.php:239
#: modules/pref-users.php:258
msgid "Search"
msgstr "Søk"
@@ -1422,7 +1471,7 @@ msgid "Help topic not found."
msgstr "Hjelp-emne kunne ikke bli funnet"
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
+#: modules/popup-dialog.php:547 modules/pref-feeds.php:817
msgid "Close this window"
msgstr "Lukk dette vinduet"
@@ -1526,9 +1575,9 @@ msgid "Subscribe"
msgstr "Abonner"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
-#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
-#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/popup-dialog.php:279 modules/popup-dialog.php:427
+#: modules/popup-dialog.php:523 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:371 modules/pref-filters.php:132
#: modules/pref-users.php:79
msgid "Cancel"
msgstr "Avbryt"
@@ -1556,7 +1605,7 @@ msgid "Create Label"
msgstr "Lag merkelapp"
#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:278
+#: modules/pref-labels.php:282
msgid "Caption"
msgstr "Overskrift"
@@ -1565,100 +1614,100 @@ msgstr "Overskrift"
msgid "Match SQL"
msgstr "Match"
-#: modules/popup-dialog.php:259 modules/pref-labels.php:64
+#: modules/popup-dialog.php:265 modules/pref-labels.php:68
msgid "Help"
msgstr "Hjelp"
-#: modules/popup-dialog.php:262
+#: modules/popup-dialog.php:268
msgid "Test"
msgstr "Test"
-#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
+#: modules/popup-dialog.php:275 modules/popup-dialog.php:423
msgid "Create"
msgstr "Lag"
-#: modules/popup-dialog.php:282
+#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
msgstr "Lag filter"
-#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/popup-dialog.php:306 modules/popup-dialog.php:387
#: modules/pref-filters.php:38 modules/pref-filters.php:72
msgid "description"
msgstr "beskrivelse"
-#: modules/popup-dialog.php:351 modules/pref-filters.php:41
-#: modules/pref-filters.php:343
+#: modules/popup-dialog.php:357 modules/pref-filters.php:41
+#: modules/pref-filters.php:346
msgid "Match"
msgstr "Match"
-#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#: modules/popup-dialog.php:366 modules/pref-filters.php:50
#, fuzzy
msgid "on field"
msgstr "På felt:"
-#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#: modules/popup-dialog.php:371 modules/pref-filters.php:55
#, fuzzy
msgid "in"
msgstr "Lenke"
-#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#: modules/popup-dialog.php:376 modules/pref-filters.php:60
#, fuzzy
msgid "Perform Action"
msgstr "Utfør oppdateringene"
-#: modules/popup-dialog.php:386 modules/pref-filters.php:77
-msgid "with params"
+#: modules/popup-dialog.php:393 modules/pref-filters.php:80
+msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
-#: modules/pref-filters.php:86 modules/pref-users.php:60
+#: modules/popup-dialog.php:402 modules/pref-feeds.php:294
+#: modules/pref-filters.php:89 modules/pref-users.php:60
#, fuzzy
msgid "Options"
msgstr "Valg:"
-#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+#: modules/popup-dialog.php:408 modules/pref-filters.php:101
msgid "Enabled"
msgstr "Tillatt"
-#: modules/popup-dialog.php:402 modules/pref-filters.php:107
+#: modules/popup-dialog.php:411 modules/pref-filters.php:110
msgid "Inverse match"
msgstr "Motsatt markering"
-#: modules/popup-dialog.php:429
+#: modules/popup-dialog.php:438
msgid "Update Errors"
msgstr "Oppdaterer feil"
-#: modules/popup-dialog.php:432
+#: modules/popup-dialog.php:441
msgid "These feeds have not been updated because of errors:"
msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:460
msgid "Close"
msgstr "Steng"
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:469
msgid "Edit Tags"
msgstr "Endre tagger"
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:474
msgid "Tags for this article (separated by commas):"
msgstr "Denne artikkelens tagger (separert med kommaer):"
-#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
-#: modules/pref-filters.php:117 modules/pref-users.php:76
+#: modules/popup-dialog.php:519 modules/pref-feeds.php:369
+#: modules/pref-filters.php:128 modules/pref-users.php:76
msgid "Save"
msgstr "Lagre"
-#: modules/popup-dialog.php:523
+#: modules/popup-dialog.php:532
msgid "Tag cloud"
msgstr "Tag-sky"
-#: modules/popup-dialog.php:526
+#: modules/popup-dialog.php:535
msgid "Showing most popular tags "
msgstr "Vis mest populære tagger"
-#: modules/popup-dialog.php:527
+#: modules/popup-dialog.php:536
msgid "browse more"
msgstr "utforsk videre"
@@ -1756,134 +1805,134 @@ msgstr "Inkluder i e-postsammendraget"
msgid "Cache images locally"
msgstr "Mellomlagre bilder lokalt på serveren"
-#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+#: modules/pref-feeds.php:366 modules/pref-feeds.php:1115
msgid "Unsubscribe"
msgstr "Avabonner"
-#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
+#: modules/pref-feeds.php:522 modules/pref-feeds.php:569
msgid "All done."
msgstr "Alt ferdig."
-#: modules/pref-feeds.php:603
+#: modules/pref-feeds.php:600
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Abonnerer på <b>%s</b>"
-#: modules/pref-feeds.php:605
+#: modules/pref-feeds.php:602
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Abonnerer allerede på <b>%s</b>"
-#: modules/pref-feeds.php:687
+#: modules/pref-feeds.php:684
msgid "Category editor"
msgstr "Kategoriredigerer"
-#: modules/pref-feeds.php:710
+#: modules/pref-feeds.php:707
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
-#: modules/pref-feeds.php:738
+#: modules/pref-feeds.php:735
msgid "Unable to delete non empty feed categories."
msgstr "Kunne ikke slette kategorien, den var ikke tom"
-#: modules/pref-feeds.php:755
+#: modules/pref-feeds.php:752
msgid "Create category"
msgstr "Lag kategori"
-#: modules/pref-feeds.php:815
+#: modules/pref-feeds.php:812
msgid "No feed categories defined."
msgstr "Ingen kategorier ble markert"
-#: modules/pref-feeds.php:826 modules/pref-filters.php:128
-#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-feeds.php:823 modules/pref-filters.php:122
+#: modules/pref-filters.php:414 modules/pref-labels.php:330
#: modules/pref-users.php:375
msgid "Remove"
msgstr "Fjern"
-#: modules/pref-feeds.php:848
+#: modules/pref-feeds.php:845
msgid "Some feeds have update errors (click for details)"
msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
-#: modules/pref-feeds.php:870
+#: modules/pref-feeds.php:867
msgid "Subscribe to feed"
msgstr "Abonner på nyhetsstrøm"
-#: modules/pref-feeds.php:875
+#: modules/pref-feeds.php:872
msgid "Top 25"
msgstr "Topp 25"
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:946
msgid "Show last article times"
msgstr "Vis tidspunktene for siste artikkel"
-#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1025
msgid "Last&nbsp;Article"
msgstr "Siste&nbsp;Artikkel"
-#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1029
msgid "Updated"
msgstr "Oppdatert"
-#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
-#: modules/pref-labels.php:306 modules/pref-users.php:350
+#: modules/pref-feeds.php:1050 modules/pref-filters.php:388
+#: modules/pref-labels.php:310 modules/pref-users.php:350
msgid "Click to edit"
msgstr "Trykk for å endre"
-#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1096 modules/pref-feeds.php:1110
msgid "Selection:"
msgstr "Utvalg:"
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1102
msgid "Recategorize"
msgstr "Rekategoriser"
-#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
-#: modules/pref-labels.php:324 modules/pref-users.php:373
+#: modules/pref-feeds.php:1111 modules/pref-filters.php:412
+#: modules/pref-labels.php:328 modules/pref-users.php:373
msgid "Edit"
msgstr "Rediger"
-#: modules/pref-feeds.php:1115
+#: modules/pref-feeds.php:1112
msgid "Manual purge"
msgstr "Slett manuelt"
-#: modules/pref-feeds.php:1116
+#: modules/pref-feeds.php:1113
msgid "Clear feed data"
msgstr "Slett nyhetsstrømsdata"
-#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:268
msgid "Rescore articles"
msgstr "Tilbakestill poengsummene for artiklene"
-#: modules/pref-feeds.php:1123
+#: modules/pref-feeds.php:1120
msgid "Other:"
msgstr "Andre:"
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1121
msgid "Edit categories"
msgstr "Rediger kategorier"
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1128
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1135
+#: modules/pref-feeds.php:1132
msgid "File:"
msgstr "Fil:"
-#: modules/pref-feeds.php:1138
+#: modules/pref-feeds.php:1135
msgid "Import"
msgstr "Importer"
-#: modules/pref-feeds.php:1145
+#: modules/pref-feeds.php:1142
msgid "Export OPML"
msgstr "Eksporter OPML"
-#: modules/pref-feeds.php:1148
+#: modules/pref-feeds.php:1145
msgid "Firefox Integration"
msgstr "Firefox integrering"
-#: modules/pref-feeds.php:1150
+#: modules/pref-feeds.php:1147
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
@@ -1891,11 +1940,11 @@ msgstr ""
"Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
"ved å trykke på lenken nedenfor."
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1151
msgid "Click here to register this site as a feed reader."
msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1160
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
@@ -1903,7 +1952,7 @@ msgstr ""
"Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
"kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1167
msgid "Generate another link"
msgstr "Genererer en ny adresse"
@@ -1912,53 +1961,53 @@ msgstr "Genererer en ny adresse"
msgid "Filter Editor"
msgstr "Filterredigering"
-#: modules/pref-filters.php:165
+#: modules/pref-filters.php:168
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "Lagret filter <b>%s</b>"
-#: modules/pref-filters.php:205
+#: modules/pref-filters.php:208
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Laget filter <b>%s</b>"
-#: modules/pref-filters.php:258
+#: modules/pref-filters.php:261
msgid "Create filter"
msgstr "Lag filter"
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:334
msgid "filter_type_descr"
msgstr "Beskrivelse av filtertype"
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:335
msgid "action_description"
msgstr "Handlingsbeskrivelse"
-#: modules/pref-filters.php:341
+#: modules/pref-filters.php:344
msgid "Filter expression"
msgstr "Filteruttrykk"
-#: modules/pref-filters.php:344
+#: modules/pref-filters.php:347
msgid "Action"
msgstr "Handling"
-#: modules/pref-filters.php:345
+#: modules/pref-filters.php:348
msgid "Params"
msgstr "Parametre"
-#: modules/pref-filters.php:374
+#: modules/pref-filters.php:377
msgid "(Disabled)"
msgstr "(Avskrudd)"
-#: modules/pref-filters.php:393
+#: modules/pref-filters.php:396
msgid "(Inverse)"
msgstr "(Motsatt)"
-#: modules/pref-filters.php:419
+#: modules/pref-filters.php:422
msgid "No filters defined."
msgstr "Ingen filtre er valgt"
-#: modules/pref-filters.php:421
+#: modules/pref-filters.php:424
msgid "No matching filters found."
msgstr "Ingen filtre ble funnet."
@@ -1972,33 +2021,37 @@ msgstr ""
"installasjonen. Vennligst kontakt sideadministratoren eller rediger "
"konfigurasjonsfilen for å åpne for denne funksjonaliteten."
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:99
+msgid "Error: SQL expression is blank."
+msgstr ""
+
+#: modules/pref-labels.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "Lagret merkelapp <b>%s</b>"
-#: modules/pref-labels.php:207
+#: modules/pref-labels.php:211
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Laget merkelappen <b>%s</b>"
-#: modules/pref-labels.php:245
+#: modules/pref-labels.php:249
msgid "Create label"
msgstr "Lag merkelapp"
-#: modules/pref-labels.php:279
+#: modules/pref-labels.php:283
msgid "SQL Expression"
msgstr "SQL-uttrykk"
-#: modules/pref-labels.php:304
+#: modules/pref-labels.php:308
msgid "[No caption]"
msgstr "Ingen bildetekst"
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:335
msgid "No labels defined."
msgstr "Ingen merkelapper er valgt"
-#: modules/pref-labels.php:333
+#: modules/pref-labels.php:337
msgid "No matching labels found."
msgstr "Ingen passende merkelapper ble funnet."
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 812eec600..4f556c4c1 100644
--- 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 430253b22..c35bbf3fc 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: 2008-08-06 16:43+0400\n"
+"POT-Creation-Date: 2008-08-07 16:13+0400\n"
"PO-Revision-Date: 2007-10-24 00:47-0200\n"
"Last-Translator: Marcelo Jorge VIeira (metal) <[email protected]>\n"
"Language-Team: Portuguese/Brazil\n"
@@ -189,7 +189,7 @@ msgid "Starred articles"
msgstr ""
#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1154
msgid "Published articles"
msgstr ""
@@ -198,12 +198,12 @@ msgid "Fresh articles"
msgstr ""
#: functions.php:2856 modules/popup-dialog.php:175
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:356
msgid "All feeds"
msgstr "Todos os feeds"
#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:988
+#: functions.php:4348 modules/pref-feeds.php:985
msgid "Uncategorized"
msgstr "Não Categorizado"
@@ -225,15 +225,15 @@ msgid "Searched for"
msgstr ""
#: functions.php:3945 functions.php:3994 functions.php:5216
-#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
-#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-feeds.php:766 modules/pref-feeds.php:947
+#: modules/pref-filters.php:308 modules/pref-labels.php:275
#: modules/pref-users.php:302
msgid "Select:"
msgstr "Selecione:"
-#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
-#: modules/pref-feeds.php:951 modules/pref-filters.php:306
-#: modules/pref-labels.php:272 modules/pref-users.php:303
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:767
+#: modules/pref-feeds.php:948 modules/pref-filters.php:309
+#: modules/pref-labels.php:276 modules/pref-users.php:303
msgid "All"
msgstr "Todos"
@@ -242,13 +242,13 @@ msgstr "Todos"
msgid "Unread"
msgstr "Não Lido"
-#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
-#: modules/pref-feeds.php:952 modules/pref-filters.php:307
-#: modules/pref-labels.php:273 modules/pref-users.php:304
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:768
+#: modules/pref-feeds.php:949 modules/pref-filters.php:310
+#: modules/pref-labels.php:277 modules/pref-users.php:304
msgid "None"
msgstr "Nenhum"
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1108
msgid "Actions..."
msgstr "Ações..."
@@ -294,7 +294,7 @@ msgid "Page"
msgstr "Página"
#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
-#: modules/pref-filters.php:342
+#: modules/pref-filters.php:345
msgid "Feed"
msgstr "Feed"
@@ -378,6 +378,54 @@ msgstr "Sem Feeds para exibir."
msgid "No articles found to display."
msgstr "Sem Feeds para exibir."
+#: functions.php:5651
+msgid "Match "
+msgstr ""
+
+#: functions.php:5659
+#, fuzzy
+msgid "Unread articles"
+msgstr "Favoritos"
+
+#: functions.php:5660
+#, fuzzy
+msgid "Updated articles"
+msgstr "Favoritos"
+
+#: functions.php:5661
+#, fuzzy
+msgid "Title contains"
+msgstr "Título ou conteúdo"
+
+#: functions.php:5662
+#, fuzzy
+msgid "Content contains"
+msgstr "Filtrando o conteúdo"
+
+#: functions.php:5663
+msgid "Score equals"
+msgstr ""
+
+#: functions.php:5664
+msgid "Score is greater than"
+msgstr ""
+
+#: functions.php:5665
+msgid "Score is less than"
+msgstr ""
+
+#: functions.php:5666
+msgid "Articles newer than X hours"
+msgstr ""
+
+#: functions.php:5667
+msgid "Articles newer than X days"
+msgstr ""
+
+#: functions.php:5676
+msgid "Add"
+msgstr ""
+
#: localized_js.php:35
msgid "display feeds"
msgstr ""
@@ -386,7 +434,7 @@ msgstr ""
msgid "display tags"
msgstr ""
-#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
+#: localized_js.php:37 prefs.php:65 prefs.php:151 tt-rss.php:66
msgid "Loading, please wait..."
msgstr ""
@@ -742,7 +790,7 @@ msgid "Rescoring articles..."
msgstr "Favoritos"
#: localized_schema.php:9 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:960 modules/pref-feeds.php:1021
msgid "Title"
msgstr "Título"
@@ -1086,7 +1134,7 @@ msgstr ""
msgid "Return to preferences"
msgstr "Retornar às preferências"
-#: prefs.php:73 prefs.php:153 tt-rss.php:74
+#: prefs.php:73 prefs.php:154 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1226,8 +1274,8 @@ msgid "tag cloud"
msgstr "núvem de tags"
#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
-#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:862
+#: modules/pref-filters.php:251 modules/pref-labels.php:239
#: modules/pref-users.php:258
msgid "Search"
msgstr ""
@@ -1381,7 +1429,7 @@ msgid "Help topic not found."
msgstr "Tópico de ajuda não encontrado."
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
+#: modules/popup-dialog.php:547 modules/pref-feeds.php:817
msgid "Close this window"
msgstr "Fechar esta janela"
@@ -1474,9 +1522,9 @@ msgid "Subscribe"
msgstr ""
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
-#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
-#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/popup-dialog.php:279 modules/popup-dialog.php:427
+#: modules/popup-dialog.php:523 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:371 modules/pref-filters.php:132
#: modules/pref-users.php:79
msgid "Cancel"
msgstr "Cancelar"
@@ -1503,7 +1551,7 @@ msgid "Create Label"
msgstr "Criar um usuário"
#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:278
+#: modules/pref-labels.php:282
msgid "Caption"
msgstr ""
@@ -1511,100 +1559,100 @@ msgstr ""
msgid "Match SQL"
msgstr ""
-#: modules/popup-dialog.php:259 modules/pref-labels.php:64
+#: modules/popup-dialog.php:265 modules/pref-labels.php:68
#, fuzzy
msgid "Help"
msgstr "Olá,"
-#: modules/popup-dialog.php:262
+#: modules/popup-dialog.php:268
msgid "Test"
msgstr "Teste"
-#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
+#: modules/popup-dialog.php:275 modules/popup-dialog.php:423
msgid "Create"
msgstr "Criar"
-#: modules/popup-dialog.php:282
+#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
msgstr "Criar um usuário"
-#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/popup-dialog.php:306 modules/popup-dialog.php:387
#: modules/pref-filters.php:38 modules/pref-filters.php:72
msgid "description"
msgstr "descrição"
-#: modules/popup-dialog.php:351 modules/pref-filters.php:41
-#: modules/pref-filters.php:343
+#: modules/popup-dialog.php:357 modules/pref-filters.php:41
+#: modules/pref-filters.php:346
msgid "Match"
msgstr ""
-#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#: modules/popup-dialog.php:366 modules/pref-filters.php:50
msgid "on field"
msgstr ""
-#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#: modules/popup-dialog.php:371 modules/pref-filters.php:55
#, fuzzy
msgid "in"
msgstr "Link"
-#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#: modules/popup-dialog.php:376 modules/pref-filters.php:60
#, fuzzy
msgid "Perform Action"
msgstr "Ação"
-#: modules/popup-dialog.php:386 modules/pref-filters.php:77
-msgid "with params"
+#: modules/popup-dialog.php:393 modules/pref-filters.php:80
+msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
-#: modules/pref-filters.php:86 modules/pref-users.php:60
+#: modules/popup-dialog.php:402 modules/pref-feeds.php:294
+#: modules/pref-filters.php:89 modules/pref-users.php:60
#, fuzzy
msgid "Options"
msgstr "Opções:"
-#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+#: modules/popup-dialog.php:408 modules/pref-filters.php:101
msgid "Enabled"
msgstr "Ativado"
-#: modules/popup-dialog.php:402 modules/pref-filters.php:107
+#: modules/popup-dialog.php:411 modules/pref-filters.php:110
msgid "Inverse match"
msgstr ""
-#: modules/popup-dialog.php:429
+#: modules/popup-dialog.php:438
msgid "Update Errors"
msgstr ""
-#: modules/popup-dialog.php:432
+#: modules/popup-dialog.php:441
msgid "These feeds have not been updated because of errors:"
msgstr ""
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:460
msgid "Close"
msgstr "Fechar"
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:469
msgid "Edit Tags"
msgstr "Editar Tags"
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:474
msgid "Tags for this article (separated by commas):"
msgstr ""
-#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
-#: modules/pref-filters.php:117 modules/pref-users.php:76
+#: modules/popup-dialog.php:519 modules/pref-feeds.php:369
+#: modules/pref-filters.php:128 modules/pref-users.php:76
msgid "Save"
msgstr "Salvar"
-#: modules/popup-dialog.php:523
+#: modules/popup-dialog.php:532
msgid "Tag cloud"
msgstr "Núvem de tags"
-#: modules/popup-dialog.php:526
+#: modules/popup-dialog.php:535
msgid "Showing most popular tags "
msgstr "Exibir as Tags mais populares."
-#: modules/popup-dialog.php:527
+#: modules/popup-dialog.php:536
msgid "browse more"
msgstr ""
@@ -1701,153 +1749,153 @@ msgstr ""
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+#: modules/pref-feeds.php:366 modules/pref-feeds.php:1115
msgid "Unsubscribe"
msgstr ""
-#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
+#: modules/pref-feeds.php:522 modules/pref-feeds.php:569
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:603
+#: modules/pref-feeds.php:600
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:605
+#: modules/pref-feeds.php:602
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr ""
-#: modules/pref-feeds.php:687
+#: modules/pref-feeds.php:684
msgid "Category editor"
msgstr "Editor de Categoria"
-#: modules/pref-feeds.php:710
+#: modules/pref-feeds.php:707
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "A categoria <b>$%s</b> já existe na base de dados."
-#: modules/pref-feeds.php:738
+#: modules/pref-feeds.php:735
msgid "Unable to delete non empty feed categories."
msgstr ""
-#: modules/pref-feeds.php:755
+#: modules/pref-feeds.php:752
msgid "Create category"
msgstr "Criar categoria"
-#: modules/pref-feeds.php:815
+#: modules/pref-feeds.php:812
msgid "No feed categories defined."
msgstr ""
-#: modules/pref-feeds.php:826 modules/pref-filters.php:128
-#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-feeds.php:823 modules/pref-filters.php:122
+#: modules/pref-filters.php:414 modules/pref-labels.php:330
#: modules/pref-users.php:375
msgid "Remove"
msgstr "Remover"
-#: modules/pref-feeds.php:848
+#: modules/pref-feeds.php:845
msgid "Some feeds have update errors (click for details)"
msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
-#: modules/pref-feeds.php:870
+#: modules/pref-feeds.php:867
msgid "Subscribe to feed"
msgstr ""
-#: modules/pref-feeds.php:875
+#: modules/pref-feeds.php:872
msgid "Top 25"
msgstr ""
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:946
msgid "Show last article times"
msgstr ""
-#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1025
msgid "Last&nbsp;Article"
msgstr ""
-#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1029
msgid "Updated"
msgstr "Atualizado"
-#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
-#: modules/pref-labels.php:306 modules/pref-users.php:350
+#: modules/pref-feeds.php:1050 modules/pref-filters.php:388
+#: modules/pref-labels.php:310 modules/pref-users.php:350
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1096 modules/pref-feeds.php:1110
#, fuzzy
msgid "Selection:"
msgstr "Seleção"
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1102
msgid "Recategorize"
msgstr ""
-#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
-#: modules/pref-labels.php:324 modules/pref-users.php:373
+#: modules/pref-feeds.php:1111 modules/pref-filters.php:412
+#: modules/pref-labels.php:328 modules/pref-users.php:373
msgid "Edit"
msgstr "Editar"
-#: modules/pref-feeds.php:1115
+#: modules/pref-feeds.php:1112
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1116
+#: modules/pref-feeds.php:1113
msgid "Clear feed data"
msgstr ""
-#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:268
#, fuzzy
msgid "Rescore articles"
msgstr "Favoritos"
-#: modules/pref-feeds.php:1123
+#: modules/pref-feeds.php:1120
#, fuzzy
msgid "Other:"
msgstr "Onde:"
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1121
msgid "Edit categories"
msgstr "Editar categorias"
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1128
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1135
+#: modules/pref-feeds.php:1132
msgid "File:"
msgstr "Arquivo:"
-#: modules/pref-feeds.php:1138
+#: modules/pref-feeds.php:1135
msgid "Import"
msgstr "Importar"
-#: modules/pref-feeds.php:1145
+#: modules/pref-feeds.php:1142
msgid "Export OPML"
msgstr "Exportar OPML"
-#: modules/pref-feeds.php:1148
+#: modules/pref-feeds.php:1145
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1150
+#: modules/pref-feeds.php:1147
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1151
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1160
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr ""
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1167
#, fuzzy
msgid "Generate another link"
msgstr "Gerar um outro endereço"
@@ -1857,53 +1905,53 @@ msgstr "Gerar um outro endereço"
msgid "Filter Editor"
msgstr "Editor de Feed"
-#: modules/pref-filters.php:165
+#: modules/pref-filters.php:168
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:205
+#: modules/pref-filters.php:208
#, php-format
msgid "Created filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:258
+#: modules/pref-filters.php:261
msgid "Create filter"
msgstr ""
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:334
msgid "filter_type_descr"
msgstr "filter_type_descr"
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:335
msgid "action_description"
msgstr "action_description"
-#: modules/pref-filters.php:341
+#: modules/pref-filters.php:344
msgid "Filter expression"
msgstr ""
-#: modules/pref-filters.php:344
+#: modules/pref-filters.php:347
msgid "Action"
msgstr "Ação"
-#: modules/pref-filters.php:345
+#: modules/pref-filters.php:348
msgid "Params"
msgstr ""
-#: modules/pref-filters.php:374
+#: modules/pref-filters.php:377
msgid "(Disabled)"
msgstr "(Desativado)"
-#: modules/pref-filters.php:393
+#: modules/pref-filters.php:396
msgid "(Inverse)"
msgstr "(Inverso)"
-#: modules/pref-filters.php:419
+#: modules/pref-filters.php:422
msgid "No filters defined."
msgstr ""
-#: modules/pref-filters.php:421
+#: modules/pref-filters.php:424
msgid "No matching filters found."
msgstr ""
@@ -1914,33 +1962,37 @@ msgid ""
"functionality."
msgstr ""
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:99
+msgid "Error: SQL expression is blank."
+msgstr ""
+
+#: modules/pref-labels.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:207
+#: modules/pref-labels.php:211
#, php-format
msgid "Created label <b>%s</b>"
msgstr ""
-#: modules/pref-labels.php:245
+#: modules/pref-labels.php:249
msgid "Create label"
msgstr ""
-#: modules/pref-labels.php:279
+#: modules/pref-labels.php:283
msgid "SQL Expression"
msgstr "Expressão SQL"
-#: modules/pref-labels.php:304
+#: modules/pref-labels.php:308
msgid "[No caption]"
msgstr ""
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:335
msgid "No labels defined."
msgstr ""
-#: modules/pref-labels.php:333
+#: modules/pref-labels.php:337
msgid "No matching labels found."
msgstr ""
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 4a073d7f2..a3b62af66 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 fabd8a521..a0486d1a2 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 16:43+0400\n"
+"POT-Creation-Date: 2008-08-07 16:13+0400\n"
"PO-Revision-Date: 2007-08-18 15:14+0400\n"
"Last-Translator: Andrew Dolgov <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
@@ -191,7 +191,7 @@ msgid "Starred articles"
msgstr "Отмеченные"
#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1154
msgid "Published articles"
msgstr "Опубликованные"
@@ -201,12 +201,12 @@ msgid "Fresh articles"
msgstr "Отмеченные"
#: functions.php:2856 modules/popup-dialog.php:175
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:356
msgid "All feeds"
msgstr "Все каналы"
#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:988
+#: functions.php:4348 modules/pref-feeds.php:985
msgid "Uncategorized"
msgstr "Нет категории"
@@ -228,15 +228,15 @@ msgid "Searched for"
msgstr "Поиск"
#: functions.php:3945 functions.php:3994 functions.php:5216
-#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
-#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-feeds.php:766 modules/pref-feeds.php:947
+#: modules/pref-filters.php:308 modules/pref-labels.php:275
#: modules/pref-users.php:302
msgid "Select:"
msgstr "Выбрать:"
-#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
-#: modules/pref-feeds.php:951 modules/pref-filters.php:306
-#: modules/pref-labels.php:272 modules/pref-users.php:303
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:767
+#: modules/pref-feeds.php:948 modules/pref-filters.php:309
+#: modules/pref-labels.php:276 modules/pref-users.php:303
msgid "All"
msgstr "Все"
@@ -245,13 +245,13 @@ msgstr "Все"
msgid "Unread"
msgstr "Новые"
-#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
-#: modules/pref-feeds.php:952 modules/pref-filters.php:307
-#: modules/pref-labels.php:273 modules/pref-users.php:304
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:768
+#: modules/pref-feeds.php:949 modules/pref-filters.php:310
+#: modules/pref-labels.php:277 modules/pref-users.php:304
msgid "None"
msgstr "Ничего"
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1108
msgid "Actions..."
msgstr "Действия..."
@@ -299,7 +299,7 @@ msgid "Page"
msgstr "Страница"
#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
-#: modules/pref-filters.php:342
+#: modules/pref-filters.php:345
msgid "Feed"
msgstr "Канал"
@@ -383,6 +383,55 @@ msgstr "Статей не найдено."
msgid "No articles found to display."
msgstr "Статей не найдено."
+#: functions.php:5651
+#, fuzzy
+msgid "Match "
+msgstr "Искать"
+
+#: functions.php:5659
+#, fuzzy
+msgid "Unread articles"
+msgstr "Отмеченные"
+
+#: functions.php:5660
+#, fuzzy
+msgid "Updated articles"
+msgstr "Отмеченные"
+
+#: functions.php:5661
+#, fuzzy
+msgid "Title contains"
+msgstr "Заголовок или содержимое"
+
+#: functions.php:5662
+#, fuzzy
+msgid "Content contains"
+msgstr "Фильтры"
+
+#: functions.php:5663
+msgid "Score equals"
+msgstr ""
+
+#: functions.php:5664
+msgid "Score is greater than"
+msgstr ""
+
+#: functions.php:5665
+msgid "Score is less than"
+msgstr ""
+
+#: functions.php:5666
+msgid "Articles newer than X hours"
+msgstr ""
+
+#: functions.php:5667
+msgid "Articles newer than X days"
+msgstr ""
+
+#: functions.php:5676
+msgid "Add"
+msgstr ""
+
#: localized_js.php:35
msgid "display feeds"
msgstr "показать каналы"
@@ -391,7 +440,7 @@ msgstr "показать каналы"
msgid "display tags"
msgstr "показать теги"
-#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
+#: localized_js.php:37 prefs.php:65 prefs.php:151 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "Идет загрузка..."
@@ -755,7 +804,7 @@ msgid "Rescoring articles..."
msgstr "Отмеченные"
#: localized_schema.php:9 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:960 modules/pref-feeds.php:1021
msgid "Title"
msgstr "Заголовок"
@@ -1101,7 +1150,7 @@ msgstr "Расширение DOMXML не найдено. Оно необходи
msgid "Return to preferences"
msgstr "Вернуться к настройкам"
-#: prefs.php:73 prefs.php:153 tt-rss.php:74
+#: prefs.php:73 prefs.php:154 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1239,8 +1288,8 @@ msgid "tag cloud"
msgstr "облако тегов"
#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
-#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:862
+#: modules/pref-filters.php:251 modules/pref-labels.php:239
#: modules/pref-users.php:258
msgid "Search"
msgstr "Поиск"
@@ -1395,7 +1444,7 @@ msgid "Help topic not found."
msgstr "Раздел помощи не найден."
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
+#: modules/popup-dialog.php:547 modules/pref-feeds.php:817
msgid "Close this window"
msgstr "Закрыть это окно"
@@ -1489,9 +1538,9 @@ msgid "Subscribe"
msgstr "Подписаться"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
-#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
-#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/popup-dialog.php:279 modules/popup-dialog.php:427
+#: modules/popup-dialog.php:523 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:371 modules/pref-filters.php:132
#: modules/pref-users.php:79
msgid "Cancel"
msgstr "Отмена"
@@ -1519,7 +1568,7 @@ msgid "Create Label"
msgstr "Создать метку"
#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:278
+#: modules/pref-labels.php:282
msgid "Caption"
msgstr "Заголовок"
@@ -1528,100 +1577,100 @@ msgstr "Заголовок"
msgid "Match SQL"
msgstr "Искать"
-#: modules/popup-dialog.php:259 modules/pref-labels.php:64
+#: modules/popup-dialog.php:265 modules/pref-labels.php:68
msgid "Help"
msgstr "Помощь"
-#: modules/popup-dialog.php:262
+#: modules/popup-dialog.php:268
msgid "Test"
msgstr "Проверить"
-#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
+#: modules/popup-dialog.php:275 modules/popup-dialog.php:423
msgid "Create"
msgstr "Создать"
-#: modules/popup-dialog.php:282
+#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
msgstr "Создать фильтр"
-#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/popup-dialog.php:306 modules/popup-dialog.php:387
#: modules/pref-filters.php:38 modules/pref-filters.php:72
msgid "description"
msgstr "описание"
-#: modules/popup-dialog.php:351 modules/pref-filters.php:41
-#: modules/pref-filters.php:343
+#: modules/popup-dialog.php:357 modules/pref-filters.php:41
+#: modules/pref-filters.php:346
msgid "Match"
msgstr "Искать"
-#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#: modules/popup-dialog.php:366 modules/pref-filters.php:50
#, fuzzy
msgid "on field"
msgstr "По полю:"
-#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#: modules/popup-dialog.php:371 modules/pref-filters.php:55
#, fuzzy
msgid "in"
msgstr "Ссылка"
-#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#: modules/popup-dialog.php:376 modules/pref-filters.php:60
#, fuzzy
msgid "Perform Action"
msgstr "Применить обновления"
-#: modules/popup-dialog.php:386 modules/pref-filters.php:77
-msgid "with params"
+#: modules/popup-dialog.php:393 modules/pref-filters.php:80
+msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
-#: modules/pref-filters.php:86 modules/pref-users.php:60
+#: modules/popup-dialog.php:402 modules/pref-feeds.php:294
+#: modules/pref-filters.php:89 modules/pref-users.php:60
#, fuzzy
msgid "Options"
msgstr "Дополнительно:"
-#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+#: modules/popup-dialog.php:408 modules/pref-filters.php:101
msgid "Enabled"
msgstr "Включен"
-#: modules/popup-dialog.php:402 modules/pref-filters.php:107
+#: modules/popup-dialog.php:411 modules/pref-filters.php:110
msgid "Inverse match"
msgstr "Инвертировать фильтр"
-#: modules/popup-dialog.php:429
+#: modules/popup-dialog.php:438
msgid "Update Errors"
msgstr "Ошибки обновления"
-#: modules/popup-dialog.php:432
+#: modules/popup-dialog.php:441
msgid "These feeds have not been updated because of errors:"
msgstr "Эти каналы не было обновлены из-за ошибок:"
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:460
msgid "Close"
msgstr "Закрыть"
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:469
msgid "Edit Tags"
msgstr "Редактировать теги"
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:474
msgid "Tags for this article (separated by commas):"
msgstr "Теги для этой статьи (разделенные запятыми):"
-#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
-#: modules/pref-filters.php:117 modules/pref-users.php:76
+#: modules/popup-dialog.php:519 modules/pref-feeds.php:369
+#: modules/pref-filters.php:128 modules/pref-users.php:76
msgid "Save"
msgstr "Сохранить"
-#: modules/popup-dialog.php:523
+#: modules/popup-dialog.php:532
msgid "Tag cloud"
msgstr "Облако тегов"
-#: modules/popup-dialog.php:526
+#: modules/popup-dialog.php:535
msgid "Showing most popular tags "
msgstr "Самые популярные теги "
-#: modules/popup-dialog.php:527
+#: modules/popup-dialog.php:536
msgid "browse more"
msgstr "еще"
@@ -1719,155 +1768,155 @@ msgstr "Включить в дайджест"
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+#: modules/pref-feeds.php:366 modules/pref-feeds.php:1115
msgid "Unsubscribe"
msgstr "Отписаться"
-#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
+#: modules/pref-feeds.php:522 modules/pref-feeds.php:569
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:603
+#: modules/pref-feeds.php:600
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "Добавлена подписка на <b>%s</b>."
-#: modules/pref-feeds.php:605
+#: modules/pref-feeds.php:602
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "Канал <b>%s</b> уже подписан."
-#: modules/pref-feeds.php:687
+#: modules/pref-feeds.php:684
msgid "Category editor"
msgstr "Редактор категорий"
-#: modules/pref-feeds.php:710
+#: modules/pref-feeds.php:707
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "Категория <b>$%s</b> уже существует."
-#: modules/pref-feeds.php:738
+#: modules/pref-feeds.php:735
msgid "Unable to delete non empty feed categories."
msgstr "Не могу удалить не пустую категорию"
-#: modules/pref-feeds.php:755
+#: modules/pref-feeds.php:752
msgid "Create category"
msgstr "Создать категорию"
-#: modules/pref-feeds.php:815
+#: modules/pref-feeds.php:812
msgid "No feed categories defined."
msgstr "Категории отсутствуют."
-#: modules/pref-feeds.php:826 modules/pref-filters.php:128
-#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-feeds.php:823 modules/pref-filters.php:122
+#: modules/pref-filters.php:414 modules/pref-labels.php:330
#: modules/pref-users.php:375
msgid "Remove"
msgstr "Удалить"
-#: modules/pref-feeds.php:848
+#: modules/pref-feeds.php:845
msgid "Some feeds have update errors (click for details)"
msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)"
-#: modules/pref-feeds.php:870
+#: modules/pref-feeds.php:867
msgid "Subscribe to feed"
msgstr "Подписаться на канал"
-#: modules/pref-feeds.php:875
+#: modules/pref-feeds.php:872
msgid "Top 25"
msgstr "Топ 25"
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:946
msgid "Show last article times"
msgstr "Показать дату последней статьи"
-#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1025
msgid "Last&nbsp;Article"
msgstr "Последняя&nbsp;статья"
-#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1029
msgid "Updated"
msgstr "Обновлено"
-#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
-#: modules/pref-labels.php:306 modules/pref-users.php:350
+#: modules/pref-feeds.php:1050 modules/pref-filters.php:388
+#: modules/pref-labels.php:310 modules/pref-users.php:350
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1096 modules/pref-feeds.php:1110
#, fuzzy
msgid "Selection:"
msgstr "Выбрать:"
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1102
msgid "Recategorize"
msgstr "Изменить категорию"
-#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
-#: modules/pref-labels.php:324 modules/pref-users.php:373
+#: modules/pref-feeds.php:1111 modules/pref-filters.php:412
+#: modules/pref-labels.php:328 modules/pref-users.php:373
msgid "Edit"
msgstr "Редактировать"
-#: modules/pref-feeds.php:1115
+#: modules/pref-feeds.php:1112
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1116
+#: modules/pref-feeds.php:1113
#, fuzzy
msgid "Clear feed data"
msgstr "Все каналы обновлены."
-#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:268
#, fuzzy
msgid "Rescore articles"
msgstr "Отмеченные"
-#: modules/pref-feeds.php:1123
+#: modules/pref-feeds.php:1120
#, fuzzy
msgid "Other:"
msgstr "Где:"
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1121
msgid "Edit categories"
msgstr "Редактировать категории"
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1128
msgid "OPML"
msgstr ""
-#: modules/pref-feeds.php:1135
+#: modules/pref-feeds.php:1132
#, fuzzy
msgid "File:"
msgstr "Заголовок:"
-#: modules/pref-feeds.php:1138
+#: modules/pref-feeds.php:1135
msgid "Import"
msgstr "Импортировать"
-#: modules/pref-feeds.php:1145
+#: modules/pref-feeds.php:1142
msgid "Export OPML"
msgstr "Экспортировать OPML"
-#: modules/pref-feeds.php:1148
+#: modules/pref-feeds.php:1145
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1150
+#: modules/pref-feeds.php:1147
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1151
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1160
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr ""
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1167
#, fuzzy
msgid "Generate another link"
msgstr "Создать другой адрес"
@@ -1877,55 +1926,55 @@ msgstr "Создать другой адрес"
msgid "Filter Editor"
msgstr "Редактор фильтров"
-#: modules/pref-filters.php:165
+#: modules/pref-filters.php:168
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "Фильтр <b>%s</b> сохранен"
-#: modules/pref-filters.php:205
+#: modules/pref-filters.php:208
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Добавлен фильтр <b>%s</b>"
-#: modules/pref-filters.php:258
+#: modules/pref-filters.php:261
msgid "Create filter"
msgstr "Создать фильтр"
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:334
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:335
#, fuzzy
msgid "action_description"
msgstr "описание"
-#: modules/pref-filters.php:341
+#: modules/pref-filters.php:344
msgid "Filter expression"
msgstr "Выражение"
-#: modules/pref-filters.php:344
+#: modules/pref-filters.php:347
msgid "Action"
msgstr "Действие"
-#: modules/pref-filters.php:345
+#: modules/pref-filters.php:348
#, fuzzy
msgid "Params"
msgstr "Параметры:"
-#: modules/pref-filters.php:374
+#: modules/pref-filters.php:377
msgid "(Disabled)"
msgstr "(Отключен)"
-#: modules/pref-filters.php:393
+#: modules/pref-filters.php:396
msgid "(Inverse)"
msgstr "(Инвертирован)"
-#: modules/pref-filters.php:419
+#: modules/pref-filters.php:422
msgid "No filters defined."
msgstr "Фильтры отсутствуют."
-#: modules/pref-filters.php:421
+#: modules/pref-filters.php:424
#, fuzzy
msgid "No matching filters found."
msgstr "Статей не найдено."
@@ -1937,34 +1986,38 @@ msgid ""
"functionality."
msgstr ""
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:99
+msgid "Error: SQL expression is blank."
+msgstr ""
+
+#: modules/pref-labels.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "Метка <b>%s</b> сохранена"
-#: modules/pref-labels.php:207
+#: modules/pref-labels.php:211
#, php-format
msgid "Created label <b>%s</b>"
msgstr "Добавлена метка <b>%s</b>"
-#: modules/pref-labels.php:245
+#: modules/pref-labels.php:249
msgid "Create label"
msgstr "Создать метку"
-#: modules/pref-labels.php:279
+#: modules/pref-labels.php:283
msgid "SQL Expression"
msgstr "SQL выражение"
-#: modules/pref-labels.php:304
+#: modules/pref-labels.php:308
#, fuzzy
msgid "[No caption]"
msgstr "Заголовок"
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:335
msgid "No labels defined."
msgstr "Метки отсутствуют."
-#: modules/pref-labels.php:333
+#: modules/pref-labels.php:337
#, fuzzy
msgid "No matching labels found."
msgstr "Статей не найдено."
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 0a1d64a10..cb489a8b4 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 b76f32abd..201d54f22 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 16:43+0400\n"
+"POT-Creation-Date: 2008-08-07 16:13+0400\n"
"PO-Revision-Date: 2007-08-19 19:03+0800\n"
"Last-Translator: sluke <[email protected]>\n"
"Language-Team: hicode.org <[email protected]>\n"
@@ -187,7 +187,7 @@ msgid "Starred articles"
msgstr "星级文章"
#: functions.php:2586 functions.php:2936 functions.php:3313 functions.php:4164
-#: modules/pref-feeds.php:1157
+#: modules/pref-feeds.php:1154
msgid "Published articles"
msgstr "已发布文章"
@@ -197,12 +197,12 @@ msgid "Fresh articles"
msgstr "星级文章"
#: functions.php:2856 modules/popup-dialog.php:175
-#: modules/pref-filters.php:353
+#: modules/pref-filters.php:356
msgid "All feeds"
msgstr "所有feed"
#: functions.php:2885 functions.php:2924 functions.php:3288 functions.php:4318
-#: functions.php:4348 modules/pref-feeds.php:988
+#: functions.php:4348 modules/pref-feeds.php:985
msgid "Uncategorized"
msgstr "未分类"
@@ -224,15 +224,15 @@ msgid "Searched for"
msgstr "搜索"
#: functions.php:3945 functions.php:3994 functions.php:5216
-#: modules/pref-feeds.php:769 modules/pref-feeds.php:950
-#: modules/pref-filters.php:305 modules/pref-labels.php:271
+#: modules/pref-feeds.php:766 modules/pref-feeds.php:947
+#: modules/pref-filters.php:308 modules/pref-labels.php:275
#: modules/pref-users.php:302
msgid "Select:"
msgstr "选择:"
-#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:770
-#: modules/pref-feeds.php:951 modules/pref-filters.php:306
-#: modules/pref-labels.php:272 modules/pref-users.php:303
+#: functions.php:3946 functions.php:3995 modules/pref-feeds.php:767
+#: modules/pref-feeds.php:948 modules/pref-filters.php:309
+#: modules/pref-labels.php:276 modules/pref-users.php:303
msgid "All"
msgstr "所有"
@@ -241,13 +241,13 @@ msgstr "所有"
msgid "Unread"
msgstr "未读"
-#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:771
-#: modules/pref-feeds.php:952 modules/pref-filters.php:307
-#: modules/pref-labels.php:273 modules/pref-users.php:304
+#: functions.php:3948 functions.php:3997 modules/pref-feeds.php:768
+#: modules/pref-feeds.php:949 modules/pref-filters.php:310
+#: modules/pref-labels.php:277 modules/pref-users.php:304
msgid "None"
msgstr "无"
-#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1111
+#: functions.php:3950 tt-rss.php:142 modules/pref-feeds.php:1108
msgid "Actions..."
msgstr "激活..."
@@ -294,7 +294,7 @@ msgid "Page"
msgstr "页"
#: functions.php:4004 modules/popup-dialog.php:70 modules/pref-feeds.php:151
-#: modules/pref-filters.php:342
+#: modules/pref-filters.php:345
msgid "Feed"
msgstr "Feed"
@@ -378,6 +378,55 @@ msgstr "未找到文章。"
msgid "No articles found to display."
msgstr "未找到文章。"
+#: functions.php:5651
+#, fuzzy
+msgid "Match "
+msgstr "匹配"
+
+#: functions.php:5659
+#, fuzzy
+msgid "Unread articles"
+msgstr "星级文章"
+
+#: functions.php:5660
+#, fuzzy
+msgid "Updated articles"
+msgstr "星级文章"
+
+#: functions.php:5661
+#, fuzzy
+msgid "Title contains"
+msgstr "标题或内容"
+
+#: functions.php:5662
+#, fuzzy
+msgid "Content contains"
+msgstr "内容过滤器"
+
+#: functions.php:5663
+msgid "Score equals"
+msgstr ""
+
+#: functions.php:5664
+msgid "Score is greater than"
+msgstr ""
+
+#: functions.php:5665
+msgid "Score is less than"
+msgstr ""
+
+#: functions.php:5666
+msgid "Articles newer than X hours"
+msgstr ""
+
+#: functions.php:5667
+msgid "Articles newer than X days"
+msgstr ""
+
+#: functions.php:5676
+msgid "Add"
+msgstr ""
+
#: localized_js.php:35
msgid "display feeds"
msgstr "显示Feed"
@@ -386,7 +435,7 @@ msgstr "显示Feed"
msgid "display tags"
msgstr "显示标签"
-#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
+#: localized_js.php:37 prefs.php:65 prefs.php:151 tt-rss.php:66
msgid "Loading, please wait..."
msgstr "读取中,请等待..."
@@ -750,7 +799,7 @@ msgid "Rescoring articles..."
msgstr "星级文章"
#: localized_schema.php:9 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:963 modules/pref-feeds.php:1024
+#: modules/pref-feeds.php:960 modules/pref-feeds.php:1021
msgid "Title"
msgstr "标题"
@@ -1098,7 +1147,7 @@ msgstr "未检测到DOMXML 扩展, 要求PHP5以下版本。"
msgid "Return to preferences"
msgstr "返回 我的最爱"
-#: prefs.php:73 prefs.php:153 tt-rss.php:74
+#: prefs.php:73 prefs.php:154 tt-rss.php:74
msgid ""
"Your browser doesn't support Javascript, which is required\n"
"\t\tfor this application to function properly. Please check your\n"
@@ -1245,8 +1294,8 @@ msgid "tag cloud"
msgstr "标签簇"
#: tt-rss.php:143 modules/popup-dialog.php:140 modules/popup-dialog.php:152
-#: modules/popup-dialog.php:211 modules/pref-feeds.php:865
-#: modules/pref-filters.php:248 modules/pref-labels.php:235
+#: modules/popup-dialog.php:211 modules/pref-feeds.php:862
+#: modules/pref-filters.php:251 modules/pref-labels.php:239
#: modules/pref-users.php:258
msgid "Search"
msgstr "搜索"
@@ -1402,7 +1451,7 @@ msgid "Help topic not found."
msgstr "未找到帮助主题。"
#: modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:538 modules/pref-feeds.php:820
+#: modules/popup-dialog.php:547 modules/pref-feeds.php:817
msgid "Close this window"
msgstr "关闭此窗口"
@@ -1501,9 +1550,9 @@ msgid "Subscribe"
msgstr "订阅"
#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:273 modules/popup-dialog.php:418
-#: modules/popup-dialog.php:514 modules/pref-feeds.php:116
-#: modules/pref-feeds.php:367 modules/pref-filters.php:121
+#: modules/popup-dialog.php:279 modules/popup-dialog.php:427
+#: modules/popup-dialog.php:523 modules/pref-feeds.php:116
+#: modules/pref-feeds.php:371 modules/pref-filters.php:132
#: modules/pref-users.php:79
msgid "Cancel"
msgstr "取消"
@@ -1531,7 +1580,7 @@ msgid "Create Label"
msgstr "创建标记"
#: modules/popup-dialog.php:231 modules/pref-labels.php:36
-#: modules/pref-labels.php:278
+#: modules/pref-labels.php:282
msgid "Caption"
msgstr "标题"
@@ -1540,101 +1589,101 @@ msgstr "标题"
msgid "Match SQL"
msgstr "匹配"
-#: modules/popup-dialog.php:259 modules/pref-labels.php:64
+#: modules/popup-dialog.php:265 modules/pref-labels.php:68
#, fuzzy
msgid "Help"
msgstr "你好,"
-#: modules/popup-dialog.php:262
+#: modules/popup-dialog.php:268
msgid "Test"
msgstr "测试"
-#: modules/popup-dialog.php:269 modules/popup-dialog.php:414
+#: modules/popup-dialog.php:275 modules/popup-dialog.php:423
msgid "Create"
msgstr "创建"
-#: modules/popup-dialog.php:282
+#: modules/popup-dialog.php:288
#, fuzzy
msgid "Create Filter"
msgstr "创建过滤器"
-#: modules/popup-dialog.php:300 modules/popup-dialog.php:381
+#: modules/popup-dialog.php:306 modules/popup-dialog.php:387
#: modules/pref-filters.php:38 modules/pref-filters.php:72
msgid "description"
msgstr "描述"
-#: modules/popup-dialog.php:351 modules/pref-filters.php:41
-#: modules/pref-filters.php:343
+#: modules/popup-dialog.php:357 modules/pref-filters.php:41
+#: modules/pref-filters.php:346
msgid "Match"
msgstr "匹配"
-#: modules/popup-dialog.php:360 modules/pref-filters.php:50
+#: modules/popup-dialog.php:366 modules/pref-filters.php:50
#, fuzzy
msgid "on field"
msgstr "于:"
-#: modules/popup-dialog.php:365 modules/pref-filters.php:55
+#: modules/popup-dialog.php:371 modules/pref-filters.php:55
#, fuzzy
msgid "in"
msgstr "链接"
-#: modules/popup-dialog.php:370 modules/pref-filters.php:60
+#: modules/popup-dialog.php:376 modules/pref-filters.php:60
#, fuzzy
msgid "Perform Action"
msgstr "完成更新"
-#: modules/popup-dialog.php:386 modules/pref-filters.php:77
-msgid "with params"
+#: modules/popup-dialog.php:393 modules/pref-filters.php:80
+msgid "with parameters:"
msgstr ""
-#: modules/popup-dialog.php:393 modules/pref-feeds.php:294
-#: modules/pref-filters.php:86 modules/pref-users.php:60
+#: modules/popup-dialog.php:402 modules/pref-feeds.php:294
+#: modules/pref-filters.php:89 modules/pref-users.php:60
#, fuzzy
msgid "Options"
msgstr "选项:"
-#: modules/popup-dialog.php:399 modules/pref-filters.php:98
+#: modules/popup-dialog.php:408 modules/pref-filters.php:101
msgid "Enabled"
msgstr "可用"
-#: modules/popup-dialog.php:402 modules/pref-filters.php:107
+#: modules/popup-dialog.php:411 modules/pref-filters.php:110
msgid "Inverse match"
msgstr "逆匹配"
-#: modules/popup-dialog.php:429
+#: modules/popup-dialog.php:438
msgid "Update Errors"
msgstr "更新错误"
-#: modules/popup-dialog.php:432
+#: modules/popup-dialog.php:441
msgid "These feeds have not been updated because of errors:"
msgstr "这些feed更新错误:"
-#: modules/popup-dialog.php:451
+#: modules/popup-dialog.php:460
msgid "Close"
msgstr "关闭"
-#: modules/popup-dialog.php:460
+#: modules/popup-dialog.php:469
msgid "Edit Tags"
msgstr "编辑标签"
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:474
msgid "Tags for this article (separated by commas):"
msgstr "本文的标签,请用逗号分开:"
-#: modules/popup-dialog.php:510 modules/pref-feeds.php:365
-#: modules/pref-filters.php:117 modules/pref-users.php:76
+#: modules/popup-dialog.php:519 modules/pref-feeds.php:369
+#: modules/pref-filters.php:128 modules/pref-users.php:76
msgid "Save"
msgstr "保存"
-#: modules/popup-dialog.php:523
+#: modules/popup-dialog.php:532
msgid "Tag cloud"
msgstr "标签簇"
-#: modules/popup-dialog.php:526
+#: modules/popup-dialog.php:535
msgid "Showing most popular tags "
msgstr "显示最热标签"
-#: modules/popup-dialog.php:527
+#: modules/popup-dialog.php:536
msgid "browse more"
msgstr "浏览更多"
@@ -1732,156 +1781,156 @@ msgstr "包括电子邮件文摘"
msgid "Cache images locally"
msgstr ""
-#: modules/pref-feeds.php:371 modules/pref-feeds.php:1118
+#: modules/pref-feeds.php:366 modules/pref-feeds.php:1115
msgid "Unsubscribe"
msgstr "退订"
-#: modules/pref-feeds.php:525 modules/pref-feeds.php:572
+#: modules/pref-feeds.php:522 modules/pref-feeds.php:569
msgid "All done."
msgstr ""
-#: modules/pref-feeds.php:603
+#: modules/pref-feeds.php:600
#, php-format
msgid "Subscribed to <b>%s</b>."
msgstr "订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:605
+#: modules/pref-feeds.php:602
#, php-format
msgid "Already subscribed to <b>%s</b>."
msgstr "已经订阅到 <b>%s</b>."
-#: modules/pref-feeds.php:687
+#: modules/pref-feeds.php:684
msgid "Category editor"
msgstr "分类编辑"
-#: modules/pref-feeds.php:710
+#: modules/pref-feeds.php:707
#, php-format
msgid "Category <b>$%s</b> already exists in the database."
msgstr "分类 <b>$%s</b>已经存在."
-#: modules/pref-feeds.php:738
+#: modules/pref-feeds.php:735
msgid "Unable to delete non empty feed categories."
msgstr "不能删除非空分类。"
-#: modules/pref-feeds.php:755
+#: modules/pref-feeds.php:752
msgid "Create category"
msgstr "创建分类"
-#: modules/pref-feeds.php:815
+#: modules/pref-feeds.php:812
msgid "No feed categories defined."
msgstr "未定义feed分类"
-#: modules/pref-feeds.php:826 modules/pref-filters.php:128
-#: modules/pref-filters.php:411 modules/pref-labels.php:326
+#: modules/pref-feeds.php:823 modules/pref-filters.php:122
+#: modules/pref-filters.php:414 modules/pref-labels.php:330
#: modules/pref-users.php:375
msgid "Remove"
msgstr "移除"
-#: modules/pref-feeds.php:848
+#: modules/pref-feeds.php:845
msgid "Some feeds have update errors (click for details)"
msgstr "有些feed更新错误(点击了解详情) "
-#: modules/pref-feeds.php:870
+#: modules/pref-feeds.php:867
msgid "Subscribe to feed"
msgstr "订阅feed"
-#: modules/pref-feeds.php:875
+#: modules/pref-feeds.php:872
msgid "Top 25"
msgstr "Top 25"
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:946
msgid "Show last article times"
msgstr "显示最近文章时间"
-#: modules/pref-feeds.php:966 modules/pref-feeds.php:1028
+#: modules/pref-feeds.php:963 modules/pref-feeds.php:1025
msgid "Last&nbsp;Article"
msgstr "最后&nbsp;文章"
-#: modules/pref-feeds.php:969 modules/pref-feeds.php:1032
+#: modules/pref-feeds.php:966 modules/pref-feeds.php:1029
msgid "Updated"
msgstr "已更新"
-#: modules/pref-feeds.php:1053 modules/pref-filters.php:385
-#: modules/pref-labels.php:306 modules/pref-users.php:350
+#: modules/pref-feeds.php:1050 modules/pref-filters.php:388
+#: modules/pref-labels.php:310 modules/pref-users.php:350
msgid "Click to edit"
msgstr ""
-#: modules/pref-feeds.php:1099 modules/pref-feeds.php:1113
+#: modules/pref-feeds.php:1096 modules/pref-feeds.php:1110
#, fuzzy
msgid "Selection:"
msgstr "选择:"
-#: modules/pref-feeds.php:1105
+#: modules/pref-feeds.php:1102
msgid "Recategorize"
msgstr "再分类"
-#: modules/pref-feeds.php:1114 modules/pref-filters.php:409
-#: modules/pref-labels.php:324 modules/pref-users.php:373
+#: modules/pref-feeds.php:1111 modules/pref-filters.php:412
+#: modules/pref-labels.php:328 modules/pref-users.php:373
msgid "Edit"
msgstr "编辑"
-#: modules/pref-feeds.php:1115
+#: modules/pref-feeds.php:1112
msgid "Manual purge"
msgstr ""
-#: modules/pref-feeds.php:1116
+#: modules/pref-feeds.php:1113
#, fuzzy
msgid "Clear feed data"
msgstr "所有Feed已更新。"
-#: modules/pref-feeds.php:1117 modules/pref-filters.php:265
+#: modules/pref-feeds.php:1114 modules/pref-filters.php:268
#, fuzzy
msgid "Rescore articles"
msgstr "星级文章"
-#: modules/pref-feeds.php:1123
+#: modules/pref-feeds.php:1120
#, fuzzy
msgid "Other:"
msgstr "地点:"
-#: modules/pref-feeds.php:1124
+#: modules/pref-feeds.php:1121
msgid "Edit categories"
msgstr "编辑分类"
-#: modules/pref-feeds.php:1131
+#: modules/pref-feeds.php:1128
msgid "OPML"
msgstr "OPML"
-#: modules/pref-feeds.php:1135
+#: modules/pref-feeds.php:1132
#, fuzzy
msgid "File:"
msgstr "标题:"
-#: modules/pref-feeds.php:1138
+#: modules/pref-feeds.php:1135
msgid "Import"
msgstr "导入"
-#: modules/pref-feeds.php:1145
+#: modules/pref-feeds.php:1142
msgid "Export OPML"
msgstr "导出OPML"
-#: modules/pref-feeds.php:1148
+#: modules/pref-feeds.php:1145
msgid "Firefox Integration"
msgstr ""
-#: modules/pref-feeds.php:1150
+#: modules/pref-feeds.php:1147
msgid ""
"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
"link below."
msgstr ""
-#: modules/pref-feeds.php:1154
+#: modules/pref-feeds.php:1151
msgid "Click here to register this site as a feed reader."
msgstr ""
-#: modules/pref-feeds.php:1163
+#: modules/pref-feeds.php:1160
#, fuzzy
msgid ""
"Published articles are exported as a public RSS feed and can be subscribed "
"by anyone who knows the URL specified below."
msgstr "本站文章作为一个公开的RSS源,可以被大众订阅。"
-#: modules/pref-feeds.php:1170
+#: modules/pref-feeds.php:1167
#, fuzzy
msgid "Generate another link"
msgstr "生成另一个地址"
@@ -1891,55 +1940,55 @@ msgstr "生成另一个地址"
msgid "Filter Editor"
msgstr "过滤器编辑"
-#: modules/pref-filters.php:165
+#: modules/pref-filters.php:168
#, php-format
msgid "Saved filter <b>%s</b>"
msgstr "保存过滤器<b>%s</b>"
-#: modules/pref-filters.php:205
+#: modules/pref-filters.php:208
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "创建过滤器 <b>%s</b>"
-#: modules/pref-filters.php:258
+#: modules/pref-filters.php:261
msgid "Create filter"
msgstr "创建过滤器"
-#: modules/pref-filters.php:331
+#: modules/pref-filters.php:334
msgid "filter_type_descr"
msgstr ""
-#: modules/pref-filters.php:332
+#: modules/pref-filters.php:335
#, fuzzy
msgid "action_description"
msgstr "描述"
-#: modules/pref-filters.php:341
+#: modules/pref-filters.php:344
msgid "Filter expression"
msgstr "过滤器表达式"
-#: modules/pref-filters.php:344
+#: modules/pref-filters.php:347
msgid "Action"
msgstr "操作"
-#: modules/pref-filters.php:345
+#: modules/pref-filters.php:348
#, fuzzy
msgid "Params"
msgstr "参数:"
-#: modules/pref-filters.php:374
+#: modules/pref-filters.php:377
msgid "(Disabled)"
msgstr "(不可用)"
-#: modules/pref-filters.php:393
+#: modules/pref-filters.php:396
msgid "(Inverse)"
msgstr "(逆)"
-#: modules/pref-filters.php:419
+#: modules/pref-filters.php:422
msgid "No filters defined."
msgstr "未定义过滤器。"
-#: modules/pref-filters.php:421
+#: modules/pref-filters.php:424
#, fuzzy
msgid "No matching filters found."
msgstr "未找到文章。"
@@ -1951,34 +2000,38 @@ msgid ""
"functionality."
msgstr ""
-#: modules/pref-labels.php:175
+#: modules/pref-labels.php:99
+msgid "Error: SQL expression is blank."
+msgstr ""
+
+#: modules/pref-labels.php:179
#, php-format
msgid "Saved label <b>%s</b>"
msgstr "已保存标记<b>%s</b>"
-#: modules/pref-labels.php:207
+#: modules/pref-labels.php:211
#, php-format
msgid "Created label <b>%s</b>"
msgstr "创建标记 <b>%s</b>"
-#: modules/pref-labels.php:245
+#: modules/pref-labels.php:249
msgid "Create label"
msgstr "创建标记"
-#: modules/pref-labels.php:279
+#: modules/pref-labels.php:283
msgid "SQL Expression"
msgstr "SQL 表达式"
-#: modules/pref-labels.php:304
+#: modules/pref-labels.php:308
#, fuzzy
msgid "[No caption]"
msgstr "标题"
-#: modules/pref-labels.php:331
+#: modules/pref-labels.php:335
msgid "No labels defined."
msgstr "未定义标记."
-#: modules/pref-labels.php:333
+#: modules/pref-labels.php:337
#, fuzzy
msgid "No matching labels found."
msgstr "未找到文章。"