summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-11-17 16:11:55 +0300
committerAndrew Dolgov <[email protected]>2010-11-17 16:11:55 +0300
commitc19dd6b7dccbcc00ecc7ee21e3e1cd4beed29237 (patch)
tree9895651dbe16da500238017ae3809dea43709415 /locale
parente7435df04aa38f478fc93d662346c7155ee0f6d2 (diff)
update fr_FR translation
Diffstat (limited to 'locale')
-rw-r--r--locale/ca_CA/LC_MESSAGES/messages.mobin39369 -> 39275 bytes
-rw-r--r--locale/ca_CA/LC_MESSAGES/messages.po134
-rw-r--r--locale/de_DE/LC_MESSAGES/messages.mobin39595 -> 39527 bytes
-rw-r--r--locale/de_DE/LC_MESSAGES/messages.po134
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.mobin40917 -> 40833 bytes
-rw-r--r--locale/es_ES/LC_MESSAGES/messages.po134
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.mobin51307 -> 51253 bytes
-rw-r--r--locale/fr_FR/LC_MESSAGES/messages.po138
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.mobin34938 -> 34871 bytes
-rw-r--r--locale/hu_HU/LC_MESSAGES/messages.po134
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.mobin44398 -> 44334 bytes
-rw-r--r--locale/it_IT/LC_MESSAGES/messages.po134
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.mobin33754 -> 33667 bytes
-rw-r--r--locale/ja_JP/LC_MESSAGES/messages.po134
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.mobin37911 -> 37848 bytes
-rw-r--r--locale/nb_NO/LC_MESSAGES/messages.po134
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.mobin8615 -> 8615 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/messages.po131
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.mobin48510 -> 48431 bytes
-rw-r--r--locale/ru_RU/LC_MESSAGES/messages.po134
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.mobin16566 -> 16502 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/messages.po134
22 files changed, 725 insertions, 750 deletions
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 8ea0af978..3da8bd458 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.mo
+++ b/locale/ca_CA/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 1393f948b..f2f79b3a8 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.po
+++ b/locale/ca_CA/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2009-11-19 09:40+0100\n"
"Last-Translator: Alfred Galitó <[email protected]>\n"
"Language-Team: Català <[email protected]>\n"
@@ -326,7 +326,7 @@ msgid "Incorrect username or password"
msgstr "El nom d'usuari o la contrasenya és incorrecte"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Tots els canals"
@@ -371,13 +371,13 @@ msgid "Archived articles"
msgstr "Articles mémorisés"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Selecciona:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Tot"
@@ -391,7 +391,7 @@ msgid "Invert"
msgstr "Inverteix"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Cap"
@@ -1099,7 +1099,7 @@ msgid "Sort articles"
msgstr "Articles mémorisés"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Data"
@@ -1252,7 +1252,7 @@ msgstr "Adaptatiu"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Suprimeix"
@@ -1318,7 +1318,7 @@ msgid "Subscribe to Feed"
msgstr "Subscriviu-vos al canal"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Canal"
@@ -1370,7 +1370,7 @@ msgstr "Navegador de canals"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Cerca"
@@ -1415,17 +1415,17 @@ msgid "Create Filter"
msgstr "Crea un filtre"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Coincidència"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "abans"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "després"
@@ -1646,7 +1646,7 @@ msgstr "Purger manuellement"
msgid "Clear feed data"
msgstr "Esborra les dades del canal"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "Canvia la puntuació dels articles"
@@ -1658,7 +1658,7 @@ msgstr "Mostra l'hora de l'últim article"
msgid "Last&nbsp;Article"
msgstr "Últim&nbsp;article"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Feu clic per editar"
@@ -1781,45 +1781,40 @@ msgstr "No s'ha trobat cap canal."
msgid "Filter Editor"
msgstr "Editor del filtre"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "S'ha desat el filtre <b>%s</b>"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "S'ha creat el filtre <b>%s</b>"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Crea un filtre"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Edita"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "Camp"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Paràmetres"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(Desactivat)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(Invers)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "No s'ha definit cap filtre."
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "No s'ha trobat cap fitxer que coincideixi."
@@ -2400,8 +2395,8 @@ msgstr "No esteu subscrit a cap canal."
msgid "Subscribed to %d feed(s)."
msgstr "Subscrit als canals:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "No heu seleccionat cap canal."
@@ -2446,170 +2441,170 @@ msgstr "Si us plau, escriviu una nota per aquest article:"
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Error: No s'ha especificat la URL del canal."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Error: URL del canal no vàlida."
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "No s'ha pogut afegir la categoria: no s'ha especificat cap nom."
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "No s'ha pogut afegir la categoria: no s'ha especificat cap nom."
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Si us plau, introduïu la vostra identificació (login)"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "No heu seleccionat cap etiqueta."
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "No heu seleccionat cap usuari."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "No heu seleccionat cap filtre."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "Us voleu donar de baixa dels canals seleccionats?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Si us plau, seleccioneu només un canal."
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"Esteu segur que voleu suprimir tots els articles que no estan marcats als "
"canals seleccionats?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "No hi ha cap article seleccionat."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "No heu seleccionat cap categoria."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "El nom del camp no es pot deixar en blanc."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Si us plau, seleccioneu només un usuari."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Si us plau, seleccioneu només un filtre."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "No hi ha cap fitxer OPML per a carregar."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "Esteu segur que voleu establir els valors per defecte?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Voleu canviar l'adreça de publicació per una de nova?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Voleu desar la configuració actual?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr ""
"Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
"personalitzades?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Esteu segur que voleu recuperar tots els articles? Aquesta operació pot "
"durar molt temps."
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "Esteu segur que voleu suprimir el filtre %s?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr ""
"Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
"defecte?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Si us plau, escriviu un nou color pel primer pla de l'etiqueta:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Si us plau, escriviu el nou color de fons de l'etiqueta:"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2704,6 +2699,9 @@ msgstr "S'està carregant la llista de canals..."
msgid "Please enter a note for this article:"
msgstr "Si us plau, escriviu una nota per aquest article:"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "S'ha desat el filtre <b>%s</b>"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Torna a Tiny Tiny RSS"
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 005aee67e..4b531e007 100644
--- a/locale/de_DE/LC_MESSAGES/messages.mo
+++ b/locale/de_DE/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index b22034c4b..35ca53227 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS 1.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: \n"
"Last-Translator: Kevin Kraft <[email protected]>\n"
"Language-Team: Deutsch <de.org>\n"
@@ -327,7 +327,7 @@ msgid "Incorrect username or password"
msgstr "falscher Benutzername oder Passwort"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Alle Feeds"
@@ -372,13 +372,13 @@ msgid "Archived articles"
msgstr "Bewertete Artikel"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Auswahl:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Alle"
@@ -392,7 +392,7 @@ msgid "Invert"
msgstr "Invertieren"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Keine"
@@ -1089,7 +1089,7 @@ msgid "Sort articles"
msgstr "Artikel bewerten"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Datum"
@@ -1241,7 +1241,7 @@ msgstr "Adaptiv"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Entfernen"
@@ -1308,7 +1308,7 @@ msgid "Subscribe to Feed"
msgstr "Feed abonnieren"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Feed"
@@ -1360,7 +1360,7 @@ msgstr "Feed-Browser"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Suchen"
@@ -1406,17 +1406,17 @@ msgid "Create Filter"
msgstr "Filter erstellen"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Übereinstimmung"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "vorher"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "nacher"
@@ -1636,7 +1636,7 @@ msgstr "Manuelle Säuberung"
msgid "Clear feed data"
msgstr "Feed-Daten löschen"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "Artikel neu bewerten"
@@ -1648,7 +1648,7 @@ msgstr "Zeige Zeitstempel des letzten Artikels"
msgid "Last&nbsp;Article"
msgstr "Letzer&nbsp;Artikel"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Zum Bearbeiten klicken"
@@ -1770,45 +1770,40 @@ msgstr "Keine Feeds gefunden."
msgid "Filter Editor"
msgstr "Filter-Editor"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "Filter <b>%s</b> gespeichert"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Filter <b>%s</b> erstellt"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Filter erstellen"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Bearbeiten"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "Feld"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Parameter"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(Deaktiviert)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(Invertiert)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "Keine Filter definiert."
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "Keine übereinstimmenden Filter gefunden."
@@ -2396,8 +2391,8 @@ msgstr "Sie können die Kategorie nicht abbestellen."
msgid "Subscribed to %d feed(s)."
msgstr "Abonnierte Feeds:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "Keine Feeds ausgewählt."
@@ -2445,40 +2440,40 @@ msgstr "Tags für diesen Artikel bearbeiten"
msgid "Generate new syndication address for this feed?"
msgstr "Neues Icon für diesen Feed hochladen"
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Fehler: Keine Feed URL angegeben."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Fehler: Ungültige Feed URL."
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Kann die Kategorie nicht hinzufügen: kein Name angegeben."
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "Kann die Kategorie nicht hinzufügen: kein Name angegeben."
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Bitte Benutzernamen eingeben:"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "Ausgewählte Label entfernen?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "Keine Label ausgewählt."
-#: prefs.js:484
+#: prefs.js:480
#, fuzzy
msgid ""
"Remove selected users? Neither default admin nor your account will be "
@@ -2487,126 +2482,126 @@ msgstr ""
"ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
"gelöscht"
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "Keine Benutzer ausgewählt."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Ausgewählte Filter entfernen?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "Keine Filter ausgewählt."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "Ausgewählte Feeds abbestellen?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Bitte nur einen Feed auswählen."
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr "Alle nicht bewerteten Artikel im ausgewählten Feed löschen?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Artikel von wievielen Tagen aufbewahren (0 - Standardwert nutzen)?"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
"ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
"gelöscht"
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "Kein Artikel ausgewählt."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Ausgewählte Kategorien entfernen?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "Keine Kategorien ausgewählt."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "Feld für Benutzername darf nicht leer sein."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Bitte nur einen Benutzer auswählen."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Bitte nur einen Filter auswählen."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "Keine OPML Datei zum Hochladen."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "Auf Standardwerte zurücksetzen?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Aktuelle Einstellungen speichern?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr "Artikel in gewählten Feeds neu bewerten?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Alle Artikel neu bewerten? Dieser Vorgang kann viel Zeit in Anspruch nehmen."
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "Filter entfernen %s?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "Änderungen an den gewählten Feeds speichern?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "Label-Farben auf Standardwerte zurücksetzen?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Bitte eine neue Label-Vordergrundfarbe eingeben:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Bitte eine neue Label-Hintergrundfarbe eingeben:"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "Ausgewählte Filter entfernen?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr "Bitte ein Profil zum aktivieren auswählen"
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2694,6 +2689,9 @@ msgstr "Lade Feedliste..."
msgid "Please enter a note for this article:"
msgstr "Tags für diesen Artikel bearbeiten"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "Filter <b>%s</b> gespeichert"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Zu Tiny Tiny RSS zurückkehren"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 4e4cbe7cc..9477b4426 100644
--- a/locale/es_ES/LC_MESSAGES/messages.mo
+++ b/locale/es_ES/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index da37ac0b4..63b9e7900 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2009-11-10 00:12+0100\n"
"Last-Translator: Manuel Gualda Caballero <[email protected]>\n"
"Language-Team: Español <[email protected]>\n"
@@ -323,7 +323,7 @@ msgid "Incorrect username or password"
msgstr "Nombre de usuario o contraseña incorrecta"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Todas las fuentes"
@@ -368,13 +368,13 @@ msgid "Archived articles"
msgstr "Favoritos"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Seleccione:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "No"
@@ -388,7 +388,7 @@ msgid "Invert"
msgstr "Invertir"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Ninguno"
@@ -1099,7 +1099,7 @@ msgid "Sort articles"
msgstr "Marcar el artículo como favorito"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Fecha"
@@ -1251,7 +1251,7 @@ msgstr "Adaptable"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Eliminar"
@@ -1318,7 +1318,7 @@ msgid "Subscribe to Feed"
msgstr "Suscribir a la fuente"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Fuente"
@@ -1370,7 +1370,7 @@ msgstr "Navegador de fuentes"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Buscar"
@@ -1415,17 +1415,17 @@ msgid "Create Filter"
msgstr "Crear filtro"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Coincidir"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "antes"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "después"
@@ -1646,7 +1646,7 @@ msgstr "Purga manual"
msgid "Clear feed data"
msgstr "Limpiar los datos de la fuente"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "Reiniciar la puntuación de los artículos"
@@ -1658,7 +1658,7 @@ msgstr "Mostrar el horario de los últimos artículos"
msgid "Last&nbsp;Article"
msgstr "Último artículo"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Pulse aquí para editar"
@@ -1781,45 +1781,40 @@ msgstr "No se han encontrado fuentes."
msgid "Filter Editor"
msgstr "Editor de filtros"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "Se ha guardado el filtro <strong>%s</strong>"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Se ha creado el filtro <strong>%s</strong>"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Crear filtro"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Editar"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "campo"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Parámetros"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(desactivado)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(inverso)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "No se han definido filtros."
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "No se han encontrado filtros coincidentes."
@@ -2406,8 +2401,8 @@ msgstr "No está suscrito a ninguna fuente."
msgid "Subscribed to %d feed(s)."
msgstr "Suscrito a las fuentes:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "No se han seleccionado fuentes."
@@ -2452,167 +2447,167 @@ msgstr "Por favor, introduzca una nota para este artículo:"
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Error: no se ha indicado la URL de la fuente."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Error: la URL de la fuente no es válida."
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "No se puede añadir la categoría: no se ha especificado el nombre."
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "No se puede añadir la categoría: no se ha especificado el nombre."
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Por favor, introduzca el nombre de usuario:"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr ""
"No se puede crear el usuario: no se ha especificado el nombre de usuario."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "¿Eliminar las etiquetas seleccionadas?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "No se han seleccionado etiquetas."
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "No se han seleccionado usuarios."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "¿Eliminar los filtros seleccionados?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "No se han seleccionado filtros."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Por favor, seleccione una única fuente."
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
"¿Cuántos días desea guardar el artículo? (0 = configuración por defecto)"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "No se ha seleccionado ningún artículo."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "¿Eliminar las categorías seleccionadas?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "No se han seleccionado categorías."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "El campo de nombre de usuario no puede dejarse en blanco."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Por favor, seleccione un único usuario."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "¿Reajustar la contraseña del usuario seleccionado?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Por favor, seleccione un único filtro."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "No hay fichero OPML que subir."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "¿Reajustar a las opciones por defecto?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "¿Guardar la configuración actual?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr ""
"¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"¿Reiniciar la puntuación de todos los artículos? Esta operación puede tomar "
"algo de tiempo."
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "¿Eliminar el filtro %s?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "¿Reajustar los colores de la etiqueta a las opciones por defecto?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Por favor, introduzca un nuevo color de primer plano para la etiqueta:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Por favor, introduzca un nuevo color de fondo para la etiqueta:"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "¿Eliminar los filtros seleccionados?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2699,6 +2694,9 @@ msgstr "Cargando la lista de la fuente..."
msgid "Please enter a note for this article:"
msgstr "Por favor, introduzca una nota para este artículo:"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "Se ha guardado el filtro <strong>%s</strong>"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Volver a Tiny Tiny RSS"
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index b00db0050..c8282f95b 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 33c2de150..0155ed983 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2007-11-20 23:01+0100\n"
"Last-Translator: Ploc <[email protected]>\n"
"Language-Team: Français <[email protected]>\n"
@@ -323,7 +323,7 @@ msgid "Incorrect username or password"
msgstr "Login ou mot de passe incorrect"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Tous les flux"
@@ -366,13 +366,13 @@ msgid "Archived articles"
msgstr "Articles archivés"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Sélectionner :"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Tout"
@@ -386,7 +386,7 @@ msgid "Invert"
msgstr "Inverse"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Aucun"
@@ -918,7 +918,7 @@ msgstr "Créer un nouveau compte"
#: login_form.php:169
msgid "Use less traffic"
-msgstr "Connexion lente"
+msgstr "Minimiser l'usage du trafic"
#: opml.php:157 opml.php:162
msgid "OPML Utility"
@@ -1078,7 +1078,7 @@ msgid "Sort articles"
msgstr "Classer les articles"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Date"
@@ -1170,7 +1170,7 @@ msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
#: modules/opml_domdoc.php:82
#, php-format
msgid "Setting preference key %s to %s"
-msgstr "La touche de préférence de %s est %s"
+msgstr "Paramétrage de la préférence %s à %s"
#: modules/opml_domdoc.php:128 modules/opml_domxml.php:107
msgid "is already imported."
@@ -1218,7 +1218,7 @@ msgstr "(actif)"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Supprimer"
@@ -1280,7 +1280,7 @@ msgid "Subscribe to Feed"
msgstr "S'abonner au flux"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Flux"
@@ -1330,7 +1330,7 @@ msgstr "Navigateur de flux"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Rechercher"
@@ -1372,17 +1372,17 @@ msgid "Create Filter"
msgstr "Créer un filtre"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Correspondance"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "avant"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "après"
@@ -1594,7 +1594,7 @@ msgstr "Purger manuellement"
msgid "Clear feed data"
msgstr "Purger les données de flux"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "Recalculer le score des articles"
@@ -1606,7 +1606,7 @@ msgstr "Afficher l'heure du dernier article"
msgid "Last&nbsp;Article"
msgstr "Dernier article"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Cliquer pour éditer"
@@ -1735,45 +1735,40 @@ msgstr "Aucun flux trouvé."
msgid "Filter Editor"
msgstr "Éditeur de filtre"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "Filtre <b>%s</b> enregistré"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Filtre <b>%s</b> créé"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Créer un filtre"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Editer"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "Champs"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Paramètres"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(Désactivé)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(Inverse)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "Aucun filtre défini."
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "Aucun filtre correspondant trouvé."
@@ -2344,8 +2339,8 @@ msgstr "Vous êtes déjà abonné à ce flux."
msgid "Subscribed to %d feed(s)."
msgstr "Abonné au(x) flux %d."
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "Aucun flux sélectionné."
@@ -2389,39 +2384,39 @@ msgstr "Veuillez saisir un titre pour cette catégorie :"
msgid "Generate new syndication address for this feed?"
msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Erreur : aucune URL de flux n'a été fournie."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Erreur : URL du flux est invalide."
-#: prefs.js:254
+#: prefs.js:250
msgid "Can't add profile: no name specified."
msgstr "Impossible d'ajouter un profil : aucun nom fourni."
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "Impossible d'ajouter une catégorie : aucun nom fourni."
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Veuillez saisir le login :"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "Supprimer les étiquettes sélectionnées ?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "Aucune étiquette sélectionnée."
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
@@ -2429,127 +2424,127 @@ msgstr ""
"Supprimer les utilisateurs sélectionnés ? l'administrateur par défaut et "
"votre compte utilisateur ne seront pas supprimés."
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "Aucun utilisateur sélectionné."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Supprimer les filtres sélectionnés ?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "Aucun filtre sélectionné."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "Se désabonner des flux sélectionnés ?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Veuillez sélectionner un seul flux."
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
"Combien de jour faut-il conserver l'article (entrer 0 pour utiliser la "
"valeur par défaut)"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
"Supprimer les profils sélectionnés ? Les profils actifs et par défaut ne "
"seront pas supprimés."
-#: prefs.js:664
+#: prefs.js:660
msgid "No profiles selected."
msgstr "Aucun profil sélectionné."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Supprimer les catégories sélectionnées ?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "Aucune catégorie sélectionnée."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "Le nom ne peut pas être vide."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Veuillez sélectionner un seul utilisateur."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Veuillez sélectionner un seul filtre."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "Aucun fichier OPML à envoyer."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "Revenir aux valeurs par défaut ?"
-#: prefs.js:1502
+#: prefs.js:1498
msgid "Replace current OPML publishing address with a new one?"
msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Enregistrer la configuration actuelle ?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr "Recalculer le score des articles des flux sélectionnés ?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Recalculer le score de tous les articles ? Cette opération peut prendre "
"beaucoup de temps."
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "Supprimer le filtre %s ?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "Enregistrer les modifications aux flux sélectionnés ?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Veuillez saisir la couleur d'avant-plan de l'étiquette :"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Veuillez saisir la couleur d'arrière-plan de l'étiquette :"
-#: prefs.js:1950
+#: prefs.js:1946
msgid "Activate selected profile?"
msgstr "Activer le profil selectionné ?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr "Veuillez sélectionner un profil à activer"
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
"Cela va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
@@ -2632,3 +2627,6 @@ msgstr "Chargement en cours..."
#: viewfeed.js:1843
msgid "Please enter a note for this article:"
msgstr "Veuillez saisir une note pour cet article :"
+
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "Filtre <b>%s</b> enregistré"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 2a07e37ec..3b905a467 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 b7b6df65e..2fb0cf2bc 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2009-08-17 23:04+0100\n"
"Last-Translator: MoJo2009\n"
"Language-Team: HUNGARIAN\n"
@@ -316,7 +316,7 @@ msgid "Incorrect username or password"
msgstr "Hibás felhasználói név vagy jelszó"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Összes hírcsatorna"
@@ -361,13 +361,13 @@ msgid "Archived articles"
msgstr "Tárolt hírek"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Kiválaszt:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Mind"
@@ -381,7 +381,7 @@ msgid "Invert"
msgstr "Fordított"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Kijelölés törlése"
@@ -1077,7 +1077,7 @@ msgid "Sort articles"
msgstr "Tárolt hírek"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Dátum"
@@ -1229,7 +1229,7 @@ msgstr "Adaptív"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Eltávolít"
@@ -1294,7 +1294,7 @@ msgid "Subscribe to Feed"
msgstr "Feliratkozás hírcsatornára"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Hírcsatorna"
@@ -1346,7 +1346,7 @@ msgstr "Hírcsatorna-böngésző"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Keresés"
@@ -1392,17 +1392,17 @@ msgid "Create Filter"
msgstr "Szárő létrehozása"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Egyezés"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr ""
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "elteltével"
@@ -1623,7 +1623,7 @@ msgstr "Kézi takarítás (régi hírek törlése)"
msgid "Clear feed data"
msgstr "Hírcsatorna-adatok törlése"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr ""
@@ -1635,7 +1635,7 @@ msgstr "Mutasd az utolsó hírek időpontjait"
msgid "Last&nbsp;Article"
msgstr "Utolsó&nbsp;Hír"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Kattintson ide a szerkesztéshez"
@@ -1757,45 +1757,40 @@ msgstr "Nem található hírcsatorna."
msgid "Filter Editor"
msgstr "Szűrők módosítása"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "Szűrő elmentve: <b>%s</b>"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Szűrő létrehozva: <b>%s</b>"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Szűrő létrehozása"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Szerkesztése"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "Mező"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Paraméterek"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(Kikapcsolva)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(Fordított)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "Nincs szűrő definiálva."
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "Nem található a feltételeknek megfelelő szűrő."
@@ -2369,8 +2364,8 @@ msgstr "Ebből a kategóriából nem ."
msgid "Subscribed to %d feed(s)."
msgstr "Feliratkozva a következő hírcsatornákra:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "Nincs kiválasztott hírcsatorna."
@@ -2415,165 +2410,165 @@ msgstr "Megyjegyzés csatolása ehhez a hírhez:"
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Hiba: Nincs megadva hírcsatorna URL."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Hiba: Hibás hírcsatorna-URL cím"
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Kategória hozzáadása sikertelen: nincs megadva név."
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "Kategória hozzáadása sikertelen: nincs megadva név."
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Kérem adja meg a felhasználói nevét:"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "Eltávolítja a kiválasztott címkéket?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "Nincs kiválasztott címke."
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "Nincs kijelölt felhasználó."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Eltávolítja a kiválasztott szűrőket?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "Nincs kiválasztott szűrő."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr "Eltávolítja az összes csillag nélküli hírt a kijelölt hírcsatornából?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
"Milyen régi híreket szeretne megtartani (napokban; 0 - alapértelmezett)?"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "Nincs kiválasztott hír."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Kiválasztott kategóriák eltávolítása?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "Nincs kategória kiválaszta."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "A felhasználói név nem maradhat üresen."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Kérem csak egy felhasználót jelöljön meg!"
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "Visszaállítja akiválasztott felhasználók jelszavakit?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Kérem csak egy szűrőt jelöljön meg!"
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "Nincs feltöltendő OPML fájl megjelölve."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "Visszaállítja a gyári beállításokat?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr ""
"Biztosan lecseréli a jelenlegi publikált hírek hírcsatornájának címét egy "
"újra?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Menti a jelenlegi beállításokat?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr ""
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "Eltávolítja a következő szűrőt: %s?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "Visszaállítja a címkeszíneket az alapértelmezettre?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Adja meg az új címke-előtérrszín nevét:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Adja meg az új címke-háttérszín nevét:"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "Eltávolítja a kiválasztott szűrőket?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2660,6 +2655,9 @@ msgstr "Hírcsatornák töltése, kérem várjon..."
msgid "Please enter a note for this article:"
msgstr "Megyjegyzés csatolása ehhez a hírhez:"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "Szűrő elmentve: <b>%s</b>"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Vissza az RSS-olvasóhoz"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 32417069f..081c5bc78 100644
--- a/locale/it_IT/LC_MESSAGES/messages.mo
+++ b/locale/it_IT/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 3094f78d5..d71b77017 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ttrss-1.4.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2010-04-19 16:36+0200\n"
"Last-Translator: Andrea Zagli <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -321,7 +321,7 @@ msgid "Incorrect username or password"
msgstr "Nome utente o password sbagliati"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Tutti i notiziari"
@@ -365,13 +365,13 @@ msgid "Archived articles"
msgstr "Articoli archiviati"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Seleziona:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Tutti"
@@ -385,7 +385,7 @@ msgid "Invert"
msgstr "Inverti"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Nessuno"
@@ -1086,7 +1086,7 @@ msgid "Sort articles"
msgstr "Ordina articoli"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Data"
@@ -1231,7 +1231,7 @@ msgstr "(attivo)"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Rimuovi"
@@ -1296,7 +1296,7 @@ msgid "Subscribe to Feed"
msgstr "Sottoscrivi il notiziario"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Notiziario"
@@ -1347,7 +1347,7 @@ msgstr "Browser notiziari"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Cerca"
@@ -1389,17 +1389,17 @@ msgid "Create Filter"
msgstr "Crea filtro"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Corrisponde"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "prima"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "dopo"
@@ -1615,7 +1615,7 @@ msgstr "Eliminazione manuale"
msgid "Clear feed data"
msgstr "Pulisci i dati del notiziario"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "Cambio punteggio degli articoli"
@@ -1627,7 +1627,7 @@ msgstr "Mostrare l&apos;ora dell&apos;ultimo articolo"
msgid "Last&nbsp;Article"
msgstr "Ultimo&nbsp;articolo"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Fare clic per modificare"
@@ -1749,45 +1749,40 @@ msgstr "Nessun notiziario trovato."
msgid "Filter Editor"
msgstr "Editor filtri"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "Filtro <b>%s</b> salvato"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Filtro <b>%s</b> creato"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Crea filtro"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Modifica"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "Campo"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Parametri"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(disabilitato)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(inverso)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "Nessun filtro definito."
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "Nessun filtro trovato che corrisponde."
@@ -2369,8 +2364,8 @@ msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
msgid "Subscribed to %d feed(s)."
msgstr "Sottoscrizione effettuata a %d notiziari."
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "Nessun notiziario selezionato."
@@ -2416,39 +2411,39 @@ msgstr "Inserire una nota per questo articolo:"
msgid "Generate new syndication address for this feed?"
msgstr "Caricare una nuova icona per questo notiziario?"
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Errore: non è stato fornito alcun URL di notiziario."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Errore: URL non valido del notiziario."
-#: prefs.js:254
+#: prefs.js:250
msgid "Can't add profile: no name specified."
msgstr "Impossibile aggiungere il profilo: nessun nome specificato."
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "Impossibile aggiungere la categoria: nessun nome specificato."
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Inserire l'accesso:"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "Impossibile creare l'utente: nessun accesso specificato."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "Rimuovere le etichette selezionate?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "Nessuna etichetta selezionata."
-#: prefs.js:484
+#: prefs.js:480
#, fuzzy
msgid ""
"Remove selected users? Neither default admin nor your account will be "
@@ -2457,126 +2452,126 @@ msgstr ""
"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
"saranno rimossi."
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "Nessun utente selezionato."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Rimuovere i filtri selezionati?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "Nessun filtro selezionato."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Selezionare solo un notiziario."
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
"saranno rimossi."
-#: prefs.js:664
+#: prefs.js:660
msgid "No profiles selected."
msgstr "Nessun profilo selezionato."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Rimuovere le categorie selezionate?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "Nessuna categoria selezionata."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "Il campo accesso non può essere vuoto."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Selezionare un solo utente."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "Reimpostare la password per l&apos;utente selezionato?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Selezionare solo un filtro."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "Nessun file OPML da caricare."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "Reimpostare ai valori predefiniti?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Sostituire l&apos;indirizzo di pubblicazione attuale con uno nuovo?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Salvare la configurazione attuale?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Cambiare il punteggio a tutti i notiziari? Questa operazione può durare "
"molto tempo."
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "Rimuovere il filtro «%s»?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "Salvare i cambiamenti ai notiziari selezionati?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "Reimpostare i colori delle etichette ai valori predefiniti?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Inserire il colore del testo nella nuova etichetta:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Inserire il colore di sfondo della nuova etichetta:"
-#: prefs.js:1950
+#: prefs.js:1946
msgid "Activate selected profile?"
msgstr "Attivare il profilo selezionato?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr "Scegliere un profilo da attivare"
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2660,6 +2655,9 @@ msgstr "Caricamento elenco notiziari..."
msgid "Please enter a note for this article:"
msgstr "Inserire una nota per questo articolo:"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "Filtro <b>%s</b> salvato"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Ritorna a Tiny Tiny RSS"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index a0cbe2772..a7444f772 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index d176f5dd0..0cd1f95a3 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tt-rss unstable\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2009-05-12 03:25+0900\n"
"Last-Translator: Tadashi Jokagi <[email protected]>\n"
"Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -321,7 +321,7 @@ msgid "Incorrect username or password"
msgstr "ユーザー名かパスワードが正しくありません"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "すべてのフィード"
@@ -366,13 +366,13 @@ msgid "Archived articles"
msgstr "未読記事"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "選択:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "すべて"
@@ -386,7 +386,7 @@ msgid "Invert"
msgstr "反転"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "なし"
@@ -1050,7 +1050,7 @@ msgid "Sort articles"
msgstr "記事を保管しました"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "日付"
@@ -1201,7 +1201,7 @@ msgstr ""
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "削除"
@@ -1258,7 +1258,7 @@ msgid "Subscribe to Feed"
msgstr "フィードを購読する"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "フィード"
@@ -1310,7 +1310,7 @@ msgstr "フィードブラウザー"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "検索"
@@ -1356,17 +1356,17 @@ msgid "Create Filter"
msgstr "フィルターを作成する"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "一致"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "前"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "後"
@@ -1587,7 +1587,7 @@ msgstr "手動削除"
msgid "Clear feed data"
msgstr "フィードデータの消去"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "記事のスコアの再集計"
@@ -1599,7 +1599,7 @@ msgstr "最後の記事の時間を表示する"
msgid "Last&nbsp;Article"
msgstr "最後の記事"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "編集するにはクリック"
@@ -1717,45 +1717,40 @@ msgstr "フィードがありません。"
msgid "Filter Editor"
msgstr "フィルターエディター"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "フィルター <b>%s</b> を保存しました"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "フィルター <b>%s</b> を作成しました"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "フィルターを作成する"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "編集"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "項目"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "パラメーター"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(無効です)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr ""
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "フィルターが定義されていません。"
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "一致するフィルターが見つかりません。"
@@ -2326,8 +2321,8 @@ msgstr "カテゴリーから購読をやめることができません。"
msgid "Subscribed to %d feed(s)."
msgstr "フィードを購読する:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "選択されたフィードはありません。"
@@ -2372,164 +2367,164 @@ msgstr "このアーティクルのノートを入力してください:"
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "エラー: フィードの URL が入力されていません。"
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "エラー: フィードの URL が正しくありません。"
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "カテゴリーが追加できません: 名前が指定されていません。"
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "カテゴリーが追加できません: 名前が指定されていません。"
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "ログイン名を入力してください:"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "選択したラベルを削除しますか?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "選択されたラベルはありません。"
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "選択されたユーザーはありません。"
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "選択されたフィルターを削除しますか?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "選択されたフィルターはありません。"
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "選択されたフィードの購読をやめますか?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "フィードをひとつだけ選択してください。"
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr ""
"選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr "記事を維持したい日数は? (0: 標準を使う)"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "選択された記事はありません。"
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "選択されたカテゴリーを削除しますか?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "選択されたカテゴリーはありません。"
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "ログイン名の項目は空にできません。"
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "ひとつだけユーザーを選択してください。"
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "選択したユーザーのパスワードをリセットしますか?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "フィルターをひとつだけ選択してください。"
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "アップロードする OPML ファイルがありません。"
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "標準に戻しますか?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "新しいもので現在の公開アドレスを置き換えますか?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "現在の設定を保存しますか?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr "選択したフィードの記事のスコアを再計算しますか?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "フィルター %s を削除しますか?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "選択したフィードの変更を保存しますか?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "ラベルの色を標準にリセットしますか?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "新しいラベルの前景色を入力してください:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "新しいラベルの背景色を入力してください:"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "選択されたフィルターを削除しますか?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2616,6 +2611,9 @@ msgstr "フィード一覧を読み込んでいます..."
msgid "Please enter a note for this article:"
msgstr "このアーティクルのノートを入力してください:"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "フィルター <b>%s</b> を保存しました"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Tiny Tiny RSS に戻る"
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 5ac1686f7..c31a11387 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 c10212ca4..3a4d0e65b 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2009-05-02 00:10+0100\n"
"Last-Translator: Christian Lomsdalen <[email protected]>\n"
"Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -323,7 +323,7 @@ msgid "Incorrect username or password"
msgstr "Feil brukernavn og/eller passord"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Alle Nyhetsstrømmer"
@@ -368,13 +368,13 @@ msgid "Archived articles"
msgstr "Lagrede artikler"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Velg:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Alle"
@@ -388,7 +388,7 @@ msgid "Invert"
msgstr "Motsatt"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Ingen"
@@ -1086,7 +1086,7 @@ msgid "Sort articles"
msgstr "Lagrede artikler"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Dato"
@@ -1238,7 +1238,7 @@ msgstr "Tilpasset"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Fjern"
@@ -1304,7 +1304,7 @@ msgid "Subscribe to Feed"
msgstr "Abonner på nyhetsstrøm"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Nyhetsstrøm"
@@ -1356,7 +1356,7 @@ msgstr "Nyhetsstrømsredigerer"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Søk"
@@ -1402,17 +1402,17 @@ msgid "Create Filter"
msgstr "Lag filter"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Match"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "før"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "etter"
@@ -1633,7 +1633,7 @@ msgstr "Slett manuelt"
msgid "Clear feed data"
msgstr "Slett nyhetsstrømsdata"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "Tilbakestill poengsummene for artiklene"
@@ -1645,7 +1645,7 @@ msgstr "Vis tidspunktene for siste artikkel"
msgid "Last&nbsp;Article"
msgstr "Siste&nbsp;Artikkel"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Trykk for å endre"
@@ -1768,45 +1768,40 @@ msgstr "Ingen nyhetsstrømmer ble funnet."
msgid "Filter Editor"
msgstr "Filteradministrering"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "Lagret filter <b>%s</b>"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Laget filter <b>%s</b>"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Lag filter"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Rediger"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "Felt"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Parametre"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(Avskrudd)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(Motsatt)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "Ingen filtre er valgt"
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "Ingen filtre ble funnet."
@@ -2393,8 +2388,8 @@ msgstr "Du kan ikke fjerne abonnement fra kategorien."
msgid "Subscribed to %d feed(s)."
msgstr "Abonnerer på følgende nyhetsstrømmer:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "Ingen nyhetsstrømmer er valgt"
@@ -2439,162 +2434,162 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Feil: Ingen nyhetsstrømsadresse ble oppgitt."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Feil: Ugyldig nyhetsstrømsadresse."
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Kan ikke legge til kategori: mangler navn"
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "Kan ikke legge til kategori: mangler navn"
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Vennligst skriv inn brukernavn:"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "Kan ikke legge til bruker: brukernavn mangler."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "Fjerne merkede merkelapper?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "Ingen merkelapper er markert"
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "Ingen bruker er markert"
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Fjerne valgte filtre?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "Ingen filtre er valgt"
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "Fjern abonnement på valgte nyhetsstrømmer"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Vennligst velg kun en nyhetsstrøm"
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "Ingen artikkel er valgt."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Fjerne valgte kategorier?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "Ingen kategorier er valgt."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "Brukernavn kan ikke være blankt"
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Vennligst velg kun en bruker"
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "Nullstill passordet til utvalgte bruker?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Vennligst velg kun et filter"
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "Ingen OPML-fil til å lastes opp."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "Tilbakefør til standardinnstillingene"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Lagre nåværende konfigurasjon?"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "Fjerne %s filteret?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "Sett merkelappsfargene til standard?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Vennligst legg inn forgrunnsfarge for merkelappen:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Vennligst skriv inn bakgrunnsfarge for merkelappen:"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "Fjerne valgte filtre?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2681,6 +2676,9 @@ msgstr "Laster nyhetsstrømmer..."
msgid "Please enter a note for this article:"
msgstr "Vennligst skriv inn et notat for denne artikkelen:"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "Lagret filter <b>%s</b>"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Returner til Tiny Tiny RSS"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index d9fb693b9..9040d25a1 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 7e9603764..79bc3c0b3 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: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\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"
@@ -306,7 +306,7 @@ msgid "Incorrect username or password"
msgstr ""
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Todos os feeds"
@@ -352,13 +352,13 @@ msgid "Archived articles"
msgstr "Favoritos"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Selecione:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Todos"
@@ -373,7 +373,7 @@ msgid "Invert"
msgstr "(Inverso)"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Nenhum"
@@ -1046,7 +1046,7 @@ msgid "Sort articles"
msgstr "Favoritos"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
#, fuzzy
msgid "Date"
msgstr "Atualizar"
@@ -1199,7 +1199,7 @@ msgstr ""
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Remover"
@@ -1254,7 +1254,7 @@ msgid "Subscribe to Feed"
msgstr ""
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Feed"
@@ -1309,7 +1309,7 @@ msgstr "Editor de Feed"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr ""
@@ -1355,17 +1355,17 @@ msgid "Create Filter"
msgstr "Criar um usuário"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr ""
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr ""
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
#, fuzzy
msgid "after"
msgstr "Atualizar"
@@ -1591,7 +1591,7 @@ msgstr ""
msgid "Clear feed data"
msgstr "Salvando o Feed..."
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
#, fuzzy
msgid "Rescore articles"
msgstr "Favoritos"
@@ -1604,7 +1604,7 @@ msgstr ""
msgid "Last&nbsp;Article"
msgstr ""
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr ""
@@ -1719,46 +1719,41 @@ msgstr "Sem Feeds para exibir."
msgid "Filter Editor"
msgstr "Editor de Feed"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr ""
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr ""
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr ""
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Editar"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
#, fuzzy
msgid "Field"
msgstr "Feed"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr ""
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(Desativado)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(Inverso)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr ""
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr ""
@@ -2358,8 +2353,8 @@ msgstr ""
msgid "Subscribed to %d feed(s)."
msgstr "Removendo o Feed..."
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "Nenhum feed foi selecionado."
@@ -2404,165 +2399,165 @@ msgstr "Salvando categoria..."
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr ""
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr ""
-#: prefs.js:254
+#: prefs.js:250
msgid "Can't add profile: no name specified."
msgstr ""
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr ""
-#: prefs.js:298
+#: prefs.js:294
#, fuzzy
msgid "Please enter login:"
msgstr "Último Login"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr ""
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr ""
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr ""
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "Nenhum usuário foi selecionado."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "Nenhum filtro foi selecionado."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr ""
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Por favor selecione somente um feed"
-#: prefs.js:594
+#: prefs.js:590
#, fuzzy
msgid "Erase all non-starred articles in selected feed?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "Nenhum filtro foi selecionado."
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Remover as categorias selecionadas?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "Nenhuma categoria foi selecionada."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "O campo de Login não pode ser vazio."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Por favor selecione somente um usuário."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr ""
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Por favor selecione somente um filtro."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "Nenhum arquivo OPML para upload."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr ""
-#: prefs.js:1502
+#: prefs.js:1498
msgid "Replace current OPML publishing address with a new one?"
msgstr ""
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Salvar a configuração atual?"
-#: prefs.js:1639
+#: prefs.js:1635
#, fuzzy
msgid "Rescore articles in selected feeds?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
-#: prefs.js:1681
+#: prefs.js:1677
#, fuzzy
msgid "Remove filter %s?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:1711
+#: prefs.js:1707
#, fuzzy
msgid "Save changes to selected feeds?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr ""
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr ""
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr ""
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "Remover os filtros selecionados?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index d75dc359e..5fc90b3a7 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 962621214..8a7ad96b9 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: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2009-05-29 14:38+0300\n"
"Last-Translator: Max Kamashev <[email protected]>\n"
"Language-Team: Русский <[email protected]>\n"
@@ -327,7 +327,7 @@ msgid "Incorrect username or password"
msgstr "Некорректное имя пользователя или пароль"
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "Все каналы"
@@ -372,13 +372,13 @@ msgid "Archived articles"
msgstr "Сохранённые статьи"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "Выбрать:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "Все"
@@ -392,7 +392,7 @@ msgid "Invert"
msgstr "Инвертировать"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "Ничего"
@@ -1083,7 +1083,7 @@ msgid "Sort articles"
msgstr "Сохранённые статьи"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
msgid "Date"
msgstr "Дата"
@@ -1235,7 +1235,7 @@ msgstr "Адаптивно"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "Удалить"
@@ -1300,7 +1300,7 @@ msgid "Subscribe to Feed"
msgstr "Подписаться на канал"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Канал"
@@ -1352,7 +1352,7 @@ msgstr "Обзор Каналов"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "Поиск"
@@ -1398,17 +1398,17 @@ msgid "Create Filter"
msgstr "Создать фильтр"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "Искать"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr "перед"
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
msgid "after"
msgstr "после"
@@ -1629,7 +1629,7 @@ msgstr "Ручная очистка"
msgid "Clear feed data"
msgstr "Очистить данные канала."
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
msgid "Rescore articles"
msgstr "Заново оценить статьи"
@@ -1641,7 +1641,7 @@ msgstr "Показать дату последней статьи"
msgid "Last&nbsp;Article"
msgstr "Последняя&nbsp;статья"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr "Щёлкните для редактирования"
@@ -1764,45 +1764,40 @@ msgstr "Каналы не найдены."
msgid "Filter Editor"
msgstr "Редактор фильтров"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "Фильтр <b>%s</b> сохранен"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "Добавлен фильтр <b>%s</b>"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "Создать фильтр"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "Редактировать"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
msgid "Field"
msgstr "Поле"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
msgid "Params"
msgstr "Параметры:"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(Отключен)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(Инвертирован)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "Фильтры отсутствуют."
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
msgid "No matching filters found."
msgstr "Не найдено совпадений с фильтром."
@@ -2387,8 +2382,8 @@ msgstr "Нельзя отписаться от категории."
msgid "Subscribed to %d feed(s)."
msgstr "Подписаны каналы:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "Нет выбранных каналов."
@@ -2433,163 +2428,163 @@ msgstr "Пожалуйста, укажите заметку для статьи:
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
msgid "Error: No feed URL given."
msgstr "Ошибка: Канал не отдаёт URL."
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr "Ошибка: Не верный URL канала."
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "Не могу добавить категорию без имени"
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "Не могу добавить категорию без имени"
-#: prefs.js:298
+#: prefs.js:294
msgid "Please enter login:"
msgstr "Пожалуйста, введите логин:"
-#: prefs.js:305
+#: prefs.js:301
msgid "Can't create user: no login specified."
msgstr "Не могу добавить пользователя: не указан логин."
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "Удалить выбранные метки?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "Нет выбранных меток."
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "Нет выбранных пользователей."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "Удалить выбранные фильтры?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "Нет выбранных фильтров."
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "Отписаться от выбранных каналов?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "Пожалуйста выберите только один канал."
-#: prefs.js:594
+#: prefs.js:590
msgid "Erase all non-starred articles in selected feed?"
msgstr "Стереть все не отмеченные статьи в выбранном канале?"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "Статья не выбрана"
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "Удалить выбранные категории?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "Нет выбранных категорий."
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "Поле логина не может быть пустым."
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "Пожалуйста выберите только одного пользователя."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "Сбросить пароль выбранного пользователя?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "Пожалуйста выберите только один фильтр."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "Нет файла OPML для загрузки."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "Сбросить настройки?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "Изменить текущий адрес публикации на новый?"
-#: prefs.js:1538
+#: prefs.js:1534
msgid "Save current configuration?"
msgstr "Сохранить конфигурацию"
-#: prefs.js:1639
+#: prefs.js:1635
msgid "Rescore articles in selected feeds?"
msgstr "Заново оценить статьи в выбранных каналах?"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
"Оценить заново все статьи? Эта операция может продолжаться длительное время."
-#: prefs.js:1681
+#: prefs.js:1677
msgid "Remove filter %s?"
msgstr "Удалить фильтр %s?"
-#: prefs.js:1711
+#: prefs.js:1707
msgid "Save changes to selected feeds?"
msgstr "Сохранить изменения выбранных каналов?"
-#: prefs.js:1791
+#: prefs.js:1787
msgid "Reset label colors to default?"
msgstr "Сбросить метку цветов, на цвета по умолчанию?"
-#: prefs.js:1816
+#: prefs.js:1812
msgid "Please enter new label foreground color:"
msgstr "Пожалуйста, введите новую метку цвета переднего плана:"
-#: prefs.js:1818
+#: prefs.js:1814
msgid "Please enter new label background color:"
msgstr "Пожалуйста, введите новую метку цвета фона:"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "Удалить выбранные фильтры?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2676,6 +2671,9 @@ msgstr "Загрузка списка каналов..."
msgid "Please enter a note for this article:"
msgstr "Пожалуйста, укажите заметку для статьи:"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "Фильтр <b>%s</b> сохранен"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "Вернуться к Tiny Tiny RSS"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 1cbf158cf..eaece08a2 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 4cbee35c8..2c32a3f80 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: 2010-11-17 15:38+0300\n"
+"POT-Creation-Date: 2010-11-17 16:11+0300\n"
"PO-Revision-Date: 2007-08-19 19:03+0800\n"
"Last-Translator: sluke <[email protected]>\n"
"Language-Team: hicode.org <[email protected]>\n"
@@ -307,7 +307,7 @@ msgid "Incorrect username or password"
msgstr ""
#: functions.php:2947 modules/popup-dialog.php:407
-#: modules/pref-filters.php:426
+#: modules/pref-filters.php:421
msgid "All feeds"
msgstr "所有feed"
@@ -354,13 +354,13 @@ msgid "Archived articles"
msgstr "星级文章"
#: functions.php:4093 modules/popup-dialog.php:85 modules/pref-feeds.php:895
-#: modules/pref-feeds.php:1106 modules/pref-filters.php:383
+#: modules/pref-feeds.php:1106 modules/pref-filters.php:378
#: modules/pref-labels.php:212 modules/pref-users.php:428
msgid "Select:"
msgstr "选择:"
#: functions.php:4094 modules/popup-dialog.php:86 modules/pref-feeds.php:896
-#: modules/pref-feeds.php:1107 modules/pref-filters.php:384
+#: modules/pref-feeds.php:1107 modules/pref-filters.php:379
#: modules/pref-labels.php:213 modules/pref-users.php:429
msgid "All"
msgstr "所有"
@@ -375,7 +375,7 @@ msgid "Invert"
msgstr "(逆)"
#: functions.php:4097 modules/popup-dialog.php:87 modules/pref-feeds.php:897
-#: modules/pref-feeds.php:1108 modules/pref-filters.php:385
+#: modules/pref-feeds.php:1108 modules/pref-filters.php:380
#: modules/pref-labels.php:214 modules/pref-users.php:430
msgid "None"
msgstr "无"
@@ -1061,7 +1061,7 @@ msgid "Sort articles"
msgstr "星级文章"
#: tt-rss.php:154 modules/popup-dialog.php:478 modules/pref-filters.php:53
-#: modules/pref-filters.php:481
+#: modules/pref-filters.php:476
#, fuzzy
msgid "Date"
msgstr "更新"
@@ -1220,7 +1220,7 @@ msgstr "自适应"
#: modules/popup-dialog.php:151 modules/popup-dialog.php:360
#: modules/pref-feeds.php:284 modules/pref-feeds.php:944
-#: modules/pref-filters.php:154 modules/pref-filters.php:321
+#: modules/pref-filters.php:154 modules/pref-filters.php:316
#: modules/pref-labels.php:169 modules/pref-users.php:387
msgid "Remove"
msgstr "移除"
@@ -1286,7 +1286,7 @@ msgid "Subscribe to Feed"
msgstr "订阅feed"
#: modules/popup-dialog.php:252 modules/pref-feeds.php:92
-#: modules/pref-feeds.php:320 modules/pref-filters.php:413
+#: modules/pref-feeds.php:320 modules/pref-filters.php:408
msgid "Feed"
msgstr "Feed"
@@ -1341,7 +1341,7 @@ msgstr "Feed编辑"
#: modules/popup-dialog.php:331 modules/popup-dialog.php:369
#: modules/popup-dialog.php:440 modules/pref-feeds.php:990
-#: modules/pref-filters.php:311 modules/pref-labels.php:162
+#: modules/pref-filters.php:306 modules/pref-labels.php:162
#: modules/pref-users.php:370
msgid "Search"
msgstr "搜索"
@@ -1388,17 +1388,17 @@ msgid "Create Filter"
msgstr "创建过滤器"
#: modules/popup-dialog.php:473 modules/pref-filters.php:44
-#: modules/pref-filters.php:412
+#: modules/pref-filters.php:407
msgid "Match"
msgstr "匹配"
#: modules/popup-dialog.php:481 modules/pref-filters.php:56
-#: modules/pref-filters.php:453
+#: modules/pref-filters.php:448
msgid "before"
msgstr ""
#: modules/popup-dialog.php:482 modules/pref-filters.php:57
-#: modules/pref-filters.php:454
+#: modules/pref-filters.php:449
#, fuzzy
msgid "after"
msgstr "更新"
@@ -1627,7 +1627,7 @@ msgstr ""
msgid "Clear feed data"
msgstr "所有Feed已更新。"
-#: modules/pref-feeds.php:1020 modules/pref-filters.php:325
+#: modules/pref-feeds.php:1020 modules/pref-filters.php:320
#, fuzzy
msgid "Rescore articles"
msgstr "星级文章"
@@ -1640,7 +1640,7 @@ msgstr "显示最近文章时间"
msgid "Last&nbsp;Article"
msgstr "最后&nbsp;文章"
-#: modules/pref-feeds.php:1198 modules/pref-filters.php:499
+#: modules/pref-feeds.php:1198 modules/pref-filters.php:494
#: modules/pref-users.php:466
msgid "Click to edit"
msgstr ""
@@ -1760,47 +1760,42 @@ msgstr "无feed可订阅。"
msgid "Filter Editor"
msgstr "过滤器编辑"
-#: modules/pref-filters.php:213
-#, php-format
-msgid "Saved filter <b>%s</b>"
-msgstr "保存过滤器<b>%s</b>"
-
-#: modules/pref-filters.php:267
+#: modules/pref-filters.php:262
#, php-format
msgid "Created filter <b>%s</b>"
msgstr "创建过滤器 <b>%s</b>"
-#: modules/pref-filters.php:315 help/3.php:33 help/4.php:25
+#: modules/pref-filters.php:310 help/3.php:33 help/4.php:25
msgid "Create filter"
msgstr "创建过滤器"
-#: modules/pref-filters.php:318 modules/pref-users.php:385
+#: modules/pref-filters.php:313 modules/pref-users.php:385
msgid "Edit"
msgstr "编辑"
-#: modules/pref-filters.php:414
+#: modules/pref-filters.php:409
#, fuzzy
msgid "Field"
msgstr "Feed"
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:410
#, fuzzy
msgid "Params"
msgstr "参数:"
-#: modules/pref-filters.php:488
+#: modules/pref-filters.php:483
msgid "(Disabled)"
msgstr "(不可用)"
-#: modules/pref-filters.php:504
+#: modules/pref-filters.php:499
msgid "(Inverse)"
msgstr "(逆)"
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:519
msgid "No filters defined."
msgstr "未定义过滤器。"
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:521
#, fuzzy
msgid "No matching filters found."
msgstr "未找到文章。"
@@ -2415,8 +2410,8 @@ msgstr "您不能从分类中取消订阅。"
msgid "Subscribed to %d feed(s)."
msgstr "订阅feed:"
-#: functions.js:1041 functions.js:1072 prefs.js:573 prefs.js:603 prefs.js:635
-#: prefs.js:936 prefs.js:956 prefs.js:1655
+#: functions.js:1041 functions.js:1072 prefs.js:569 prefs.js:599 prefs.js:631
+#: prefs.js:932 prefs.js:952 prefs.js:1651
msgid "No feeds are selected."
msgstr "未选择feed."
@@ -2462,173 +2457,173 @@ msgstr "请输入标签主题"
msgid "Generate new syndication address for this feed?"
msgstr ""
-#: prefs.js:224
+#: prefs.js:220
#, fuzzy
msgid "Error: No feed URL given."
msgstr "未能订阅:无 feed URL。"
-#: prefs.js:226
+#: prefs.js:222
msgid "Error: Invalid feed URL."
msgstr ""
-#: prefs.js:254
+#: prefs.js:250
#, fuzzy
msgid "Can't add profile: no name specified."
msgstr "添加分类失败:未指定分类名"
-#: prefs.js:276
+#: prefs.js:272
msgid "Can't add category: no name specified."
msgstr "添加分类失败:未指定分类名"
-#: prefs.js:298
+#: prefs.js:294
#, fuzzy
msgid "Please enter login:"
msgstr "请输入标签主题"
-#: prefs.js:305
+#: prefs.js:301
#, fuzzy
msgid "Can't create user: no login specified."
msgstr "添加用户失败:未登录。"
-#: prefs.js:454
+#: prefs.js:450
msgid "Remove selected labels?"
msgstr "移除选定标记?"
-#: prefs.js:470
+#: prefs.js:466
msgid "No labels are selected."
msgstr "未选定标记."
-#: prefs.js:484
+#: prefs.js:480
msgid ""
"Remove selected users? Neither default admin nor your account will be "
"removed."
msgstr ""
-#: prefs.js:501 prefs.js:826 prefs.js:847 prefs.js:886
+#: prefs.js:497 prefs.js:822 prefs.js:843 prefs.js:882
msgid "No users are selected."
msgstr "未选定用户."
-#: prefs.js:519
+#: prefs.js:515
msgid "Remove selected filters?"
msgstr "移除选定的过滤器?"
-#: prefs.js:535 prefs.js:916
+#: prefs.js:531 prefs.js:912
msgid "No filters are selected."
msgstr "未选定过滤器。"
-#: prefs.js:554
+#: prefs.js:550
msgid "Unsubscribe from selected feeds?"
msgstr "退订选定feed?"
-#: prefs.js:588
+#: prefs.js:584
msgid "Please select only one feed."
msgstr "请只选择一个feed."
-#: prefs.js:594
+#: prefs.js:590
#, fuzzy
msgid "Erase all non-starred articles in selected feed?"
msgstr "标记 %s 中所有访问过的主题为已读"
-#: prefs.js:616
+#: prefs.js:612
msgid "How many days of articles to keep (0 - use default)?"
msgstr ""
-#: prefs.js:648
+#: prefs.js:644
msgid ""
"Remove selected profiles? Active and default profiles will not be removed."
msgstr ""
-#: prefs.js:664
+#: prefs.js:660
#, fuzzy
msgid "No profiles selected."
msgstr "无选定文章。"
-#: prefs.js:676
+#: prefs.js:672
msgid "Remove selected categories?"
msgstr "移除选定分类?"
-#: prefs.js:694
+#: prefs.js:690
msgid "No categories are selected."
msgstr "未选定分类。"
-#: prefs.js:748
+#: prefs.js:744
msgid "Login field cannot be blank."
msgstr "登陆框不能留空。"
-#: prefs.js:831 prefs.js:852 prefs.js:891
+#: prefs.js:827 prefs.js:848 prefs.js:887
msgid "Please select only one user."
msgstr "请只选择一个用户."
-#: prefs.js:856
+#: prefs.js:852
msgid "Reset password of selected user?"
msgstr "重置选定用户密码?"
-#: prefs.js:921
+#: prefs.js:917
msgid "Please select only one filter."
msgstr "请只选择一个过滤器."
-#: prefs.js:997
+#: prefs.js:993
msgid "No OPML file to upload."
msgstr "无OPML文件上传."
-#: prefs.js:1174
+#: prefs.js:1170
msgid "Reset to defaults?"
msgstr "重置默认项?"
-#: prefs.js:1502
+#: prefs.js:1498
#, fuzzy
msgid "Replace current OPML publishing address with a new one?"
msgstr "使用新地址替换当前地址?"
-#: prefs.js:1538
+#: prefs.js:1534
#, fuzzy
msgid "Save current configuration?"
msgstr "保存设置"
-#: prefs.js:1639
+#: prefs.js:1635
#, fuzzy
msgid "Rescore articles in selected feeds?"
msgstr "无选定文章。"
-#: prefs.js:1662
+#: prefs.js:1658
msgid "Rescore all articles? This operation may take a lot of time."
msgstr ""
-#: prefs.js:1681
+#: prefs.js:1677
#, fuzzy
msgid "Remove filter %s?"
msgstr "移除选定的过滤器?"
-#: prefs.js:1711
+#: prefs.js:1707
#, fuzzy
msgid "Save changes to selected feeds?"
msgstr "无选定文章。"
-#: prefs.js:1791
+#: prefs.js:1787
#, fuzzy
msgid "Reset label colors to default?"
msgstr "重置默认项?"
-#: prefs.js:1816
+#: prefs.js:1812
#, fuzzy
msgid "Please enter new label foreground color:"
msgstr "请输入标签主题"
-#: prefs.js:1818
+#: prefs.js:1814
#, fuzzy
msgid "Please enter new label background color:"
msgstr "请输入标签主题"
-#: prefs.js:1950
+#: prefs.js:1946
#, fuzzy
msgid "Activate selected profile?"
msgstr "移除选定的过滤器?"
-#: prefs.js:1966
+#: prefs.js:1962
msgid "Please choose a profile to activate."
msgstr ""
-#: prefs.js:1990
+#: prefs.js:1986
msgid "This will invalidate all previously generated feed URLs. Continue?"
msgstr ""
@@ -2723,6 +2718,9 @@ msgstr "读取中,请等待..."
msgid "Please enter a note for this article:"
msgstr "请输入标签主题"
+#~ msgid "Saved filter <b>%s</b>"
+#~ msgstr "保存过滤器<b>%s</b>"
+
#, fuzzy
#~ msgid "Tiny Tiny RSS"
#~ msgstr "返回Tiny Tiny RSS"