From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 28 Dec 2011 09:31:39 +0000 (+0400)
Subject: update ru_RU translation; misc translation fixes
X-Git-Tag: 1.5.9~21
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e84e813fccff742f0c050fb46f5e982de1127b07;p=tt-rss.git

update ru_RU translation; misc translation fixes
---

diff --git a/include/localized_schema.php b/include/localized_schema.php
index 29663f35..2f68a1bc 100644
--- a/include/localized_schema.php
+++ b/include/localized_schema.php
@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Wed Nov 23 10:40:20 MSK 2011
+<?php # This file has been generated at:  Wed Dec 28 13:30:55 MSK 2011
 
 __("Title");
 __("Title or Content");
@@ -12,6 +12,11 @@ __("Set starred");
 __("Publish article");
 __("Assign tags");
 __("Assign label");
+__("Modify score");
+
+__("General");
+__("Interface");
+__("Advanced");
 
 __('This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once.');
 __('Display expanded list of feed articles, instead of separate displays for headlines and article content');
diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index 55773e32..07f1188c 100644
Binary files a/locale/ca_CA/LC_MESSAGES/messages.mo and b/locale/ca_CA/LC_MESSAGES/messages.mo differ
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 0d49126e..96befc99 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <bratac@bratac.cat>\n"
 "Language-Team: Català <bratac@bratac.cat>\n"
@@ -17,156 +17,136 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Catalan\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Valors per defecte"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "No ho purguis mai"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "Al cap d'1 setmana"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "Al cap de 2 setmanes"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "Al cap d'1 mes"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "Al cap de 2 mesos"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "Al cap de 3 mesos"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Interval per defecte"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Deshabilita les actualitzacions"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Cada 15 minuts"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "cada  30 minuts"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Cada 4 hores"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Cada 12 hores"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Diàriament"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Setmanalment"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Per defecte"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Usuari"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Súper usuari"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Canals"
-
-#: backend.php:201
-#, fuzzy
-msgid "Article not found."
-msgstr "No s'ha trobat el canal."
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "No s'ha trobat el canal."
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "S'està obrint, preneu paciència..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "No teniu prou permisos per a executar aquest script."
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Eina d'actualització de la base de dades"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "No s'ha pogut actualitzar la base de dades"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr ""
 "No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", trobats:"
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr ""
 "Si us plau feu una còpia de seguretat de la base de dades abans de continuar."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -175,54 +155,54 @@ msgstr ""
 "La base de dades de Tiny Tiny RSS s'ha d'actualitzar ( de la versió <b>%d</"
 "b> a la <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Aplica les actualitzacions"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "S'estan realitzant les actualitzacions..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "S'està actualitzant a la versió %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "S'està comprovant la versió..."
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "D'acord!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "Error!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr "Fet. S'ha actualitzat l'esquema de la versió <b>%d</b> a <b>%d</b>."
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
+#: digest.php:58
 #, fuzzy
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -234,16 +214,23 @@ msgstr ""
 "reviseu els vostres\n"
 "/t/t paràmetres del navegador."
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "S'està obrint, preneu paciència..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Hola, "
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Surt"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -251,7 +238,7 @@ msgstr ""
 "Aquest programa necessita XmlHttpRequest per funcionar correctament. Sembla "
 "que el vostre navegador no n'és compatible."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -259,15 +246,15 @@ msgstr ""
 "Aquest programa necessita «cookies» per a funcionar correctament. Sembla que "
 "el vostre navegador no les suporta."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "La comprovació del motor de l'administrador ha fallat."
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "La revisió de la interfície ha fallat."
 
-#: errors.php:18
+#: errors.php:19
 #, fuzzy
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
@@ -276,15 +263,15 @@ msgstr ""
 "Versió de l'esquema de la base de dades incorrecta. &lt;a href='update."
 "php'&gt;Si us plau, actualitzeu-lo&lt;/a&gt;."
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Sol·licitud no autoritzada."
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Cap operació per a fer."
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -292,15 +279,15 @@ msgstr ""
 "No s'ha pogut mostrar el canal: ha fallat la consulta. Si us plau reviseu si "
 "coincideix l'etiqueta o la configuració local."
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr "Denegat. No teniu prou permisos per accedir a aquesta pàgina."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "La comprovació de la configuració ha fallat."
 
-#: errors.php:30
+#: errors.php:31
 #, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
@@ -310,452 +297,261 @@ msgstr ""
 "a \n"
 "\t\tla pàgina oficial per tenir-ne més informació."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
 "bases de dades i de PHP"
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Preferències"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "Comentaris?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Redueix la llista de canals"
 
-#: index.php:127
+#: index.php:148
 #, fuzzy
 msgid "Show articles"
 msgstr "Articles mémorisés"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Adaptatiu"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Tots els articles"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Marcats"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Publicats"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Per llegir"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "Ignora la puntuació"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Actualitzat"
 
-#: index.php:139
+#: index.php:160
 #, fuzzy
 msgid "Sort articles"
 msgstr "Articles mémorisés"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Data"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Títol"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "Puntuació"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Actualitza"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Accions..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Cerca..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Edita aquest canal..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Tots els canals"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Altres accions:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:173
+#: index.php:194
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Núvol d'etiquetes"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Crea una etiqueta"
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Crea un filtre..."
 
-#: index.php:177
+#: index.php:198
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Dreceres de teclat"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Títol o contingut"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Enllaç"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Contingut"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Data de l'article"
-
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Buida els articles"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Marca'l com a destacat"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Publica l'article"
-
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Assigna etiquetes"
-
-#: localized_schema.php:14
-msgid "Assign label"
-msgstr "Assigna-li l'etiqueta"
-
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Aquesta opció és útil si rebeu informació de diferents canals de tipus "
-"«multicanal» amb informació que pot coincidir. Si està desactivat només "
-"mostra els articles repetits un sol cop."
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Affiche les articles sous la forme d'une liste étendue, au lieu de deux "
-"listes séparées (une pour les en-têtes et une pour le contenu)"
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"En fer clic al botó «&nbsp;Marca'ls com a llegits&nbsp;», obre "
-"automàticament el següent canal que contingui articles per llegir."
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Aquesta opció habilita l'enviament diari d'un resum de les capçaleres noves "
-"(i no llegides) a l'adreça electrònica especificada en la configuració de "
-"l'usuari."
-
-#: localized_schema.php:20
-#, fuzzy
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Aquesta opció permet marcar els articles com a llegits automàticament en "
-"mode combinat (excepte en el canal d'articles Frescos) mentre desplaceu la "
-"barra."
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr "Elimina les etiquetes HTML més freqüents en llegir els articles."
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Quan s'autodetectin etiquetes en els articles, aquestes etiquetes no "
-"s'utilitzaran (fes una llista separada per comes)"
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Quan aquesta habiliteu aquesta opció, s'agruparan les capçaleres i etiquetes "
-"per canals."
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
+#: opml.php:70
+#, fuzzy, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "S'està afegint la categoria <b>%s</b>."
 
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Assigna-li l'etiqueta"
 
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
-"Purga els articles vells al cap d'aquest nombre de dies (0 - desactiva la "
-"purga)"
-
-#: localized_schema.php:28
-#, fuzzy
-msgid "Default interval between feed updates"
-msgstr "Interval per defecte per a les actualitzacions dels canals (en minuts)"
-
-#: localized_schema.php:29
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "No s'han trobat articles per a mostrar."
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Permet la duplicació d'articles"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Utiliser les catégories de flux"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "Mostra el contingut en la llista de capçaleres"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Format curt de data"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Format llarg de data"
 
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Mostra els canals combinats"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Amaga els canals que no tinguin missatges per llegir."
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Salta automàticament al canal següent"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Ordena els canals per articles no llegits"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Habilita el resum diari de capçaleres per correu electrònic."
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "S'està afegint el canal..."
 
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Demana la confirmació quan es marqui un canal com a llegit"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Crea un filtre"
 
-#: localized_schema.php:42
+#: opml.php:230
 #, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "En mode combinat expandeix els articles automàticament."
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Elimina les etiquetes dels articles que no siguin segures."
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Llista negra d'etiquetes"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Temps màxim per als articles marcats com a frescos (en hores)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr ""
-"Marca tots els articles enviat en el resum via adreça electrònica com a "
-"llegits"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "En mode combinat expandeix els articles automàticament."
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Purga els articles per llegir"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "Mostra els canals especials quan s'amaguin els canals reals."
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Agrupa les capçaleres en canals virtuals"
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "No mostris imatges en els articles"
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
-
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
+msgid "is already imported."
+msgstr "Ja s'ha importat"
 
-#: localized_schema.php:54
+#: opml.php:250
 #, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Ordena els canals per articles no llegits"
+msgid "OK"
+msgstr "D'acord!"
 
-#: localized_schema.php:55
-#, fuzzy
-msgid "Customize stylesheet"
-msgstr "URL de la fulla d'estils personalitzada."
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Error mentre s'analitza el document."
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Error: si us plau carregueu el fitxer OPML."
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "Eina OPML"
 
-#: opml.php:188
+#: opml.php:492
 #, fuzzy
 msgid "Importing OPML..."
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Torna a les preferències"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Surt de les preferències"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Canals"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "Usuaris"
 
-#: prefs.php:109
+#: prefs.php:108
 #, fuzzy
 msgid "Linked"
 msgstr "Enllaç"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "Creeu un compte nou"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr "L'administrador ha deshabilitat els registres de nous usuaris."
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -765,195 +561,420 @@ msgstr ""
 "especificada. Els comptes en els quals no s'hagi entrat almenys un cop "
 "s'eliminaran passades 24 hores des de l'enviament de la contrasenya."
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "Usuari desitjat:"
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "Comprova la disponibilitat"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "Adreça electrònica:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "Quant és dos més dos:"
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "Envia el registre"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "La vostra informació de registre és incompleta."
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "Aquest nom d'usuari ja existeix."
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "Ha fallat el regsitre"
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "S'ha creat el compte."
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "Actualment no es permet el registre de nous usuaris."
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr ""
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 #, fuzzy
 msgid "Register"
 msgstr "Registrat"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-#, fuzzy
-msgid "Default profile"
-msgstr "Nombre maximal d'articles par défaut"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Dreceres de teclat"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "sense etiqueta"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Navegació"
 
-#: modules/backend-rpc.php:836
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "La vostra informació de registre és incompleta."
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Mou entre canals"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Mou entre articles"
+
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Mostra el diàleg de cerca"
+
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Accions actives de l'article"
+
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Commuta els marcats"
+
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Commuta els publicats"
+
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Commuta els no llegits"
+
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Edita les etiquetes"
+
+#: help/main.php:20
+#, fuzzy
+msgid "Dismiss selected articles"
 msgstr ""
+"Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
-#: modules/backend-rpc.php:848
+#: help/main.php:21
 #, fuzzy
-msgid "Category update has been scheduled."
-msgstr "S'ha modificat la contrasenya."
+msgid "Dismiss read articles"
+msgstr "Amaga els articles llegits."
+
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Obre l'article en una finestra nova"
+
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Marca els articles de sobre/sota de l'actiu com a llegits."
+
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Desplaça el contingut de l'article"
 
-#: modules/backend-rpc.php:861
+#: help/main.php:25
 #, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "No podeu editar aquest tipus de canal."
+msgid "Email article"
+msgstr "Tots els articles"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Ajuda"
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Altres accions"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "No s'ha trobat el tema a l'ajuda."
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Seleccioneu un article mitjançant el ratolí."
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Tanca la finestra"
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Crea una etiqueta"
 
-#: modules/opml_domdoc.php:60
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "S'està afegint la categoria <b>%s</b>."
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Crea un filtre"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Redueix la barra lateral"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "Mostra aquest quadre d'ajuda"
 
-#: modules/opml_domdoc.php:128
+#: help/main.php:41
 #, fuzzy
-msgid "is already imported."
-msgstr "Ja s'ha importat"
+msgid "Multiple articles actions"
+msgstr "Tots els articles"
 
-#: modules/opml_domdoc.php:148
+#: help/main.php:44
 #, fuzzy
-msgid "OK"
-msgstr "D'acord!"
+msgid "Select all articles"
+msgstr "Buida els articles"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Error mentre s'analitza el document."
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Purga els articles per llegir"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Accions actives de l'article"
 
-#: modules/popup-dialog.php:34
+#: help/main.php:47
 #, fuzzy
-msgid "Importing using DOMXML."
-msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
+msgid "Deselect all articles"
+msgstr "Buida els articles"
+
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Accions dels canals"
+
+#: help/main.php:53
+#, fuzzy
+msgid "Refresh active feed"
+msgstr "Actualitza els canals actius"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "Subscriu-te al canal"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Edita el canal"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Marca el canal com a llegit"
+
+#: help/main.php:58
+#, fuzzy
+msgid "Reverse headlines order"
+msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Marca tots els canals com a llegits"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "Si esteu veient les categories reduir-les/ampliar-les"
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "Vés a..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Tots els articles"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Articles nous"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Articles marcats"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Articles publicats"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Núvol d'etiquetes"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Premeu qualsevol tecla per a tancar aquesta finestra."
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Els meus canals"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Altres canals"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Quadre d'accions"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "Els 25 més llegits"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Edita les categories dels canals"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Crea un usuari"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "Concreta la cerca (si n'hi ha)"
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+"<b>Nota:</b> L'accés a les accions depèn de la configuració del Tiny Tiny "
+"RSS o del nivell d'accés del teu usuari."
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Registreu-vos"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Usuari:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr ""
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Especial"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
+msgstr ""
 
-#: modules/popup-dialog.php:40
+#: mobile/prefs.php:24
 #, fuzzy
-msgid "Importing using DOMDocument."
+msgid "Enable categories"
+msgstr "Utiliser les catégories de flux"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr ""
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
 msgstr ""
-"S'està important el fitxer OPML (s'està utilitzant l'extensió DOMDocument)..."
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: mobile/prefs.php:29
+#, fuzzy
+msgid "Browse categories like folders"
+msgstr "Reinicia l'ordre de les categories"
+
+#: mobile/prefs.php:35
+#, fuzzy
+msgid "Show images in posts"
+msgstr "No mostris imatges en els articles"
+
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Mostra/amaga els canals llegits"
+
+#: mobile/prefs.php:45
+#, fuzzy
+msgid "Sort feeds by unread count"
+msgstr "Ordena els canals per articles no llegits"
+
+#: classes/article.php:25
+#, fuzzy
+msgid "Article not found."
+msgstr "No s'ha trobat el canal."
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "No s'ha trobat el tema a l'ajuda."
+
+#: classes/dlg.php:26
+#, fuzzy
+msgid "Prepare data"
+msgstr "Desa"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Tanca la finestra"
+
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"No s'ha trobat l'extensió DOMXML. Fa falta per a versions de PHP inferiors a "
-"la 5."
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Crea un filtre"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptatiu"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+#, fuzzy
+msgid "Default profile"
+msgstr "Nombre maximal d'articles par défaut"
+
+#: classes/dlg.php:170
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 #, fuzzy
 msgid "Activate profile"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr ""
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enllaç als articles publicats del canal."
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "Avís"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -964,11 +985,11 @@ msgstr ""
 "us plau, engegueu el procés del daemon o contacteu amb el responsable "
 "pertinent."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Última actualització:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -978,279 +999,253 @@ msgstr ""
 "un problema com la caiguda. Si us plau, reviseu dels processos del daemon o "
 "contacteu amb el seu propietari."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Canal"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 #, fuzzy
 msgid "Available feeds"
 msgstr "Tots els canals"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Entra"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "Subscriu-t'hi"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Cerca"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr "Mirar-ho per"
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 msgid "match on"
 msgstr "coincideix en"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Contingut"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Títol o contingut"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Limita la cerca a:"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Tots els canals"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Aquest canal"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Coincidència"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "abans"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "després"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "Revisa-ho"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "al camp"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "a"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Acció a realitzar:"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "amb els paràmetres:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Opcions"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Activat"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "Coincidència inversa"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "Posa'l a la categoria:"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "Tester"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Crea"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Feu clic per editar"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Desa"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvol d'etiquetes"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "mostra els canals"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Tots els articles"
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr ""
-
-#: modules/popup-dialog.php:843
-#, fuzzy
-msgid "To:"
-msgstr "Dalt"
-
-#: modules/popup-dialog.php:856
-#, fuzzy
-msgid "Subject:"
-msgstr "Selecciona:"
-
-#: modules/popup-dialog.php:872
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Canvieu l'adreça electrònica"
-
-#: modules/popup-dialog.php:881
+#: classes/dlg.php:821 classes/feeds.php:152
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
 
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 #, fuzzy
 msgid "Details"
 msgstr "Diàriament"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1258,301 +1253,443 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr ""
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr ""
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "Nivell d'accés:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "Nivell d'accés"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "Canals generats"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 #, fuzzy
 msgid "Create link"
 msgstr "Crea"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: classes/feeds.php:94 include/functions.php:3346
+#, fuzzy
+msgid "Visit the website"
+msgstr "Visiteu el web oficial"
+
+#: classes/feeds.php:107
+#, fuzzy
+msgid "View as RSS feed"
+msgstr "Visualitza els canals"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Selecciona:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Tot"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Inverteix"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Cap"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Commuta la selecció"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Selecció:"
+
+#: classes/feeds.php:138
+#, fuzzy
+msgid "Archive"
+msgstr "Data de l'article"
+
+#: classes/feeds.php:140
+#, fuzzy
+msgid "Move back"
+msgstr "Vés enrere"
+
+#: classes/feeds.php:141
+#, fuzzy
+msgid "Delete"
+msgstr "Per defecte"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+#, fuzzy
+msgid "Forward by email"
+msgstr "Marca l'article"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "Flux&nbsp;:"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "No s'ha trobat el canal."
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "Marca'l com a llegit"
+
+#: classes/feeds.php:625 include/functions.php:3318
+#, fuzzy
+msgid "Originally from:"
+msgstr "Mostra el contingut original de l'article"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Edita les etiquetes d'aquest article"
+
+#: classes/feeds.php:712 include/functions.php:3285
+#, fuzzy
+msgid "Open article in new tab"
+msgstr "Obre l'article en una finestra nova"
+
+#: classes/feeds.php:723 include/functions.php:3301
+#, fuzzy
+msgid "Close article"
+msgstr "Buida els articles"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "No hi ha cap article actualitzat."
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "No hi ha articles marcats per mostrar."
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"No s'han trobat articles per a mostrar. Podeu assignar articles a etiquetes "
+"manualment (mireu el menú Accions) o utilitzeu un filtre."
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "No s'han trobat articles per a mostrar."
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Erreurs de mise à jour"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"S'han detectat errors en alguns canals (feu clic aquí per veure'n els "
+"detalls)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
+msgid "Uncategorized"
+msgstr "Sense categoria"
+
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr ""
+
+#: classes/mail_button.php:52
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Tots els articles"
+
+#: classes/mail_button.php:73
+msgid "From:"
 msgstr ""
 
-#: modules/pref-feeds.php:4
+#: classes/mail_button.php:82
+#, fuzzy
+msgid "To:"
+msgstr "Dalt"
+
+#: classes/mail_button.php:95
+#, fuzzy
+msgid "Subject:"
+msgstr "Selecciona:"
+
+#: classes/mail_button.php:111
+#, fuzzy
+msgid "Send e-mail"
+msgstr "Canvieu l'adreça electrònica"
+
+#: classes/note_button.php:7 js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Edita les etiquetes"
+
+#: classes/pref_feeds.php:11
 msgid "Check to enable field"
 msgstr "Seleccioneu-ho per activar els camps"
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Edita el canal"
 
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr "Sense categoria"
-
-#: modules/pref-feeds.php:306
+#: classes/pref_feeds.php:299
 #, fuzzy
 msgid "Feed Title"
 msgstr "Títol"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr "s'està utilitzant"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Neteja d'articles:"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Amaga-ho de la llista de canals"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Contingut escrit de dreta a esquerra"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr "Mostra les imatges adjuntes"
 
-#: modules/pref-feeds.php:472
-#, fuzzy
-msgid "Cache images locally (SimplePie only)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
 msgstr "Emmagatzema les imatges localment"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 #, fuzzy
 msgid "Icon"
 msgstr "Action"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Subscrit als canals:"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Emmagatzema les imatges localment"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Fet!"
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No s'ha trobat cap canal."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ja esteu subscrit a <b>%s</b>."
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Edita les opcions de les subscripcions"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoria <b>%s</b> ja existeix a la base de dades."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Crea una categoria"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "No s'ha definit cap categoria per als canals."
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de canals"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Tots els canals"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 #, fuzzy
 msgid "Select"
 msgstr "Selecciona:"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Tot"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Cap"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "Subscriu-te al canal"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "S'estan purgant els canals seleccionats..."
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Reinicia la contrasenya"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 #, fuzzy
 msgid "Categories"
 msgstr "Catégorie&nbsp;:"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Edita les categories"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 #, fuzzy
 msgid "More actions..."
 msgstr "Accions..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Esborra les dades del canal"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "Canvia la puntuació dels articles"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importeu"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Exporta en format OPML"
+msgid "Import my OPML"
+msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr ""
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "Inclou-lo en el resum diari per correu electrònic"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Publicats"
+msgid "Export OPML"
+msgstr "Exporta en format OPML"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1561,23 +1698,42 @@ msgstr ""
 "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
 "subscriure qualsevol que en conegui l'adreça URL."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
+#: classes/pref_feeds.php:1439
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1442
 #, fuzzy
-msgid "Display URL"
-msgstr "afficher les étiquettes"
+msgid "Article archive"
+msgstr "Data de l'article"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "Exporta en format OPML"
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importeu"
+
+#: classes/pref_feeds.php:1469
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integració al Firefox"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1585,45 +1741,45 @@ msgstr ""
 "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent "
 "clic en el següent enllaç."
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal."
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1631,1132 +1787,1370 @@ msgstr ""
 "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
 "subscriure qualsevol que en conegui l'adreça URL."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+#, fuzzy
+msgid "Display URL"
+msgstr "afficher les étiquettes"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Articles mémorisés"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 #, fuzzy
 msgid "Twitter"
 msgstr "Títol"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Esborra les dades del canal"
 
-#: modules/pref-feeds.php:1654
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Articles marcats"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "No s'ha trobat cap canal."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "No s'ha trobat cap fitxer que coincideixi."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "S'ha creat el filtre <b>%s</b>"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Crea un filtre"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Edita"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "No teniu  permisos per a obrir aquesta pestanya."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Més canals"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Feu clic per editar"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "Descriptif"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 #, fuzzy
 msgid "Colors"
 msgstr "Tanca"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Foreground:"
 msgstr "Primer pla"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Background:"
 msgstr "Fons"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "S'ha creat l'etiqueta <b>%s</b> "
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Crea una etiqueta"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Elimina els colors"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "El camp de contrasenya antiga no pot estar buit."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "El camp de contrasenya nova no pot estar buit."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "S'ha modificat la contrasenya."
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "La contrasenya antiga és incorrecta."
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "S'ha desat la configuració"
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Es desconeix l'opció %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Dades personals"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "Adreça electrònica"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Nivell d'accés"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 #, fuzzy
 msgid "Save data"
 msgstr "Desa"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "La contrasenya actual és la predeterminada,\n"
 "\t\t\t\t\t\t penseu en modificar-la."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Contrasenya antiga"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Confirmeu la contrasenya"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Seleccioneu una interfície"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Sí"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "No"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Desa la configuració"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Torna als paràmetres per defecte"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Detalls de l'usuari"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "No s'ha trobat l'usuari"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Registrat"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Última connexió el"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Nombre de canals subscrits"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Canals subscrits"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Editor de perfils d'usuari"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Nivell d'accés:"
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Nova contrasenya"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "Adreça electrònica:"
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "S'ha canviat la contrasenya de l'usuari <b>%s</b>."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "S'ha creat l'usuari <b>%s</b> amb la contrasenya <b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "No s'ha pogut crear l'usuari <b>%s</b>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "L'usuari<b>%s</b> ja existeix."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "La contrasenya de l'usuari <b>%s</b>\n"
 "\t\t\t\t\ts'ha canviat a <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "S'està notificant <b>%s</b>."
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificació de canvi de contrasenya"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Crea un usuari"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Reinicia la contrasenya"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Permisos"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Última connexió"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "No s'han definit els usuaris."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "No s'ha trobat cap usuari que coinicideixi. "
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Filtratge del contingut"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Tiny Tiny RSS pot filtrar articles. El filtratge es realitza quan s'importa "
-"el nou article a la base de dades del canal de notícies si coincideix "
-"l'expressió regular configurada. Les expressions regulars distingeixen entre "
-"les majúscules i les minúscules."
 
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
-msgstr ""
-"Les accions que funcionen són: filtratge (no importació) d'articles, marcar "
-"articles com a llegits, marcar articles, assignació d'etiquetes i puntuar "
-"articles. Els filtres es poden definir globalment per alguns canals concrets."
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "sense etiqueta"
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
+#: classes/rpc.php:741
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "La vostra informació de registre és incompleta."
+
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
 msgstr ""
 
-#: help/2.php:9
-msgid "See also:"
-msgstr "Veieu també:"
+#: classes/rpc.php:753
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "S'ha modificat la contrasenya."
 
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Dreceres de teclat"
+#: classes/rpc.php:766
+#, fuzzy
+msgid "Can't update this kind of feed."
+msgstr "No podeu editar aquest tipus de canal."
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Navegació"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "Marca l'article"
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Mou entre canals"
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Mou entre articles"
+#: classes/tweet_button.php:7
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Títol"
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Mostra el diàleg de cerca"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Accions actives de l'article"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "Commuta els marcats"
+#: include/functions.php:2013
+#, fuzzy
+msgid "Archived articles"
+msgstr "Articles mémorisés"
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Commuta els publicats"
+#: include/functions.php:3109 js/viewfeed.js:1945
+#, fuzzy
+msgid "Click to play"
+msgstr "Feu clic per editar"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Commuta els no llegits"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr ""
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Edita les etiquetes"
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
 
-#: help/3.php:20
+#: include/functions.php:4061
 #, fuzzy
-msgid "Dismiss selected articles"
-msgstr ""
-"Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
+msgid "(edit note)"
+msgstr "edita la nota"
 
-#: help/3.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "Amaga els articles llegits."
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "No heu seleccionat cap canal."
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Obre l'article en una finestra nova"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "tipus desconegut"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marca els articles de sobre/sota de l'actiu com a llegits."
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Adjunció:"
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Desplaça el contingut de l'article"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Adjuncions:"
+
+#: include/functions.php:5091
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "Articles marcats"
 
-#: help/3.php:25
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "No s'ha trobat cap canal."
+
+#: include/functions.php:5161
 #, fuzzy
-msgid "Email article"
-msgstr "Tots els articles"
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Altres accions"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Seleccioneu un article mitjançant el ratolí."
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Redueix la barra lateral"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "Mostra aquest quadre d'ajuda"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Títol o contingut"
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Tots els articles"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Enllaç"
+
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Data de l'article"
 
-#: help/3.php:44
+#: include/localized_schema.php:9
 #, fuzzy
-msgid "Select all articles"
+msgid "Delete article"
 msgstr "Buida els articles"
 
-#: help/3.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "Purga els articles per llegir"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Marca'l com a destacat"
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Accions actives de l'article"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Publica l'article"
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Buida els articles"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Assigna etiquetes"
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Accions dels canals"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Assigna-li l'etiqueta"
 
-#: help/3.php:53
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Actualitza els canals actius"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Edita el canal"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "General"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Marca el canal com a llegit"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Interfície"
 
-#: help/3.php:58
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Avançat"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Marca tots els canals com a llegits"
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+"Aquesta opció és útil si rebeu informació de diferents canals de tipus "
+"«multicanal» amb informació que pot coincidir. Si està desactivat només "
+"mostra els articles repetits un sol cop."
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "Si esteu veient les categories reduir-les/ampliar-les"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Affiche les articles sous la forme d'une liste étendue, au lieu de deux "
+"listes séparées (une pour les en-têtes et une pour le contenu)"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "Vés a..."
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"En fer clic al botó «&nbsp;Marca'ls com a llegits&nbsp;», obre "
+"automàticament el següent canal que contingui articles per llegir."
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Tots els articles"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Aquesta opció habilita l'enviament diari d'un resum de les capçaleres noves "
+"(i no llegides) a l'adreça electrònica especificada en la configuració de "
+"l'usuari."
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Articles nous"
+#: include/localized_schema.php:25
+#, fuzzy
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Aquesta opció permet marcar els articles com a llegits automàticament en "
+"mode combinat (excepte en el canal d'articles Frescos) mentre desplaceu la "
+"barra."
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Articles marcats"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "Elimina les etiquetes HTML més freqüents en llegir els articles."
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Articles publicats"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Quan s'autodetectin etiquetes en els articles, aquestes etiquetes no "
+"s'utilitzaran (fes una llista separada per comes)"
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Núvol d'etiquetes"
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+"Quan aquesta habiliteu aquesta opció, s'agruparan les capçaleres i etiquetes "
+"per canals."
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
 msgstr ""
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Premeu qualsevol tecla per a tancar aquesta finestra."
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr ""
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Els meus canals"
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Altres canals"
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+"Purga els articles vells al cap d'aquest nombre de dies (0 - desactiva la "
+"purga)"
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Quadre d'accions"
+#: include/localized_schema.php:33
+#, fuzzy
+msgid "Default interval between feed updates"
+msgstr "Interval per defecte per a les actualitzacions dels canals (en minuts)"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "Els 25 més llegits"
+#: include/localized_schema.php:34
+#, fuzzy
+msgid "Amount of articles to display at once"
+msgstr "No s'han trobat articles per a mostrar."
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Edita les categories dels canals"
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Permet la duplicació d'articles"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "Concreta la cerca (si n'hi ha)"
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "Utiliser les catégories de flux"
 
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Nota:</b> L'accés a les accions depèn de la configuració del Tiny Tiny "
-"RSS o del nivell d'accés del teu usuari."
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "Mostra el contingut en la llista de capçaleres"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Registreu-vos"
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Format curt de data"
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Usuari:"
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Format llarg de data"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Contrasenya:"
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Mostra els canals combinats"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Amaga els canals que no tinguin missatges per llegir."
+
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Salta automàticament al canal següent"
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "Ordena els canals per articles no llegits"
+
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Inverteix l'ordre de les capçaleres (les més antigues les primeres)"
+
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Habilita el resum diari de capçaleres per correu electrònic."
+
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Demana la confirmació quan es marqui un canal com a llegit"
+
+#: include/localized_schema.php:47
+#, fuzzy
+msgid "Automatically mark articles as read"
+msgstr "En mode combinat expandeix els articles automàticament."
+
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Elimina les etiquetes dels articles que no siguin segures."
+
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Llista negra d'etiquetes"
+
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Temps màxim per als articles marcats com a frescos (en hores)"
+
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
 msgstr ""
+"Marca tots els articles enviat en el resum via adreça electrònica com a "
+"llegits"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Especial"
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "En mode combinat expandeix els articles automàticament."
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr ""
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Purga els articles per llegir"
 
-#: mobile/prefs.php:24
-#, fuzzy
-msgid "Enable categories"
-msgstr "Utiliser les catégories de flux"
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "Mostra els canals especials quan s'amaguin els canals reals."
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Agrupa les capçaleres en canals virtuals"
+
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "No mostris imatges en els articles"
+
+#: include/localized_schema.php:57
+msgid "Enable external API"
 msgstr ""
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
+#: include/localized_schema.php:58
+msgid "User timezone"
 msgstr ""
 
-#: mobile/prefs.php:29
+#: include/localized_schema.php:59
 #, fuzzy
-msgid "Browse categories like folders"
-msgstr "Reinicia l'ordre de les categories"
+msgid "Sort headlines by feed date"
+msgstr "Ordena els canals per articles no llegits"
 
-#: mobile/prefs.php:35
+#: include/localized_schema.php:60 js/prefs.js:1762
 #, fuzzy
-msgid "Show images in posts"
-msgstr "No mostris imatges en els articles"
+msgid "Customize stylesheet"
+msgstr "URL de la fulla d'estils personalitzada."
 
-#: mobile/prefs.php:40
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Mostra/amaga els canals llegits"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr ""
 
-#: mobile/prefs.php:45
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Idioma:"
+
+#: include/login_form.php:148
 #, fuzzy
-msgid "Sort feeds by unread count"
-msgstr "Ordena els canals per articles no llegits"
+msgid "Profile:"
+msgstr "Fitxer:"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr ""
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "El nom d'usuari o la contrasenya és incorrecte"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
+#: js/digest.js:69
 #, fuzzy
-#~ msgid "Archived articles"
-#~ msgstr "Articles mémorisés"
+msgid "Mark %d displayed articles as read?"
+msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 
-#~ msgid "Select:"
-#~ msgstr "Selecciona:"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Treu la marca de l'article"
 
-#~ msgid "Invert"
-#~ msgstr "Inverteix"
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Marca l'article"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Commuta la selecció"
-
-#~ msgid "Selection:"
-#~ msgstr "Selecció:"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Deixa de publicar l'article"
 
+#: js/digest.js:265
 #, fuzzy
-#~ msgid "Move back"
-#~ msgstr "Vés enrere"
+msgid "Original article"
+msgstr "Mostra el contingut original de l'article"
 
+#: js/digest.js:267
 #, fuzzy
-#~ msgid "Delete"
-#~ msgstr "Per defecte"
+msgid "Close this panel"
+msgstr "Tanca la finestra"
 
-#~ msgid "Feed:"
-#~ msgstr "Flux&nbsp;:"
+#: js/digest.js:290
+#, fuzzy
+msgid "Error: unable to load article."
+msgstr "Error: si us plau carregueu el fitxer OPML."
 
+#: js/digest.js:444
 #, fuzzy
-#~ msgid "Visit the website"
-#~ msgstr "Visiteu el web oficial"
+msgid "Click to expand article."
+msgstr "Clica-hi per a veure el cos de l'article"
 
+#: js/digest.js:519
 #, fuzzy
-#~ msgid "View as RSS feed"
-#~ msgstr "Visualitza els canals"
+msgid "%d more..."
+msgstr "Ouverture de l'aide..."
 
+#: js/digest.js:526
 #, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "Feu clic per editar"
+msgid "No unread feeds."
+msgstr "Mostra/amaga els canals llegits"
 
-#~ msgid " - "
-#~ msgstr " - "
+#: js/digest.js:628
+#, fuzzy
+msgid "Load more..."
+msgstr "Ouverture de l'aide..."
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Edita les etiquetes d'aquest article"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr ""
 
+#: js/FeedTree.js:137
 #, fuzzy
-#~ msgid "Open article in new tab"
-#~ msgstr "Obre l'article en una finestra nova"
+msgid "Update feed"
+msgstr "Actualitza tots els canals"
 
-#, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "Edita les etiquetes"
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
 
+#: js/functions.js:647
 #, fuzzy
-#~ msgid "Close this panel"
-#~ msgstr "Tanca la finestra"
+msgid "Date syntax appears to be correct:"
+msgstr "La contrasenya antiga és incorrecta."
 
-#~ msgid "mark as read"
-#~ msgstr "Marca'l com a llegit"
+#: js/functions.js:650
+#, fuzzy
+msgid "Date syntax is incorrect."
+msgstr "La contrasenya antiga és incorrecta."
 
+#: js/functions.js:777
 #, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Publica l'article"
+msgid "Remove stored feed icon?"
+msgstr "Elimina les dades emmagatzemades"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
+#: js/functions.js:809
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Si us plau, seleccioneu un canal."
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "No hi ha cap article actualitzat."
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr ""
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "No hi ha articles marcats per mostrar."
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "No s'han trobat articles per a mostrar. Podeu assignar articles a "
-#~ "etiquetes manualment (mireu el menú Accions) o utilitzeu un filtre."
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
 
-#~ msgid "No articles found to display."
-#~ msgstr "No s'han trobat articles per a mostrar."
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "Subscriviu-vos al canal"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr ""
-#~ "S'han detectat errors en alguns canals (feu clic aquí per veure'n els "
-#~ "detalls)"
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "S'està subscrivint a un canal..."
 
+#: js/functions.js:901
 #, fuzzy
-#~ msgid "Remove:"
-#~ msgstr "Suprimeix"
+msgid "Subscribed to %s"
+msgstr "Subscrit als canals:"
 
-#, fuzzy
-#~ msgid "Assign:"
-#~ msgstr "Assigna-l'hi l'etiqueta:"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr ""
+
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
 
+#: js/functions.js:945
 #, fuzzy
-#~ msgid "(edit note)"
-#~ msgstr "edita la nota"
+msgid "Couldn't download the specified URL."
+msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal."
 
-#~ msgid "No feed selected."
-#~ msgstr "No heu seleccionat cap canal."
+#: js/functions.js:948
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "No esteu subscrit a cap canal."
 
-#~ msgid "unknown type"
-#~ msgstr "tipus desconegut"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Crea un filtre"
 
-#~ msgid "Attachment:"
-#~ msgstr "Adjunció:"
+#: js/functions.js:987 js/prefs.js:165
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "Expression du filtre"
 
-#~ msgid "Attachments:"
-#~ msgstr "Adjuncions:"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
 
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "Us voleu donar de baixa de %s ?"
 
+#: js/functions.js:1173
 #, fuzzy
-#~ msgid "Profile:"
-#~ msgstr "Fitxer:"
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Canvia al mode de reordenació de categories"
+msgid "Please enter category title:"
+msgstr "Si us plau, escriviu una nota per aquest article:"
 
-#~ msgid "Update all feeds"
-#~ msgstr "Actualitza tots els canals"
-
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Ordena per nom o per número de no llegits."
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr ""
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "No podeu editar aquest tipus de canal."
 
+#: js/functions.js:1400
 #, fuzzy
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
+msgid "Edit Feed"
+msgstr "Edita el canal"
 
-#~ msgid "Unstar article"
-#~ msgstr "Treu la marca de l'article"
+#: js/functions.js:1438
+#, fuzzy
+msgid "More Feeds"
+msgstr "Més canals"
 
-#~ msgid "Star article"
-#~ msgstr "Marca l'article"
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "No heu seleccionat cap canal."
 
-#~ msgid "Unpublish article"
-#~ msgstr "Deixa de publicar l'article"
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
 
+#: js/functions.js:1580
 #, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Mostra el contingut original de l'article"
+msgid "Feeds with update errors"
+msgstr "Erreurs de mise à jour"
 
+#: js/functions.js:1591 js/prefs.js:1229
 #, fuzzy
-#~ msgid "Error: unable to load article."
-#~ msgstr "Error: si us plau carregueu el fitxer OPML."
+msgid "Remove selected feeds?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#, fuzzy
-#~ msgid "Click to expand article."
-#~ msgstr "Clica-hi per a veure el cos de l'article"
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "No hi ha cap article seleccionat."
 
+#: js/mail_button.js:21
 #, fuzzy
-#~ msgid "No unread feeds."
-#~ msgstr "Mostra/amaga els canals llegits"
+msgid "Forward article by email"
+msgstr "Marca l'article"
 
+#: js/PrefFilterTree.js:32
 #, fuzzy
-#~ msgid "Load more..."
-#~ msgstr "Ouverture de l'aide..."
+msgid "Inverse"
+msgstr "(Invers)"
 
-#, fuzzy
-#~ msgid "Update feed"
-#~ msgstr "Actualitza tots els canals"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Si us plau, introduïu la vostra identificació (login)"
 
-#, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "La contrasenya antiga és incorrecta."
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
 
+#: js/prefs.js:134
 #, fuzzy
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "La contrasenya antiga és incorrecta."
+msgid "Edit Filter"
+msgstr "Filtres"
 
-#, fuzzy
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Elimina les dades emmagatzemades"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "Esteu segur que voleu suprimir el filtre %s?"
 
-#, fuzzy
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Si us plau, seleccioneu un canal."
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "No heu seleccionat cap etiqueta."
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Subscriviu-vos al canal"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "No heu seleccionat cap usuari."
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "S'està subscrivint a un canal..."
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#, fuzzy
-#~ msgid "Subscribed to %s"
-#~ msgstr "Subscrit als canals:"
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "No heu seleccionat cap filtre."
 
-#, fuzzy
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal."
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
-#, fuzzy
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "No esteu subscrit a cap canal."
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Si us plau, seleccioneu només un canal."
 
-#~ msgid "Create Filter"
-#~ msgstr "Crea un filtre"
+#: js/prefs.js:411
+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?"
 
-#, fuzzy
-#~ msgid "Filter Test Results"
-#~ msgstr "Expression du filtre"
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "Us voleu donar de baixa de %s ?"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "El nom del camp no es pot deixar en blanc."
 
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Si us plau, seleccioneu només un usuari."
+
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
+
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Si us plau, seleccioneu només un filtre."
+
+#: js/prefs.js:652
 #, fuzzy
-#~ msgid "Please enter category title:"
-#~ msgstr "Si us plau, escriviu una nota per aquest article:"
+msgid "Edit Multiple Feeds"
+msgstr "Editor múltiple de canals"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "No podeu editar aquest tipus de canal."
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
 
+#: js/prefs.js:768
 #, fuzzy
-#~ msgid "Edit Feed"
-#~ msgstr "Edita el canal"
+msgid "OPML Import"
+msgstr "Importeu"
+
+#: js/prefs.js:795
+#, fuzzy
+msgid "Please choose an OPML file first."
+msgstr "Primerament heu de seleccionar un canal."
 
+#: js/prefs.js:811
 #, fuzzy
-#~ msgid "More Feeds"
-#~ msgstr "Més canals"
+msgid "Please choose the file first."
+msgstr "Primerament heu de seleccionar un canal."
 
-#~ msgid "No feeds are selected."
-#~ msgstr "No heu seleccionat cap canal."
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "Esteu segur que voleu establir els valors per defecte?"
 
+#: js/prefs.js:1149
 #, fuzzy
-#~ msgid "Feeds with update errors"
-#~ msgstr "Erreurs de mise à jour"
+msgid "Feed Categories"
+msgstr "Catégorie&nbsp;:"
 
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
+
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "No heu seleccionat cap categoria."
+
+#: js/prefs.js:1218
 #, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+msgid "Feeds without recent updates"
+msgstr "Erreurs de mise à jour"
 
+#: js/prefs.js:1267
 #, fuzzy
-#~ msgid "Inverse"
-#~ msgstr "(Invers)"
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Voleu canviar l'adreça de publicació per una de nova?"
 
-#~ msgid "Please enter login:"
-#~ msgstr "Si us plau, introduïu la vostra identificació (login)"
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr ""
+"Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
+"personalitzades?"
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
+#: js/prefs.js:1399
+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."
 
+#: js/prefs.js:1419
 #, fuzzy
-#~ msgid "Edit Filter"
-#~ msgstr "Filtres"
+msgid "Reset selected labels to default colors?"
+msgstr ""
+"Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
+"defecte?"
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "Esteu segur que voleu suprimir el filtre %s?"
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr ""
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
 
-#~ msgid "No labels are selected."
-#~ msgstr "No heu seleccionat cap etiqueta."
+#: js/prefs.js:1483
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "No hi ha cap article seleccionat."
 
-#~ msgid "No users are selected."
-#~ msgstr "No heu seleccionat cap usuari."
+#: js/prefs.js:1491 js/prefs.js:1544
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+#: js/prefs.js:1507 js/prefs.js:1560
+#, fuzzy
+msgid "Please choose a profile to activate."
+msgstr "Primerament heu de seleccionar un canal."
 
-#~ msgid "No filters are selected."
-#~ msgstr "No heu seleccionat cap filtre."
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "Us voleu donar de baixa dels canals seleccionats?"
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Si us plau, seleccioneu només un canal."
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "Éditeur d'intitulé"
 
-#~ 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?"
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
+#: js/prefs.js:1804
+#, fuzzy
+msgid "Link Instance"
+msgstr "Edita les etiquetes"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "El nom del camp no es pot deixar en blanc."
+#: js/prefs.js:1855
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Edita les etiquetes"
 
-#~ msgid "Please select only one user."
-#~ msgstr "Si us plau, seleccioneu només un usuari."
+#: js/prefs.js:1904
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
+#: js/prefs.js:1921 js/prefs.js:1933
+#, fuzzy
+msgid "No instances are selected."
+msgstr "No heu seleccionat cap filtre."
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Si us plau, seleccioneu només un filtre."
+#: js/prefs.js:1938
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Si us plau, seleccioneu només un filtre."
 
+#: js/prefs.js:1973
 #, fuzzy
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Editor múltiple de canals"
+msgid "Export Data"
+msgstr "Exporta en format OPML"
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
+#: js/prefs.js:2053
 #, fuzzy
-#~ msgid "OPML Import"
-#~ msgstr "Importeu"
+msgid "Data Import"
+msgstr "Importeu"
 
+#: js/share_button.js:10
 #, fuzzy
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Primerament heu de seleccionar un canal."
+msgid "Share article by URL"
+msgstr "Marca l'article"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "Esteu segur que voleu establir els valors per defecte?"
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
-#, fuzzy
-#~ msgid "Feed Categories"
-#~ msgstr "Catégorie&nbsp;:"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "No us podeu donar de baixa de la categoria."
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Primerament heu de seleccionar un canal."
 
-#~ msgid "No categories are selected."
-#~ msgstr "No heu seleccionat cap categoria."
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 
-#, fuzzy
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Erreurs de mise à jour"
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
+#: js/tt-rss.js:1083
 #, fuzzy
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "Voleu canviar l'adreça de publicació per una de nova?"
+msgid "New version available!"
+msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr ""
-#~ "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
-#~ "personalitzades?"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr ""
+"Esteu segur que voleu marcar tots els articles visibles de %s com a llegits ?"
 
-#~ 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."
+#: js/viewfeed.js:901
+#, fuzzy
+msgid "Delete %d selected articles in %s?"
+msgstr ""
+"Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
+"llegits?"
 
+#: js/viewfeed.js:903
 #, fuzzy
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr ""
-#~ "Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
-#~ "defecte?"
+msgid "Delete %d selected articles?"
+msgstr ""
+"Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
+#: js/viewfeed.js:945
 #, fuzzy
-#~ msgid "No profiles are selected."
-#~ msgstr "No hi ha cap article seleccionat."
+msgid "Archive %d selected articles in %s?"
+msgstr ""
+"Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
+"llegits?"
 
+#: js/viewfeed.js:948
 #, fuzzy
-#~ msgid "Activate selected profile?"
-#~ msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+msgid "Move %d archived articles back?"
+msgstr "Articles marcats"
 
-#~ msgid "Label Editor"
-#~ msgstr "Éditeur d'intitulé"
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr ""
+"Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
+"llegits?"
 
+#: js/viewfeed.js:1016
 #, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "Edita les etiquetes"
+msgid "Edit article Tags"
+msgstr "Edita les etiquetes"
 
-#, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "No hi ha cap article seleccionat."
 
-#, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "No heu seleccionat cap filtre."
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "No s'han trobat articles per a marcar."
 
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
+
+#: js/viewfeed.js:1374
 #, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "Si us plau, seleccioneu només un filtre."
+msgid "Loading..."
+msgstr "S'està carregant la llista de canals..."
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
+#: js/viewfeed.js:1848
+#, fuzzy
+msgid "Open original article"
+msgstr "Mostra el contingut original de l'article"
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "No us podeu donar de baixa de la categoria."
+#: js/viewfeed.js:1854
+#, fuzzy
+msgid "View in a tt-rss tab"
+msgstr "Obre l'article en una finestra nova"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Primerament heu de seleccionar un canal."
+#: js/viewfeed.js:1862
+#, fuzzy
+msgid "Mark above as read"
+msgstr "Marca'l com a llegit"
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
+#: js/viewfeed.js:1868
+#, fuzzy
+msgid "Mark below as read"
+msgstr "Marca'l com a llegit"
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
+#: js/viewfeed.js:1914
+#, fuzzy
+msgid "Remove label"
+msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
+#: js/viewfeed.js:1938
 #, fuzzy
-#~ msgid "New version available!"
-#~ msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
+msgid "Playing..."
+msgstr "S'està carregant la llista de canals..."
 
-#~ msgid "No articles are selected."
-#~ msgstr "No hi ha cap article seleccionat."
+#: js/viewfeed.js:1939
+#, fuzzy
+msgid "Click to pause"
+msgstr "Feu clic per editar"
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr ""
-#~ "Esteu segur que voleu marcar tots els articles visibles de %s com a "
-#~ "llegits ?"
+#~ msgid "Help"
+#~ msgstr "Ajuda"
 
 #, fuzzy
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr ""
-#~ "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
-#~ "llegits?"
+#~ msgid "Importing using DOMXML."
+#~ msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
 #, fuzzy
-#~ msgid "Delete %d selected articles?"
+#~ msgid "Importing using DOMDocument."
 #~ msgstr ""
-#~ "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
+#~ "S'està important el fitxer OPML (s'està utilitzant l'extensió "
+#~ "DOMDocument)..."
 
-#, fuzzy
-#~ msgid "Archive %d selected articles in %s?"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
 #~ msgstr ""
-#~ "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
-#~ "llegits?"
+#~ "No s'ha trobat l'extensió DOMXML. Fa falta per a versions de PHP "
+#~ "inferiors a la 5."
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr ""
-#~ "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
-#~ "llegits?"
+#, fuzzy
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "Emmagatzema les imatges localment"
 
 #, fuzzy
-#~ msgid "Edit article Tags"
-#~ msgstr "Edita les etiquetes"
+#~ msgid "Publish"
+#~ msgstr "Publicats"
 
-#~ msgid "No article is selected."
-#~ msgstr "No hi ha cap article seleccionat."
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "S'ha canviat la contrasenya de l'usuari <b>%s</b>."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "No s'han trobat articles per a marcar."
+#~ msgid "Content filtering"
+#~ msgstr "Filtratge del contingut"
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny Tiny RSS pot filtrar articles. El filtratge es realitza quan "
+#~ "s'importa el nou article a la base de dades del canal de notícies si "
+#~ "coincideix l'expressió regular configurada. Les expressions regulars "
+#~ "distingeixen entre les majúscules i les minúscules."
 
-#, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "S'està carregant la llista de canals..."
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "Les accions que funcionen són: filtratge (no importació) d'articles, "
+#~ "marcar articles com a llegits, marcar articles, assignació d'etiquetes i "
+#~ "puntuar articles. Els filtres es poden definir globalment per alguns "
+#~ "canals concrets."
 
-#, fuzzy
-#~ msgid "Open original article"
-#~ msgstr "Mostra el contingut original de l'article"
+#~ msgid "See also:"
+#~ msgstr "Veieu també:"
 
 #, fuzzy
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Obre l'article en una finestra nova"
+#~ msgid "Add category..."
+#~ msgstr "S'està afegint la categoria..."
 
 #, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
+#~ msgid "Add label..."
+#~ msgstr "S'està afegint la categoria..."
+
+#~ msgid "description"
+#~ msgstr "description"
 
 #, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "S'està carregant la llista de canals..."
+#~ msgid "Dismiss article"
+#~ msgstr "Publica l'article"
 
 #, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "Feu clic per editar"
+#~ msgid "Remove:"
+#~ msgstr "Suprimeix"
 
 #, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Marca l'article"
+#~ msgid "Assign:"
+#~ msgstr "Assigna-l'hi l'etiqueta:"
+
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Canvia al mode de reordenació de categories"
+
+#~ msgid "Update all feeds"
+#~ msgstr "Actualitza tots els canals"
+
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Ordena per nom o per número de no llegits."
 
 #, fuzzy
 #~ msgid "feeds"
@@ -2834,20 +3228,9 @@ msgstr "Ordena els canals per articles no llegits"
 #~ msgid "Fatal Exception"
 #~ msgstr "Erreur critique"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "S'està afegint la categoria..."
-
 #~ msgid "audio/mpeg"
 #~ msgstr "àudio/mpeg"
 
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "S'està afegint la categoria..."
-
-#~ msgid "General"
-#~ msgstr "General"
-
 #~ msgid "Enable offline reading"
 #~ msgstr "Habilita la lectura fora de línia"
 
@@ -2856,9 +3239,6 @@ msgstr "Ordena els canals per articles no llegits"
 #~ "Sincronitzeu els nous articles per a llegir-los en mode fora de línia "
 #~ "mitjançant Google Gears."
 
-#~ msgid "Interface"
-#~ msgstr "Interfície"
-
 #~ msgid "Default article limit"
 #~ msgstr "Nombre maximal d'articles par défaut"
 
@@ -2890,9 +3270,6 @@ msgstr "Ordena els canals per articles no llegits"
 #~ "Aquesta opció amaga la llista de canals i permet canviar-ho ràpidament, "
 #~ "pràctica per a pantalles petites."
 
-#~ msgid "Advanced"
-#~ msgstr "Avançat"
-
 #~ msgid "Enable feed icons"
 #~ msgstr "Habilita les icones dels canals."
 
@@ -3179,10 +3556,6 @@ msgstr "Ordena els canals per articles no llegits"
 #~ msgid "Adding feed..."
 #~ msgstr "S'està afegint el canal..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "S'està afegint el canal..."
-
 #~ msgid "Adding user..."
 #~ msgstr "S'està afegint l'usuari"
 
@@ -3473,9 +3846,6 @@ msgstr "Ordena els canals per articles no llegits"
 #~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
 #~ msgstr "&nbsp;&nbsp;Purger les articles"
 
-#~ msgid "description"
-#~ msgstr "description"
-
 #~ msgid "Can't add user: no login specified."
 #~ msgstr "Impossible d'ajouter un utilisateur : aucun nom fourni."
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index cc25938f..146cb9c9 100644
Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index e65abbf1..ad3eec85 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2011-04-22 14:45+0000\n"
 "Last-Translator: joschi <joschi.studispam@googlemail.com>\n"
 "Language-Team: German <None>\n"
@@ -17,153 +17,134 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Standard verwenden"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Niemals löschen"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "Nach 1 Woche"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "Nach 2 Wochen"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "Nach 1 Monat"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "Nach 2 Monaten"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "Nach 3 Monaten"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Standard Intervall"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Aktualisierungen deaktivieren"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Alle 15 Minuten"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Alle 30 Minuten"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "Stündlich"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Alle 4 Stunden"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Alle 12 Stunden"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Täglich"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Standard"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr "Twitter OAuth "
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Benutzer"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Erfahrener Benutzer"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Feeds"
-
-#: backend.php:201
-msgid "Article not found."
-msgstr "Artikel nicht gefunden."
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Feed nicht gefunden."
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "Ladevorgang, bitte warten..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "Sie haben nicht die benötigten Rechte um dieses Skript auszuführen."
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Datenbank Aktualisierer"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "Konnte die Datenbank nicht aktualisieren"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr "Konnte die notwendige Schema Datei nicht finden, benötige Version:"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", gefunden: "
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS Datenbank ist auf dem neusten Stand."
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "Bitte sichern Sie Ihre Datenbank bevor Sie fortfahren."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -172,32 +153,32 @@ msgstr ""
 "Ihre Tiny Tiny RSS Datenbank benötigt eine Aktualisierung auf die neuste "
 "Version (<b>%d</b> nach <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Aktualisierungen durchführen"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "Führe Aktualisierungen durch..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Aktualisiere auf Version %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Überprüfe Version..."
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "FEHLER!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -206,16 +187,16 @@ msgstr ""
 "Beendet. <b>%d</b> Aktualisierung(en) auf Schema\n"
 "\t\tVersion <b>%d</b> durchgeführt."
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr "Ihr Datenbankschema ist von einer neueren Version von Tiny Tiny RSS."
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr "Gefundene Schemaversion: <b>%d</b>, benötigt: <b>%d</b>."
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
@@ -223,7 +204,7 @@ msgstr ""
 "Aktualisierung des Schemas nicht möglich. Bitte aktualisieren Sie die Tiny "
 "Tiny RSS Dateien auf die neuere Version und fahren Sie fort."
 
-#: digest.php:57
+#: digest.php:58
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\t\tfor this application to function properly. Please check your\n"
@@ -233,16 +214,23 @@ msgstr ""
 "\t\tfunktionieren, welches von Ihrem Browser nicht unterstützt wird.\t"
 "\tBitte überprüfen Sie Ihre Browser Einstellungen."
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "Ladevorgang, bitte warten..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Hallo,"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Abmelden"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -250,7 +238,7 @@ msgstr ""
 "Dieses Programm benötigt XmlHttpRequest um ordnungsgemäß zu funktionieren. "
 "Ihr Browser scheint dies nicht zu unterstüzen."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -258,15 +246,15 @@ msgstr ""
 "Dieses Programm benötigt Cookies um ordungsgemäß zu funktionieren. Ihr "
 "Browser scheint diese nicht zu unterstüzen."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "Backend Sicherheitsprüfung fehlgeschlagen"
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "Frontend Sicherheitsprüfung fehlgeschlagen."
 
-#: errors.php:18
+#: errors.php:19
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
 "update&lt;/a&gt;."
@@ -274,15 +262,15 @@ msgstr ""
 "Falsche Version des Datenbankschemas. &lt;a href='update.php'&gt;Bitte "
 "aktualisieren&lt;/a&gt;."
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Nicht autorisierte Abfrage."
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Keine Funktion ausgewählt."
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -290,17 +278,17 @@ msgstr ""
 "Kann Feed nicht angezeigen: fehlgeschlagene Abfrage. Bitte überprüfen Sie "
 "die Label Match-Syntax oder die lokale Konfiguration."
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr ""
 "Zugriff verweigert. Sie haben nicht die benötigten Rechte um auf diese Seite "
 "zuzugreifen."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "Konfigurationsprüfung fehlgeschlagen"
 
-#: errors.php:30
+#: errors.php:31
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
 "\t\tofficial site for more information."
@@ -308,436 +296,253 @@ msgstr ""
 "Ihre Version von MySQL wird zur Zeit nicht unterstüzt. Bitte \n"
 "\t\tinformieren Sie sich auf der offiziellen Website."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
 "Konfiguration"
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "Kommentare?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr "Neuigkeiten"
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Feedliste verbergen"
 
-#: index.php:127
+#: index.php:148
 msgid "Show articles"
 msgstr "Neue Artikel"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Adaptiv"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Alle Artikel"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Bewertet"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "Bewertung ignorieren"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: index.php:139
+#: index.php:160
 msgid "Sort articles"
 msgstr "Artikel sortieren"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Datum"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Titel"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "Bewertung"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Aktionen..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Suchen..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Diesen Feed bearbeiten..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Alle Feeds:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "Gelesene ein-/ausblenden"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr "Zur Zusammenfassung wechseln..."
 
-#: index.php:173
+#: index.php:194
 msgid "Show tag cloud..."
 msgstr "Tagwolke anzeigen..."
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Label erstellen..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Filter erstellen..."
 
-#: index.php:177
+#: index.php:198
 msgid "Keyboard shortcuts help"
 msgstr "Hilfe zu Tastaturbefehlen"
 
-#: index.php:178
-msgid "About..."
-msgstr "Über..."
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Titel oder Inhalt"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Link"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Inhalt"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Artikeldatum"
-
-#: localized_schema.php:9
-msgid "Delete article"
-msgstr "Artikel löschen"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Bewertung setzen"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Artikel veröffentlichen"
+#: opml.php:70
+#, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "<li>Füge Kategorie <b>%s</b> hinzu.</li>"
 
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Tags zuweisen"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Setze Konfigurationsoption %s auf %s"
 
-#: localized_schema.php:14
-msgid "Assign label"
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
 msgstr "Label zuweisen"
 
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Diese Option dient zum Lesen mehrerer planet-artiger Aggregatoren mit "
-"teilweise überdeckender Userbase. Ist diese Option deaktiviert, werden die "
-"selben Nachrichten von unterschiedlichen Feeds nur einmal erscheinen."
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Erweiterte Anzeigeliste für Feedartikel, anstelle von separater Anzeige für "
-"Schlagzeilen und Artikelinhalt"
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"Beim Klick auf \"Als gelesen markieren\" in der Toolbar, automatisch "
-"nächsten Feed mit ungelesenen Artikeln öffnen."
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Diese Option aktiviert das Senden einer täglichen Zusammenfassung über neue "
-"(und ungelesene) Schlagzeilen an Ihre angegebene E-Mail Adresse"
-
-#: localized_schema.php:20
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Diese Option aktiviert das automatische \"Als gelesen Markieren\" im "
-"Kombinierten Anzeigemodus (ausgenommen ist der Neue-Artikel Feed), während "
-"Sie durch die Artikelliste scrollen."
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr "Alle außer den meist gebräuchlichen HTML Tags beim Lesen entfernen."
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Bei der Autoerkennung von Tags in Artikeln werden die folgenden nicht "
-"verwendet (Komma-getrennte Liste)."
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Wenn diese Option aktiviert ist, werden Schlagzeilen in Sonderfeeds und "
-"Labels nach Feeds gruppiert"
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
-"Benutze feed-spezifisches Datum statt des lokalen Importdatums um "
-"Schlagzeilen zu sortieren."
-
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr "CSS Stylesheet nach Ihren Vorlieben anpassen"
-
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr "Klicken um Ihr SSL Clientzertifikat bei tt-rss zu registrieren"
-
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Alte Nachrichten nach dieser Anzahl an Tagen löschen (0 - deaktivert)"
-
-#: localized_schema.php:28
-msgid "Default interval between feed updates"
-msgstr "Standard Intervall zwischen Feed-Aktualisierungen (in Minuten)"
-
-#: localized_schema.php:29
-msgid "Amount of articles to display at once"
-msgstr "Keine Artikel zum Anzeigen gefunden."
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Duplikate zulassen"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Feedkategorien aktivieren"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "Inhaltsvorschau in der Schlagzeilenliste anzeigen"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Kurzes Datumsformat"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Langes Datumsformat"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Kombinierte Feed-Anzeige"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Feeds ohne unglesene Nachrichten verbergen"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Den nächsten Feed anzeigen"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Umgekehrte Schlagzeilen Sortierung (älteste zuerst)"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Aktiviere E-Mail-Zusammenfassung"
-
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Bestätigung um Feed als gelesen zu markieren"
-
-#: localized_schema.php:42
-msgid "Automatically mark articles as read"
-msgstr "Artikel automatisch als gelesen markieren"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Unsichere Tags aus Artikeln entfernen"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Gesperrte Tags"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Maximales Alter neuer Artikel (in Stunden)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "Artikel in E-Mail-Zusammenfassung als gelesen markieren"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "Artikel im Kombinierten Modus automatisch aufklappen"
 
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Ungelesene Artikel löschen"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "Sonderfeeds anzeigen wenn gelesene Feeds verborgen werden"
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Schlagzeilen in virtuellen Feeds gruppieren"
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "Keine Bilder in Artikeln anzeigen"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "Filter entfernen %s?"
 
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr "Externe API aktivieren"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Filter erstellen"
 
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr "Zeitzone des Benutzers"
+#: opml.php:230
+msgid "is already imported."
+msgstr "wurde bereits importiert."
 
-#: localized_schema.php:54
-msgid "Sort headlines by feed date"
-msgstr "Feeds nach Feed-Datum sortieren"
+#: opml.php:250
+msgid "OK"
+msgstr "OK"
 
-#: localized_schema.php:55
-msgid "Customize stylesheet"
-msgstr "Benutzer Stylesheet"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Fehler beim Parsen des Dokuments."
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr "Mit SSL-Zertifikat anmelden"
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Fehler: bitte eine OPML-Datei hochladen."
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "OPML Werkzeug"
 
-#: opml.php:188
+#: opml.php:492
 msgid "Importing OPML..."
 msgstr "Importiere OPML..."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Zu den Einstellungen zurückkehren"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Feeds"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "Filter"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "Label"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "Benutzer"
 
-#: prefs.php:109
+#: prefs.php:108
 msgid "Linked"
 msgstr "Link"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "Neues Konto erstellen"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr "Die Registrierung für neue Benutzer wurde administrativ deaktiviert."
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -747,181 +552,405 @@ msgstr ""
 "gesendet. Konten, die nicht innerhalb von 24 Stunden aktiviert wurden, "
 "werden gelöscht."
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "Gewünschter Benutzername:"
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "Verfügbarkeit prüfen"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "Wieviel ist zwei plus zwei:"
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "Registrierung abschicken"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "Ihre Registrieungsinformationen sind unvollständig."
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "Leider ist dieser Benutzername schon vergeben."
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "Registrierung fehlgeschlagen."
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "Konto erfolgreich erstellt."
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr "Mit Twitter verbinden"
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 "Konnte nicht zu Twitter verbinden. Aktualisieren Sie die Seite oder "
 "versuchen es später erneut."
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "Glückwunsch! Sie haben sich erfolgreich mit Twitter verbunden."
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 msgid "Register"
 msgstr "Registrieren"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-msgid "Default profile"
-msgstr "Standard Profil"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Tastaturbefehle"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "Keine Tags"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Navigation"
 
-#: modules/backend-rpc.php:836
-msgid "Your request could not be completed."
-msgstr "Ihre Anfrage konnte nicht bearbeitet werden."
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Zwischen Feeds wechseln"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr "Feed-Aktualisierung wurde eingeplant."
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Zwischen Artikeln wechseln"
 
-#: modules/backend-rpc.php:848
-msgid "Category update has been scheduled."
-msgstr "Kategorieaktualisierung wurde eingeplant."
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Suchdialog anzeigen"
 
-#: modules/backend-rpc.php:861
-msgid "Can't update this kind of feed."
-msgstr "Sie können diese Art von Feed nicht aktualisieren."
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Aktionen für aktiven Artikel"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Hilfe"
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Umschalten bewertet"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Hilfe Thema nicht gefunden."
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Umschalten veröffentlicht"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Dieses Fenster schließen"
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Umschalten ungelesen"
 
-#: modules/opml_domdoc.php:60
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>Füge Kategorie <b>%s</b> hinzu.</li>"
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Tags bearbeiten"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Setze Konfigurationsoption %s auf %s"
+#: help/main.php:20
+msgid "Dismiss selected articles"
+msgstr "Die gewählten Artikel vom Label entfernen?"
 
-#: modules/opml_domdoc.php:128
-msgid "is already imported."
-msgstr "wurde bereits importiert."
+#: help/main.php:21
+msgid "Dismiss read articles"
+msgstr "Gelesene Artikel verbergen"
 
-#: modules/opml_domdoc.php:148
-msgid "OK"
-msgstr "OK"
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Artikel in neuem Fenster öffnen"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Fehler beim Parsen des Dokuments."
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Markiere vorhergehende/nachfolgende Artikel als gelesen"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Fehler: bitte eine OPML-Datei hochladen."
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Artikelinhalt scrollen"
+
+#: help/main.php:25
+#, fuzzy
+msgid "Email article"
+msgstr "Alle Artikel"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Andere Aktionen"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Artikel unter Mauszeiger auswählen"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Label erstellen"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Filter erstellen"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Seitenleiste verbergen"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "Diesen Hilfe-Dialog anzeigen"
+
+#: help/main.php:41
+#, fuzzy
+msgid "Multiple articles actions"
+msgstr "Mehrere Artikel"
+
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "Artikel löschen"
+
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Ungelesene Artikel löschen"
+
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Aktionen für aktiven Artikel"
+
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "Artikel löschen"
+
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Feed-Aktionen"
+
+#: help/main.php:53
+msgid "Refresh active feed"
+msgstr "Aktiven Feed aktualisieren"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "Feed abonnieren"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Feed bearbeiten"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Feed als gelesen markieren"
+
+#: help/main.php:58
+msgid "Reverse headlines order"
+msgstr "Umgekehrte Schlagzeilen Sortierung (Älteste zuerst)"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Alle Feeds als gelesen markieren"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "Gewählte Kategorie auf-/zuklappen"
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "Gehe zu..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Alle Artikel"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Neue Artikel"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Bewertete Artikel"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Veröffentlichte Artikel"
 
-#: modules/popup-dialog.php:34
-msgid "Importing using DOMXML."
-msgstr "Importiere OPML (verwende DOMXML Erweiterung)..."
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Tagwolke"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+"Andere Tipps für das Webinterface sind im Tiny Tiny RSS wiki verfügbar."
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Drücken Sie eine beliebige Taste um dieses Fenster zu schließen."
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Meine Feeds"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Andere Feeds"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Panel Aktionen"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "Top 25 Feeds"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Feedkategorien bearbeiten"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Benutzer anlegen"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "Fokussierte Suche (wenn gewählt)"
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+"<b>Anmerkung:</b> Abhängig von Ihren Tiny Tiny RSS Einstellungen und "
+"Zugriffsrechten könnten nicht alle Aktionen verfügbar sein."
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Anmelden"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Benutzername:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Passwort:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr "Startseite"
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Sonderfeeds"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
+msgstr "Nicht gefunden (klicken um Feed zu aktualisieren)"
+
+#: mobile/prefs.php:24
+msgid "Enable categories"
+msgstr "Feedkategorien aktivieren"
 
-#: modules/popup-dialog.php:40
-msgid "Importing using DOMDocument."
-msgstr "Importiere OPML (verwende DOMDocument Erweiterung)..."
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr "AN"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr "AUS"
+
+#: mobile/prefs.php:29
+msgid "Browse categories like folders"
+msgstr "Kategoriefolge zurücksetzen"
+
+#: mobile/prefs.php:35
+msgid "Show images in posts"
+msgstr "Keine Bilder in Artikeln anzeigen"
+
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Gelesene ein-/ausblenden"
+
+#: mobile/prefs.php:45
+msgid "Sort feeds by unread count"
+msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
+
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Artikel nicht gefunden."
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Hilfe Thema nicht gefunden."
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: classes/dlg.php:26
+#, fuzzy
+msgid "Prepare data"
+msgstr "Speichern"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"Die DOMXML Erweiterung wurde nicht gefunden. Sie wird benötigt für PHP vor "
-"Version 5."
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Profil erstellen"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 msgid "(active)"
 msgstr "(aktiv)"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+msgid "Default profile"
+msgstr "Standard Profil"
+
+#: classes/dlg.php:170
 msgid "Remove selected profiles"
 msgstr "Ausgewählte Profile entfernen"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 msgid "Activate profile"
 msgstr "Aktives Profil"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "Anmerkung"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -932,11 +961,11 @@ msgstr ""
 "Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den "
 "Besitzer der Instanz."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -947,166 +976,169 @@ msgstr ""
 "Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
 "benachrichtigen Sie den Besitzer des Instanz."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 msgid "Feed URL"
 msgstr "Feed URL"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Authentifizierung"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Anmelden"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 msgid "Password"
 msgstr "Passwort"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Dieser Feed benötigt eine Authentifizierung."
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 msgid "More feeds"
 msgstr "Weitere Feeds"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Suchen"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 msgid "limit:"
 msgstr "Grenzwert:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Entfernen"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr "Suche nach"
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 msgid "match on"
 msgstr "suchen in:"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Inhalt"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Titel oder Inhalt"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Suche begrenzen auf:"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Diesen Feed"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Übereinstimmung"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "vorher"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "nacher"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "Überprüfen"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "in Feld"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "in"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Aktion ausführen"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "mit Parametern:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Optionen"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "Invertierte Übereinstimmung"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "In Kategorie einordnen:"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "Test"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Erstellen"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
@@ -1114,98 +1146,73 @@ msgstr ""
 "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste "
 "zuerst):"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (komma-getrennt)"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Speichern"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 msgid "Tag Cloud"
 msgstr "Tagwolke"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 #, fuzzy
 msgid "Match:"
 msgstr "Übereinstimmung"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "Zeige URL an"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr "[Weitergeleitet]"
-
-#: modules/popup-dialog.php:813
-msgid "Multiple articles"
-msgstr "Mehrere Artikel"
+#: classes/dlg.php:821 classes/feeds.php:152
+msgid "View as RSS"
+msgstr "Als RSS anzeigen"
 
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr "Absender:"
+#: classes/dlg.php:832
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: modules/popup-dialog.php:843
-msgid "To:"
-msgstr "Empfänger:"
+#: classes/dlg.php:860
+#, php-format
+msgid "New version of Tiny Tiny RSS is available (%s)."
+msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
 
-#: modules/popup-dialog.php:856
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: modules/popup-dialog.php:872
-msgid "Send e-mail"
-msgstr "E-Mail versenden"
-
-#: modules/popup-dialog.php:881
-msgid "View as RSS"
-msgstr "Als RSS anzeigen"
-
-#: modules/popup-dialog.php:892
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
-
-#: modules/popup-dialog.php:919
-#, php-format
-msgid "New version of Tiny Tiny RSS is available (%s)."
-msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
-
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 msgid "Details"
 msgstr "Details"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr "Download"
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1217,74 +1224,220 @@ msgstr ""
 "class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Basis benutzt "
 "werden."
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr "Instanz"
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr "Instanz-URL"
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 msgid "Access key:"
 msgstr "Zugriffsberechtigung:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 msgid "Access key"
 msgstr "Zugriffsberechtigung"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 "Benutzen Sie eine Zugriffsberechtigung für beide verbundenen Instanzen."
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 msgid "Generate new key"
 msgstr "Neue Zugriffsberechtigung erstellen"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 msgid "Create link"
 msgstr "Verbindung herstellen"
 
-#: modules/popup-dialog.php:1094
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: classes/feeds.php:94 include/functions.php:3346
+msgid "Visit the website"
+msgstr "Offizielle Website besuchen"
+
+#: classes/feeds.php:107
+msgid "View as RSS feed"
+msgstr "Als RSS-Feed anzeigen"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Auswahl:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Alle"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Invertieren"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Keine"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Auswahl umschalten:"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Auswahl:"
+
+#: classes/feeds.php:138
+msgid "Archive"
+msgstr "Archiv"
+
+#: classes/feeds.php:140
+msgid "Move back"
+msgstr "Zurückgehen"
+
+#: classes/feeds.php:141
+msgid "Delete"
+msgstr "Löschen"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+msgid "Forward by email"
+msgstr "Per E-Mail weiterleiten"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "Feed:"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Feed nicht gefunden."
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "als gelesen markieren"
+
+#: classes/feeds.php:625 include/functions.php:3318
+msgid "Originally from:"
+msgstr "Original von:"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Tags für diesen Artikel bearbeiten"
+
+#: classes/feeds.php:712 include/functions.php:3285
+msgid "Open article in new tab"
+msgstr "Artikel in neuem Reiter öffnen"
+
+#: classes/feeds.php:723 include/functions.php:3301
 #, fuzzy
-msgid "You can share this article by the following unique URL:"
-msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
+msgid "Close article"
+msgstr "Artikel löschen"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "Keine bewerteten Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
+"hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "Keine Artikel zum Anzeigen gefunden."
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Feeds zuletzt aktualisiert am %s"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
+msgid "Uncategorized"
+msgstr "Unkategorisiert"
+
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr "[Weitergeleitet]"
+
+#: classes/mail_button.php:52
+msgid "Multiple articles"
+msgstr "Mehrere Artikel"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr "Absender:"
+
+#: classes/mail_button.php:82
+msgid "To:"
+msgstr "Empfänger:"
+
+#: classes/mail_button.php:95
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: classes/mail_button.php:111
+msgid "Send e-mail"
+msgstr "E-Mail versenden"
 
-#: modules/pref-feeds.php:4
+#: classes/note_button.php:7 js/note_button.js:11
+msgid "Edit article note"
+msgstr "Artikelnotizen bearbeiten"
+
+#: classes/pref_feeds.php:11
 msgid "Check to enable field"
 msgstr "Ankreuzen um das Feld zu aktivieren"
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Feeds"
 
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr "Unkategorisiert"
-
-#: modules/pref-feeds.php:306
+#: classes/pref_feeds.php:299
 msgid "Feed Title"
 msgstr "Feed-Titel"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr "verwende"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Artikel löschen:"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1292,217 +1445,200 @@ msgstr ""
 "<b>Hinweise:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed "
 "eine Authentifizierung erfordert (außer Twitter-Feeds)."
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 msgid "Hide from Popular feeds"
 msgstr "Auf meiner Feedliste verbergen"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Rechts-nach-links Inhalt"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr "Angehängte Bilder immer anzeigen"
 
-#: modules/pref-feeds.php:472
-msgid "Cache images locally (SimplePie only)"
-msgstr "Bilder lokal zwischenspeichern (nur SimplePie)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
+msgstr "Bilder lokal zwischenspeichern"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 msgid "Mark updated articles as unread"
 msgstr "Alle Artikel als ungelesen markieren"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr "Artikel als aktualisiert markieren bei Inhaltsänderung"
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 msgid "Icon"
 msgstr "Icon"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr "Ersetze"
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 msgid "Resubscribe to push updates"
 msgstr "Abonnierte Feeds:"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "PubSubHubbub-Abonnementstatus für push-enabled Feeds zurücksetzen"
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Bilder lokal zwischenspeichern"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Alle fertig."
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> abonniert."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Keine Feeds gefunden."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> bereits abonniert."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "Konnte <b>%s</b> nicht abonnieren.<br>Kann die Feed-URL nicht herunterladen."
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 msgid "Subscribe to selected feed"
 msgstr "Ausgewählte Feeds abbestellen"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Abonnementoptionen bearbeiten"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorie <b>$%s</b> existiert bereits in der Datenbank."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Kategorie erstellen"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "Keine Feedkategorien definiert."
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 msgid "Remove selected categories"
 msgstr "Ausgewählte Kategorien entfernen?"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 msgid "Feeds with errors"
 msgstr "Feeds mit Fehlern"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 msgid "Inactive feeds"
 msgstr "Inaktive Feed"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 msgid "Select"
 msgstr "Auswahl"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Alle"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Keine"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "Feed abonnieren"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 msgid "Edit selected feeds"
 msgstr "Bearbeite gewählten Feed..."
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 msgid "Reset sort order"
 msgstr "Sortierreihenfolge zurücksetzen"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 msgid "Categories"
 msgstr "Kategorien"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Kategorien bearbeiten"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 msgid "More actions..."
 msgstr "Mehr Aktionen..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Manuelle Säuberung"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Feed-Daten löschen"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "Artikel neu bewerten"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 "<b>Hinweis</b>: Sie können Feeds und Kategorien mit der Maus herumziehen."
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
+#, fuzzy
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 "Mit OPML können Sie Ihre Feeds und Tiny Tiny RSS Einstellungen im- und "
 "exportieren."
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+#, fuzzy
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 "Hinweis: Nur das Haupteinstellungsprofil kann mit OPML migriert werden."
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importieren"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "OPML exportieren"
+msgid "Import my OPML"
+msgstr "Importiere OPML..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 #, fuzzy
 msgid "Filename:"
 msgstr "Vollständiger Name"
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "In E-Mail-Zusammenfassung aufnehmen"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Veröffentlicht"
+msgid "Export OPML"
+msgstr "OPML exportieren"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -1510,24 +1646,46 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die folgende URL kennt."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
+#, fuzzy
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 "Hinweis: Veröffentlichte Artikel enthalten weder Ihre Tiny Tiny RSS "
 "Einstellungen, noch Feeds welche eine Authentifizierung benötigen oder von "
 "der Feedliste versteckte Feeds."
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
-msgstr "Zeige URL an"
+#: classes/pref_feeds.php:1439
+#, fuzzy
+msgid "Display published OPML URL"
+msgstr "Öffentliche OPML-URL"
+
+#: classes/pref_feeds.php:1442
+#, fuzzy
+msgid "Article archive"
+msgstr "Artikeldatum"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "OPML exportieren"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importieren"
+
+#: classes/pref_feeds.php:1469
 msgid "Firefox integration"
 msgstr "Firefox Integration"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1535,15 +1693,15 @@ msgstr ""
 "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox "
 "verwendet werden."
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Diese Website als Feedreader registrieren."
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr "Mit Bookmarklet abonnieren"
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1552,25 +1710,25 @@ msgstr ""
 "dem Sie interessiert sind in Ihren Browser und klicken auf den Link, um ihn "
 "zu abonnieren."
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "%s in Tiny Tiny RSS abonnieren?"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Abonnieren in Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "Veröffentlichte Artikel und erzeugte Feeds"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 msgid "Published articles and generated feeds"
 msgstr "Veröffentlichte Artikel und erzeugte Feeds"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1578,28 +1736,32 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die nachstehende URL kennt."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+msgid "Display URL"
+msgstr "Zeige URL an"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr "Alle generierten URLs löschen"
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Artikelbewertung zurücknehmen"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 msgid "Twitter"
 msgstr "Twitter"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1607,7 +1769,7 @@ msgstr ""
 "Bevor Sie Ihre Twitter-Feeds aktualisieren können, müssen Sie diese Instanz "
 "von Tiny Tiny RSS bei Twitter registrieren."
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
@@ -1615,55 +1777,42 @@ msgstr ""
 "Sie haben diese Instanz erfolgreich mit Twitter verbunden und sollten nun "
 "auf Ihre Twitter-Feeds zugreifen können."
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr "Mit Twitter registrieren"
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 msgid "Clear stored credentials"
 msgstr "Gespeicherte Zugangsdaten löschen"
 
-#: modules/pref-feeds.php:1654
-#, php-format
-msgid "%d archived articles"
-msgstr "%d archivierte Artikel"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "Keine Feeds gefunden."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr "Artikel, die auf diesen Filter passen: "
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 msgid "No articles matching this filter has been found."
 msgstr "Keine übereinstimmenden Artikel für diesen Filter gefunden."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filter <b>%s</b> erstellt"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Filter erstellen"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr ""
 "Sie haben nicht die benötigten Rechte um diese Registerkarte zu öffnen."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr "Instanz verbinden"
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
@@ -1672,1063 +1821,1237 @@ msgstr ""
 "beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS mit "
 "folgender URL:"
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr "Zuletzt verbunden"
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 msgid "Stored feeds"
 msgstr "Gespeicherte Feeds"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Zum Bearbeiten klicken"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "Titel"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 msgid "Colors"
 msgstr "Farben"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Foreground:"
 msgstr "Vordergrund"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Background:"
 msgstr "Hintergrund"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Label <b>%s</b> erstellt"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Label erstellen"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Farben löschen"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "Altes Passwort darf nicht leer sein."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "Neues Passwort darf nicht leer sein."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "Die eingegebenen Passwörter stimmen nicht überein."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "Passwort wurde geändert."
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "Altes Passwort ist falsch."
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "Die Einstellungen wurden gespeichert."
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Unbekannte Option: %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr "Ihre persönlichen Daten wurden gespeichert."
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Persönliche Daten"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Zugriffsberechtigung"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 msgid "Save data"
 msgstr "Speichern"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 msgid "Your password is at default value, please change it."
 msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Thema auswählen"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr "Personalisieren"
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "Nein"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr "Löschen"
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Einstellungen speichern"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr "Profile verwalten"
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Benutzerdetails"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Registriert"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Zuletzt angemeldet"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Anzahl abonnierter Feeds"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Abonnierte Feeds"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Benutzereditor"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Zugriffsberechtigung: "
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Passwort ändern in"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "E-Mail: "
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "Passwort von Benutzer <b>%s</b> geändert."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Benutzer <b>%s</b> mit Passwort <b>%s</b> hinzugefügt"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Konnte den Benutzer <b>%s</b> nicht anlegen"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "Benutzer <b>%s</b> existiert bereits."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "Passwort von Benutzer <b>%s</b>\n"
 "\t\t\t\t\t geändert in <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Benachrichtige <b>%s</b>."
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Benutzer anlegen"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Zugriffsberechtigung"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Zuletzt angemeldet"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "Keine Benutzer definiert."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "Keine zugehörigen Benutzer gefunden."
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Inhaltsfilterung"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
-msgstr ""
-"Tiny Tiny RSS bietet das Filtern (oder Verarbeiten) von Artikeln an. Die "
-"Filterung wird einmalig ausgeführt, wenn der neue Artikel vom Feed in die "
-"Datenbank importiert wird, das angegebene Feld wird mit einem Regulären "
-"Ausdruck verglichen und eine Aktion ausgeführt. Die Regulären Ausdrücke "
-"unterscheiden nicht zwischen Groß- und Kleinschreibung."
-
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Unterstützte Aktionen sind: Artikel filtern (ohne zu importieren), Artikel "
-"als gelesen markieren, als bewertet markieren, Tags zuweisen und bewerten. "
-"Filter können global und für einen einzigen Feed definiert werden."
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-"Mehrfach und invertierte Übereinstimmungen werden unterstützt. Alle "
-"übereinstimmenden Filter werden berücksichtigt wenn ein Artikel importiert "
-"wird und alle Aktionen werden nacheinander ausgeführt. Invertierte "
-"Übereinstimmungen kehren das Ergebnis um, z.B. Filterübereinstimmung XYZZY "
-"im Titel mit invert Flag markiert alle Artikel, außer diejenigen, welche den "
-"String XYZZY im Titel haben."
-
-#: help/2.php:9
-msgid "See also:"
-msgstr "Siehe auch:"
-
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Tastaturbefehle"
-
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Navigation"
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "Keine Tags"
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Zwischen Feeds wechseln"
+#: classes/rpc.php:741
+msgid "Your request could not be completed."
+msgstr "Ihre Anfrage konnte nicht bearbeitet werden."
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Zwischen Artikeln wechseln"
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
+msgstr "Feed-Aktualisierung wurde eingeplant."
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Suchdialog anzeigen"
+#: classes/rpc.php:753
+msgid "Category update has been scheduled."
+msgstr "Kategorieaktualisierung wurde eingeplant."
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Aktionen für aktiven Artikel"
+#: classes/rpc.php:766
+msgid "Can't update this kind of feed."
+msgstr "Sie können diese Art von Feed nicht aktualisieren."
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "Umschalten bewertet"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "Artikel bewerten"
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Umschalten veröffentlicht"
+#: classes/share_button.php:29
+#, fuzzy
+msgid "You can share this article by the following unique URL:"
+msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Umschalten ungelesen"
+#: classes/tweet_button.php:7
+msgid "Share on Twitter"
+msgstr "Auf Twitter teilen"
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Tags bearbeiten"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Session konnte nicht validiert werden (falsche IP)"
 
-#: help/3.php:20
-msgid "Dismiss selected articles"
-msgstr "Die gewählten Artikel vom Label entfernen?"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "Falscher Benutzername oder Passwort"
 
-#: help/3.php:21
-msgid "Dismiss read articles"
-msgstr "Gelesene Artikel verbergen"
+#: include/functions.php:2013
+msgid "Archived articles"
+msgstr "Bewertete Artikel"
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Artikel in neuem Fenster öffnen"
+#: include/functions.php:3109 js/viewfeed.js:1945
+msgid "Click to play"
+msgstr "Zum Abspielen klicken"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Markiere vorhergehende/nachfolgende Artikel als gelesen"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr "Abspielen"
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Artikelinhalt scrollen"
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
 
-#: help/3.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "Alle Artikel"
+#: include/functions.php:4061
+msgid "(edit note)"
+msgstr "(Notiz bearbeiten)"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Andere Aktionen"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "Kein Feed ausgewählt."
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Artikel unter Mauszeiger auswählen"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "unbekannter Typ"
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Seitenleiste verbergen"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Anhang:"
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "Diesen Hilfe-Dialog anzeigen"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Anhänge:"
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Mehrere Artikel"
+#: include/functions.php:5091
+#, php-format
+msgid "%d archived articles"
+msgstr "%d archivierte Artikel"
 
-#: help/3.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Artikel löschen"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "Keine Feeds gefunden."
 
-#: help/3.php:45
+#: include/functions.php:5161
 #, fuzzy
-msgid "Select unread articles"
-msgstr "Ungelesene Artikel löschen"
+msgid "Could not import: incorrect schema version."
+msgstr "Konnte die notwendige Schema Datei nicht finden, benötige Version:"
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Aktionen für aktiven Artikel"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Artikel löschen"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Feed-Aktionen"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:53
-msgid "Refresh active feed"
-msgstr "Aktiven Feed aktualisieren"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Titel oder Inhalt"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Feed bearbeiten"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Link"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Feed als gelesen markieren"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Artikeldatum"
 
-#: help/3.php:58
-msgid "Reverse headlines order"
-msgstr "Umgekehrte Schlagzeilen Sortierung (Älteste zuerst)"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "Artikel löschen"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Alle Feeds als gelesen markieren"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Bewertung setzen"
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "Gewählte Kategorie auf-/zuklappen"
-
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "Gehe zu..."
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Artikel veröffentlichen"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Alle Artikel"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Tags zuweisen"
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Neue Artikel"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Label zuweisen"
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Bewertete Artikel"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Veröffentlichte Artikel"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr ""
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Tagwolke"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr ""
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:19
+msgid "Advanced"
 msgstr ""
-"Andere Tipps für das Webinterface sind im Tiny Tiny RSS wiki verfügbar."
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Drücken Sie eine beliebige Taste um dieses Fenster zu schließen."
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+"Diese Option dient zum Lesen mehrerer planet-artiger Aggregatoren mit "
+"teilweise überdeckender Userbase. Ist diese Option deaktiviert, werden die "
+"selben Nachrichten von unterschiedlichen Feeds nur einmal erscheinen."
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Meine Feeds"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Erweiterte Anzeigeliste für Feedartikel, anstelle von separater Anzeige für "
+"Schlagzeilen und Artikelinhalt"
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Andere Feeds"
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"Beim Klick auf \"Als gelesen markieren\" in der Toolbar, automatisch "
+"nächsten Feed mit ungelesenen Artikeln öffnen."
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Panel Aktionen"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Diese Option aktiviert das Senden einer täglichen Zusammenfassung über neue "
+"(und ungelesene) Schlagzeilen an Ihre angegebene E-Mail Adresse"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "Top 25 Feeds"
+#: include/localized_schema.php:25
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Diese Option aktiviert das automatische \"Als gelesen Markieren\" im "
+"Kombinierten Anzeigemodus (ausgenommen ist der Neue-Artikel Feed), während "
+"Sie durch die Artikelliste scrollen."
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Feedkategorien bearbeiten"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "Alle außer den meist gebräuchlichen HTML Tags beim Lesen entfernen."
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "Fokussierte Suche (wenn gewählt)"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Bei der Autoerkennung von Tags in Artikeln werden die folgenden nicht "
+"verwendet (Komma-getrennte Liste)."
 
-#: help/4.php:39
+#: include/localized_schema.php:28
 msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
 msgstr ""
-"<b>Anmerkung:</b> Abhängig von Ihren Tiny Tiny RSS Einstellungen und "
-"Zugriffsrechten könnten nicht alle Aktionen verfügbar sein."
+"Wenn diese Option aktiviert ist, werden Schlagzeilen in Sonderfeeds und "
+"Labels nach Feeds gruppiert"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Anmelden"
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
+"Benutze feed-spezifisches Datum statt des lokalen Importdatums um "
+"Schlagzeilen zu sortieren."
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Benutzername:"
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr "CSS Stylesheet nach Ihren Vorlieben anpassen"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Passwort:"
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr "Klicken um Ihr SSL Clientzertifikat bei tt-rss zu registrieren"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr "Startseite"
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Alte Nachrichten nach dieser Anzahl an Tagen löschen (0 - deaktivert)"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Sonderfeeds"
+#: include/localized_schema.php:33
+msgid "Default interval between feed updates"
+msgstr "Standard Intervall zwischen Feed-Aktualisierungen (in Minuten)"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr "Nicht gefunden (klicken um Feed zu aktualisieren)"
+#: include/localized_schema.php:34
+msgid "Amount of articles to display at once"
+msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: mobile/prefs.php:24
-msgid "Enable categories"
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Duplikate zulassen"
+
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
 msgstr "Feedkategorien aktivieren"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
-msgstr "AN"
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "Inhaltsvorschau in der Schlagzeilenliste anzeigen"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
-msgstr "AUS"
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Kurzes Datumsformat"
 
-#: mobile/prefs.php:29
-msgid "Browse categories like folders"
-msgstr "Kategoriefolge zurücksetzen"
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Langes Datumsformat"
 
-#: mobile/prefs.php:35
-msgid "Show images in posts"
-msgstr "Keine Bilder in Artikeln anzeigen"
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Kombinierte Feed-Anzeige"
 
-#: mobile/prefs.php:40
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Gelesene ein-/ausblenden"
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Feeds ohne unglesene Nachrichten verbergen"
 
-#: mobile/prefs.php:45
-msgid "Sort feeds by unread count"
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Den nächsten Feed anzeigen"
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "Session konnte nicht validiert werden (falsche IP)"
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Umgekehrte Schlagzeilen Sortierung (älteste zuerst)"
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Falscher Benutzername oder Passwort"
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Aktiviere E-Mail-Zusammenfassung"
 
-#~ msgid "Archived articles"
-#~ msgstr "Bewertete Artikel"
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Bestätigung um Feed als gelesen zu markieren"
 
-#~ msgid "Select:"
-#~ msgstr "Auswahl:"
+#: include/localized_schema.php:47
+msgid "Automatically mark articles as read"
+msgstr "Artikel automatisch als gelesen markieren"
 
-#~ msgid "Invert"
-#~ msgstr "Invertieren"
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Unsichere Tags aus Artikeln entfernen"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Auswahl umschalten:"
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Gesperrte Tags"
 
-#~ msgid "Selection:"
-#~ msgstr "Auswahl:"
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Maximales Alter neuer Artikel (in Stunden)"
 
-#~ msgid "Archive"
-#~ msgstr "Archiv"
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "Artikel in E-Mail-Zusammenfassung als gelesen markieren"
 
-#~ msgid "Move back"
-#~ msgstr "Zurückgehen"
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "Artikel im Kombinierten Modus automatisch aufklappen"
 
-#~ msgid "Delete"
-#~ msgstr "Löschen"
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Ungelesene Artikel löschen"
 
-#~ msgid "Forward by email"
-#~ msgstr "Per E-Mail weiterleiten"
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "Sonderfeeds anzeigen wenn gelesene Feeds verborgen werden"
 
-#~ msgid "Feed:"
-#~ msgstr "Feed:"
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Schlagzeilen in virtuellen Feeds gruppieren"
 
-#~ msgid "Visit the website"
-#~ msgstr "Offizielle Website besuchen"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "Keine Bilder in Artikeln anzeigen"
 
-#~ msgid "View as RSS feed"
-#~ msgstr "Als RSS-Feed anzeigen"
+#: include/localized_schema.php:57
+msgid "Enable external API"
+msgstr "Externe API aktivieren"
 
-#~ msgid "Click to play"
-#~ msgstr "Zum Abspielen klicken"
+#: include/localized_schema.php:58
+msgid "User timezone"
+msgstr "Zeitzone des Benutzers"
 
-#~ msgid "Play"
-#~ msgstr "Abspielen"
+#: include/localized_schema.php:59
+msgid "Sort headlines by feed date"
+msgstr "Feeds nach Feed-Datum sortieren"
 
-#~ msgid " - "
-#~ msgstr " - "
+#: include/localized_schema.php:60 js/prefs.js:1762
+msgid "Customize stylesheet"
+msgstr "Benutzer Stylesheet"
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Tags für diesen Artikel bearbeiten"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr "Mit SSL-Zertifikat anmelden"
 
-#~ msgid "Open article in new tab"
-#~ msgstr "Artikel in neuem Reiter öffnen"
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Sprache:"
 
-#~ msgid "Edit article note"
-#~ msgstr "Artikelnotizen bearbeiten"
+#: include/login_form.php:148
+msgid "Profile:"
+msgstr "Profil:"
 
-#~ msgid "Share on Twitter"
-#~ msgstr "Auf Twitter teilen"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr "Weniger Datenverkehr nutzen"
 
-#~ msgid "Close this panel"
-#~ msgstr "Dieses Panel schließen"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "Alle Artikel in %s als gelesen markieren?"
 
-#~ msgid "Originally from:"
-#~ msgstr "Original von:"
+#: js/digest.js:69
+msgid "Mark %d displayed articles as read?"
+msgstr "%d Artikel als gelesen markieren?"
 
-#~ msgid "mark as read"
-#~ msgstr "als gelesen markieren"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Artikelbewertung zurücknehmen"
 
-#~ msgid "Dismiss article"
-#~ msgstr "Artikel abweisen"
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Artikel bewerten"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Artikelveröffentlichung widerrufen"
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
+#: js/digest.js:265
+#, fuzzy
+msgid "Original article"
+msgstr "Originalartikel öffnen"
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "Keine bewerteten Artikel zum Anzeigen gefunden."
+#: js/digest.js:267
+msgid "Close this panel"
+msgstr "Dieses Panel schließen"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
-#~ "hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
+#: js/digest.js:290
+msgid "Error: unable to load article."
+msgstr "Fehler: bitte eine OPML Datei hochladen."
 
-#~ msgid "No articles found to display."
-#~ msgstr "Keine Artikel zum Anzeigen gefunden."
+#: js/digest.js:444
+msgid "Click to expand article."
+msgstr "Klicken um den Artikel aufzuklappen"
 
-#~ msgid "Feeds last updated at %s"
-#~ msgstr "Feeds zuletzt aktualisiert am %s"
+#: js/digest.js:519
+msgid "%d more..."
+msgstr "%d weitere..."
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
+#: js/digest.js:526
+msgid "No unread feeds."
+msgstr "Gelesene ein-/ausblenden"
 
-#~ msgid "Remove:"
-#~ msgstr "Entfernen:"
+#: js/digest.js:628
+msgid "Load more..."
+msgstr "Gehe zu..."
 
-#~ msgid "Assign:"
-#~ msgstr "Label zuweisen:"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr "Neue Artikel verfügbar (klicken zum anzeigen)"
 
-#~ msgid "(edit note)"
-#~ msgstr "(Notiz bearbeiten)"
+#: js/FeedTree.js:137
+msgid "Update feed"
+msgstr "Alle Feeds aktualisieren"
 
-#~ msgid "No feed selected."
-#~ msgstr "Kein Feed ausgewählt."
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
+"Sind Sie sicher, dass Sie tt-rss.org diese Ausnahme melden wollen? Der "
+"Bericht enthält Ihre Browser-Informationen. Ihre IP-Adresse würde in der "
+"Datenbank gespeichert werden."
 
-#~ msgid "unknown type"
-#~ msgstr "unbekannter Typ"
+#: js/functions.js:647
+msgid "Date syntax appears to be correct:"
+msgstr "Die Datumssyntax scheint korrekt zu sein:"
 
-#~ msgid "Attachment:"
-#~ msgstr "Anhang:"
+#: js/functions.js:650
+msgid "Date syntax is incorrect."
+msgstr "Die Datumssyntax ist falsch."
 
-#~ msgid "Attachments:"
-#~ msgstr "Anhänge:"
+#: js/functions.js:777
+msgid "Remove stored feed icon?"
+msgstr "Gespeicherte Feed-Icons entfernen"
 
-#~ msgid "Language:"
-#~ msgstr "Sprache:"
+#: js/functions.js:809
+msgid "Please select an image file to upload."
+msgstr "Bitte eine Bilddatei zum Hochladen auswählen."
 
-#~ msgid "Profile:"
-#~ msgstr "Profil:"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr "Neues Icon für diesen Feed hochladen"
 
-#~ msgid "Use less traffic"
-#~ msgstr "Weniger Datenverkehr nutzen"
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Bitte einen Label-Titel eingeben:"
 
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "In den Sortiermodus für Kategorien wechseln"
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
 
-#~ msgid "Update all feeds"
-#~ msgstr "Alle Feeds aktualisieren"
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "Feed abonnieren"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Nach Namen oder Anzahl ungelesener Artikel sortieren"
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "Abonniere Feed..."
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Alle Artikel in %s als gelesen markieren?"
+#: js/functions.js:901
+msgid "Subscribed to %s"
+msgstr "%s abonniert"
 
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "%d Artikel als gelesen markieren?"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr "Die angegebene URL scheint ungültig zu sein"
 
-#~ msgid "Unstar article"
-#~ msgstr "Artikelbewertung zurücknehmen"
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr "Die angegebene URL scheint keine Feeds zu enthalten."
 
-#~ msgid "Star article"
-#~ msgstr "Artikel bewerten"
+#: js/functions.js:945
+msgid "Couldn't download the specified URL."
+msgstr "Konnte die angegebene Feed-URL nicht herunterladen."
 
-#~ msgid "Unpublish article"
-#~ msgstr "Artikelveröffentlichung widerrufen"
+#: js/functions.js:948
+msgid "You are already subscribed to this feed."
+msgstr "Sie haben diesen Feed bereits abonniert."
 
-#, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Originalartikel öffnen"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Filter erstellen"
 
-#~ msgid "Error: unable to load article."
-#~ msgstr "Fehler: bitte eine OPML Datei hochladen."
+#: js/functions.js:987 js/prefs.js:165
+msgid "Filter Test Results"
+msgstr "Filtertestergebnis"
 
-#~ msgid "Click to expand article."
-#~ msgstr "Klicken um den Artikel aufzuklappen"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+"Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten "
+"Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
 
-#~ msgid "%d more..."
-#~ msgstr "%d weitere..."
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "%s abbestellen?"
 
-#~ msgid "No unread feeds."
-#~ msgstr "Gelesene ein-/ausblenden"
+#: js/functions.js:1173
+msgid "Please enter category title:"
+msgstr "Bitte geben Sie den Kategorietitel ein:"
 
-#~ msgid "Load more..."
-#~ msgstr "Gehe zu..."
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
-#~ msgid "New articles available in this feed (click to show)"
-#~ msgstr "Neue Artikel verfügbar (klicken zum anzeigen)"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
-#~ msgid "Update feed"
-#~ msgstr "Alle Feeds aktualisieren"
+#: js/functions.js:1400
+msgid "Edit Feed"
+msgstr "Feed bearbeiten"
 
-#~ msgid ""
-#~ "Are you sure to report this exception to tt-rss.org? The report will "
-#~ "include your browser information. Your IP would be saved in the database."
-#~ msgstr ""
-#~ "Sind Sie sicher, dass Sie tt-rss.org diese Ausnahme melden wollen? Der "
-#~ "Bericht enthält Ihre Browser-Informationen. Ihre IP-Adresse würde in der "
-#~ "Datenbank gespeichert werden."
+#: js/functions.js:1438
+msgid "More Feeds"
+msgstr "Weitere Feeds"
 
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "Die Datumssyntax scheint korrekt zu sein:"
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "Keine Feeds ausgewählt."
 
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "Die Datumssyntax ist falsch."
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
+"Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten "
+"Artikeln werden nicht gelöscht"
 
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Gespeicherte Feed-Icons entfernen"
+#: js/functions.js:1580
+msgid "Feeds with update errors"
+msgstr "Feeds mit Aktualisierungsfehlern"
 
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Bitte eine Bilddatei zum Hochladen auswählen."
+#: js/functions.js:1591 js/prefs.js:1229
+msgid "Remove selected feeds?"
+msgstr "Ausgewählte Feeds entfernen?"
 
-#~ msgid "Upload new icon for this feed?"
-#~ msgstr "Neues Icon für diesen Feed hochladen"
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "Keine Artikel ausgewählt."
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Bitte einen Label-Titel eingeben:"
+#: js/mail_button.js:21
+msgid "Forward article by email"
+msgstr "Artikel via E-Mail weiterleiten"
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
+#: js/PrefFilterTree.js:32
+msgid "Inverse"
+msgstr "(Invertiert)"
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Feed abonnieren"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Bitte Benutzernamen eingeben:"
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Abonniere Feed..."
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
 
-#~ msgid "Subscribed to %s"
-#~ msgstr "%s abonniert"
+#: js/prefs.js:134
+msgid "Edit Filter"
+msgstr "Filter bearbeiten"
 
-#~ msgid "Specified URL seems to be invalid."
-#~ msgstr "Die angegebene URL scheint ungültig zu sein"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "Filter entfernen %s?"
 
-#~ msgid "Specified URL doesn't seem to contain any feeds."
-#~ msgstr "Die angegebene URL scheint keine Feeds zu enthalten."
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "Ausgewählte Labels entfernen?"
 
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "Konnte die angegebene Feed-URL nicht herunterladen."
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "Keine Labels ausgewählt."
 
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Sie haben diesen Feed bereits abonniert."
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
+"Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes Konto "
+"werden gelöscht."
 
-#~ msgid "Create Filter"
-#~ msgstr "Filter erstellen"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "Keine Benutzer ausgewählt."
 
-#~ msgid "Filter Test Results"
-#~ msgstr "Filtertestergebnis"
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Ausgewählte Filter entfernen?"
 
-#~ msgid ""
-#~ "Reset subscription? Tiny Tiny RSS will try to subscribe to the "
-#~ "notification hub again on next feed update."
-#~ msgstr ""
-#~ "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der "
-#~ "nächsten Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "Keine Filter ausgewählt."
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "%s abbestellen?"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "Ausgewählte Feeds abbestellen?"
 
-#~ msgid "Please enter category title:"
-#~ msgstr "Bitte geben Sie den Kategorietitel ein:"
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Bitte nur einen Feed auswählen."
 
-#~ msgid "Generate new syndication address for this feed?"
-#~ msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Alle nicht bewerteten Artikel im ausgewählten Feed löschen?"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "Sie können diese Art von Feed nicht bearbeiten."
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
 
-#~ msgid "Edit Feed"
-#~ msgstr "Feed bearbeiten"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "Feld für Benutzername darf nicht leer sein."
 
-#~ msgid "More Feeds"
-#~ msgstr "Weitere Feeds"
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Bitte nur einen Benutzer auswählen."
 
-#~ msgid "No feeds are selected."
-#~ msgstr "Keine Feeds ausgewählt."
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
 
-#~ msgid ""
-#~ "Remove selected feeds from the archive? Feeds with stored articles will "
-#~ "not be removed."
-#~ msgstr ""
-#~ "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten "
-#~ "Artikeln werden nicht gelöscht"
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Bitte nur einen Filter auswählen."
 
-#~ msgid "Feeds with update errors"
-#~ msgstr "Feeds mit Aktualisierungsfehlern"
+#: js/prefs.js:652
+msgid "Edit Multiple Feeds"
+msgstr "Mehrere Feeds bearbeiten"
 
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Ausgewählte Feeds entfernen?"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "Änderungen an den gewählten Feeds speichern?"
 
-#~ msgid "Inverse"
-#~ msgstr "(Invertiert)"
+#: js/prefs.js:768
+msgid "OPML Import"
+msgstr "OPML Import"
 
-#~ msgid "Please enter login:"
-#~ msgstr "Bitte Benutzernamen eingeben:"
+#: js/prefs.js:795
+msgid "Please choose an OPML file first."
+msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
+#: js/prefs.js:811
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
-#~ msgid "Edit Filter"
-#~ msgstr "Filter bearbeiten"
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "Auf Standardwerte zurücksetzen?"
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "Filter entfernen %s?"
+#: js/prefs.js:1149
+msgid "Feed Categories"
+msgstr "Feed-Kategorien"
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "Ausgewählte Labels entfernen?"
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Ausgewählte Kategorien entfernen?"
 
-#~ msgid "No labels are selected."
-#~ msgstr "Keine Labels ausgewählt."
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "Keine Kategorien ausgewählt."
 
-#~ msgid ""
-#~ "Remove selected users? Neither default admin nor your account will be "
-#~ "removed."
-#~ msgstr ""
-#~ "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes "
-#~ "Konto werden gelöscht."
+#: js/prefs.js:1218
+msgid "Feeds without recent updates"
+msgstr "Feeds ohne kürzliche Aktualisierungen"
 
-#~ msgid "No users are selected."
-#~ msgstr "Keine Benutzer ausgewählt."
+#: js/prefs.js:1267
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Ausgewählte Filter entfernen?"
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr "Artikel in gewählten Feeds neu bewerten?"
 
-#~ msgid "No filters are selected."
-#~ msgstr "Keine Filter ausgewählt."
+#: js/prefs.js:1399
+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."
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "Ausgewählte Feeds abbestellen?"
+#: js/prefs.js:1419
+msgid "Reset selected labels to default colors?"
+msgstr "Label-Farben auf Standardwerte zurücksetzen?"
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Bitte nur einen Feed auswählen."
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr "Einstellungsprofile"
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr "Alle nicht bewerteten Artikel im ausgewählten Feed löschen?"
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+"Ausgewählte Profile löschen? Das aktive und das Standardprofil werden nicht "
+"gelöscht"
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
+#: js/prefs.js:1483
+msgid "No profiles are selected."
+msgstr "Keine Profile ausgewählt."
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "Feld für Benutzername darf nicht leer sein."
+#: js/prefs.js:1491 js/prefs.js:1544
+msgid "Activate selected profile?"
+msgstr "Ausgewählte Profile entfernen?"
 
-#~ msgid "Please select only one user."
-#~ msgstr "Bitte nur einen Benutzer auswählen."
+#: js/prefs.js:1507 js/prefs.js:1560
+msgid "Please choose a profile to activate."
+msgstr "Bitte ein Profil zum aktivieren auswählen"
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Bitte nur einen Filter auswählen."
+#: js/prefs.js:1587
+#, fuzzy
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
 
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Mehrere Feeds bearbeiten"
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "Label-Editor"
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Änderungen an den gewählten Feeds speichern?"
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
+"Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter "
+"löschen. Fortfahren?"
 
-#~ msgid "OPML Import"
-#~ msgstr "OPML Import"
+#: js/prefs.js:1804
+msgid "Link Instance"
+msgstr "Instanz verbinden"
 
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Bitte zuerst eine OPML-Datei auswählen."
+#: js/prefs.js:1855
+msgid "Edit Instance"
+msgstr "Instanz bearbeiten"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "Auf Standardwerte zurücksetzen?"
+#: js/prefs.js:1904
+msgid "Remove selected instances?"
+msgstr "Ausgewählte Instanzen entfernen?"
 
-#~ msgid "Feed Categories"
-#~ msgstr "Feed-Kategorien"
+#: js/prefs.js:1921 js/prefs.js:1933
+msgid "No instances are selected."
+msgstr "Keine Instanzen ausgewählt."
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Ausgewählte Kategorien entfernen?"
+#: js/prefs.js:1938
+msgid "Please select only one instance."
+msgstr "Bitte nur eine Instanz auswählen."
 
-#~ msgid "No categories are selected."
-#~ msgstr "Keine Kategorien ausgewählt."
+#: js/prefs.js:1973
+#, fuzzy
+msgid "Export Data"
+msgstr "OPML exportieren"
 
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Feeds ohne kürzliche Aktualisierungen"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "Importieren"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "Artikel in gewählten Feeds neu bewerten?"
+#: js/share_button.js:10
+#, fuzzy
+msgid "Share article by URL"
+msgstr "Artikel bewerten"
 
-#~ 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."
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "Alle Artikel als gelesen markieren?"
 
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "Label-Farben auf Standardwerte zurücksetzen?"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "Sie können die Kategorie nicht abbestellen."
 
-#~ msgid "Settings Profiles"
-#~ msgstr "Einstellungsprofile"
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Bitte erst einen Feed auswählen."
 
-#~ msgid ""
-#~ "Remove selected profiles? Active and default profiles will not be removed."
-#~ msgstr ""
-#~ "Ausgewählte Profile löschen? Das aktive und das Standardprofil werden "
-#~ "nicht gelöscht"
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
-#~ msgid "No profiles are selected."
-#~ msgstr "Keine Profile ausgewählt."
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "Artikel in %s neu bewerten?"
 
-#~ msgid "Activate selected profile?"
-#~ msgstr "Ausgewählte Profile entfernen?"
+#: js/tt-rss.js:1083
+msgid "New version available!"
+msgstr "Neue Version verfügbar!"
 
-#~ msgid "Please choose a profile to activate."
-#~ msgstr "Bitte ein Profil zum aktivieren auswählen"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "Alle sichtbaren Artikel in %s als gelesen markieren?"
 
-#~ msgid "This will invalidate all previously generated feed URLs. Continue?"
-#~ msgstr ""
-#~ "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
+#: js/viewfeed.js:901
+msgid "Delete %d selected articles in %s?"
+msgstr "%d ausgewählte Artikel in %s löschen?"
 
-#, fuzzy
-#~ msgid "This will invalidate all previously shared article URLs. Continue?"
-#~ msgstr ""
-#~ "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
+#: js/viewfeed.js:903
+msgid "Delete %d selected articles?"
+msgstr "%d ausgewählte Artikel löschen?"
 
-#~ msgid "Label Editor"
-#~ msgstr "Label-Editor"
+#: js/viewfeed.js:945
+msgid "Archive %d selected articles in %s?"
+msgstr "%d ausgewählte Artikel in %s archivieren?"
 
-#~ msgid ""
-#~ "This will clear your stored authentication information for Twitter. "
-#~ "Continue?"
-#~ msgstr ""
-#~ "Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter "
-#~ "löschen. Fortfahren?"
+#: js/viewfeed.js:948
+msgid "Move %d archived articles back?"
+msgstr "%d archivierte Artikel zurück verschieben"
 
-#~ msgid "Link Instance"
-#~ msgstr "Instanz verbinden"
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "%d ausgewählte Artikel in %s als gelesen markieren?"
 
-#~ msgid "Edit Instance"
-#~ msgstr "Instanz bearbeiten"
+#: js/viewfeed.js:1016
+msgid "Edit article Tags"
+msgstr "Artikel-Tags bearbeiten"
 
-#~ msgid "Remove selected instances?"
-#~ msgstr "Ausgewählte Instanzen entfernen?"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "Kein Artikel ausgewählt."
 
-#~ msgid "No instances are selected."
-#~ msgstr "Keine Instanzen ausgewählt."
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "Keine Artikel zum markieren gefunden."
 
-#~ msgid "Please select only one instance."
-#~ msgstr "Bitte nur eine Instanz auswählen."
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "%d Artikel als gelesen markieren?"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Alle Artikel als gelesen markieren?"
+#: js/viewfeed.js:1374
+msgid "Loading..."
+msgstr "Lade..."
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "Sie können die Kategorie nicht abbestellen."
+#: js/viewfeed.js:1848
+msgid "Open original article"
+msgstr "Originalartikel öffnen"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Bitte erst einen Feed auswählen."
+#: js/viewfeed.js:1854
+msgid "View in a tt-rss tab"
+msgstr "Artikel in neuem Reiter öffnen"
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "Sie können diese Art von Feed nicht neu bewerten."
+#: js/viewfeed.js:1862
+#, fuzzy
+msgid "Mark above as read"
+msgstr "Als gelesen markieren"
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "Artikel in %s neu bewerten?"
+#: js/viewfeed.js:1868
+#, fuzzy
+msgid "Mark below as read"
+msgstr "Als gelesen markieren"
 
-#~ msgid "New version available!"
-#~ msgstr "Neue Version verfügbar!"
+#: js/viewfeed.js:1914
+msgid "Remove label"
+msgstr "Ausgewähltes Label entfernen?"
 
-#~ msgid "No articles are selected."
-#~ msgstr "Keine Artikel ausgewählt."
+#: js/viewfeed.js:1938
+msgid "Playing..."
+msgstr "Abspielen..."
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "Alle sichtbaren Artikel in %s als gelesen markieren?"
+#: js/viewfeed.js:1939
+msgid "Click to pause"
+msgstr "Zum Pausieren klicken"
 
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "%d ausgewählte Artikel in %s löschen?"
+#~ msgid "About..."
+#~ msgstr "Über..."
 
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "%d ausgewählte Artikel löschen?"
+#~ msgid "Help"
+#~ msgstr "Hilfe"
 
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "%d ausgewählte Artikel in %s archivieren?"
+#~ msgid "Importing using DOMXML."
+#~ msgstr "Importiere OPML (verwende DOMXML Erweiterung)..."
 
-#~ msgid "Move %d archived articles back?"
-#~ msgstr "%d archivierte Artikel zurück verschieben"
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "Importiere OPML (verwende DOMDocument Erweiterung)..."
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "%d ausgewählte Artikel in %s als gelesen markieren?"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "Die DOMXML Erweiterung wurde nicht gefunden. Sie wird benötigt für PHP "
+#~ "vor Version 5."
 
-#~ msgid "Edit article Tags"
-#~ msgstr "Artikel-Tags bearbeiten"
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "Bilder lokal zwischenspeichern (nur SimplePie)"
 
-#~ msgid "No article is selected."
-#~ msgstr "Kein Artikel ausgewählt."
+#~ msgid ""
+#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
+#~ "settings."
+#~ msgstr ""
+#~ "Mit OPML können Sie Ihre Feeds und Tiny Tiny RSS Einstellungen im- und "
+#~ "exportieren."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "Keine Artikel zum markieren gefunden."
+#~ msgid "Note: Only main settings profile can be migrated using OPML."
+#~ msgstr ""
+#~ "Hinweis: Nur das Haupteinstellungsprofil kann mit OPML migriert werden."
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "%d Artikel als gelesen markieren?"
+#, fuzzy
+#~ msgid "Publish"
+#~ msgstr "Veröffentlicht"
 
-#~ msgid "Loading..."
-#~ msgstr "Lade..."
+#~ msgid ""
+#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+#~ "that require authentication or feeds hidden from Popular feeds."
+#~ msgstr ""
+#~ "Hinweis: Veröffentlichte Artikel enthalten weder Ihre Tiny Tiny RSS "
+#~ "Einstellungen, noch Feeds welche eine Authentifizierung benötigen oder "
+#~ "von der Feedliste versteckte Feeds."
 
-#~ msgid "Forward article by email"
-#~ msgstr "Artikel via E-Mail weiterleiten"
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "Passwort von Benutzer <b>%s</b> geändert."
 
-#~ msgid "Open original article"
-#~ msgstr "Originalartikel öffnen"
+#~ msgid "Content filtering"
+#~ msgstr "Inhaltsfilterung"
 
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Artikel in neuem Reiter öffnen"
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny Tiny RSS bietet das Filtern (oder Verarbeiten) von Artikeln an. Die "
+#~ "Filterung wird einmalig ausgeführt, wenn der neue Artikel vom Feed in die "
+#~ "Datenbank importiert wird, das angegebene Feld wird mit einem Regulären "
+#~ "Ausdruck verglichen und eine Aktion ausgeführt. Die Regulären Ausdrücke "
+#~ "unterscheiden nicht zwischen Groß- und Kleinschreibung."
 
-#~ msgid "Remove label"
-#~ msgstr "Ausgewähltes Label entfernen?"
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "Unterstützte Aktionen sind: Artikel filtern (ohne zu importieren), "
+#~ "Artikel als gelesen markieren, als bewertet markieren, Tags zuweisen und "
+#~ "bewerten. Filter können global und für einen einzigen Feed definiert "
+#~ "werden."
 
-#~ msgid "Playing..."
-#~ msgstr "Abspielen..."
+#~ msgid ""
+#~ "Multiple and inverse matching are supported. All matching filters are "
+#~ "considered when article is being imported and all actions executed in "
+#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
+#~ "XYZZY in title with inverse flag will match all articles, except those "
+#~ "containing string XYZZY in title."
+#~ msgstr ""
+#~ "Mehrfach und invertierte Übereinstimmungen werden unterstützt. Alle "
+#~ "übereinstimmenden Filter werden berücksichtigt wenn ein Artikel "
+#~ "importiert wird und alle Aktionen werden nacheinander ausgeführt. "
+#~ "Invertierte Übereinstimmungen kehren das Ergebnis um, z.B. "
+#~ "Filterübereinstimmung XYZZY im Titel mit invert Flag markiert alle "
+#~ "Artikel, außer diejenigen, welche den String XYZZY im Titel haben."
 
-#~ msgid "Click to pause"
-#~ msgstr "Zum Pausieren klicken"
+#~ msgid "See also:"
+#~ msgstr "Siehe auch:"
+
+#, fuzzy
+#~ msgid "Add category..."
+#~ msgstr "Kategorie erstellen"
 
 #, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Artikel bewerten"
+#~ msgid "Add label..."
+#~ msgstr "Label erstellen..."
+
+#~ msgid "Dismiss article"
+#~ msgstr "Artikel abweisen"
+
+#~ msgid "Remove:"
+#~ msgstr "Entfernen:"
+
+#~ msgid "Assign:"
+#~ msgstr "Label zuweisen:"
+
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "In den Sortiermodus für Kategorien wechseln"
+
+#~ msgid "Update all feeds"
+#~ msgstr "Alle Feeds aktualisieren"
+
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Nach Namen oder Anzahl ungelesener Artikel sortieren"
 
 #~ msgid "headlines"
 #~ msgstr "Schlagzeilen"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 6fff1634..dd892322 100644
Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 6379f505..de6040ea 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2009-11-10 00:12+0100\n"
 "Last-Translator: Manuel Gualda Caballero <manuel@utopiaverde.org>\n"
 "Language-Team: Español <manuel@utopiaverde.org>\n"
@@ -14,157 +14,137 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Usar configuración por defecto"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Nunca purgar"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "1 semana de antigüedad"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "2 semanas de antigüedad"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "1 mes de antigüedad"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "2 meses de antigüedad"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "3 meses de antigüedad"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Intervalo por defecto"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Desactivar actualizaciones"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Diariamente"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Por defecto"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Usuario"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Usuario con poder"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Fuentes"
-
-#: backend.php:201
-#, fuzzy
-msgid "Article not found."
-msgstr "Fuente no encontrada."
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Fuente no encontrada."
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "Cargando. Por favor, espere..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "Su nivel de acceso es insuficiente para ejecutar este programa."
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Actualizador de la base de datos"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "No se puede actualizar la base de datos"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr ""
 "No se puede encontrar el fichero de esquema necesario. Versión necesaria:"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", encontrado:"
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr ""
 "Por favor, haga una copia de seguridad de su base de datos antes de "
 "continuar."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -173,32 +153,32 @@ msgstr ""
 "Su base de datos Tiny Tiny RSS necesita ser actualizada a la última versión "
 "(<b>%d</b> to <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Actualizar"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "Actualizando..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Actualizando a la versión %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Comprobando la versión..."
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "¡TODO CORRECTO!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "¡ERROR!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -207,22 +187,22 @@ msgstr ""
 "Tarea terminada. Realizada(s) <b>%d</b> actualización(es) a la versión del "
 "esquema <b>%d</b>."
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
+#: digest.php:58
 #, fuzzy
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -233,16 +213,23 @@ msgstr ""
 "navegador no lo soporta actualmente. Por favor, revise las opciones de "
 "configuración de su navegador."
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "Cargando. Por favor, espere..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Hola,"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -250,7 +237,7 @@ msgstr ""
 "Este programa requiere XmlHttpRequest para funcionar apropiadamente. Parece "
 "que su navegador no lo soporta."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -258,15 +245,15 @@ msgstr ""
 "Este programa requiere cookies para funcionar apropiadamente. Parece que su "
 "navegador no las soporta."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "La comprobación de validez del Backend ha fallado"
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "La comprobación de validez del Frontend ha fallado"
 
-#: errors.php:18
+#: errors.php:19
 #, fuzzy
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
@@ -275,15 +262,15 @@ msgstr ""
 "La versión del esquema de la base de datos es incorrecta. &lt;a href='update."
 "php'&gt;Por favor, actualice&lt;/a&gt;."
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Petición no autorizada."
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Ninguna operación a realizar."
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -291,16 +278,16 @@ msgstr ""
 "No se puede mostrar la fuente: consulta fallida. Por favor, compruebe la "
 "sintaxis de la coincidencia de etiqueta o la configuración local."
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr ""
 "Denegado. Su nivel de acceso es insuficiente para acceder a esta página."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "La comprobación de la configuración ha fallado."
 
-#: errors.php:30
+#: errors.php:31
 #, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
@@ -309,455 +296,262 @@ msgstr ""
 "Su versión de MySQL no está soportada actualmente. Por favor, vaya al sitio "
 "oficial para obtener más información."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
 "base de datos y PHP."
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "¿Comentarios?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Plegar la lista de fuentes"
 
-#: index.php:127
+#: index.php:148
 #, fuzzy
 msgid "Show articles"
 msgstr "Recientes"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Adaptable"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Todos"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Publicado"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Sin leer"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "Ignorar la puntuación"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Actualizados"
 
-#: index.php:139
+#: index.php:160
 #, fuzzy
 msgid "Sort articles"
 msgstr "Marcar el artículo como favorito"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Fecha"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Título"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "Puntos"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Actualizar"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Acciones..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Buscar..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "Suscribir a la fuente..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/Mostrar las leídas"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Otras acciones:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:173
+#: index.php:194
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "nube de etiquetas"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Crear etiqueta..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Crear filtro..."
 
-#: index.php:177
+#: index.php:198
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Atajos de teclado"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Título o contenido"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Enlace"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Contenido"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Fecha del artículo"
-
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Limpiar los artículos"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Fijar como favorito"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Publicar artículo"
-
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Asignar etiquetas"
-
-#: localized_schema.php:14
-msgid "Assign label"
-msgstr "Asignar etiqueta"
-
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Esta opción es útil cuando está leyendo varios agregadores de tipo \"planeta"
-"\" con bases de usuarios parcialmente coincidentes. Cuando está desactivado, "
-"fuerza a que los mismos envíos que hayan sido publicados por varias fuentes "
-"aparezcan una sola vez."
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Muestra una lista expandida de los artículos de la fuente, en lugar de "
-"mostrar por separado los títulos y contenidos de los artículos."
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"Cuando se pulse el botón \"Marcar como leído\" de la barra de herramientas, "
-"abrir automáticamente la siguiente fuente que tenga artículos sin leer."
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Esta opción permite el envío diario de un recopilatorio de los titulares "
-"nuevos o sin leer a la dirección de correo que haya indicado en la "
-"configuración"
-
-#: localized_schema.php:20
-#, fuzzy
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Esta opción habilita el marcado automático de los artículos como leídos "
-"cuando está activado el modo de despliegue combinado de las fuentes y nos "
-"desplazamos por la lista de artículos (excepción: fuente de artículos "
-"recientes)."
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-"Quitar todo salvo las etiquetas HTML más comunes cuando se esté leyendo los "
-"artículos."
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Cuando esté activada la función de autodetectar etiquetas en los artículos, "
-"no se incluirán estas etiquetas (lista de etiquetas separadas por comas)"
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Cuando esta opción está habilitada, los titulares de fuentes especiales y "
-"etiquetas son agrupados por fuentes"
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
+#: opml.php:70
+#, fuzzy, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "Añadiendo categoría <b>%s</b>."
 
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr ""
-"Purgar los envíos antiguos después de este número de días (0 = desactivado)"
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Asignar etiqueta"
 
-#: localized_schema.php:28
-#, fuzzy
-msgid "Default interval between feed updates"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
-"Intervalo por defecto entre las actualizaciones de las fuentes (en minutos)"
-
-#: localized_schema.php:29
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "No se han encontrado artículos que desplegar."
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Permitir envíos duplicados"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Habilitar las categorías de fuentes"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "Mostrar una vista previa del contenido en la lista de titulares"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Formato de fecha corto"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Formato de fecha largo"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Despliegue combinado de la fuente"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Ocultar las fuentes que no tengan mensajes sin leer"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Al ponerse al corriente, mostrar la siguiente fuente"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Invertir el orden de los titulares (los más antiguos primero)"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Activar los correos recopilatorios"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "Añadiendo fuente..."
 
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Confirmar el marcado de la fuente como leída"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Crear filtro"
 
-#: localized_schema.php:42
+#: opml.php:230
 #, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "Expandir automáticamente los artículos en el modo combinado"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Quitar las etiquetas peligrosas de los artículos"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Etiquetas añadidas a la lista negra"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Antigüedad máxima de los artículos recientes (en horas)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "Marcar como leídos los artículos de los correos de recopilación"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "Expandir automáticamente los artículos en el modo combinado"
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Purgar los artículos no leídos"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "Mostrar las fuentes especiales cuando se oculten las fuentes leídas"
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Agrupar los titulares en fuentes virtuales"
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "No mostrar imágenes en los artículos"
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
-
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
+msgid "is already imported."
+msgstr "Ya importado."
 
-#: localized_schema.php:54
+#: opml.php:250
 #, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Ordenar las fuentes en función del número de artículos sin leer"
+msgid "OK"
+msgstr "¡TODO CORRECTO!"
 
-#: localized_schema.php:55
-#, fuzzy
-msgid "Customize stylesheet"
-msgstr "URL de la hoja de estilo del usuario"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Error mientras se analizaba el documento."
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Error: por favor, suba un fichero OPML."
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "Utilidad OPML"
 
-#: opml.php:188
+#: opml.php:492
 #, fuzzy
 msgid "Importing OPML..."
 msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Volver a las preferencias"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Fuentes"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "Filtros"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "Usuarios"
 
-#: prefs.php:109
+#: prefs.php:108
 #, fuzzy
 msgid "Linked"
 msgstr "Enlace"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "Crear una nueva cuenta"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr ""
 "El registro de nuevos usuarios ha sido deshabilitado por el administrador."
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -767,194 +561,419 @@ msgstr ""
 "Las cuentas en las que no se entre una vez serán borradas automáticamente a "
 "las 24 horas de enviar la contraseña temporal."
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "Nombre de usuario deseado:"
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "Comprobar la disponibilidad"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "Correo electrónico:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "¿Cuánto es dos más dos?"
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "Enviar solicitud de registro"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "Su información de registro está incompleta"
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "Lo sentimos, este nombre de usuario ya existe."
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "El registro ha fallado."
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "Cuenta creada correctamente."
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr ""
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 #, fuzzy
 msgid "Register"
 msgstr "Registrado"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-#, fuzzy
-msgid "Default profile"
-msgstr "Límite de artículos por defecto"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Atajos de teclado"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "sin etiquetas"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Navegación"
+
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Mover entre fuentes"
+
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Mover entre artículos"
+
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Mostrar el diálogo de búsqueda"
+
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Activar las acciones de los artículos"
+
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Alternar favoritos"
+
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Alternar publicados"
+
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Alternar no leídos"
+
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Editar etiquetas"
 
-#: modules/backend-rpc.php:836
+#: help/main.php:20
 #, fuzzy
-msgid "Your request could not be completed."
-msgstr "Su información de registro está incompleta"
+msgid "Dismiss selected articles"
+msgstr "¿Eliminar de la etiqueta los artículos seleccionados?"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr ""
+#: help/main.php:21
+#, fuzzy
+msgid "Dismiss read articles"
+msgstr "Ocultar los artículos leídos que estén visibles"
+
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Abrir el artículo en una nueva pestaña o ventana"
+
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Marcar como leídos los artículos por debajo o por encima de éste"
+
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Desplazar el contenido del artículo"
 
-#: modules/backend-rpc.php:848
+#: help/main.php:25
 #, fuzzy
-msgid "Category update has been scheduled."
-msgstr "La contraseña ha sido cambiada."
+msgid "Email article"
+msgstr "Todos"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Otras acciones"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Seleccionar el artículo que esté detrás del cursor del ratón"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Crear etiqueta"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Crear filtro"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Plegar la barra lateral"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "Desplegar este diálogo de ayuda"
 
-#: modules/backend-rpc.php:861
+#: help/main.php:41
 #, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "No puede editar esta clase de fuente."
+msgid "Multiple articles actions"
+msgstr "Todos"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Ayuda"
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "Limpiar los artículos"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Tema de ayuda no encontrado."
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Purgar los artículos no leídos"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Activar las acciones de los artículos"
 
-#: modules/opml_domdoc.php:60
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Añadiendo categoría <b>%s</b>."
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "Limpiar los artículos"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Acciones de las fuentes"
+
+#: help/main.php:53
+#, fuzzy
+msgid "Refresh active feed"
+msgstr "Actualizar las fuentes activas"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "Suscribir a la fuente"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Editar la fuente"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Marcar la fuente como leída"
+
+#: help/main.php:58
+#, fuzzy
+msgid "Reverse headlines order"
+msgstr "Invertir el orden de los titulares (los más antiguos primero)"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Marcar todas las fuentes como leídas"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "si se está viendo la categoría, (des)pliéguela"
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "Ir a..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Todos"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Recientes"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Favoritos"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Publicados"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Nube de etiquetas"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Pulse cualquier tecla para cerrar esta ventana."
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Mis fuentes"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Otras fuentes"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Acciones del panel"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "Primeros 25 puestos de las fuentes"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Editar las categorías de fuentes"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Crear usuario"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "Búsqueda enfocada (si está presente)"
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+"<strong>Nota:</strong> la disponibilidad de las acciones dependerá de la "
+"configuración de Tiny Tiny RSS y de su nivel de acceso."
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Iniciar sesión"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Nombre de usuario:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr ""
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Especial"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
 msgstr ""
 
-#: modules/opml_domdoc.php:128
+#: mobile/prefs.php:24
 #, fuzzy
-msgid "is already imported."
-msgstr "Ya importado."
+msgid "Enable categories"
+msgstr "Habilitar las categorías de fuentes"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr ""
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr ""
 
-#: modules/opml_domdoc.php:148
+#: mobile/prefs.php:29
 #, fuzzy
-msgid "OK"
-msgstr "¡TODO CORRECTO!"
+msgid "Browse categories like folders"
+msgstr "Reordenar categorías"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Error mientras se analizaba el documento."
+#: mobile/prefs.php:35
+#, fuzzy
+msgid "Show images in posts"
+msgstr "No mostrar imágenes en los artículos"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Error: por favor, suba un fichero OPML."
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Ocultar/Mostrar las leídas"
 
-#: modules/popup-dialog.php:34
+#: mobile/prefs.php:45
 #, fuzzy
-msgid "Importing using DOMXML."
-msgstr "Importando OPML (usando la extensión DOMXML)..."
+msgid "Sort feeds by unread count"
+msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: modules/popup-dialog.php:40
+#: classes/article.php:25
 #, fuzzy
-msgid "Importing using DOMDocument."
-msgstr "Importando OPML (usando la extensión DOMDocument)..."
+msgid "Article not found."
+msgstr "Fuente no encontrada."
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Tema de ayuda no encontrado."
+
+#: classes/dlg.php:26
+#, fuzzy
+msgid "Prepare data"
+msgstr "Guardar"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"No se ha encontrado la extensión DOMXML, la cual es necesaria para las "
-"versiones de PHP inferiores a la 5."
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Crear filtro"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptable"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+#, fuzzy
+msgid "Default profile"
+msgstr "Límite de artículos por defecto"
+
+#: classes/dlg.php:170
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 #, fuzzy
 msgid "Activate profile"
 msgstr "¿Eliminar los filtros seleccionados?"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr ""
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enlace a la fuente de artículos publicados."
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Fuente generada"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "Aviso"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -965,11 +984,11 @@ msgstr ""
 "actualización de todas las fuentes. Por favor, inicie el proceso del demonio "
 "o solicítelo al propietario de la instancia."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -980,173 +999,176 @@ msgstr ""
 "(rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise "
 "al propietario de la instancia."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Fuente"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 #, fuzzy
 msgid "Feed URL"
 msgstr "Fuente"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "Colocar en la categoría:"
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 #, fuzzy
 msgid "Available feeds"
 msgstr "Todas las fuentes"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 #, fuzzy
 msgid "Password"
 msgstr "Contraseña:"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 #, fuzzy
 msgid "More feeds"
 msgstr "Más fuentes"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Buscar"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 #, fuzzy
 msgid "Popular feeds"
 msgstr "desplegar fuentes"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 #, fuzzy
 msgid "Feed archive"
 msgstr "Acciones de las fuentes"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 #, fuzzy
 msgid "limit:"
 msgstr "Límite:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Eliminar"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr "Buscar"
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 msgid "match on"
 msgstr "coincidencia con"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Contenido"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Título o contenido"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Limitar la búsqueda a:"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Esta fuente"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Coincidir"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "antes"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "después"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "Comprobarlo"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "en el campo"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "en"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Realizar la acción"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "con los parámetros:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Opciones"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "coincidencia inversa"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "Colocar en la categoría:"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr ""
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Crear"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
@@ -1154,108 +1176,79 @@ msgid ""
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Pulse aquí para editar"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Guardar"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 #, fuzzy
 msgid "Match:"
 msgstr "Coincidir"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "desplegar fuentes"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Todos"
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr ""
-
-#: modules/popup-dialog.php:843
-#, fuzzy
-msgid "To:"
-msgstr "Arriba"
-
-#: modules/popup-dialog.php:856
-#, fuzzy
-msgid "Subject:"
-msgstr "Seleccione:"
-
-#: modules/popup-dialog.php:872
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Cambiar el correo electrónico"
-
-#: modules/popup-dialog.php:881
+#: classes/dlg.php:821 classes/feeds.php:152
 #, fuzzy
 msgid "View as RSS"
 msgstr "Ver etiquetas"
 
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1263,300 +1256,443 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr ""
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr ""
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "Nivel de acceso:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "Nivel de acceso"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "Fuente generada"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 #, fuzzy
 msgid "Create link"
 msgstr "Crear"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:4
+#: classes/feeds.php:94 include/functions.php:3346
+#, fuzzy
+msgid "Visit the website"
+msgstr "Visitar el sitio oficial"
+
+#: classes/feeds.php:107
+#, fuzzy
+msgid "View as RSS feed"
+msgstr "Ver fuentes"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Seleccione:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "No"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Invertir"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Ninguno"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Cambiar la selección:"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Selección:"
+
+#: classes/feeds.php:138
+#, fuzzy
+msgid "Archive"
+msgstr "Fecha del artículo"
+
+#: classes/feeds.php:140
+#, fuzzy
+msgid "Move back"
+msgstr "Volver atrás"
+
+#: classes/feeds.php:141
+#, fuzzy
+msgid "Delete"
+msgstr "Por defecto"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+#, fuzzy
+msgid "Forward by email"
+msgstr "Marcar el artículo como favorito"
+
+#: classes/feeds.php:148
+#, fuzzy
+msgid "Feed:"
+msgstr "Fuente"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Fuente no encontrada."
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "marcar como leído"
+
+#: classes/feeds.php:625 include/functions.php:3318
+#, fuzzy
+msgid "Originally from:"
+msgstr "Desplegar el contenido original del artículo"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Editar las etiquetas de este artículo"
+
+#: classes/feeds.php:712 include/functions.php:3285
+#, fuzzy
+msgid "Open article in new tab"
+msgstr "Abrir el artículo en una nueva pestaña o ventana"
+
+#: classes/feeds.php:723 include/functions.php:3301
+#, fuzzy
+msgid "Close article"
+msgstr "Limpiar los artículos"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "No se han encontrado artículos sin leer."
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "No se han encontrado artículos actualizados."
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "No se han encontrado artículos favoritos."
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"No se han encontrado artículos que desplegar. Si lo desea, puede asignar "
+"artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o usar "
+"un filtro."
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "No se han encontrado artículos que desplegar."
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr ""
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
+msgid "Uncategorized"
+msgstr "Sin clasificar"
+
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr ""
+
+#: classes/mail_button.php:52
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Todos"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr ""
+
+#: classes/mail_button.php:82
+#, fuzzy
+msgid "To:"
+msgstr "Arriba"
+
+#: classes/mail_button.php:95
+#, fuzzy
+msgid "Subject:"
+msgstr "Seleccione:"
+
+#: classes/mail_button.php:111
+#, fuzzy
+msgid "Send e-mail"
+msgstr "Cambiar el correo electrónico"
+
+#: classes/note_button.php:7 js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Editar etiquetas"
+
+#: classes/pref_feeds.php:11
 msgid "Check to enable field"
 msgstr "Marcar para habilitar el campo"
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Editar la fuente"
 
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr "Sin clasificar"
-
-#: modules/pref-feeds.php:306
+#: classes/pref_feeds.php:299
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr "usando"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Purgando el artículo"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Ocultar en mi lista de fuentes"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Contenido de derecha a izquierda"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "Incluir en el correo recopilatorio"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr "Desplegar siempre las imágenes adjuntas"
 
-#: modules/pref-feeds.php:472
-#, fuzzy
-msgid "Cache images locally (SimplePie only)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
 msgstr "Guardar las imágenes en la memoria caché local"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "¿Marcar todos los artículos como leídos?"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 msgid "Icon"
 msgstr ""
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Suscrito a las fuentes:"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Guardar las imágenes en la memoria caché local"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Hecho."
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "No se han encontrado fuentes."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Ya está suscrito a <strong>%s</strong>."
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Editar las opciones de suscripción"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoría <strong>$%s</strong> ya existe en la base de datos."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Crear categoría"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "No se han definido categorías de fuentes."
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de fuente"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Fuente completa"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 #, fuzzy
 msgid "Select"
 msgstr "Seleccione:"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "No"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Ninguno"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "Suscribir a la fuente"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Purgando la fuente seleccionada..."
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Redefinir contraseña"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 #, fuzzy
 msgid "Categories"
 msgstr "Volver a categorizar"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Editar categorías"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 #, fuzzy
 msgid "More actions..."
 msgstr "Acciones..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Purga manual"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Limpiar los datos de la fuente"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "Reiniciar la puntuación de los artículos"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importar"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Exportar OPML"
+msgid "Import my OPML"
+msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr ""
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "Incluir en el correo recopilatorio"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Publicado"
+msgid "Export OPML"
+msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1566,22 +1702,42 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
+#: classes/pref_feeds.php:1439
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1442
+#, fuzzy
+msgid "Article archive"
+msgstr "Fecha del artículo"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
 msgstr ""
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "Exportar OPML"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importar"
+
+#: classes/pref_feeds.php:1469
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Integración con Firefox"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1589,43 +1745,43 @@ msgstr ""
 "Este sitio Tiny tiny RSS puede ser usado como un lector de fuentes de "
 "Firefox si pulsa en el enlace de abajo."
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1634,1117 +1790,1376 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+msgid "Display URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Quitar el artículo de los favoritos"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 #, fuzzy
 msgid "Twitter"
 msgstr "Título"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Limpiar los datos de la fuente"
 
-#: modules/pref-feeds.php:1654
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Favoritos"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "No se han encontrado fuentes."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "No se han encontrado filtros coincidentes."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Se ha creado el filtro <strong>%s</strong>"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Crear filtro"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Editar"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Más fuentes"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Pulse aquí para editar"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 #, fuzzy
 msgid "Caption"
 msgstr "Opciones"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 #, fuzzy
 msgid "Colors"
 msgstr "Cerrar"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Foreground:"
 msgstr "primer plano"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Background:"
 msgstr "fondo"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Se ha creado la etiqueta <strong>%s</strong>"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Crear etiqueta"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Limpiar los colores"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "La antigua contraseña no puede dejarse en blanco."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "La nueva contraseña no puede dejarse en blanco."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "Las contraseñas introducidas no coinciden."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "La contraseña ha sido cambiada."
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "La contraseña antigua es incorrecta."
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "La configuración ha sido guardada."
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opción desconocida: %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Datos personales"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Nivel de acceso"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 #, fuzzy
 msgid "Save data"
 msgstr "Guardar"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Confirme la nueva contraseña"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Seleccionar plantilla"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Sí"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "No"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Guardar la configuración"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Opciones por defecto"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Detalles del usuario"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Registrado"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Última sesión el"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Contador de fuentes suscritas"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Fuentes suscritas"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Editor de usuario"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Nivel de acceso:"
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Cambiar la contraseña a"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "Correo electrónico:"
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "Se ha cambiado la contraseña del usuario <strong>%s</strong>."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 "Se ha añadido al usuario <strong>%s</strong> con la contraseña <strong>%s</"
 "strong>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "No se puede crear el usuario <strong>%s</strong>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "El usuario <strong>%s</strong> ya existe."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "Se ha cambiado la contraseña del usuario <strong>%s</strong> a <strong>%s</"
 "strong>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Notificando a <strong>%s</strong>."
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notificación de cambio de contraseña"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Crear usuario"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Redefinir contraseña"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Nivel de acceso"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Última sesión"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "No se han definido usuarios."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "No se han encontrado usuarios coincidentes."
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Filtrado de contenido"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
-msgstr ""
-"Tiny tiny RSS soporta el filtrado (o procesamiento) de artículos. El "
-"filtrado se realiza una vez, cuando el nuevo artículo se importa a la base "
-"de datos desde la fuente de noticias: el campo especificado se compara con "
-"alguna expresión regular y se realiza alguna acción. La comparación de "
-"expresiones regulares es sensible a mayúsculas y minúsculas."
-
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Acciones soportadas: filtrar (no importar) el artículo, marcarlo como leído, "
-"fijarlo como favorito, asignarle etiquetas y darle una puntuación. Los "
-"filtros pueden ser definidos globalmente o para algunas fuentes concretas."
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-"Se soportan las coincidencias múltiples e inversas. Todos los filtros de "
-"coincidencia son tenidos en cuenta cuando el artículo está siendo importado "
-"y todas las acciones se ejecutan en secuencia. Las coincidencias inversas "
-"invierten los resultados. Por ejemplo, el filtro de coincidencia XYZZY en el "
-"título con la marca inversa seleccionada, hará que todos los artículos sean "
-"coincidentes salvo los que incluyan XYZZY en el título."
-
-#: help/2.php:9
-msgid "See also:"
-msgstr "Ver también:"
-
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Atajos de teclado"
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "sin etiquetas"
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Navegación"
+#: classes/rpc.php:741
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Su información de registro está incompleta"
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Mover entre fuentes"
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
+msgstr ""
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Mover entre artículos"
+#: classes/rpc.php:753
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "La contraseña ha sido cambiada."
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Mostrar el diálogo de búsqueda"
+#: classes/rpc.php:766
+#, fuzzy
+msgid "Can't update this kind of feed."
+msgstr "No puede editar esta clase de fuente."
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Activar las acciones de los artículos"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "Marcar el artículo como favorito"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "Alternar favoritos"
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Alternar publicados"
+#: classes/tweet_button.php:7
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Título"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Alternar no leídos"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "No se pudo validar la sesión (IP incorrecta)"
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Editar etiquetas"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: help/3.php:20
+#: include/functions.php:2013
 #, fuzzy
-msgid "Dismiss selected articles"
-msgstr "¿Eliminar de la etiqueta los artículos seleccionados?"
+msgid "Archived articles"
+msgstr "Favoritos"
 
-#: help/3.php:21
+#: include/functions.php:3109 js/viewfeed.js:1945
 #, fuzzy
-msgid "Dismiss read articles"
-msgstr "Ocultar los artículos leídos que estén visibles"
-
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Abrir el artículo en una nueva pestaña o ventana"
+msgid "Click to play"
+msgstr "Pulse aquí para editar"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marcar como leídos los artículos por debajo o por encima de éste"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr ""
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Desplazar el contenido del artículo"
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
 
-#: help/3.php:25
+#: include/functions.php:4061
 #, fuzzy
-msgid "Email article"
-msgstr "Todos"
+msgid "(edit note)"
+msgstr "editar nota"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Otras acciones"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "No se ha seleccionado ninguna fuente."
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Seleccionar el artículo que esté detrás del cursor del ratón"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "tipo desconocido"
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Plegar la barra lateral"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Adjunto:"
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "Desplegar este diálogo de ayuda"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Adjuntos:"
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Todos"
+#: include/functions.php:5091
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "Favoritos"
 
-#: help/3.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Limpiar los artículos"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "No se han encontrado fuentes."
 
-#: help/3.php:45
+#: include/functions.php:5161
 #, fuzzy
-msgid "Select unread articles"
-msgstr "Purgar los artículos no leídos"
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"No se puede encontrar el fichero de esquema necesario. Versión necesaria:"
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Activar las acciones de los artículos"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Limpiar los artículos"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Acciones de las fuentes"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:53
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Actualizar las fuentes activas"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Título o contenido"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Editar la fuente"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Enlace"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Marcar la fuente como leída"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Fecha del artículo"
 
-#: help/3.php:58
+#: include/localized_schema.php:9
 #, fuzzy
-msgid "Reverse headlines order"
-msgstr "Invertir el orden de los titulares (los más antiguos primero)"
+msgid "Delete article"
+msgstr "Limpiar los artículos"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Marcar todas las fuentes como leídas"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Fijar como favorito"
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "si se está viendo la categoría, (des)pliéguela"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Publicar artículo"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "Ir a..."
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Asignar etiquetas"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Todos"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Asignar etiqueta"
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Recientes"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Favoritos"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "General"
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Publicados"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Interfaz"
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Nube de etiquetas"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Avanzado"
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
 msgstr ""
+"Esta opción es útil cuando está leyendo varios agregadores de tipo \"planeta"
+"\" con bases de usuarios parcialmente coincidentes. Cuando está desactivado, "
+"fuerza a que los mismos envíos que hayan sido publicados por varias fuentes "
+"aparezcan una sola vez."
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Pulse cualquier tecla para cerrar esta ventana."
-
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Mis fuentes"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Muestra una lista expandida de los artículos de la fuente, en lugar de "
+"mostrar por separado los títulos y contenidos de los artículos."
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Otras fuentes"
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"Cuando se pulse el botón \"Marcar como leído\" de la barra de herramientas, "
+"abrir automáticamente la siguiente fuente que tenga artículos sin leer."
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Acciones del panel"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Esta opción permite el envío diario de un recopilatorio de los titulares "
+"nuevos o sin leer a la dirección de correo que haya indicado en la "
+"configuración"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "Primeros 25 puestos de las fuentes"
+#: include/localized_schema.php:25
+#, fuzzy
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Esta opción habilita el marcado automático de los artículos como leídos "
+"cuando está activado el modo de despliegue combinado de las fuentes y nos "
+"desplazamos por la lista de artículos (excepción: fuente de artículos "
+"recientes)."
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Editar las categorías de fuentes"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+"Quitar todo salvo las etiquetas HTML más comunes cuando se esté leyendo los "
+"artículos."
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "Búsqueda enfocada (si está presente)"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Cuando esté activada la función de autodetectar etiquetas en los artículos, "
+"no se incluirán estas etiquetas (lista de etiquetas separadas por comas)"
 
-#: help/4.php:39
+#: include/localized_schema.php:28
 msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
 msgstr ""
-"<strong>Nota:</strong> la disponibilidad de las acciones dependerá de la "
-"configuración de Tiny Tiny RSS y de su nivel de acceso."
+"Cuando esta opción está habilitada, los titulares de fuentes especiales y "
+"etiquetas son agrupados por fuentes"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Iniciar sesión"
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Nombre de usuario:"
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr ""
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Contraseña:"
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
+
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+"Purgar los envíos antiguos después de este número de días (0 = desactivado)"
+
+#: include/localized_schema.php:33
+#, fuzzy
+msgid "Default interval between feed updates"
+msgstr ""
+"Intervalo por defecto entre las actualizaciones de las fuentes (en minutos)"
+
+#: include/localized_schema.php:34
+#, fuzzy
+msgid "Amount of articles to display at once"
+msgstr "No se han encontrado artículos que desplegar."
+
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Permitir envíos duplicados"
+
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "Habilitar las categorías de fuentes"
+
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "Mostrar una vista previa del contenido en la lista de titulares"
+
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Formato de fecha corto"
+
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Formato de fecha largo"
+
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Despliegue combinado de la fuente"
+
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Ocultar las fuentes que no tengan mensajes sin leer"
+
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Al ponerse al corriente, mostrar la siguiente fuente"
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "Ordenar las fuentes en función del número de artículos sin leer"
+
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Invertir el orden de los titulares (los más antiguos primero)"
+
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Activar los correos recopilatorios"
+
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Confirmar el marcado de la fuente como leída"
+
+#: include/localized_schema.php:47
+#, fuzzy
+msgid "Automatically mark articles as read"
+msgstr "Expandir automáticamente los artículos en el modo combinado"
+
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Quitar las etiquetas peligrosas de los artículos"
+
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Etiquetas añadidas a la lista negra"
+
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Antigüedad máxima de los artículos recientes (en horas)"
+
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "Marcar como leídos los artículos de los correos de recopilación"
+
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "Expandir automáticamente los artículos en el modo combinado"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr ""
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Purgar los artículos no leídos"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Especial"
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "Mostrar las fuentes especiales cuando se oculten las fuentes leídas"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr ""
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Agrupar los titulares en fuentes virtuales"
 
-#: mobile/prefs.php:24
-#, fuzzy
-msgid "Enable categories"
-msgstr "Habilitar las categorías de fuentes"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "No mostrar imágenes en los artículos"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
+#: include/localized_schema.php:57
+msgid "Enable external API"
 msgstr ""
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
+#: include/localized_schema.php:58
+msgid "User timezone"
 msgstr ""
 
-#: mobile/prefs.php:29
+#: include/localized_schema.php:59
 #, fuzzy
-msgid "Browse categories like folders"
-msgstr "Reordenar categorías"
+msgid "Sort headlines by feed date"
+msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: mobile/prefs.php:35
+#: include/localized_schema.php:60 js/prefs.js:1762
 #, fuzzy
-msgid "Show images in posts"
-msgstr "No mostrar imágenes en los artículos"
+msgid "Customize stylesheet"
+msgstr "URL de la hoja de estilo del usuario"
 
-#: mobile/prefs.php:40
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Ocultar/Mostrar las leídas"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr ""
 
-#: mobile/prefs.php:45
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Idioma:"
+
+#: include/login_form.php:148
 #, fuzzy
-msgid "Sort feeds by unread count"
-msgstr "Ordenar las fuentes en función del número de artículos sin leer"
+msgid "Profile:"
+msgstr "Fichero:"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "No se pudo validar la sesión (IP incorrecta)"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr ""
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Nombre de usuario o contraseña incorrecta"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "¿Marcar todos los artículos de %s como leídos?"
 
+#: js/digest.js:69
 #, fuzzy
-#~ msgid "Archived articles"
-#~ msgstr "Favoritos"
+msgid "Mark %d displayed articles as read?"
+msgstr "¿Marcar %d artículo(s) como leído(s)?"
 
-#~ msgid "Select:"
-#~ msgstr "Seleccione:"
-
-#~ msgid "Invert"
-#~ msgstr "Invertir"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Quitar el artículo de los favoritos"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Cambiar la selección:"
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Marcar el artículo como favorito"
 
-#~ msgid "Selection:"
-#~ msgstr "Selección:"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Anular la publicación del artículo"
 
+#: js/digest.js:265
 #, fuzzy
-#~ msgid "Move back"
-#~ msgstr "Volver atrás"
+msgid "Original article"
+msgstr "Desplegar el contenido original del artículo"
 
+#: js/digest.js:267
 #, fuzzy
-#~ msgid "Delete"
-#~ msgstr "Por defecto"
+msgid "Close this panel"
+msgstr "Cerrar esta ventana"
 
+#: js/digest.js:290
 #, fuzzy
-#~ msgid "Feed:"
-#~ msgstr "Fuente"
+msgid "Error: unable to load article."
+msgstr "Error: por favor, suba un fichero OPML."
 
+#: js/digest.js:444
 #, fuzzy
-#~ msgid "Visit the website"
-#~ msgstr "Visitar el sitio oficial"
+msgid "Click to expand article."
+msgstr "Desplegar el artículo"
 
+#: js/digest.js:519
 #, fuzzy
-#~ msgid "View as RSS feed"
-#~ msgstr "Ver fuentes"
+msgid "%d more..."
+msgstr "Ir a..."
 
+#: js/digest.js:526
 #, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "Pulse aquí para editar"
+msgid "No unread feeds."
+msgstr "Ocultar/Mostrar las leídas"
 
-#~ msgid " - "
-#~ msgstr " - "
+#: js/digest.js:628
+#, fuzzy
+msgid "Load more..."
+msgstr "Ir a..."
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Editar las etiquetas de este artículo"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr ""
 
+#: js/FeedTree.js:137
 #, fuzzy
-#~ msgid "Open article in new tab"
-#~ msgstr "Abrir el artículo en una nueva pestaña o ventana"
+msgid "Update feed"
+msgstr "Actualizar todas las fuentes"
 
-#, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "Editar etiquetas"
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
 
+#: js/functions.js:647
 #, fuzzy
-#~ msgid "Close this panel"
-#~ msgstr "Cerrar esta ventana"
+msgid "Date syntax appears to be correct:"
+msgstr "La contraseña antigua es incorrecta."
 
-#~ msgid "mark as read"
-#~ msgstr "marcar como leído"
+#: js/functions.js:650
+#, fuzzy
+msgid "Date syntax is incorrect."
+msgstr "La contraseña antigua es incorrecta."
 
+#: js/functions.js:777
 #, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Publicar artículo"
+msgid "Remove stored feed icon?"
+msgstr "Eliminar los datos almacenados"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "No se han encontrado artículos sin leer."
+#: js/functions.js:809
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Por favor, seleccione una fuente."
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "No se han encontrado artículos actualizados."
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr ""
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "No se han encontrado artículos favoritos."
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Por favor, introduzca el título de la etiqueta:"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "No se han encontrado artículos que desplegar. Si lo desea, puede asignar "
-#~ "artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o "
-#~ "usar un filtro."
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "No se puede crear la etiqueta: falta el título."
 
-#~ msgid "No articles found to display."
-#~ msgstr "No se han encontrado artículos que desplegar."
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "Suscribir a la fuente"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr ""
-#~ "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "Suscribiéndose a la fuente..."
 
+#: js/functions.js:901
 #, fuzzy
-#~ msgid "Remove:"
-#~ msgstr "Eliminar"
+msgid "Subscribed to %s"
+msgstr "Suscrito a las fuentes:"
 
-#, fuzzy
-#~ msgid "Assign:"
-#~ msgstr "Asignar etiqueta:"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr ""
+
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
 
+#: js/functions.js:945
 #, fuzzy
-#~ msgid "(edit note)"
-#~ msgstr "editar nota"
+msgid "Couldn't download the specified URL."
+msgstr "Suscripción imposible: no se ha indicado la URL de la fuente."
 
-#~ msgid "No feed selected."
-#~ msgstr "No se ha seleccionado ninguna fuente."
+#: js/functions.js:948
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "No está suscrito a ninguna fuente."
 
-#~ msgid "unknown type"
-#~ msgstr "tipo desconocido"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Crear filtro"
 
-#~ msgid "Attachment:"
-#~ msgstr "Adjunto:"
+#: js/functions.js:987 js/prefs.js:165
+msgid "Filter Test Results"
+msgstr ""
 
-#~ msgid "Attachments:"
-#~ msgstr "Adjuntos:"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
 
-#~ msgid "Language:"
-#~ msgstr "Idioma:"
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "¿Cancelar la suscripción a %s?"
 
+#: js/functions.js:1173
 #, fuzzy
-#~ msgid "Profile:"
-#~ msgstr "Fichero:"
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Cambiar a modo de reordenación de categorías"
-
-#~ msgid "Update all feeds"
-#~ msgstr "Actualizar todas las fuentes"
+msgid "Please enter category title:"
+msgstr "Por favor, introduzca una nota para este artículo:"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Ordenar por nombre o por el contador de no leídos"
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr ""
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "¿Marcar todos los artículos de %s como leídos?"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "No puede editar esta clase de fuente."
 
+#: js/functions.js:1400
 #, fuzzy
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "¿Marcar %d artículo(s) como leído(s)?"
+msgid "Edit Feed"
+msgstr "Editar la fuente"
 
-#~ msgid "Unstar article"
-#~ msgstr "Quitar el artículo de los favoritos"
+#: js/functions.js:1438
+#, fuzzy
+msgid "More Feeds"
+msgstr "Más fuentes"
 
-#~ msgid "Star article"
-#~ msgstr "Marcar el artículo como favorito"
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "No se han seleccionado fuentes."
 
-#~ msgid "Unpublish article"
-#~ msgstr "Anular la publicación del artículo"
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
 
+#: js/functions.js:1580
 #, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Desplegar el contenido original del artículo"
+msgid "Feeds with update errors"
+msgstr "Editor de fuente"
 
+#: js/functions.js:1591 js/prefs.js:1229
 #, fuzzy
-#~ msgid "Error: unable to load article."
-#~ msgstr "Error: por favor, suba un fichero OPML."
+msgid "Remove selected feeds?"
+msgstr "¿Eliminar los filtros seleccionados?"
 
-#, fuzzy
-#~ msgid "Click to expand article."
-#~ msgstr "Desplegar el artículo"
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "No se han seleccionado artículos."
 
+#: js/mail_button.js:21
 #, fuzzy
-#~ msgid "No unread feeds."
-#~ msgstr "Ocultar/Mostrar las leídas"
+msgid "Forward article by email"
+msgstr "Marcar el artículo como favorito"
 
+#: js/PrefFilterTree.js:32
 #, fuzzy
-#~ msgid "Load more..."
-#~ msgstr "Ir a..."
+msgid "Inverse"
+msgstr "(inverso)"
 
-#, fuzzy
-#~ msgid "Update feed"
-#~ msgstr "Actualizar todas las fuentes"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Por favor, introduzca el nombre de usuario:"
 
-#, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "La contraseña antigua es incorrecta."
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr ""
+"No se puede crear el usuario: no se ha especificado el nombre de usuario."
 
+#: js/prefs.js:134
 #, fuzzy
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "La contraseña antigua es incorrecta."
+msgid "Edit Filter"
+msgstr "Filtros"
 
-#, fuzzy
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Eliminar los datos almacenados"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "¿Eliminar el filtro %s?"
 
-#, fuzzy
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Por favor, seleccione una fuente."
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "¿Eliminar las etiquetas seleccionadas?"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Por favor, introduzca el título de la etiqueta:"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "No se han seleccionado etiquetas."
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "No se puede crear la etiqueta: falta el título."
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Suscribir a la fuente"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "No se han seleccionado usuarios."
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Suscribiéndose a la fuente..."
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "¿Eliminar los filtros seleccionados?"
 
-#, fuzzy
-#~ msgid "Subscribed to %s"
-#~ msgstr "Suscrito a las fuentes:"
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "No se han seleccionado filtros."
 
-#, fuzzy
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "Suscripción imposible: no se ha indicado la URL de la fuente."
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
-#, fuzzy
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "No está suscrito a ninguna fuente."
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Por favor, seleccione una única fuente."
 
-#~ msgid "Create Filter"
-#~ msgstr "Crear filtro"
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "¿Cancelar la suscripción a %s?"
+#: js/prefs.js:433
+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)"
 
-#, fuzzy
-#~ msgid "Please enter category title:"
-#~ msgstr "Por favor, introduzca una nota para este artículo:"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "El campo de nombre de usuario no puede dejarse en blanco."
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "No puede editar esta clase de fuente."
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Por favor, seleccione un único usuario."
 
-#, fuzzy
-#~ msgid "Edit Feed"
-#~ msgstr "Editar la fuente"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "¿Reajustar la contraseña del usuario seleccionado?"
 
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Por favor, seleccione un único filtro."
+
+#: js/prefs.js:652
 #, fuzzy
-#~ msgid "More Feeds"
-#~ msgstr "Más fuentes"
+msgid "Edit Multiple Feeds"
+msgstr "Editor de múltiples fuentes"
 
-#~ msgid "No feeds are selected."
-#~ msgstr "No se han seleccionado fuentes."
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
 
+#: js/prefs.js:768
 #, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "¿Eliminar los filtros seleccionados?"
+msgid "OPML Import"
+msgstr "Importar"
 
+#: js/prefs.js:795
 #, fuzzy
-#~ msgid "Inverse"
-#~ msgstr "(inverso)"
+msgid "Please choose an OPML file first."
+msgstr "Por favor, seleccione alguna fuente primero."
 
-#~ msgid "Please enter login:"
-#~ msgstr "Por favor, introduzca el nombre de usuario:"
+#: js/prefs.js:811
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "Por favor, seleccione alguna fuente primero."
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr ""
-#~ "No se puede crear el usuario: no se ha especificado el nombre de usuario."
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "¿Reajustar a las opciones por defecto?"
 
+#: js/prefs.js:1149
 #, fuzzy
-#~ msgid "Edit Filter"
-#~ msgstr "Filtros"
+msgid "Feed Categories"
+msgstr "Volver a categorizar"
+
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "¿Eliminar las categorías seleccionadas?"
+
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "No se han seleccionado categorías."
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "¿Eliminar el filtro %s?"
+#: js/prefs.js:1218
+msgid "Feeds without recent updates"
+msgstr ""
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "¿Eliminar las etiquetas seleccionadas?"
+#: js/prefs.js:1267
+#, fuzzy
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
 
-#~ msgid "No labels are selected."
-#~ msgstr "No se han seleccionado etiquetas."
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr ""
+"¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
-#~ msgid "No users are selected."
-#~ msgstr "No se han seleccionado usuarios."
+#: js/prefs.js:1399
+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."
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "¿Eliminar los filtros seleccionados?"
+#: js/prefs.js:1419
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "¿Reajustar los colores de la etiqueta a las opciones por defecto?"
 
-#~ msgid "No filters are selected."
-#~ msgstr "No se han seleccionado filtros."
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr ""
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Por favor, seleccione una única fuente."
+#: js/prefs.js:1483
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "No se ha seleccionado ningún artículo."
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
+#: js/prefs.js:1491 js/prefs.js:1544
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "¿Eliminar los filtros seleccionados?"
 
-#~ 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)"
+#: js/prefs.js:1507 js/prefs.js:1560
+#, fuzzy
+msgid "Please choose a profile to activate."
+msgstr "Por favor, seleccione alguna fuente primero."
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "El campo de nombre de usuario no puede dejarse en blanco."
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#~ msgid "Please select only one user."
-#~ msgstr "Por favor, seleccione un único usuario."
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "¿Reajustar la contraseña del usuario seleccionado?"
+#: js/prefs.js:1670
+#, fuzzy
+msgid "Label Editor"
+msgstr "Editor de fuente"
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Por favor, seleccione un único filtro."
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
 
+#: js/prefs.js:1804
 #, fuzzy
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Editor de múltiples fuentes"
+msgid "Link Instance"
+msgstr "Editar etiquetas"
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
+#: js/prefs.js:1855
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Editar etiquetas"
 
+#: js/prefs.js:1904
 #, fuzzy
-#~ msgid "OPML Import"
-#~ msgstr "Importar"
+msgid "Remove selected instances?"
+msgstr "¿Eliminar los filtros seleccionados?"
 
+#: js/prefs.js:1921 js/prefs.js:1933
 #, fuzzy
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Por favor, seleccione alguna fuente primero."
+msgid "No instances are selected."
+msgstr "No se han seleccionado filtros."
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "¿Reajustar a las opciones por defecto?"
+#: js/prefs.js:1938
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Por favor, seleccione un único filtro."
 
+#: js/prefs.js:1973
 #, fuzzy
-#~ msgid "Feed Categories"
-#~ msgstr "Volver a categorizar"
+msgid "Export Data"
+msgstr "Exportar OPML"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "¿Eliminar las categorías seleccionadas?"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "No categories are selected."
-#~ msgstr "No se han seleccionado categorías."
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "Importar"
 
+#: js/share_button.js:10
 #, fuzzy
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
+msgid "Share article by URL"
+msgstr "Marcar el artículo como favorito"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr ""
-#~ "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "¿Marcar todos los artículos como leídos?"
 
-#~ 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."
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "No puede cancelar la suscripción a la categoría."
 
-#, fuzzy
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "¿Reajustar los colores de la etiqueta a las opciones por defecto?"
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Por favor, seleccione alguna fuente primero."
 
-#, fuzzy
-#~ msgid "No profiles are selected."
-#~ msgstr "No se ha seleccionado ningún artículo."
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "¿Reiniciar la puntuación de los artículos de %s?"
+
+#: js/tt-rss.js:1083
 #, fuzzy
-#~ msgid "Activate selected profile?"
-#~ msgstr "¿Eliminar los filtros seleccionados?"
+msgid "New version available!"
+msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "¿Marcar todos los artículos visibles de %s como leídos?"
+
+#: js/viewfeed.js:901
 #, fuzzy
-#~ msgid "Label Editor"
-#~ msgstr "Editor de fuente"
+msgid "Delete %d selected articles in %s?"
+msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
+#: js/viewfeed.js:903
 #, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "Editar etiquetas"
+msgid "Delete %d selected articles?"
+msgstr "¿Eliminar de la etiqueta los artículos seleccionados?"
 
+#: js/viewfeed.js:945
 #, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "¿Eliminar los filtros seleccionados?"
+msgid "Archive %d selected articles in %s?"
+msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
+#: js/viewfeed.js:948
 #, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "No se han seleccionado filtros."
+msgid "Move %d archived articles back?"
+msgstr "Favoritos"
+
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
+#: js/viewfeed.js:1016
 #, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "Por favor, seleccione un único filtro."
+msgid "Edit article Tags"
+msgstr "Editar etiquetas"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "¿Marcar todos los artículos como leídos?"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "No se ha seleccionado ningún artículo."
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "No puede cancelar la suscripción a la categoría."
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "No se han encontrado artículos que marcar"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Por favor, seleccione alguna fuente primero."
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "¿Marcar %d artículo(s) como leído(s)?"
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "No puede reiniciar la puntuación de esta clase de fuente."
+#: js/viewfeed.js:1374
+#, fuzzy
+msgid "Loading..."
+msgstr "Cargando la lista de la fuente..."
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "¿Reiniciar la puntuación de los artículos de %s?"
+#: js/viewfeed.js:1848
+#, fuzzy
+msgid "Open original article"
+msgstr "Desplegar el contenido original del artículo"
 
+#: js/viewfeed.js:1854
 #, fuzzy
-#~ msgid "New version available!"
-#~ msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
+msgid "View in a tt-rss tab"
+msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
-#~ msgid "No articles are selected."
-#~ msgstr "No se han seleccionado artículos."
+#: js/viewfeed.js:1862
+#, fuzzy
+msgid "Mark above as read"
+msgstr "Marcar como leído"
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "¿Marcar todos los artículos visibles de %s como leídos?"
+#: js/viewfeed.js:1868
+#, fuzzy
+msgid "Mark below as read"
+msgstr "Marcar como leído"
 
+#: js/viewfeed.js:1914
 #, fuzzy
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
+msgid "Remove label"
+msgstr "¿Eliminar las etiquetas seleccionadas?"
 
+#: js/viewfeed.js:1938
 #, fuzzy
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "¿Eliminar de la etiqueta los artículos seleccionados?"
+msgid "Playing..."
+msgstr "Cargando la lista de la fuente..."
 
+#: js/viewfeed.js:1939
 #, fuzzy
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
+msgid "Click to pause"
+msgstr "Pulse aquí para editar"
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
+#~ msgid "Help"
+#~ msgstr "Ayuda"
 
 #, fuzzy
-#~ msgid "Edit article Tags"
-#~ msgstr "Editar etiquetas"
+#~ msgid "Importing using DOMXML."
+#~ msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#~ msgid "No article is selected."
-#~ msgstr "No se ha seleccionado ningún artículo."
+#, fuzzy
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "Importando OPML (usando la extensión DOMDocument)..."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "No se han encontrado artículos que marcar"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "No se ha encontrado la extensión DOMXML, la cual es necesaria para las "
+#~ "versiones de PHP inferiores a la 5."
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "¿Marcar %d artículo(s) como leído(s)?"
+#, fuzzy
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "Guardar las imágenes en la memoria caché local"
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "Cargando la lista de la fuente..."
+#~ msgid "Publish"
+#~ msgstr "Publicado"
+
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "Se ha cambiado la contraseña del usuario <strong>%s</strong>."
+
+#~ msgid "Content filtering"
+#~ msgstr "Filtrado de contenido"
+
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny tiny RSS soporta el filtrado (o procesamiento) de artículos. El "
+#~ "filtrado se realiza una vez, cuando el nuevo artículo se importa a la "
+#~ "base de datos desde la fuente de noticias: el campo especificado se "
+#~ "compara con alguna expresión regular y se realiza alguna acción. La "
+#~ "comparación de expresiones regulares es sensible a mayúsculas y "
+#~ "minúsculas."
+
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "Acciones soportadas: filtrar (no importar) el artículo, marcarlo como "
+#~ "leído, fijarlo como favorito, asignarle etiquetas y darle una puntuación. "
+#~ "Los filtros pueden ser definidos globalmente o para algunas fuentes "
+#~ "concretas."
+
+#~ msgid ""
+#~ "Multiple and inverse matching are supported. All matching filters are "
+#~ "considered when article is being imported and all actions executed in "
+#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
+#~ "XYZZY in title with inverse flag will match all articles, except those "
+#~ "containing string XYZZY in title."
+#~ msgstr ""
+#~ "Se soportan las coincidencias múltiples e inversas. Todos los filtros de "
+#~ "coincidencia son tenidos en cuenta cuando el artículo está siendo "
+#~ "importado y todas las acciones se ejecutan en secuencia. Las "
+#~ "coincidencias inversas invierten los resultados. Por ejemplo, el filtro "
+#~ "de coincidencia XYZZY en el título con la marca inversa seleccionada, "
+#~ "hará que todos los artículos sean coincidentes salvo los que incluyan "
+#~ "XYZZY en el título."
+
+#~ msgid "See also:"
+#~ msgstr "Ver también:"
 
 #, fuzzy
-#~ msgid "Open original article"
-#~ msgstr "Desplegar el contenido original del artículo"
+#~ msgid "Add category..."
+#~ msgstr "Añadiendo categoría de fuentes..."
 
 #, fuzzy
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Abrir el artículo en una nueva pestaña o ventana"
+#~ msgid "Add label..."
+#~ msgstr "Añadiendo categoría de fuentes..."
 
 #, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "¿Eliminar las etiquetas seleccionadas?"
+#~ msgid "description"
+#~ msgstr "Selección"
 
 #, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "Cargando la lista de la fuente..."
+#~ msgid "Dismiss article"
+#~ msgstr "Publicar artículo"
 
 #, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "Pulse aquí para editar"
+#~ msgid "Remove:"
+#~ msgstr "Eliminar"
 
 #, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Marcar el artículo como favorito"
+#~ msgid "Assign:"
+#~ msgstr "Asignar etiqueta:"
+
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Cambiar a modo de reordenación de categorías"
+
+#~ msgid "Update all feeds"
+#~ msgstr "Actualizar todas las fuentes"
+
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Ordenar por nombre o por el contador de no leídos"
 
 #, fuzzy
 #~ msgid "feeds"
@@ -2811,20 +3226,9 @@ msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 #~ msgid "Subscribed to %d feed(s)."
 #~ msgstr "Suscrito a las fuentes:"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Añadiendo categoría de fuentes..."
-
 #~ msgid "audio/mpeg"
 #~ msgstr "audio/mpeg"
 
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Añadiendo categoría de fuentes..."
-
-#~ msgid "General"
-#~ msgstr "General"
-
 #~ msgid "Enable offline reading"
 #~ msgstr "Activar la lectura fuera de línea"
 
@@ -2833,9 +3237,6 @@ msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 #~ "Sincronizar los nuevos artículos para su lectura fuera de línea usando "
 #~ "\"Google Gears\"."
 
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
 #~ msgid "Default article limit"
 #~ msgstr "Límite de artículos por defecto"
 
@@ -2870,9 +3271,6 @@ msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 #~ "Esta opción oculta la lista de fuentes y le permite ser cambiada al vuelo "
 #~ "(útil para pequeñas pantallas)."
 
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
 #~ msgid "Enable feed icons"
 #~ msgstr "Habilitar los iconos de la fuente"
 
@@ -3161,10 +3559,6 @@ msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 #~ msgid "Adding feed..."
 #~ msgstr "Añadiendo fuente..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "Añadiendo fuente..."
-
 #~ msgid "Adding user..."
 #~ msgstr "Añadiendo usuario..."
 
@@ -3284,9 +3678,6 @@ msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 #~ msgid "Saving user..."
 #~ msgstr "Guardando usuario..."
 
-#~ msgid "Selection"
-#~ msgstr "Selección"
-
 #~ msgid "Tiny Tiny RSS is in offline mode."
 #~ msgstr "Tiny Tiny RSS está en modo fuera de línea."
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 91b0f106..5cdadde1 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index f6262fd0..ac2de624 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Ploc\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -19,153 +19,134 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Utiliser la valeur par défaut"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Ne jamais purger"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "Au bout d'une semaine"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "Au bout de 2 semaines"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "Au bout d'un mois"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "Au bout de 2 mois"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "Au bout de 3 mois"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Toutes les 15 minutes"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Toutes les 30 minutes"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "Toutes les heures"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Toutes les 4 heures"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Toutes les 12 heures"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Une fois par jour"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr "Twitter OAuth"
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Utilisateur"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Utilisateur avancé"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Flux"
-
-#: backend.php:201
-msgid "Article not found."
-msgstr "Article non trouvé."
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Flux non trouvé."
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "Chargement en cours, veuillez patienter..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "Vous n'avez pas les permissions nécessaires pour exécuter ce script."
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Outil de mise à jour de la base de données"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "Impossible de mettre la base de données à jour"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr "Impossible de trouver le fichier de schéma, version requise :"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", trouvée : "
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "La base de données de Tiny Tiny RSS est à jour."
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "Merci de sauvegardez votre base de données avant de poursuivre."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -174,54 +155,54 @@ msgstr ""
 "La base de données de Tiny Tiny RSS a besoin d'être mise à jour (version <b>"
 "%d</b> à <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Exécuter les mises à jour"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "Exécution des mises à jour..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Passage à la version %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Vérification de la version..."
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK !"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "ERREUR !"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr "Terminé. Le schéma est passé de la version <b>%d</b> à <b>%d</b>."
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
+#: digest.php:58
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\t\tfor this application to function properly. Please check your\n"
@@ -231,16 +212,23 @@ msgstr ""
 "\t\t\tpour le bon fonctionnement de ce logiciel. Veuillez modifier la\n"
 "\t\t\tconfiguration de votre navigateur."
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "Chargement en cours, veuillez patienter..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Bonjour,"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -249,7 +237,7 @@ msgstr ""
 "correctement. Votre navigateur web semble ne pas intégrer cette "
 "fonctionnalité."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -258,15 +246,15 @@ msgstr ""
 "correctement. Votre navigateur web semble ne pas intégrer cette "
 "fonctionnalité."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "Le test du moteur a échoué"
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "Le test de l'interface a échoué."
 
-#: errors.php:18
+#: errors.php:19
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
 "update&lt;/a&gt;."
@@ -274,15 +262,15 @@ msgstr ""
 "Version non valable pour le schéma de la base de données. &lt;a href='db-"
 "updater.php'&gt;Veuillez le mettre à jour&lt;/a&gt;."
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Requête rejetée."
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Aucune opération à effectuer."
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -290,17 +278,17 @@ msgstr ""
 "Impossible d'afficher le flux : la requête n'a pas abouti. Veuillez vérifier "
 "la syntaxe de l'étiquette de correspondance ou la configuration locale."
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr ""
 "Accès refusé. Vous n'avez pas les permissions nécessaires pour accéder à "
 "cette page."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "Échec du test de configuration"
 
-#: errors.php:30
+#: errors.php:31
 #, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
@@ -309,447 +297,256 @@ msgstr ""
 "Votre version de MySQL n'est pas gérée pour le moment. Reportez-vous au \n"
 "\t\tsite officiel pour plus d'informations."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "Le test d'échappement sql a échoué, vérifier votre base de donnée et votre "
 "configuration de PHP."
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Configuration"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "Commentaires ?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Contracter la liste des flux"
 
-#: index.php:127
+#: index.php:148
 msgid "Show articles"
 msgstr "Afficher les articles"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Remarquables"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Publiés"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Non lus"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "Ignorer le score"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: index.php:139
+#: index.php:160
 msgid "Sort articles"
 msgstr "Classer les articles"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Date"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Titre"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "Score"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Actions..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Rechercher..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Editer ce flux..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Tous les flux :"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Autres actions :"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr "Basculer en mode résumé..."
 
-#: index.php:173
+#: index.php:194
 msgid "Show tag cloud..."
 msgstr "Afficher le nuage d'étiquettes"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Créer une étiquette..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Créer un filtre..."
 
-#: index.php:177
+#: index.php:198
 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Titre ou contenu"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Lien"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Contenu"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Date de l'article"
-
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Filtrer l'article"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Marquer comme remarquable"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Publier l'article"
+#: opml.php:70
+#, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
 
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Assigner des tags"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Paramétrage de la préférence %s à %s"
 
-#: localized_schema.php:14
-msgid "Assign label"
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
 msgstr "Assigner l'étiquette"
 
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Cette option est utile si vous lisez des articles venant d'agrégateurs de "
-"type « planet&nbsp,;», dans lesquels certains flux se recoupent largement. "
-"Lorsque cette option est désactivée, les articles en double sont affichées "
-"en un seul exemplaire."
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Affiche les articles sous la forme d'une liste étendue, au lieu de deux "
-"listes séparées (une pour les en-têtes et une pour le contenu)"
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"Lorsque vous cliquez sur « Marquer comme lus », le prochain flux contenant "
-"des articles non lus est automatiquement affiché"
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Cette option active l'envoi d'une synthèse quotidienne (digest) des en-têtes "
-"nouveaux et non lus à l'adresse électronique donnée"
-
-#: localized_schema.php:20
-#, fuzzy
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Cette option active le marquage automatique des articles comme lus en "
-"affichage combiné (sauf dans le flux virtuel Nouveaux articles) pendant que "
-"vous faites défiler la liste des articles"
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-"Élimine toutes les balises HTML sauf les plus courantes lors de la lecture "
-"des articles"
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Lors de l'auto-détection des tags dans les articles, ces tags ne sont pas "
-"utilisés (en faire une liste, séparés par des virgules)"
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-" Avec cette option activée, les entêtes dans les flux spéciaux et par "
-"étiquettes sont regroupés par flux"
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-"Utiliser les dates spécifiées dans le flux pour trier les en-têtes au lieu "
-"des dates importées localement."
-
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr "Personnaliser les feuilles de style CSS"
-
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
-
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
-"Purger les articles plus vieux que le nombre de jours donné (0 pour ne "
-"jamais purger)"
-
-#: localized_schema.php:28
-msgid "Default interval between feed updates"
-msgstr "Intervalle par défaut entre les mises à jour de flux"
-
-#: localized_schema.php:29
-msgid "Amount of articles to display at once"
-msgstr "Nombre d'articles à afficher"
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Permettre les articles en double"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Utiliser les catégories de flux"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "Donner un aperçu du contenu dans la liste des en-têtes"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Format de date court"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Format de date long"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Affichage combiné des flux"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Masquer les flux sans article non lu"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Sauter automatiquement au flux suivant"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Trier les flux par nombre d'articles non lus"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
 
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Activer la synthèse quotidienne par courrier électronique"
-
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Demander confirmation pour marquer un flux comme lu"
-
-#: localized_schema.php:42
-#, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "Développer automatiquement les articles en affichage combiné"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Éliminer les tags non sûrs des articles"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Tags exclus"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Ancienneté maximale pour un nouvel article (en heures)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "Marquer tous les articles du compte-rendu par email comme lus"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "Développer automatiquement les articles en affichage combiné"
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Purger les articles non lus"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "Afficher les flux spéciaux en masquant les flux lus"
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Regrouper les entêtes dans des flux virtuels"
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "Ne pas afficher les images dans les articles"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "Supprimer le filtre %s ?"
 
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr "Activer les API externes"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Créer un filtre"
 
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr "Fuseau horaire de l'utilisateur"
+#: opml.php:230
+msgid "is already imported."
+msgstr "est déjà importé."
 
-#: localized_schema.php:54
-msgid "Sort headlines by feed date"
-msgstr "Trier les en-têtes par date de flux"
+#: opml.php:250
+msgid "OK"
+msgstr "OK"
 
-#: localized_schema.php:55
-msgid "Customize stylesheet"
-msgstr "Personnaliser la feuille de style"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Erreur lors de l'analyse du document."
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Erreur : veuillez envoyer un document OPML."
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "Outil OPML"
 
-#: opml.php:188
+#: opml.php:492
 #, fuzzy
 msgid "Importing OPML..."
 msgstr "Import en utilisant DOMXML."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Revenir à la configuration"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Flux"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "Etiquettes"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: prefs.php:109
+#: prefs.php:108
 #, fuzzy
 msgid "Linked"
 msgstr "Lien"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "Créer un nouveau compte"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr ""
 "L'inscription de nouveaux utilisateurs est désactivée par l'administrateur."
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -759,182 +556,406 @@ msgstr ""
 "ne s'étant pas connectés au moins une fois dans les 24 heures qui suivent "
 "l'envoi du mail seront supprimés."
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "Login souhaité :"
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "Adresse email :"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "Combien dont 2 plus 2 :"
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "Envoyer l'inscription"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "Vos informations d'inscription sont incomplètes."
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "Désolé, ce login est déjà utilisé."
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "L'inscription a échoué."
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "Compte créé avec succès."
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr "S'inscrire via Twitter"
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 "Impossible de se connecter à Twitter. Rafraichissez la page ou essayez à "
 "nouveau plus tard."
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "Félicitation ! Vous vous êtes inscrit via Twitter avec succès."
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 msgid "Register"
 msgstr "S'inscrire"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-msgid "Default profile"
-msgstr "Profil par défaut"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "aucun tag"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Navigation"
 
-#: modules/backend-rpc.php:836
-msgid "Your request could not be completed."
-msgstr "Votre requête ne peut être traitée."
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Naviguer dans les flux"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr "La mise à jour des flux a été planifiée."
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Naviguer dans les articles"
 
-#: modules/backend-rpc.php:848
-msgid "Category update has been scheduled."
-msgstr "La mise à jour des catégories a été planifiée."
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Afficher la fenêtre de recherche"
 
-#: modules/backend-rpc.php:861
-msgid "Can't update this kind of feed."
-msgstr "Impossible de mettre à jour ce type de flux."
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Activer les actions de l'article"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Aide"
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Marquer comme remarquable"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Sujet non trouvé dans l'aide."
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Marquer comme publié"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Fermer cette fenêtre"
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Marquages comme non-lu"
 
-#: modules/opml_domdoc.php:60
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Editer les tags"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Paramétrage de la préférence %s à %s"
+#: help/main.php:20
+msgid "Dismiss selected articles"
+msgstr "Exclure les articles sélectionnés"
 
-#: modules/opml_domdoc.php:128
-msgid "is already imported."
-msgstr "est déjà importé."
+#: help/main.php:21
+msgid "Dismiss read articles"
+msgstr "Exclure les articles lus"
 
-#: modules/opml_domdoc.php:148
-msgid "OK"
-msgstr "OK"
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Ouvrir les articles dans une nouvelle fenêtre"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Erreur lors de l'analyse du document."
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Marquer les articles au-dessous/au-dessus de l'article actif comme lus"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Erreur : veuillez envoyer un document OPML."
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Faire déflier le contenu de l'article"
 
-#: modules/popup-dialog.php:34
-msgid "Importing using DOMXML."
-msgstr "Import en utilisant DOMXML."
+#: help/main.php:25
+#, fuzzy
+msgid "Email article"
+msgstr "Tous les articles"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Autres actions"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Selectionner l'article sous le curseur de la souris"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Créer une étiquette"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Créer un filtre"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Contracter le menu"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "Afficher cette aide"
+
+#: help/main.php:41
+#, fuzzy
+msgid "Multiple articles actions"
+msgstr "Articles multiples"
+
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "Filtrer l'article"
+
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Purger les articles non lus"
+
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Activer les actions de l'article"
+
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "Filtrer l'article"
+
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Actions sur ce flux"
+
+#: help/main.php:53
+msgid "Refresh active feed"
+msgstr "Mettre à jour le flux actif"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "S'abonner au flux"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Editer le flux"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Marquer le flux comme lu"
+
+#: help/main.php:58
+msgid "Reverse headlines order"
+msgstr "Inverser l'ordre des titres"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Marquer tous les flux comme lus"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "Déployer/Contracter lors de la consultation des catégories"
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "Aller à..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Tous les articles"
 
-#: modules/popup-dialog.php:40
-msgid "Importing using DOMDocument."
-msgstr "Import en utilisant DOMDocument."
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Nouveaux articles"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Articles remarquables"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Articles publiés"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Nuage de tags"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+"D'autres astuces sur l'interface sont disponibles sur le wiki de Tiny Tiny "
+"RSS."
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Appuyer sur une touche pour fermer cette fenêtre"
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Mes flux"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Autres flux"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Actions du panneau :"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "Top 25 des flux"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Editer les catégories des flux"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Créer l'utilisateur"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "Focus sur la recherche (si affichée)"
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+"<b>Note :</b> certaines actions peuvent ne pas être disponibles, selon la "
+"configuration de Tiny Tiny RSS et vos permissions."
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Se connecter"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Login :"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr "Accueil"
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Spécial"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
+msgstr "Rien trouvé (cliquez pour recharger le flux)."
+
+#: mobile/prefs.php:24
+msgid "Enable categories"
+msgstr "Utiliser les catégories de flux"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr "Marche"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr "Arrêt"
+
+#: mobile/prefs.php:29
+msgid "Browse categories like folders"
+msgstr ""
+
+#: mobile/prefs.php:35
+msgid "Show images in posts"
+msgstr "Afficher les images dans les articles"
+
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Masquer les flux lus"
+
+#: mobile/prefs.php:45
+msgid "Sort feeds by unread count"
+msgstr "Trier les flux par nombre d'articles non lus"
+
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Article non trouvé."
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Sujet non trouvé dans l'aide."
+
+#: classes/dlg.php:26
+#, fuzzy
+msgid "Prepare data"
+msgstr "Enregistrer les données"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Fermer cette fenêtre"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"Extension DOMXML non trouvée. Cette extension est requise pour les versions "
-"de php inférieures à 5.Extension DOMXML non trouvée. Elle est nécessaire "
-"pour les versions de PHP antérieures à la 5."
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Création d'un profil"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 msgid "(active)"
 msgstr "(actif)"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+msgid "Default profile"
+msgstr "Profil par défaut"
+
+#: classes/dlg.php:170
 msgid "Remove selected profiles"
 msgstr "Supprimer les filtres sélectionnés"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 msgid "Activate profile"
 msgstr "Activer le profil"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "Avertissement"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -944,11 +965,11 @@ msgstr ""
 "n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le "
 "démarrer ou contacter l'administrateur."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -958,266 +979,244 @@ msgstr ""
 "de flux. Cela peut indiquer un problème comme un crash ou un suspension du "
 "processus. Veuillez vérifier son état ou bien contacter l'administrateur."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Flux"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Identification"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Se connecter"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 msgid "Password"
 msgstr "Mot de passe"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 msgid "More feeds"
 msgstr "D'autres flux"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Annuler"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Rechercher"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 msgid "Popular feeds"
 msgstr "Flux populaires"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 msgid "Feed archive"
 msgstr "Archive du flux"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 msgid "limit:"
 msgstr "limite :"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Supprimer"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr "Rechercher"
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 msgid "match on"
 msgstr "correspond à"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Contenu"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Titre ou contenu"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Restreindre la recherche à :"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Ce flux"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Correspondance"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "avant"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "après"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "Vérifier"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "sur le champ"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "dans"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Exécuter l'action"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "avec les paramètres :"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Options"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Activé"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "Correspondance inverse"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "Placer dans la catégorie :"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr ""
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Créer"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Cliquer pour éditer"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés ?"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Enregistrer"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 msgid "Tag Cloud"
 msgstr "Nuage d'étiquettes"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 #, fuzzy
 msgid "Match:"
 msgstr "Correspondance"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "Afficher l'URL"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr "[Transféré]"
+#: classes/dlg.php:821 classes/feeds.php:152
+msgid "View as RSS"
+msgstr "Voir comme RSS"
 
-#: modules/popup-dialog.php:813
-msgid "Multiple articles"
-msgstr "Articles multiples"
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr "De :"
-
-#: modules/popup-dialog.php:843
-msgid "To:"
-msgstr "A :"
-
-#: modules/popup-dialog.php:856
-msgid "Subject:"
-msgstr "Sujet :"
-
-#: modules/popup-dialog.php:872
-msgid "Send e-mail"
-msgstr "Envoyer l'email"
-
-#: modules/popup-dialog.php:881
-msgid "View as RSS"
-msgstr "Voir comme RSS"
-
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
 
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 msgid "Details"
 msgstr "Détails"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr "Télécharger"
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1229,77 +1228,227 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être "
 "utilisé comme base de départ."
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr ""
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL du flux :"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr ""
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "Permissions :"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "Permissions"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "Générer une nouvelle URL"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 #, fuzzy
 msgid "Create link"
 msgstr "Créer"
 
-#: modules/popup-dialog.php:1094
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: classes/feeds.php:94 include/functions.php:3346
+msgid "Visit the website"
+msgstr "Visiter le site web"
+
+#: classes/feeds.php:107
+msgid "View as RSS feed"
+msgstr "Voir comme flux RSS"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Sélectionner :"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Tout"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Inverse"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Aucun"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Sélectionner :"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Sélection :"
+
+#: classes/feeds.php:138
+msgid "Archive"
+msgstr "Archive"
+
+#: classes/feeds.php:140
+msgid "Move back"
+msgstr "Revenir"
+
+#: classes/feeds.php:141
+msgid "Delete"
+msgstr "Supprimer"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+msgid "Forward by email"
+msgstr "Transférer par email"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "Flux :"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Flux non trouvé."
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "marquer comme lu"
+
+#: classes/feeds.php:625 include/functions.php:3318
+msgid "Originally from:"
+msgstr "Origine :"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Editer les tags pour cet article"
+
+#: classes/feeds.php:712 include/functions.php:3285
+msgid "Open article in new tab"
+msgstr "Ouvrir les articles dans un nouvel onglet"
+
+#: classes/feeds.php:723 include/functions.php:3301
 #, fuzzy
-msgid "You can share this article by the following unique URL:"
-msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
+msgid "Close article"
+msgstr "Filtrer l'article"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "Aucun article non-lu à afficher"
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "Aucun article mis à jour à afficher"
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "Aucun article remarquable à afficher"
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"Aucun article trouvé à afficher. Vous pouvez assigner des étiquettes aux "
+"articles manuellement (voir les actions du menu ci-dessus) ou utiliser un "
+"filtre."
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "Aucun article à afficher"
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Flux mis à jour à %s"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Des erreurs sont survenues pendant la mise à jour de certains flux (cliquer "
+"ici pour les détails)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
+msgid "Uncategorized"
+msgstr "Sans catégorie"
+
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr "[Transféré]"
+
+#: classes/mail_button.php:52
+msgid "Multiple articles"
+msgstr "Articles multiples"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr "De :"
+
+#: classes/mail_button.php:82
+msgid "To:"
+msgstr "A :"
+
+#: classes/mail_button.php:95
+msgid "Subject:"
+msgstr "Sujet :"
+
+#: classes/mail_button.php:111
+msgid "Send e-mail"
+msgstr "Envoyer l'email"
+
+#: classes/note_button.php:7 js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Editer les étiquettes de l'article"
 
-#: modules/pref-feeds.php:4
+#: classes/pref_feeds.php:11
 msgid "Check to enable field"
 msgstr "Cocher pour activer le champ"
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "flux"
 
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr "Sans catégorie"
-
-#: modules/pref-feeds.php:306
+#: classes/pref_feeds.php:299
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr "en utilisant"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1307,220 +1456,203 @@ msgstr ""
 "<b>Astuce :</b> vous devez renseigner vos informations d'identification si "
 "le flux nécessite une authentification, sauf pour les flux Twitter."
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Contenu écrit de droite à gauche"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: modules/pref-feeds.php:472
-msgid "Cache images locally (SimplePie only)"
-msgstr "Enregistrer les images dans le cache local (seulement avec SimplePie)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
+msgstr "Enregistrer localement les images"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marquer tous les articles comme lus ?"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 msgid "Icon"
 msgstr "Icône"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr "Remplacer"
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Abonné à %s"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Enregistrer localement les images"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Tout est terminé."
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonné à <b>%s</b>."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Aucun flux trouvé."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Déjà abonné à <b>%s</b>."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Impossible de s'abonner à <b>%s</b>."
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Se désabonner des flux sélectionnés ?"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Editer les options d'abonnement"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La catégorie <b>%s</b> existe déjà dans la base de données."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Créer la catégorie"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "Aucune catégorie de flux définie."
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 msgid "Remove selected categories"
 msgstr "Supprimer les catégories sélectionnées"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Mettre à jour le flux actif"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 msgid "Select"
 msgstr "Sélectionner"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Tout"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Aucun"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "S'abonner au flux"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 msgid "Edit selected feeds"
 msgstr "Editer les flux sélectionnés"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 msgid "Categories"
 msgstr "Catégories"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Editer les catégories"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 msgid "More actions..."
 msgstr "Autres actions..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr "<b>Astuce :</b> vous pouvez faire glisser les flux et les catagories."
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
+#, fuzzy
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 "En utilisant OPML, vous pouvez exporter et importer vos flux et vos "
 "paramètres de Tiny Tiny RSS."
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+#, fuzzy
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 "Note : seul les paramètres principaux du profil peuvent être migrés en "
 "utilisant OPML."
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importer"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Exporter en OPML"
+msgid "Import my OPML"
+msgstr "Import en utilisant DOMXML."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom"
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Publiés"
+msgid "Export OPML"
+msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -1528,24 +1660,46 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
+#, fuzzy
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 "Note : l'OPML publié n'inclue ni vos paramètres Tiny Tiny RSS, ni les flux "
 "qui requièrent une authentification, ni les flux masqués parmi flux "
 "populaires."
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
-msgstr "Afficher l'URL"
+#: classes/pref_feeds.php:1439
+#, fuzzy
+msgid "Display published OPML URL"
+msgstr "URL OPML publique"
+
+#: classes/pref_feeds.php:1442
+#, fuzzy
+msgid "Article archive"
+msgstr "Date de l'article"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "Exporter en OPML"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importer"
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1469
 msgid "Firefox integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1553,15 +1707,15 @@ msgstr ""
 "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
 "en cliquant sur le lien ci-dessous."
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr "S'abonner via bookmarklet"
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1570,25 +1724,25 @@ msgstr ""
 "le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce "
 "flux."
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "S'abonner dans Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "Articles publiés et flux générés"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 msgid "Published articles and generated feeds"
 msgstr "Articles publiés et flux générés"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1596,28 +1750,32 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+msgid "Display URL"
+msgstr "Afficher l'URL"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Ne plus marquer comme remarquable"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 msgid "Twitter"
 msgstr "Twitter"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1625,7 +1783,7 @@ msgstr ""
 "Avant de mettre à jour vos flux Twitter, vous devez enregistrer cette "
 "instance de Tiny Tiny RSS avec Twitter.com."
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
@@ -1633,1120 +1791,1305 @@ msgstr ""
 "Vous vous êtes inscrit avec succès sur Twitter.com et vous devriez être en "
 "mesure d'accéder à vos flux Twitter."
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr "S'inscrire sur Twitter.com"
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 msgid "Clear stored credentials"
 msgstr "Effacer les données d'authentification stockées"
 
-#: modules/pref-feeds.php:1654
-#, php-format
-msgid "%d archived articles"
-msgstr "%d articles archivés"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "Aucun flux trouvé."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtre <b>%s</b> créé"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Créer un filtre"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Editer"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "D'autres flux"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Cliquer pour éditer"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "Légende"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 msgid "Colors"
 msgstr "Couleurs"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Foreground:"
 msgstr "Premier plan :"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Background:"
 msgstr "Arrière-plan :"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Etiquette <b>%s</b> créé"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Créer une étiquette"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Ré-initialiser les couleurs"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "L'ancien mot de passe ne peut pas être vide."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "Le nouveau mot de passe ne peut pas être vide."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "Les mots de passe saisie ne sont pas identiques."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "Le mot de passe a été modifié."
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "L'ancien mot de passe n'est pas correct."
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "La configuration a été enregistrée."
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Option inconnue : %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr "Vos données personnelles ont été sauvegardées."
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Données personnelles"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr "Nom"
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "Adresse électronique"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Permissions"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 msgid "Save data"
 msgstr "Enregistrer les données"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 msgid "Your password is at default value, please change it."
 msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Confirmation du mot de passe"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Sélectionner un thème"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr "Personnaliser"
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Oui"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "Non"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Enregistrer la configuration"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr "Gérer les profils"
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Revenir aux valeurs par défaut"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Détails de l'utilisateur"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Inscrit"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Dernière connexion"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Nombre d'abonnements à des flux"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Flux abonnés"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Éditeur d'utilisateur"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Permissions :"
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Nouveau mot de passe"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "Adresse email :"
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "Mot de passe de l'utilisateur <b>%s</b> modifié."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Utilisateur <b>%s</b> ajouté avec le mot de passe <b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Impossible de créer l'utilisateur <b>%s</b>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "L'utilisateur <b>%s</b> existe déjà."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "Mot de passe de l'utilisateur <b>%s</b>\n"
 "\t\t\t\t\tmodifié en <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Notification <b>%s</b>."
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notification de changement de mot passe"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Créer l'utilisateur"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Permissions"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "Aucun utilisateur défini."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Filtrage de contenu"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
-msgstr ""
-"Tiny Tiny RSS permet le filtrage (ou le traitement) d'articles. Le filtrage "
-"est effectué une seule foi, lors le nouvel article est importé en base "
-"depuis le flux rss le champ spécifié est comparé à l'expression régulière et "
-"une action est effectuée.La comparaison des expressions régulières est "
-"insensible à la casse."
-
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Les actions possibles sont : filtrer (ne pas importer) l'article, marquer "
-"l'article comme lu, marquer comme remarquable, assigner un ou plusieurs tags "
-"et assigner un score. Les filtres peuvent être définis globalement ou pour "
-"un flux uniquement."
-
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-"Les correspondances multiples et inverses sont possibles. Tous les filtres "
-"de correspondance sont activés quand un article est importé et les actions "
-"sont exécutées de manière séquentielle. La correspondance inverse a pour "
-"effet d'inverser le résultat de la correspondance. Par exemple le filtre de "
-"correspondance XYZZY dans le titre avec l'option d'inversion sélectionnera "
-"tous les articles sauf ceux dont le titre contiendra XYZZY."
-
-#: help/2.php:9
-msgid "See also:"
-msgstr "Voir également :"
-
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Raccourcis clavier"
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Navigation"
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "aucun tag"
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Naviguer dans les flux"
+#: classes/rpc.php:741
+msgid "Your request could not be completed."
+msgstr "Votre requête ne peut être traitée."
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Naviguer dans les articles"
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
+msgstr "La mise à jour des flux a été planifiée."
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Afficher la fenêtre de recherche"
+#: classes/rpc.php:753
+msgid "Category update has been scheduled."
+msgstr "La mise à jour des catégories a été planifiée."
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Activer les actions de l'article"
+#: classes/rpc.php:766
+msgid "Can't update this kind of feed."
+msgstr "Impossible de mettre à jour ce type de flux."
 
-#: help/3.php:16
-msgid "Toggle starred"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
 msgstr "Marquer comme remarquable"
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Marquer comme publié"
+#: classes/share_button.php:29
+#, fuzzy
+msgid "You can share this article by the following unique URL:"
+msgstr "Vous pouvez consulter ce flux comme RSS en utilisant l'URL suivante :"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Marquages comme non-lu"
+#: classes/tweet_button.php:7
+msgid "Share on Twitter"
+msgstr "Partager sur Twitter"
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Editer les tags"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Echec de la validation de la session (adresse ip incorrecte)"
 
-#: help/3.php:20
-msgid "Dismiss selected articles"
-msgstr "Exclure les articles sélectionnés"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "Login ou mot de passe incorrect"
 
-#: help/3.php:21
-msgid "Dismiss read articles"
-msgstr "Exclure les articles lus"
+#: include/functions.php:2013
+msgid "Archived articles"
+msgstr "Articles archivés"
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Ouvrir les articles dans une nouvelle fenêtre"
+#: include/functions.php:3109 js/viewfeed.js:1945
+#, fuzzy
+msgid "Click to play"
+msgstr "Cliquer pour éditer"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marquer les articles au-dessous/au-dessus de l'article actif comme lus"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr ""
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Faire déflier le contenu de l'article"
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
 
-#: help/3.php:25
+#: include/functions.php:4061
 #, fuzzy
-msgid "Email article"
-msgstr "Tous les articles"
+msgid "(edit note)"
+msgstr "éditer la note"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Autres actions"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "Aucun flux sélectionné."
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Selectionner l'article sous le curseur de la souris"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "type inconnu"
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Contracter le menu"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Fichier attaché :"
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "Afficher cette aide"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Fichiers attachés :"
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Articles multiples"
+#: include/functions.php:5091
+#, php-format
+msgid "%d archived articles"
+msgstr "%d articles archivés"
 
-#: help/3.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Filtrer l'article"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "Aucun flux trouvé."
 
-#: help/3.php:45
+#: include/functions.php:5161
 #, fuzzy
-msgid "Select unread articles"
-msgstr "Purger les articles non lus"
+msgid "Could not import: incorrect schema version."
+msgstr "Impossible de trouver le fichier de schéma, version requise :"
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Activer les actions de l'article"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Filtrer l'article"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Actions sur ce flux"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:53
-msgid "Refresh active feed"
-msgstr "Mettre à jour le flux actif"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Titre ou contenu"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Editer le flux"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Lien"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Marquer le flux comme lu"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Date de l'article"
 
-#: help/3.php:58
-msgid "Reverse headlines order"
-msgstr "Inverser l'ordre des titres"
+#: include/localized_schema.php:9
+#, fuzzy
+msgid "Delete article"
+msgstr "Filtrer l'article"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Marquer tous les flux comme lus"
-
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "Déployer/Contracter lors de la consultation des catégories"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Marquer comme remarquable"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "Aller à..."
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Publier l'article"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Tous les articles"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Assigner des tags"
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Nouveaux articles"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Assigner l'étiquette"
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Articles remarquables"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Articles publiés"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr ""
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Nuage de tags"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr ""
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:19
+msgid "Advanced"
 msgstr ""
-"D'autres astuces sur l'interface sont disponibles sur le wiki de Tiny Tiny "
-"RSS."
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Appuyer sur une touche pour fermer cette fenêtre"
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+"Cette option est utile si vous lisez des articles venant d'agrégateurs de "
+"type « planet&nbsp,;», dans lesquels certains flux se recoupent largement. "
+"Lorsque cette option est désactivée, les articles en double sont affichées "
+"en un seul exemplaire."
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Mes flux"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Affiche les articles sous la forme d'une liste étendue, au lieu de deux "
+"listes séparées (une pour les en-têtes et une pour le contenu)"
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Autres flux"
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"Lorsque vous cliquez sur « Marquer comme lus », le prochain flux contenant "
+"des articles non lus est automatiquement affiché"
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Actions du panneau :"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Cette option active l'envoi d'une synthèse quotidienne (digest) des en-têtes "
+"nouveaux et non lus à l'adresse électronique donnée"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "Top 25 des flux"
+#: include/localized_schema.php:25
+#, fuzzy
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Cette option active le marquage automatique des articles comme lus en "
+"affichage combiné (sauf dans le flux virtuel Nouveaux articles) pendant que "
+"vous faites défiler la liste des articles"
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Editer les catégories des flux"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+"Élimine toutes les balises HTML sauf les plus courantes lors de la lecture "
+"des articles"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "Focus sur la recherche (si affichée)"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Lors de l'auto-détection des tags dans les articles, ces tags ne sont pas "
+"utilisés (en faire une liste, séparés par des virgules)"
 
-#: help/4.php:39
+#: include/localized_schema.php:28
 msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
 msgstr ""
-"<b>Note :</b> certaines actions peuvent ne pas être disponibles, selon la "
-"configuration de Tiny Tiny RSS et vos permissions."
+" Avec cette option activée, les entêtes dans les flux spéciaux et par "
+"étiquettes sont regroupés par flux"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Se connecter"
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
+"Utiliser les dates spécifiées dans le flux pour trier les en-têtes au lieu "
+"des dates importées localement."
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Login :"
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr "Personnaliser les feuilles de style CSS"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Mot de passe :"
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr "Accueil"
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+"Purger les articles plus vieux que le nombre de jours donné (0 pour ne "
+"jamais purger)"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Spécial"
+#: include/localized_schema.php:33
+msgid "Default interval between feed updates"
+msgstr "Intervalle par défaut entre les mises à jour de flux"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr "Rien trouvé (cliquez pour recharger le flux)."
+#: include/localized_schema.php:34
+msgid "Amount of articles to display at once"
+msgstr "Nombre d'articles à afficher"
 
-#: mobile/prefs.php:24
-msgid "Enable categories"
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Permettre les articles en double"
+
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
 msgstr "Utiliser les catégories de flux"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
-msgstr "Marche"
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "Donner un aperçu du contenu dans la liste des en-têtes"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
-msgstr "Arrêt"
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Format de date court"
 
-#: mobile/prefs.php:29
-msgid "Browse categories like folders"
-msgstr ""
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Format de date long"
 
-#: mobile/prefs.php:35
-msgid "Show images in posts"
-msgstr "Afficher les images dans les articles"
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Affichage combiné des flux"
 
-#: mobile/prefs.php:40
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Masquer les flux lus"
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Masquer les flux sans article non lu"
 
-#: mobile/prefs.php:45
-msgid "Sort feeds by unread count"
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Sauter automatiquement au flux suivant"
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "Echec de la validation de la session (adresse ip incorrecte)"
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Inverser l'order des en-têtes (les plus anciens en premier)"
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Login ou mot de passe incorrect"
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Activer la synthèse quotidienne par courrier électronique"
 
-#~ msgid "Archived articles"
-#~ msgstr "Articles archivés"
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Demander confirmation pour marquer un flux comme lu"
 
-#~ msgid "Select:"
-#~ msgstr "Sélectionner :"
+#: include/localized_schema.php:47
+#, fuzzy
+msgid "Automatically mark articles as read"
+msgstr "Développer automatiquement les articles en affichage combiné"
 
-#~ msgid "Invert"
-#~ msgstr "Inverse"
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Éliminer les tags non sûrs des articles"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Sélectionner :"
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Tags exclus"
 
-#~ msgid "Selection:"
-#~ msgstr "Sélection :"
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Ancienneté maximale pour un nouvel article (en heures)"
 
-#~ msgid "Archive"
-#~ msgstr "Archive"
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "Marquer tous les articles du compte-rendu par email comme lus"
 
-#~ msgid "Move back"
-#~ msgstr "Revenir"
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "Développer automatiquement les articles en affichage combiné"
 
-#~ msgid "Delete"
-#~ msgstr "Supprimer"
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Purger les articles non lus"
 
-#~ msgid "Forward by email"
-#~ msgstr "Transférer par email"
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "Afficher les flux spéciaux en masquant les flux lus"
 
-#~ msgid "Feed:"
-#~ msgstr "Flux :"
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Regrouper les entêtes dans des flux virtuels"
 
-#~ msgid "Visit the website"
-#~ msgstr "Visiter le site web"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "Ne pas afficher les images dans les articles"
 
-#~ msgid "View as RSS feed"
-#~ msgstr "Voir comme flux RSS"
+#: include/localized_schema.php:57
+msgid "Enable external API"
+msgstr "Activer les API externes"
 
-#, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "Cliquer pour éditer"
+#: include/localized_schema.php:58
+msgid "User timezone"
+msgstr "Fuseau horaire de l'utilisateur"
 
-#~ msgid " - "
-#~ msgstr " - "
+#: include/localized_schema.php:59
+msgid "Sort headlines by feed date"
+msgstr "Trier les en-têtes par date de flux"
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Editer les tags pour cet article"
+#: include/localized_schema.php:60 js/prefs.js:1762
+msgid "Customize stylesheet"
+msgstr "Personnaliser la feuille de style"
 
-#~ msgid "Open article in new tab"
-#~ msgstr "Ouvrir les articles dans un nouvel onglet"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "Editer les étiquettes de l'article"
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Langue :"
 
-#~ msgid "Share on Twitter"
-#~ msgstr "Partager sur Twitter"
+#: include/login_form.php:148
+msgid "Profile:"
+msgstr "Profil :"
 
-#~ msgid "Close this panel"
-#~ msgstr "Fermer ce panel"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr "Minimiser l'usage du trafic"
 
-#~ msgid "Originally from:"
-#~ msgstr "Origine :"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "Marquer tous les articles de %s comme lus ?"
 
-#~ msgid "mark as read"
-#~ msgstr "marquer comme lu"
+#: js/digest.js:69
+msgid "Mark %d displayed articles as read?"
+msgstr "Marquer les %d articles affichés comme lus ?"
 
-#~ msgid "Dismiss article"
-#~ msgstr "Exclure l'article"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Ne plus marquer comme remarquable"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "Aucun article non-lu à afficher"
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Marquer comme remarquable"
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "Aucun article mis à jour à afficher"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Ne plus publier l'article"
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "Aucun article remarquable à afficher"
+#: js/digest.js:265
+#, fuzzy
+msgid "Original article"
+msgstr "Ouvrir l'article original"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "Aucun article trouvé à afficher. Vous pouvez assigner des étiquettes aux "
-#~ "articles manuellement (voir les actions du menu ci-dessus) ou utiliser un "
-#~ "filtre."
+#: js/digest.js:267
+msgid "Close this panel"
+msgstr "Fermer ce panel"
 
-#~ msgid "No articles found to display."
-#~ msgstr "Aucun article à afficher"
+#: js/digest.js:290
+msgid "Error: unable to load article."
+msgstr "Erreur : impossible de charger l'article."
 
-#~ msgid "Feeds last updated at %s"
-#~ msgstr "Flux mis à jour à %s"
+#: js/digest.js:444
+msgid "Click to expand article."
+msgstr "Cliquer pour développer l'article"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr ""
-#~ "Des erreurs sont survenues pendant la mise à jour de certains flux "
-#~ "(cliquer ici pour les détails)"
+#: js/digest.js:519
+msgid "%d more..."
+msgstr "%d de plus..."
 
-#~ msgid "Remove:"
-#~ msgstr "Supprimer :"
+#: js/digest.js:526
+msgid "No unread feeds."
+msgstr "Aucun flux non lu."
 
-#~ msgid "Assign:"
-#~ msgstr "Assigner :"
+#: js/digest.js:628
+msgid "Load more..."
+msgstr "Charger plus..."
+
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)"
 
+#: js/FeedTree.js:137
+msgid "Update feed"
+msgstr "Mettre à jour le flux"
+
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
+
+#: js/functions.js:647
 #, fuzzy
-#~ msgid "(edit note)"
-#~ msgstr "éditer la note"
+msgid "Date syntax appears to be correct:"
+msgstr "La syntaxe des dates semble correcte."
 
-#~ msgid "No feed selected."
-#~ msgstr "Aucun flux sélectionné."
+#: js/functions.js:650
+msgid "Date syntax is incorrect."
+msgstr "La syntaxe des dates est incorrecte."
 
-#~ msgid "unknown type"
-#~ msgstr "type inconnu"
+#: js/functions.js:777
+msgid "Remove stored feed icon?"
+msgstr "Supprimer les données stockées ?"
 
-#~ msgid "Attachment:"
-#~ msgstr "Fichier attaché :"
+#: js/functions.js:809
+msgid "Please select an image file to upload."
+msgstr "Veuillez sélectionner une image à envoyer."
 
-#~ msgid "Attachments:"
-#~ msgstr "Fichiers attachés :"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr "Envoyer une nouvelle icône pour ce flux ?"
 
-#~ msgid "Language:"
-#~ msgstr "Langue :"
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Veuillez saisir le libellé de l'étiquette :"
 
-#~ msgid "Profile:"
-#~ msgstr "Profil :"
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "Impossible de créer une étiquette : libellé manquant."
 
-#~ msgid "Use less traffic"
-#~ msgstr "Minimiser l'usage du trafic"
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "S'abonner au flux"
 
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Activer le classement selon la catégorie"
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "Abonnement au flux..."
 
-#~ msgid "Update all feeds"
-#~ msgstr "Mettre à jour tous les flux"
+#: js/functions.js:901
+msgid "Subscribed to %s"
+msgstr "Abonné à %s"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Trier les flux par nom ou par nombre d'articles non lus"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr "L'URL spécifiée semble invalide."
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Marquer tous les articles de %s comme lus ?"
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr "L'URL spécifiée ne semble pas correspondre à un flux."
 
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "Marquer les %d articles affichés comme lus ?"
+#: js/functions.js:945
+msgid "Couldn't download the specified URL."
+msgstr "Impossible de télécharger l'URL spécifiée."
 
-#~ msgid "Unstar article"
-#~ msgstr "Ne plus marquer comme remarquable"
+#: js/functions.js:948
+msgid "You are already subscribed to this feed."
+msgstr "Vous êtes déjà abonné à ce flux."
 
-#~ msgid "Star article"
-#~ msgstr "Marquer comme remarquable"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Créer un filtre"
 
-#~ msgid "Unpublish article"
-#~ msgstr "Ne plus publier l'article"
+#: js/functions.js:987 js/prefs.js:165
+msgid "Filter Test Results"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Ouvrir l'article original"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
 
-#~ msgid "Error: unable to load article."
-#~ msgstr "Erreur : impossible de charger l'article."
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "Se désabonner de %s ?"
 
-#~ msgid "Click to expand article."
-#~ msgstr "Cliquer pour développer l'article"
+#: js/functions.js:1173
+msgid "Please enter category title:"
+msgstr "Veuillez saisir un titre pour cette catégorie :"
 
-#~ msgid "%d more..."
-#~ msgstr "%d de plus..."
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#~ msgid "No unread feeds."
-#~ msgstr "Aucun flux non lu."
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "Vous ne pouvez pas éditer ce type de flux."
 
-#~ msgid "Load more..."
-#~ msgstr "Charger plus..."
+#: js/functions.js:1400
+msgid "Edit Feed"
+msgstr "Editer le flux"
 
-#~ msgid "New articles available in this feed (click to show)"
-#~ msgstr ""
-#~ "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)"
+#: js/functions.js:1438
+msgid "More Feeds"
+msgstr "D'autres flux"
 
-#~ msgid "Update feed"
-#~ msgstr "Mettre à jour le flux"
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "Aucun flux sélectionné."
 
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
+"Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
+"articles stockés ne seront pas supprimés."
+
+#: js/functions.js:1580
+msgid "Feeds with update errors"
+msgstr "Flux avec des erreurs de mise à jour"
+
+#: js/functions.js:1591 js/prefs.js:1229
 #, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "La syntaxe des dates semble correcte."
+msgid "Remove selected feeds?"
+msgstr "Supprimer les filtres sélectionnés ?"
 
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "La syntaxe des dates est incorrecte."
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "Aucun article sélectionné."
 
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Supprimer les données stockées ?"
+#: js/mail_button.js:21
+msgid "Forward article by email"
+msgstr "Transférer l'article par email"
 
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Veuillez sélectionner une image à envoyer."
+#: js/PrefFilterTree.js:32
+msgid "Inverse"
+msgstr "Inverse"
 
-#~ msgid "Upload new icon for this feed?"
-#~ msgstr "Envoyer une nouvelle icône pour ce flux ?"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Veuillez saisir le login :"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Veuillez saisir le libellé de l'étiquette :"
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "Impossible de créer une étiquette : libellé manquant."
+#: js/prefs.js:134
+msgid "Edit Filter"
+msgstr "Editer le filtres"
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "S'abonner au flux"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "Supprimer le filtre %s ?"
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Abonnement au flux..."
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "Supprimer les étiquettes sélectionnées ?"
 
-#~ msgid "Subscribed to %s"
-#~ msgstr "Abonné à %s"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "Aucune étiquette sélectionnée."
 
-#~ msgid "Specified URL seems to be invalid."
-#~ msgstr "L'URL spécifiée semble invalide."
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
+"Supprimer les utilisateurs sélectionnés ? l'administrateur par défaut et "
+"votre compte utilisateur ne seront pas supprimés."
 
-#~ msgid "Specified URL doesn't seem to contain any feeds."
-#~ msgstr "L'URL spécifiée ne semble pas correspondre à un flux."
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "Aucun utilisateur sélectionné."
 
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "Impossible de télécharger l'URL spécifiée."
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Supprimer les filtres sélectionnés ?"
 
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Vous êtes déjà abonné à ce flux."
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "Aucun filtre sélectionné."
 
-#~ msgid "Create Filter"
-#~ msgstr "Créer un filtre"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "Se désabonner des flux sélectionnés ?"
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "Se désabonner de %s ?"
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Veuillez sélectionner un seul flux."
 
-#~ msgid "Please enter category title:"
-#~ msgstr "Veuillez saisir un titre pour cette catégorie :"
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr ""
+"Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
 
-#~ msgid "Generate new syndication address for this feed?"
-#~ msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
+#: js/prefs.js:433
+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)"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "Vous ne pouvez pas éditer ce type de flux."
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "Le nom ne peut pas être vide."
 
-#~ msgid "Edit Feed"
-#~ msgstr "Editer le flux"
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Veuillez sélectionner un seul utilisateur."
 
-#~ msgid "More Feeds"
-#~ msgstr "D'autres flux"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
 
-#~ msgid "No feeds are selected."
-#~ msgstr "Aucun flux sélectionné."
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Veuillez sélectionner un seul filtre."
 
-#~ msgid ""
-#~ "Remove selected feeds from the archive? Feeds with stored articles will "
-#~ "not be removed."
-#~ msgstr ""
-#~ "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
-#~ "articles stockés ne seront pas supprimés."
+#: js/prefs.js:652
+msgid "Edit Multiple Feeds"
+msgstr "Editer plusieurs flux"
 
-#~ msgid "Feeds with update errors"
-#~ msgstr "Flux avec des erreurs de mise à jour"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "Enregistrer les modifications aux flux sélectionnés ?"
 
-#, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Supprimer les filtres sélectionnés ?"
+#: js/prefs.js:768
+msgid "OPML Import"
+msgstr "Import OPML"
 
-#~ msgid "Inverse"
-#~ msgstr "Inverse"
+#: js/prefs.js:795
+msgid "Please choose an OPML file first."
+msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#~ msgid "Please enter login:"
-#~ msgstr "Veuillez saisir le login :"
+#: js/prefs.js:811
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "Revenir aux valeurs par défaut ?"
 
-#~ msgid "Edit Filter"
-#~ msgstr "Editer le filtres"
+#: js/prefs.js:1149
+msgid "Feed Categories"
+msgstr "Catégories de flux"
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "Supprimer le filtre %s ?"
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Supprimer les catégories sélectionnées ?"
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "Supprimer les étiquettes sélectionnées ?"
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "Aucune catégorie sélectionnée."
 
-#~ msgid "No labels are selected."
-#~ msgstr "Aucune étiquette sélectionnée."
+#: js/prefs.js:1218
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Flux avec des erreurs de mise à jour"
 
-#~ msgid ""
-#~ "Remove selected users? Neither default admin nor your account will be "
-#~ "removed."
-#~ msgstr ""
-#~ "Supprimer les utilisateurs sélectionnés ? l'administrateur par défaut et "
-#~ "votre compte utilisateur ne seront pas supprimés."
+#: js/prefs.js:1267
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
 
-#~ msgid "No users are selected."
-#~ msgstr "Aucun utilisateur sélectionné."
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr "Recalculer le score des articles des flux sélectionnés ?"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Supprimer les filtres sélectionnés ?"
+#: js/prefs.js:1399
+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."
 
-#~ msgid "No filters are selected."
-#~ msgstr "Aucun filtre sélectionné."
+#: js/prefs.js:1419
+msgid "Reset selected labels to default colors?"
+msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "Se désabonner des flux sélectionnés ?"
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr "Paramètres des profils"
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Veuillez sélectionner un seul flux."
+#: js/prefs.js:1465
+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."
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr ""
-#~ "Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
+#: js/prefs.js:1483
+msgid "No profiles are selected."
+msgstr "Aucun profil sélectionné."
 
-#~ 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)"
+#: js/prefs.js:1491 js/prefs.js:1544
+msgid "Activate selected profile?"
+msgstr "Activer le profil selectionné ?"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "Le nom ne peut pas être vide."
+#: js/prefs.js:1507 js/prefs.js:1560
+msgid "Please choose a profile to activate."
+msgstr "Veuillez sélectionner un profil à activer"
 
-#~ msgid "Please select only one user."
-#~ msgstr "Veuillez sélectionner un seul utilisateur."
+#: js/prefs.js:1568
+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 "
+"continuer ?"
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
+#: js/prefs.js:1587
+#, fuzzy
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
+"Cela va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
+"continuer ?"
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Veuillez sélectionner un seul filtre."
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "Editeur d'étiquette"
 
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Editer plusieurs flux"
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
+"Cela va effacer les informations d'authentification pour Twitter. Voulez-"
+"vous continuer ?"
+
+#: js/prefs.js:1804
+#, fuzzy
+msgid "Link Instance"
+msgstr "Editer les tags"
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Enregistrer les modifications aux flux sélectionnés ?"
+#: js/prefs.js:1855
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Editer les tags"
 
-#~ msgid "OPML Import"
-#~ msgstr "Import OPML"
+#: js/prefs.js:1904
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Supprimer les filtres sélectionnés ?"
 
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Veuillez d'abord sélectionner un fichier OPML."
+#: js/prefs.js:1921 js/prefs.js:1933
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Aucun filtre sélectionné."
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "Revenir aux valeurs par défaut ?"
+#: js/prefs.js:1938
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Veuillez sélectionner un seul filtre."
 
-#~ msgid "Feed Categories"
-#~ msgstr "Catégories de flux"
+#: js/prefs.js:1973
+#, fuzzy
+msgid "Export Data"
+msgstr "Exporter en OPML"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Supprimer les catégories sélectionnées ?"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "No categories are selected."
-#~ msgstr "Aucune catégorie sélectionnée."
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "Importer"
 
+#: js/share_button.js:10
 #, fuzzy
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Flux avec des erreurs de mise à jour"
+msgid "Share article by URL"
+msgstr "Marquer comme remarquable"
 
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "Marquer tous les articles comme lus ?"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "Recalculer le score des articles des flux sélectionnés ?"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#~ 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."
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Veuillez d'abord sélectionner un flux."
 
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr ""
-#~ "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 
-#~ msgid "Settings Profiles"
-#~ msgstr "Paramètres des profils"
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "Recalculer le score des articles de %s ?"
 
-#~ 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."
+#: js/tt-rss.js:1083
+msgid "New version available!"
+msgstr "Une nouvelle version est disponible !"
 
-#~ msgid "No profiles are selected."
-#~ msgstr "Aucun profil sélectionné."
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
-#~ msgid "Activate selected profile?"
-#~ msgstr "Activer le profil selectionné ?"
+#: js/viewfeed.js:901
+msgid "Delete %d selected articles in %s?"
+msgstr "Supprimer les %d articles sélectionnés de %s ?"
 
-#~ msgid "Please choose a profile to activate."
-#~ msgstr "Veuillez sélectionner un profil à activer"
+#: js/viewfeed.js:903
+msgid "Delete %d selected articles?"
+msgstr "Supprimer les %d articles sélectionnés ?"
 
-#~ 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 continuer ?"
+#: js/viewfeed.js:945
+msgid "Archive %d selected articles in %s?"
+msgstr "Archiver les %d articles sélectionnés de %s ?"
 
-#, fuzzy
-#~ msgid "This will invalidate all previously shared article URLs. Continue?"
-#~ msgstr ""
-#~ "Cela va invalider toutes les URL de flux générées auparavant. Souhaitez-"
-#~ "vous continuer ?"
+#: js/viewfeed.js:948
+msgid "Move %d archived articles back?"
+msgstr "Restaurer les articles archivés ?"
 
-#~ msgid "Label Editor"
-#~ msgstr "Editeur d'étiquette"
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
 
-#~ msgid ""
-#~ "This will clear your stored authentication information for Twitter. "
-#~ "Continue?"
-#~ msgstr ""
-#~ "Cela va effacer les informations d'authentification pour Twitter. Voulez-"
-#~ "vous continuer ?"
+#: js/viewfeed.js:1016
+msgid "Edit article Tags"
+msgstr "Editer les étiquettes de l'article"
+
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "Aucun article sélectionné."
+
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "Aucun article à marquer"
 
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "Marquer %d article(s) comme lu(s) ?"
+
+#: js/viewfeed.js:1374
+msgid "Loading..."
+msgstr "Chargement en cours..."
+
+#: js/viewfeed.js:1848
+msgid "Open original article"
+msgstr "Ouvrir l'article original"
+
+#: js/viewfeed.js:1854
 #, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "Editer les tags"
+msgid "View in a tt-rss tab"
+msgstr "Voir dans un nouvel onglet"
 
+#: js/viewfeed.js:1862
 #, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "Supprimer les filtres sélectionnés ?"
+msgid "Mark above as read"
+msgstr "Marquer comme lu"
 
+#: js/viewfeed.js:1868
 #, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "Aucun filtre sélectionné."
+msgid "Mark below as read"
+msgstr "Marquer comme lu"
 
+#: js/viewfeed.js:1914
 #, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "Veuillez sélectionner un seul filtre."
+msgid "Remove label"
+msgstr "Supprimer les étiquettes sélectionnées ?"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Marquer tous les articles comme lus ?"
+#: js/viewfeed.js:1938
+#, fuzzy
+msgid "Playing..."
+msgstr "Chargement en cours..."
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
+#: js/viewfeed.js:1939
+#, fuzzy
+msgid "Click to pause"
+msgstr "Cliquer pour éditer"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Veuillez d'abord sélectionner un flux."
+#~ msgid "Help"
+#~ msgstr "Aide"
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
+#~ msgid "Importing using DOMXML."
+#~ msgstr "Import en utilisant DOMXML."
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "Recalculer le score des articles de %s ?"
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "Import en utilisant DOMDocument."
 
-#~ msgid "New version available!"
-#~ msgstr "Une nouvelle version est disponible !"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "Extension DOMXML non trouvée. Cette extension est requise pour les "
+#~ "versions de php inférieures à 5.Extension DOMXML non trouvée. Elle est "
+#~ "nécessaire pour les versions de PHP antérieures à la 5."
 
-#~ msgid "No articles are selected."
-#~ msgstr "Aucun article sélectionné."
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr ""
+#~ "Enregistrer les images dans le cache local (seulement avec SimplePie)"
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "Marquer tous les articles visibles de %s comme lus ?"
+#~ msgid ""
+#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
+#~ "settings."
+#~ msgstr ""
+#~ "En utilisant OPML, vous pouvez exporter et importer vos flux et vos "
+#~ "paramètres de Tiny Tiny RSS."
 
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "Supprimer les %d articles sélectionnés de %s ?"
+#~ msgid "Note: Only main settings profile can be migrated using OPML."
+#~ msgstr ""
+#~ "Note : seul les paramètres principaux du profil peuvent être migrés en "
+#~ "utilisant OPML."
 
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "Supprimer les %d articles sélectionnés ?"
+#, fuzzy
+#~ msgid "Publish"
+#~ msgstr "Publiés"
 
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "Archiver les %d articles sélectionnés de %s ?"
+#~ msgid ""
+#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+#~ "that require authentication or feeds hidden from Popular feeds."
+#~ msgstr ""
+#~ "Note : l'OPML publié n'inclue ni vos paramètres Tiny Tiny RSS, ni les "
+#~ "flux qui requièrent une authentification, ni les flux masqués parmi flux "
+#~ "populaires."
 
-#~ msgid "Move %d archived articles back?"
-#~ msgstr "Restaurer les articles archivés ?"
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "Mot de passe de l'utilisateur <b>%s</b> modifié."
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
+#~ msgid "Content filtering"
+#~ msgstr "Filtrage de contenu"
 
-#~ msgid "Edit article Tags"
-#~ msgstr "Editer les étiquettes de l'article"
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny Tiny RSS permet le filtrage (ou le traitement) d'articles. Le "
+#~ "filtrage est effectué une seule foi, lors le nouvel article est importé "
+#~ "en base depuis le flux rss le champ spécifié est comparé à l'expression "
+#~ "régulière et une action est effectuée.La comparaison des expressions "
+#~ "régulières est insensible à la casse."
 
-#~ msgid "No article is selected."
-#~ msgstr "Aucun article sélectionné."
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "Les actions possibles sont : filtrer (ne pas importer) l'article, marquer "
+#~ "l'article comme lu, marquer comme remarquable, assigner un ou plusieurs "
+#~ "tags et assigner un score. Les filtres peuvent être définis globalement "
+#~ "ou pour un flux uniquement."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "Aucun article à marquer"
+#~ msgid ""
+#~ "Multiple and inverse matching are supported. All matching filters are "
+#~ "considered when article is being imported and all actions executed in "
+#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
+#~ "XYZZY in title with inverse flag will match all articles, except those "
+#~ "containing string XYZZY in title."
+#~ msgstr ""
+#~ "Les correspondances multiples et inverses sont possibles. Tous les "
+#~ "filtres de correspondance sont activés quand un article est importé et "
+#~ "les actions sont exécutées de manière séquentielle. La correspondance "
+#~ "inverse a pour effet d'inverser le résultat de la correspondance. Par "
+#~ "exemple le filtre de correspondance XYZZY dans le titre avec l'option "
+#~ "d'inversion sélectionnera tous les articles sauf ceux dont le titre "
+#~ "contiendra XYZZY."
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "Marquer %d article(s) comme lu(s) ?"
+#~ msgid "See also:"
+#~ msgstr "Voir également :"
 
-#~ msgid "Loading..."
-#~ msgstr "Chargement en cours..."
+#, fuzzy
+#~ msgid "Add category..."
+#~ msgstr "Créer la catégorie"
 
-#~ msgid "Forward article by email"
-#~ msgstr "Transférer l'article par email"
+#, fuzzy
+#~ msgid "Add label..."
+#~ msgstr "Créer une étiquette..."
 
-#~ msgid "Open original article"
-#~ msgstr "Ouvrir l'article original"
+#~ msgid "Dismiss article"
+#~ msgstr "Exclure l'article"
 
-#, fuzzy
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Voir dans un nouvel onglet"
+#~ msgid "Remove:"
+#~ msgstr "Supprimer :"
 
-#, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "Supprimer les étiquettes sélectionnées ?"
+#~ msgid "Assign:"
+#~ msgstr "Assigner :"
 
-#, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "Chargement en cours..."
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Activer le classement selon la catégorie"
 
-#, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "Cliquer pour éditer"
+#~ msgid "Update all feeds"
+#~ msgstr "Mettre à jour tous les flux"
 
-#, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Marquer comme remarquable"
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Trier les flux par nom ou par nombre d'articles non lus"
 
 #~ msgid "headlines"
 #~ msgstr "titres"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 5cde55a5..cd0d4795 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 473a1a35..c0dc6492 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"
@@ -18,154 +18,134 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Alapértelmezett beállítás"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Sose töröld a régi híreket"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "1 hetes"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "2 hetes"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "1 hónapos"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "2 hónapos"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "3 hónapos"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Frissítési intervallum:"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Frissítések kikapcsolása"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Minden 15 percben"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Minden 30 percben"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "Óránként"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Minden 4 órában"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Minden 12 órában"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Napi"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Heti"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Felhasználó"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Kiemelt felhasználó"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Hírcsatornák"
-
-#: backend.php:201
-#, fuzzy
-msgid "Article not found."
-msgstr "Hírcsatorna nem található"
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Hírcsatorna nem található"
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "Töltés, kérem várjon..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "A hozzáférési szinted nem elég magasa script futtatásához"
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Adatbázis-frissítő"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "Adatbázis frissítése sikertelen"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr ""
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ""
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "A Tiny Tiny RSS adatbázis friss."
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "A továbbhaladás előtt készítsen biztosági másolatot adatbázisáról."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -174,54 +154,54 @@ msgstr ""
 "A Tiny Tiny RSS adatbázisát frissíteni kell a legújabb verzióra (<b>%d</b> "
 "to <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Frissítések végrehajtása"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "Frissítések folyamatban..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Frissítés %d verzióra..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Verzió ellenőrzése"
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "HIBA!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
+#: digest.php:58
 #, fuzzy
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -232,16 +212,23 @@ msgstr ""
 "\t\telengedhetetlen a program működéséhez.\n"
 "\t\tKérem ellenőrizze böngészőbeállításait, és engedélyezze a Javascriptet!"
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "Töltés, kérem várjon..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Üdv,"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Kijelentkezés"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -249,7 +236,7 @@ msgstr ""
 "A program működéséhez XmlHttpRequest szükséges, úgy tűnik az Ön böngészője "
 "ezt nem támogatja."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -257,43 +244,43 @@ msgstr ""
 "A program működéséhez engedélkyezett sütik szükségesek, úgy tűnik a "
 "böngésződ nem támogatja a sütiket."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr ""
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr ""
 
-#: errors.php:18
+#: errors.php:19
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
 "update&lt;/a&gt;."
 msgstr ""
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Engedély nélküli kérés"
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Nincs elvégzendő művelet."
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr "Megtagadva. Hozzáférési szintje túl alacsony az oldal megtekintéséhez."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "Beállításellenőrzés sikertelen."
 
-#: errors.php:30
+#: errors.php:31
 #, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
@@ -303,444 +290,259 @@ msgstr ""
 "meg \n"
 "\t\ta hivatalos weboldalt további információkért."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "Hozzászólások?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Hírcsatornalista összecsukása"
 
-#: index.php:127
+#: index.php:148
 #, fuzzy
 msgid "Show articles"
 msgstr "Tárolt hírek"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Adaptív"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Csillagos"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Publikált"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr ""
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Frissített"
 
-#: index.php:139
+#: index.php:160
 #, fuzzy
 msgid "Sort articles"
 msgstr "Tárolt hírek"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Dátum"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Cím"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr ""
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Frissítés"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Keresés..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Hírcsatorna szerkesztése..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Az összes hírcsatorna:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:173
+#: index.php:194
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "címkefelhő"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Új címke létrehozása..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Szűrő létrehozása..."
 
-#: index.php:177
+#: index.php:198
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Billentyűparancsok"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Cím vagy tartalom"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Link"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Tartalom"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Hír dátuma"
-
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Hírek törlése"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Csillagoz"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Hír publikálása"
-
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Címke hozzáadása"
-
-#: localized_schema.php:14
-msgid "Assign label"
-msgstr "Címke hozzáadása"
-
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"A hír címének és tartalmának külön való megjelenítése helyett jelentísen emg "
-"egy kombinált listát a hírek címével és tartalmával együtt."
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"Ha a \"Olvasottá tesz\" gombra kattint az eszköztáron, automatikusan töltse "
-"be a következő olvasatlan hírekkel rednelkező hírcsatornát."
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Itt engedélyezheti a friss és olvasatlan cikkek napi elküldését a megadott e-"
-"mail címére.."
-
-#: localized_schema.php:20
-#, fuzzy
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Itt engedélyezheti a hírek automatikus olvasottá tételét kombinált "
-"üzemmódban (A Friss hírcsatorna híreinek kivételével), amikor a hírlistát "
-"böngészi."
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-"Hírek olvasásakor távolítsa el a a HTML kódokat a leggyakrabban használtak "
-"kivételével."
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Ha a program megtalája ezeket a címkéket a hírekben, kihagyja őket (lista, "
-"elemek vesszővel elválasztva)"
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Ha ezt a beállítást engedélyezi, a Kiemelt hírcsatornákban és a Címkékben "
-"szereplő címeket a program hírcsatornák alapján csoportosítja."
+#: opml.php:70
+#, fuzzy, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "Kategória hozzáadása <b>%s</b>...<br>"
 
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Címke hozzáadása"
 
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
 
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Régi postok törlése ennyi nap után: (0 - kikapcsol)"
-
-#: localized_schema.php:28
-#, fuzzy
-msgid "Default interval between feed updates"
-msgstr "Frissítések között eltelt idő (percekben)"
-
-#: localized_schema.php:29
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "Nincs megjeleníthető hír."
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Dupla postok engedélyezése"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Hírcsatornák kategorizálásának engedélyezése"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "A hírelőzetes mutatása a hírcímek listájában"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Dátum/idő rövid formátuma"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Dátum/idő hosszú formátuma"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Kombinált hírcsatorna-megjelenítés"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Olvasatlan hírekkel nem rendelkező hírcsatorna elrejtése"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Hírcsatorna végén mutassa a következő hírcsatornát"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Hírösszefoglaló e-mail elküldésének engedélyezése"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "Hírcsatorna hozzáadása..."
 
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Egész hírcsatornák olvasottá tételekor megerősítés"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Szűrő létrehozása"
 
-#: localized_schema.php:42
+#: opml.php:230
 #, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "Hírek automatikus szétnyitása kombinált üzemmódban"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Nem biztonságos kódok eltávolítása a hírekből"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Feketelistás címkék"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Meddig legyen friss egy hír (órákban megadva)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "Az e-mail összefoglalóban elküldött hírek olvasottá tétele"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "Hírek automatikus szétnyitása kombinált üzemmódban"
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Régi hírek törlésekor törölje az olvasatlanokat is"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "Különleges hírcsatornák mutatása olvasott hírcsatornák rejtésekor"
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Hírcímek csoportosítása virtuális hírcsatornákba"
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "Képek rejtése a hírekben"
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
-
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
+msgid "is already imported."
+msgstr "Már importálva."
 
-#: localized_schema.php:54
+#: opml.php:250
 #, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
+msgid "OK"
+msgstr "OK!"
 
-#: localized_schema.php:55
-#, fuzzy
-msgid "Customize stylesheet"
-msgstr "Felhasználói stíluslap URL-je"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Hiba történt a dokuementum feldoglozása közben"
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Hiba: kérem töltse fel az OPML fájlt!"
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "OMPL-segédprogram"
 
-#: opml.php:188
+#: opml.php:492
 #, fuzzy
 msgid "Importing OPML..."
 msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Vissza a beállításokhoz"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Hírcsatornák"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "Szűrők"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "Címkék"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "Felhasználók"
 
-#: prefs.php:109
+#: prefs.php:108
 #, fuzzy
 msgid "Linked"
 msgstr "Link"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "Új felhasználói fiók létrehozása"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr "Új felhasználók regisztrációja adminisztrátor által letilva."
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -750,194 +552,417 @@ msgstr ""
 "fiókok, amelyekbe az ideiglenes jelszó kipostázásától számított 24 órán "
 "belül nem lépnek be, automatikusan törlődnek."
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "Felhasználói név:"
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "Ellenőrizze, hogy nem foglalt-e már:"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "Mennyi kettő meg kettő?"
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "Regisztráció elküldése"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "Regisztrációs adatai hiányosak"
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "Ez a felhasználónév már foglalt."
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "Regisztráció sikertelen."
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "Felhasználói fiók sikeresen létrehozva"
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr ""
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 #, fuzzy
 msgid "Register"
 msgstr "Regisztrált"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-#, fuzzy
-msgid "Default profile"
-msgstr "Hírek maximális száma"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Billentyűparancsok"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "nincs címke"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Navigáció"
 
-#: modules/backend-rpc.php:836
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Hírcsatornák közötti mozgás"
+
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Mozgás hírek között"
+
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Keresőmező megjelenítése"
+
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Aktív hírre vonatkozó műveletek"
+
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Csillagoz"
+
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Publikált"
+
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Olvasatlannak jelöl"
+
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Címkék szerkesztése"
+
+#: help/main.php:20
 #, fuzzy
-msgid "Your request could not be completed."
-msgstr "Regisztrációs adatai hiányosak"
+msgid "Dismiss selected articles"
+msgstr "Eltávolítja a kijelölt híreket a címke alól?"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr ""
+#: help/main.php:21
+#, fuzzy
+msgid "Dismiss read articles"
+msgstr "Látható olvasott hírek elrejtése"
+
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Hír megnyitása új ablakban"
+
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Az aktív hír fölöttit/alatitt olvasottá teszi"
+
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Hírtartalom görgetése"
 
-#: modules/backend-rpc.php:848
+#: help/main.php:25
 #, fuzzy
-msgid "Category update has been scheduled."
-msgstr "A jelszó megváltoztatva."
+msgid "Email article"
+msgstr "Az összes hír"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Egyéb műveletek"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Az egérkurzor alatti hír kiválasztása"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Címke létrehozása"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Szűrő létrehozása"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Oldalablak összecsukása"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "A jelenlegi súgóablak megjelenítése"
 
-#: modules/backend-rpc.php:861
+#: help/main.php:41
 #, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
+msgid "Multiple articles actions"
+msgstr "Az összes hír"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Segítség"
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "Hírek törlése"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Súgótéma nem tlálható."
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Régi hírek törlésekor törölje az olvasatlanokat is"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Ablak bezárása"
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Aktív hírre vonatkozó műveletek"
 
-#: modules/opml_domdoc.php:60
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Kategória hozzáadása <b>%s</b>...<br>"
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "Hírek törlése"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Hírcsatorna-műveletek"
+
+#: help/main.php:53
+#, fuzzy
+msgid "Refresh active feed"
+msgstr "Aktív hírcsatorna frissítése"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "Feliratkozás hírcsatornára"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Hírcsatorna szerkesztése"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Olvasottá tesz"
+
+#: help/main.php:58
+#, fuzzy
+msgid "Reverse headlines order"
+msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Minden hírcsatornát olvasottá tesz"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "Ha kategóriát böngész, csukja össze/nyissa szét"
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "Ugrás ide..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Az összes hír"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Friss hírek"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Csillagos hírek"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Publikált hírek"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Címkefelhő"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Az ablak bezárásához nyomjon meg egy billentyűt!"
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Saját hírcsatornák"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Egyéb hírcsatornák"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Panelműveletek"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "A legfelső 25 hírcsatorna"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Kategóriák szerkesztése"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Felhasználó létrehozása"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr ""
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Belépés mint"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Felhasználó:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Jelszó:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr ""
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Kiemelt"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
 msgstr ""
 
-#: modules/opml_domdoc.php:128
+#: mobile/prefs.php:24
 #, fuzzy
-msgid "is already imported."
-msgstr "Már importálva."
+msgid "Enable categories"
+msgstr "Hírcsatornák kategorizálásának engedélyezése"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr ""
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr ""
 
-#: modules/opml_domdoc.php:148
+#: mobile/prefs.php:29
 #, fuzzy
-msgid "OK"
-msgstr "OK!"
+msgid "Browse categories like folders"
+msgstr "Kategória rendjének visszaállítása"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Hiba történt a dokuementum feldoglozása közben"
+#: mobile/prefs.php:35
+#, fuzzy
+msgid "Show images in posts"
+msgstr "Képek rejtése a hírekben"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Hiba: kérem töltse fel az OPML fájlt!"
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Olvasottak rejtése/mutatása"
 
-#: modules/popup-dialog.php:34
+#: mobile/prefs.php:45
 #, fuzzy
-msgid "Importing using DOMXML."
-msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
+msgid "Sort feeds by unread count"
+msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
+
+#: classes/article.php:25
+#, fuzzy
+msgid "Article not found."
+msgstr "Hírcsatorna nem található"
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Súgótéma nem tlálható."
 
-#: modules/popup-dialog.php:40
+#: classes/dlg.php:26
 #, fuzzy
-msgid "Importing using DOMDocument."
-msgstr "OPML importálása (DOMDocument kiterjesztés használatával)"
+msgid "Prepare data"
+msgstr "Mentés"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Ablak bezárása"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"Az ötösnél alacsonyabb verziószámű PHP-hez szükséges DOMXMLkiterjesztés nem "
-"található."
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Szűrő létrehozása"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptív"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+#, fuzzy
+msgid "Default profile"
+msgstr "Hírek maximális száma"
+
+#: classes/dlg.php:170
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 #, fuzzy
 msgid "Activate profile"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr ""
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generált hírcsatorna"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr ""
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -947,11 +972,11 @@ msgstr ""
 "nem fut, így a hírcsatornák nem tudnak frissülni. Kérem indítsa el a daemon "
 "folyamatot, vagy lépjen kapcsolatba az oldal/szerver tulajdonosával."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Legutóbbi frissítés:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -961,280 +986,254 @@ msgstr ""
 "összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/"
 "szerver tulajdonosával!"
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Hírcsatorna"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 #, fuzzy
 msgid "Feed URL"
 msgstr "Hírcsatorna"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 #, fuzzy
 msgid "Available feeds"
 msgstr "Összes hírcsatorna"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Belépés"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 #, fuzzy
 msgid "More feeds"
 msgstr "Hírcsatornák..."
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Mégse"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Keresés"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 #, fuzzy
 msgid "Popular feeds"
 msgstr "hírcsatornák megjelenítése"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 #, fuzzy
 msgid "Feed archive"
 msgstr "Hírcsatorna-műveletek"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 #, fuzzy
 msgid "limit:"
 msgstr "Határ:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Eltávolít"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 #, fuzzy
 msgid "match on"
 msgstr "ha egyezik ezzel:"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Tartalom"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Cím vagy tartalom"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Keresés korlátozása ezekre:"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Egyezés"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "elteltével"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "...szerepeljen ebben a mezőben: "
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "itt"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Műveletek"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "Beállítás:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Beállítások"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "Fordított egyezés"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "Hozzáadás a következő kategóriához:"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "Teszt"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Létrehoz"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Kattintson ide a szerkesztéshez"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Mentés"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Címkefelhő"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 msgid "Match:"
 msgstr "Egyezés"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "hírcsatornák megjelenítése"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
+#: classes/dlg.php:821 classes/feeds.php:152
 #, fuzzy
-msgid "Multiple articles"
-msgstr "Az összes hír"
+msgid "View as RSS"
+msgstr "Címkék megtekintése"
 
-#: modules/popup-dialog.php:834
-msgid "From:"
+#: classes/dlg.php:832
+msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:843
-#, fuzzy
-msgid "To:"
-msgstr "Legfelső"
-
-#: modules/popup-dialog.php:856
-#, fuzzy
-msgid "Subject:"
-msgstr "Kiválaszt:"
-
-#: modules/popup-dialog.php:872
-#, fuzzy
-msgid "Send e-mail"
-msgstr "E-mail megváltoztatása"
-
-#: modules/popup-dialog.php:881
-#, fuzzy
-msgid "View as RSS"
-msgstr "Címkék megtekintése"
-
-#: modules/popup-dialog.php:892
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 #, fuzzy
 msgid "Details"
 msgstr "Napi"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1242,301 +1241,444 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr ""
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "Hírcsatorna URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr ""
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "Hozzáférési szint:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "Hozzáférési szint"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generált hírcsatorna"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 #, fuzzy
 msgid "Create link"
 msgstr "Létrehoz"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:4
-msgid "Check to enable field"
+#: classes/feeds.php:94 include/functions.php:3346
+#, fuzzy
+msgid "Visit the website"
+msgstr "Hivatalos weboldal megtekintése"
+
+#: classes/feeds.php:107
+#, fuzzy
+msgid "View as RSS feed"
+msgstr "Hírcsatornák megtekintése"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Kiválaszt:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Mind"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Fordított"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Kijelölés törlése"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Kiválasztott legyen:"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Kiválasztott hírcsatornák:"
+
+#: classes/feeds.php:138
+#, fuzzy
+msgid "Archive"
+msgstr "Hír dátuma"
+
+#: classes/feeds.php:140
+#, fuzzy
+msgid "Move back"
+msgstr "Vissza"
+
+#: classes/feeds.php:141
+#, fuzzy
+msgid "Delete"
+msgstr "Alapértelmezett"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+#, fuzzy
+msgid "Forward by email"
+msgstr "Hír csillagozása"
+
+#: classes/feeds.php:148
+#, fuzzy
+msgid "Feed:"
+msgstr "Hírcsatorna"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Hírcsatorna nem található"
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "olvasottként jelöl"
+
+#: classes/feeds.php:625 include/functions.php:3318
+#, fuzzy
+msgid "Originally from:"
+msgstr "Eredeti hír tartalmának megjelenítése"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Címkék hozzáadása a hírhez"
+
+#: classes/feeds.php:712 include/functions.php:3285
+#, fuzzy
+msgid "Open article in new tab"
+msgstr "Hír megnyitása új ablakban"
+
+#: classes/feeds.php:723 include/functions.php:3301
+#, fuzzy
+msgid "Close article"
+msgstr "Hírek törlése"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "Nincs megjeleníthető olvasatlan hír."
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "Nincs megjeleníthető friss hír."
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "Nincs megjeleníthető csillagos hír."
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
 msgstr ""
+"A jelenlegi címke alá nincs besorolva egy hír sem.\n"
+"Címkék alá híreket besorolhat manuálisan (lásd a fenti Műveletek menüt) vagy "
+"a besoroláshoz használhat Szűrőket."
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "Nincs megjeleníthető hír."
+
+#: classes/feeds.php:771 include/functions.php:4486
 #, fuzzy, php-format
-msgid "(%d feeds)"
-msgstr "Hírcsatornák"
+msgid "Feeds last updated at %s"
+msgstr "Frissítési hiba"
 
-#: modules/pref-feeds.php:96
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Néhány hírcsatorna frissítésével gond akadt. (Kattints ide a részletekhez!)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: modules/pref-feeds.php:306
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr ""
+
+#: classes/mail_button.php:52
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Az összes hír"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr ""
+
+#: classes/mail_button.php:82
+#, fuzzy
+msgid "To:"
+msgstr "Legfelső"
+
+#: classes/mail_button.php:95
+#, fuzzy
+msgid "Subject:"
+msgstr "Kiválaszt:"
+
+#: classes/mail_button.php:111
+#, fuzzy
+msgid "Send e-mail"
+msgstr "E-mail megváltoztatása"
+
+#: classes/note_button.php:7 js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Címkék szerkesztése"
+
+#: classes/pref_feeds.php:11
+msgid "Check to enable field"
+msgstr ""
+
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
+#, fuzzy, php-format
+msgid "(%d feeds)"
+msgstr "Hírcsatornák"
+
+#: classes/pref_feeds.php:299
 #, fuzzy
 msgid "Feed Title"
 msgstr "Cím"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Régi hírek törlése:"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Elrejtés a hírcsatornalistámról"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Jobbról balra tartó tartalom"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "Hozzáadás az e-mail összefoglalóhou"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:472
-#, fuzzy
-msgid "Cache images locally (SimplePie only)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
 msgstr "Képek helyi tárolása"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Minden hírt olvasottá tesz?"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 #, fuzzy
 msgid "Icon"
 msgstr "Művelet"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Feliratkozva a következő hírcsatornákra:"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Képek helyi tárolása"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Kész."
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nem található hírcsatorna."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Feliratkozási beállítások szerkesztése"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "A következő kategória <b>$%s</b> már létezik az adatbázisban."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Kategória létrehozása"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "Nincs megadva hírcsatorna-kategória."
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Hírcsatornaszerkesztő"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Egész hírcsatornát"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 #, fuzzy
 msgid "Select"
 msgstr "Kiválaszt:"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Mind"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Kijelölés törlése"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "Feliratkozás hírcsatornára"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Kijelölt hírcsatorna takarítása..."
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Jelszó reset"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 #, fuzzy
 msgid "Categories"
 msgstr "Kategória:"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 #, fuzzy
 msgid "More actions..."
 msgstr "Műveletek"
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Kézi takarítás (régi hírek törlése)"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr ""
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importálás"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Exportálás OPML-be"
+msgid "Import my OPML"
+msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr ""
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "Hozzáadás az e-mail összefoglalóhou"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Publikált"
+msgid "Export OPML"
+msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1545,22 +1687,42 @@ msgstr ""
 "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
 "bárki feliratkozhat, aki tudja a lenti címet."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
+#: classes/pref_feeds.php:1439
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1442
+#, fuzzy
+msgid "Article archive"
+msgstr "Hír dátuma"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
 msgstr ""
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "Exportálás OPML-be"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importálás"
+
+#: classes/pref_feeds.php:1469
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox-integráció"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1568,41 +1730,41 @@ msgstr ""
 "Ez a Tiny Tiny RSS oldal beállítható a Firefox böngésző alapértelmezett "
 "hírcsatorna-olvasójaként. Ehhez kattintson az alábbi linkre!"
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!"
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Link a publikált hírek hírcsatornájához"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1610,1095 +1772,1330 @@ msgstr ""
 "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
 "bárki feliratkozhat, aki tudja a lenti címet."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+msgid "Display URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Tárolt hírek"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 #, fuzzy
 msgid "Twitter"
 msgstr "Cím"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Hírcsatorna-adatok törlése"
 
-#: modules/pref-feeds.php:1654
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Csillagos hírek"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "Nem található hírcsatorna."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Nem található a feltételeknek megfelelő szűrő."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Szűrő létrehozva: <b>%s</b>"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Szűrő létrehozása"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Szerkesztése"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Hírcsatornák..."
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Kattintson ide a szerkesztéshez"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "Aláírás"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 #, fuzzy
 msgid "Colors"
 msgstr "Bezár"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Foreground:"
 msgstr "előtér"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Background:"
 msgstr "háttér"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Címke létrehozva: <b>%s</b>"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Címke létrehozása"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Színek visszaállítása"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "A régi jelszó mező nem maradhat üresen."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "Az új jelszó mező nem maradhat üresen."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "A megadott jelszavak nem egyeznek."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "A jelszó megváltoztatva."
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "A régi jelszó helytelen."
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "Beállítások elmentve."
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ismeretlen beállítás: %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Személyes adatok"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Hozzáférési szint"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 #, fuzzy
 msgid "Save data"
 msgstr "Mentés"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "A jelszava alapértelmezett értékén van, \n"
 "\t\t\t\t\t\tkérem változtassa meg!"
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Új jelszó"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Jelszó még egyszer"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Stílusválasztó"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Igen"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "Nem"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Beállítások mentése"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Alapértelmezett beállítások"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Felhasználói adatok"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "Felhasználó nem találhat"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Regisztrált"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Utolsó belépés"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Olvasott hírcsatornák száma"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Feliratkozott a következő hírcsatornákra:"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Felhasználó-szerkesztő"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Hozzáférési szint:"
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Jelszó megváltoztatása"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "E-mail:"
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "A következő felhasználó jelszava megváltoztatva: <b>%s</b>."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 "A következő felhasználó hozzáadva <b>%s</b> ezzel a jelszóval <b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "A következő felhasználó létrehozása sikertelen <b>%s</b>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "A következő felhasználó már létezik <b>%s</b>."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "A lkövetkező felhasználó jelszava megváltoztatva <b>%s</b>\n"
 "\t\t\t\t\t erre: <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr ""
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Felhasználó létrehozása"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Jelszó reset"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Hozzáférési szint"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Utolsó belépés"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "Nincs megadva felhasználó."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "Nem található a feltételeknek megfelelő felhasználó."
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Tartalomszűrő"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
 
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
-msgstr ""
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "nincs címke"
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
+#: classes/rpc.php:741
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Regisztrációs adatai hiányosak"
+
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
 msgstr ""
 
-#: help/2.php:9
-msgid "See also:"
-msgstr "Lásd még:"
+#: classes/rpc.php:753
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "A jelszó megváltoztatva."
 
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Billentyűparancsok"
+#: classes/rpc.php:766
+#, fuzzy
+msgid "Can't update this kind of feed."
+msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Navigáció"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "Hír csillagozása"
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Hírcsatornák közötti mozgás"
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Mozgás hírek között"
+#: classes/tweet_button.php:7
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Cím"
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Keresőmező megjelenítése"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr ""
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Aktív hírre vonatkozó műveletek"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "Hibás felhasználói név vagy jelszó"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "Csillagoz"
+#: include/functions.php:2013
+#, fuzzy
+msgid "Archived articles"
+msgstr "Tárolt hírek"
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Publikált"
+#: include/functions.php:3109 js/viewfeed.js:1945
+#, fuzzy
+msgid "Click to play"
+msgstr "Kattintson ide a szerkesztéshez"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Olvasatlannak jelöl"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr ""
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Címkék szerkesztése"
+#: include/functions.php:3236
+msgid " - "
+msgstr "-"
 
-#: help/3.php:20
+#: include/functions.php:4061
 #, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Eltávolítja a kijelölt híreket a címke alól?"
+msgid "(edit note)"
+msgstr "jegyzet szerkesztése"
 
-#: help/3.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "Látható olvasott hírek elrejtése"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "Nincs kiválasztott hírcsatorna."
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Hír megnyitása új ablakban"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "ismeretlen hírcsatornatípus"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Az aktív hír fölöttit/alatitt olvasottá teszi"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Csatolmány:"
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Hírtartalom görgetése"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Csatolmányok:"
 
-#: help/3.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "Az összes hír"
+#: include/functions.php:5091
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "Csillagos hírek"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Egyéb műveletek"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "Nem található hírcsatorna."
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Az egérkurzor alatti hír kiválasztása"
+#: include/functions.php:5161
+msgid "Could not import: incorrect schema version."
+msgstr ""
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Oldalablak összecsukása"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "A jelenlegi súgóablak megjelenítése"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Az összes hír"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:44
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Cím vagy tartalom"
+
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Link"
+
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Hír dátuma"
+
+#: include/localized_schema.php:9
 #, fuzzy
-msgid "Select all articles"
+msgid "Delete article"
 msgstr "Hírek törlése"
 
-#: help/3.php:45
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Csillagoz"
+
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Hír publikálása"
+
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Címke hozzáadása"
+
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Címke hozzáadása"
+
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
+
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Általános"
+
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Kezelőfelület"
+
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Speciális"
+
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"A hír címének és tartalmának külön való megjelenítése helyett jelentísen emg "
+"egy kombinált listát a hírek címével és tartalmával együtt."
+
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"Ha a \"Olvasottá tesz\" gombra kattint az eszköztáron, automatikusan töltse "
+"be a következő olvasatlan hírekkel rednelkező hírcsatornát."
+
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Itt engedélyezheti a friss és olvasatlan cikkek napi elküldését a megadott e-"
+"mail címére.."
+
+#: include/localized_schema.php:25
 #, fuzzy
-msgid "Select unread articles"
-msgstr "Régi hírek törlésekor törölje az olvasatlanokat is"
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Itt engedélyezheti a hírek automatikus olvasottá tételét kombinált "
+"üzemmódban (A Friss hírcsatorna híreinek kivételével), amikor a hírlistát "
+"böngészi."
+
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+"Hírek olvasásakor távolítsa el a a HTML kódokat a leggyakrabban használtak "
+"kivételével."
+
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Ha a program megtalája ezeket a címkéket a hírekben, kihagyja őket (lista, "
+"elemek vesszővel elválasztva)"
+
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+"Ha ezt a beállítást engedélyezi, a Kiemelt hírcsatornákban és a Címkékben "
+"szereplő címeket a program hírcsatornák alapján csoportosítja."
+
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
+
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr ""
+
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
+
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Régi postok törlése ennyi nap után: (0 - kikapcsol)"
 
-#: help/3.php:46
+#: include/localized_schema.php:33
 #, fuzzy
-msgid "Invert article selection"
-msgstr "Aktív hírre vonatkozó műveletek"
+msgid "Default interval between feed updates"
+msgstr "Frissítések között eltelt idő (percekben)"
 
-#: help/3.php:47
+#: include/localized_schema.php:34
 #, fuzzy
-msgid "Deselect all articles"
-msgstr "Hírek törlése"
+msgid "Amount of articles to display at once"
+msgstr "Nincs megjeleníthető hír."
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Hírcsatorna-műveletek"
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Dupla postok engedélyezése"
 
-#: help/3.php:53
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Aktív hírcsatorna frissítése"
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "Hírcsatornák kategorizálásának engedélyezése"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Hírcsatorna szerkesztése"
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "A hírelőzetes mutatása a hírcímek listájában"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Olvasottá tesz"
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Dátum/idő rövid formátuma"
 
-#: help/3.php:58
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Dátum/idő hosszú formátuma"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Minden hírcsatornát olvasottá tesz"
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Kombinált hírcsatorna-megjelenítés"
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "Ha kategóriát böngész, csukja össze/nyissa szét"
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Olvasatlan hírekkel nem rendelkező hírcsatorna elrejtése"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "Ugrás ide..."
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Hírcsatorna végén mutassa a következő hírcsatornát"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Az összes hír"
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Friss hírek"
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Fordított hírcím-sorrend (régiebbiek előbb)"
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Csillagos hírek"
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Hírösszefoglaló e-mail elküldésének engedélyezése"
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Publikált hírek"
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Egész hírcsatornák olvasottá tételekor megerősítés"
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Címkefelhő"
+#: include/localized_schema.php:47
+#, fuzzy
+msgid "Automatically mark articles as read"
+msgstr "Hírek automatikus szétnyitása kombinált üzemmódban"
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Nem biztonságos kódok eltávolítása a hírekből"
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Az ablak bezárásához nyomjon meg egy billentyűt!"
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Feketelistás címkék"
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Saját hírcsatornák"
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Meddig legyen friss egy hír (órákban megadva)"
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Egyéb hírcsatornák"
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "Az e-mail összefoglalóban elküldött hírek olvasottá tétele"
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Panelműveletek"
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "Hírek automatikus szétnyitása kombinált üzemmódban"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "A legfelső 25 hírcsatorna"
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Régi hírek törlésekor törölje az olvasatlanokat is"
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Kategóriák szerkesztése"
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "Különleges hírcsatornák mutatása olvasott hírcsatornák rejtésekor"
+
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Hírcímek csoportosítása virtuális hírcsatornákba"
+
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "Képek rejtése a hírekben"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
+#: include/localized_schema.php:57
+msgid "Enable external API"
 msgstr ""
 
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
+#: include/localized_schema.php:58
+msgid "User timezone"
 msgstr ""
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Belépés mint"
-
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Felhasználó:"
+#: include/localized_schema.php:59
+#, fuzzy
+msgid "Sort headlines by feed date"
+msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Jelszó:"
+#: include/localized_schema.php:60 js/prefs.js:1762
+#, fuzzy
+msgid "Customize stylesheet"
+msgstr "Felhasználói stíluslap URL-je"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
 msgstr ""
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Kiemelt"
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Nyelv:"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
+#: include/login_form.php:148
+#, fuzzy
+msgid "Profile:"
+msgstr "Fájl:"
+
+#: include/login_form.php:178
+msgid "Use less traffic"
 msgstr ""
 
-#: mobile/prefs.php:24
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "Minden hírt olvasottá tesz itt: %s?"
+
+#: js/digest.js:69
 #, fuzzy
-msgid "Enable categories"
-msgstr "Hírcsatornák kategorizálásának engedélyezése"
+msgid "Mark %d displayed articles as read?"
+msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
-msgstr ""
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Csillagot levesz a hírről"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
-msgstr ""
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Hír csillagozása"
 
-#: mobile/prefs.php:29
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Publikálás visszavonása"
+
+#: js/digest.js:265
 #, fuzzy
-msgid "Browse categories like folders"
-msgstr "Kategória rendjének visszaállítása"
+msgid "Original article"
+msgstr "Eredeti hír tartalmának megjelenítése"
 
-#: mobile/prefs.php:35
+#: js/digest.js:267
 #, fuzzy
-msgid "Show images in posts"
-msgstr "Képek rejtése a hírekben"
+msgid "Close this panel"
+msgstr "Ablak bezárása"
 
-#: mobile/prefs.php:40
+#: js/digest.js:290
 #, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Olvasottak rejtése/mutatása"
+msgid "Error: unable to load article."
+msgstr "Hiba: kérem töltse fel az OPML fájlt!"
 
-#: mobile/prefs.php:45
+#: js/digest.js:444
 #, fuzzy
-msgid "Sort feeds by unread count"
-msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
+msgid "Click to expand article."
+msgstr "Hír kinyitása"
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Hibás felhasználói név vagy jelszó"
+#: js/digest.js:519
+#, fuzzy
+msgid "%d more..."
+msgstr "Segítség betöltése..."
 
+#: js/digest.js:526
 #, fuzzy
-#~ msgid "Archived articles"
-#~ msgstr "Tárolt hírek"
+msgid "No unread feeds."
+msgstr "Olvasottak rejtése/mutatása"
 
-#~ msgid "Select:"
-#~ msgstr "Kiválaszt:"
+#: js/digest.js:628
+#, fuzzy
+msgid "Load more..."
+msgstr "Segítség betöltése..."
 
-#~ msgid "Invert"
-#~ msgstr "Fordított"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr ""
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Kiválasztott legyen:"
+#: js/FeedTree.js:137
+#, fuzzy
+msgid "Update feed"
+msgstr "Összes hírcsatorna frissítése"
 
-#~ msgid "Selection:"
-#~ msgstr "Kiválasztott hírcsatornák:"
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
 
+#: js/functions.js:647
 #, fuzzy
-#~ msgid "Move back"
-#~ msgstr "Vissza"
+msgid "Date syntax appears to be correct:"
+msgstr "A régi jelszó helytelen."
 
+#: js/functions.js:650
 #, fuzzy
-#~ msgid "Delete"
-#~ msgstr "Alapértelmezett"
+msgid "Date syntax is incorrect."
+msgstr "A régi jelszó helytelen."
 
+#: js/functions.js:777
 #, fuzzy
-#~ msgid "Feed:"
-#~ msgstr "Hírcsatorna"
+msgid "Remove stored feed icon?"
+msgstr "Tárolt adatok eltávolítása."
 
+#: js/functions.js:809
 #, fuzzy
-#~ msgid "Visit the website"
-#~ msgstr "Hivatalos weboldal megtekintése"
+msgid "Please select an image file to upload."
+msgstr "Válasszon egy hírcsatornát."
 
-#, fuzzy
-#~ msgid "View as RSS feed"
-#~ msgstr "Hírcsatornák megtekintése"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Adja meg  címke nevét:"
+
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "Címke létrehozása sikertelen: nincs megadva név."
+
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "Feliratkozás hírcsatornára"
+
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "Feliratkozás a hírcsatornára..."
 
+#: js/functions.js:901
 #, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "Kattintson ide a szerkesztéshez"
+msgid "Subscribed to %s"
+msgstr "Feliratkozva a következő hírcsatornákra:"
 
-#~ msgid " - "
-#~ msgstr "-"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr ""
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Címkék hozzáadása a hírhez"
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
 
+#: js/functions.js:945
 #, fuzzy
-#~ msgid "Open article in new tab"
-#~ msgstr "Hír megnyitása új ablakban"
+msgid "Couldn't download the specified URL."
+msgstr ""
+"Feliratkozás hírcsatornára sikertelen: nincs megadva a hírcsatorna URL címe."
 
+#: js/functions.js:948
 #, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "Címkék szerkesztése"
+msgid "You are already subscribed to this feed."
+msgstr "Ebből a kategóriából nem ."
+
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Szárő létrehozása"
+
+#: js/functions.js:987 js/prefs.js:165
+msgid "Filter Test Results"
+msgstr ""
+
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "Leiratkozik innen: %s?"
 
+#: js/functions.js:1173
 #, fuzzy
-#~ msgid "Close this panel"
-#~ msgstr "Ablak bezárása"
+msgid "Please enter category title:"
+msgstr "Megyjegyzés csatolása ehhez a hírhez:"
+
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr ""
 
-#~ msgid "mark as read"
-#~ msgstr "olvasottként jelöl"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
+#: js/functions.js:1400
 #, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Hír publikálása"
+msgid "Edit Feed"
+msgstr "Hírcsatorna szerkesztése"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "Nincs megjeleníthető olvasatlan hír."
+#: js/functions.js:1438
+#, fuzzy
+msgid "More Feeds"
+msgstr "Hírcsatornák..."
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "Nincs megjeleníthető friss hír."
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "Nincs kiválasztott hírcsatorna."
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "Nincs megjeleníthető csillagos hír."
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "A jelenlegi címke alá nincs besorolva egy hír sem.\n"
-#~ "Címkék alá híreket besorolhat manuálisan (lásd a fenti Műveletek menüt) "
-#~ "vagy a besoroláshoz használhat Szűrőket."
+#: js/functions.js:1580
+#, fuzzy
+msgid "Feeds with update errors"
+msgstr "Frissítési hiba"
 
-#~ msgid "No articles found to display."
-#~ msgstr "Nincs megjeleníthető hír."
+#: js/functions.js:1591 js/prefs.js:1229
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr ""
-#~ "Néhány hírcsatorna frissítésével gond akadt. (Kattints ide a "
-#~ "részletekhez!)"
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "Nincsen kiválasztott hír."
 
+#: js/mail_button.js:21
 #, fuzzy
-#~ msgid "Remove:"
-#~ msgstr "Eltávolít"
+msgid "Forward article by email"
+msgstr "Hír csillagozása"
 
+#: js/PrefFilterTree.js:32
 #, fuzzy
-#~ msgid "Assign:"
-#~ msgstr "Besorolás címke alá:"
+msgid "Inverse"
+msgstr "(Fordított)"
+
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Kérem adja meg a felhasználói nevét:"
+
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
 
+#: js/prefs.js:134
 #, fuzzy
-#~ msgid "(edit note)"
-#~ msgstr "jegyzet szerkesztése"
+msgid "Edit Filter"
+msgstr "Szűrők"
 
-#~ msgid "No feed selected."
-#~ msgstr "Nincs kiválasztott hírcsatorna."
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "Eltávolítja a következő szűrőt: %s?"
 
-#~ msgid "unknown type"
-#~ msgstr "ismeretlen hírcsatornatípus"
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "Eltávolítja a kiválasztott címkéket?"
 
-#~ msgid "Attachment:"
-#~ msgstr "Csatolmány:"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "Nincs kiválasztott címke."
 
-#~ msgid "Attachments:"
-#~ msgstr "Csatolmányok:"
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
-#~ msgid "Language:"
-#~ msgstr "Nyelv:"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "Nincs kijelölt felhasználó."
 
-#, fuzzy
-#~ msgid "Profile:"
-#~ msgstr "Fájl:"
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Eltávolítja a kiválasztott szűrőket?"
 
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Kategória-újrarendezés bekapcsolása"
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "Nincs kiválasztott szűrő."
 
-#~ msgid "Update all feeds"
-#~ msgstr "Összes hírcsatorna frissítése"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Név vagy olvasatlan hírek száma alapján történő rendezés"
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Minden hírt olvasottá tesz itt: %s?"
+#: js/prefs.js:411
+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?"
 
-#, fuzzy
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+"Milyen régi híreket szeretne megtartani  (napokban; 0 - alapértelmezett)?"
 
-#~ msgid "Unstar article"
-#~ msgstr "Csillagot levesz a hírről"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "A felhasználói név nem maradhat üresen."
 
-#~ msgid "Star article"
-#~ msgstr "Hír csillagozása"
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Kérem csak egy felhasználót jelöljön meg!"
 
-#~ msgid "Unpublish article"
-#~ msgstr "Publikálás visszavonása"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "Visszaállítja  akiválasztott felhasználók jelszavakit?"
 
-#, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Eredeti hír tartalmának megjelenítése"
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
+#: js/prefs.js:652
 #, fuzzy
-#~ msgid "Error: unable to load article."
-#~ msgstr "Hiba: kérem töltse fel az OPML fájlt!"
+msgid "Edit Multiple Feeds"
+msgstr "Hírcsatorna szerkesztése"
 
-#, fuzzy
-#~ msgid "Click to expand article."
-#~ msgstr "Hír kinyitása"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
+#: js/prefs.js:768
 #, fuzzy
-#~ msgid "No unread feeds."
-#~ msgstr "Olvasottak rejtése/mutatása"
+msgid "OPML Import"
+msgstr "Importálás"
 
+#: js/prefs.js:795
 #, fuzzy
-#~ msgid "Load more..."
-#~ msgstr "Segítség betöltése..."
+msgid "Please choose an OPML file first."
+msgstr "Válasszon hírcsatorná(ka)t!"
 
+#: js/prefs.js:811
 #, fuzzy
-#~ msgid "Update feed"
-#~ msgstr "Összes hírcsatorna frissítése"
+msgid "Please choose the file first."
+msgstr "Válasszon hírcsatorná(ka)t!"
+
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "Visszaállítja a gyári beállításokat?"
 
+#: js/prefs.js:1149
 #, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "A régi jelszó helytelen."
+msgid "Feed Categories"
+msgstr "Kategória:"
+
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Kiválasztott kategóriák eltávolítása?"
+
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "Nincs kategória kiválaszta."
 
+#: js/prefs.js:1218
 #, fuzzy
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "A régi jelszó helytelen."
+msgid "Feeds without recent updates"
+msgstr "Frissítési hiba"
 
+#: js/prefs.js:1267
 #, fuzzy
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Tárolt adatok eltávolítása."
+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?"
 
+#: js/prefs.js:1376
 #, fuzzy
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Válasszon egy hírcsatornát."
+msgid "Rescore articles in selected feeds?"
+msgstr "Eltávolítja az összes csillag nélküli hírt a kijelölt hírcsatornából?"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Adja meg  címke nevét:"
+#: js/prefs.js:1399
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "Címke létrehozása sikertelen: nincs megadva név."
+#: js/prefs.js:1419
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "Visszaállítja a címkeszíneket az alapértelmezettre?"
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Feliratkozás hírcsatornára"
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr ""
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Feliratkozás a hírcsatornára..."
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
 
+#: js/prefs.js:1483
 #, fuzzy
-#~ msgid "Subscribed to %s"
-#~ msgstr "Feliratkozva a következő hírcsatornákra:"
+msgid "No profiles are selected."
+msgstr "Nincs kiválasztott hír."
 
+#: js/prefs.js:1491 js/prefs.js:1544
 #, fuzzy
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr ""
-#~ "Feliratkozás hírcsatornára sikertelen: nincs megadva a hírcsatorna URL "
-#~ "címe."
+msgid "Activate selected profile?"
+msgstr "Eltávolítja a kiválasztott szűrőket?"
 
+#: js/prefs.js:1507 js/prefs.js:1560
 #, fuzzy
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Ebből a kategóriából nem ."
+msgid "Please choose a profile to activate."
+msgstr "Válasszon hírcsatorná(ka)t!"
 
-#~ msgid "Create Filter"
-#~ msgstr "Szárő létrehozása"
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "Leiratkozik innen: %s?"
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Please enter category title:"
-#~ msgstr "Megyjegyzés csatolása ehhez a hírhez:"
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "Címke Szerkesztő"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
 
+#: js/prefs.js:1804
 #, fuzzy
-#~ msgid "Edit Feed"
-#~ msgstr "Hírcsatorna szerkesztése"
+msgid "Link Instance"
+msgstr "Címkék szerkesztése"
 
+#: js/prefs.js:1855
 #, fuzzy
-#~ msgid "More Feeds"
-#~ msgstr "Hírcsatornák..."
-
-#~ msgid "No feeds are selected."
-#~ msgstr "Nincs kiválasztott hírcsatorna."
+msgid "Edit Instance"
+msgstr "Címkék szerkesztése"
 
+#: js/prefs.js:1904
 #, fuzzy
-#~ msgid "Feeds with update errors"
-#~ msgstr "Frissítési hiba"
+msgid "Remove selected instances?"
+msgstr "Eltávolítja a kiválasztott szűrőket?"
 
+#: js/prefs.js:1921 js/prefs.js:1933
 #, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Eltávolítja a kiválasztott szűrőket?"
+msgid "No instances are selected."
+msgstr "Nincs kiválasztott szűrő."
 
+#: js/prefs.js:1938
 #, fuzzy
-#~ msgid "Inverse"
-#~ msgstr "(Fordított)"
-
-#~ msgid "Please enter login:"
-#~ msgstr "Kérem adja meg a felhasználói nevét:"
-
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói név."
+msgid "Please select only one instance."
+msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
+#: js/prefs.js:1973
 #, fuzzy
-#~ msgid "Edit Filter"
-#~ msgstr "Szűrők"
-
-#~ msgid "Remove filter %s?"
-#~ msgstr "Eltávolítja a következő szűrőt: %s?"
-
-#~ msgid "Remove selected labels?"
-#~ msgstr "Eltávolítja a kiválasztott címkéket?"
-
-#~ msgid "No labels are selected."
-#~ msgstr "Nincs kiválasztott címke."
-
-#~ msgid "No users are selected."
-#~ msgstr "Nincs kijelölt felhasználó."
+msgid "Export Data"
+msgstr "Exportálás OPML-be"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Eltávolítja a kiválasztott szűrőket?"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "No filters are selected."
-#~ msgstr "Nincs kiválasztott szűrő."
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "Importálás"
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
+#: js/share_button.js:10
+#, fuzzy
+msgid "Share article by URL"
+msgstr "Hír csillagozása"
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "Minden hírt olvasottá tesz?"
 
-#~ 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?"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "Ebből a kategóriából nem ."
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr ""
-#~ "Milyen régi híreket szeretne megtartani  (napokban; 0 - alapértelmezett)?"
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Válasszon hírcsatorná(ka)t!"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "A felhasználói név nem maradhat üresen."
+#: js/tt-rss.js:592
+#, fuzzy
+msgid "You can't rescore this kind of feed."
+msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
-#~ msgid "Please select only one user."
-#~ msgstr "Kérem csak egy felhasználót jelöljön meg!"
+#: js/tt-rss.js:602
+#, fuzzy
+msgid "Rescore articles in %s?"
+msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "Visszaállítja  akiválasztott felhasználók jelszavakit?"
+#: js/tt-rss.js:1083
+#, fuzzy
+msgid "New version available!"
+msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Kérem csak egy szűrőt jelöljön meg!"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "Olvasottá teszi az összes látható hírt itt: %s?"
 
+#: js/viewfeed.js:901
 #, fuzzy
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Hírcsatorna szerkesztése"
+msgid "Delete %d selected articles in %s?"
+msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
+#: js/viewfeed.js:903
+#, fuzzy
+msgid "Delete %d selected articles?"
+msgstr "Eltávolítja a kijelölt híreket a címke alól?"
 
+#: js/viewfeed.js:945
 #, fuzzy
-#~ msgid "OPML Import"
-#~ msgstr "Importálás"
+msgid "Archive %d selected articles in %s?"
+msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
+#: js/viewfeed.js:948
 #, fuzzy
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Válasszon hírcsatorná(ka)t!"
+msgid "Move %d archived articles back?"
+msgstr "Csillagos hírek"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "Visszaállítja a gyári beállításokat?"
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
+#: js/viewfeed.js:1016
 #, fuzzy
-#~ msgid "Feed Categories"
-#~ msgstr "Kategória:"
+msgid "Edit article Tags"
+msgstr "Címkék szerkesztése"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Kiválasztott kategóriák eltávolítása?"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "Nincs kiválasztott hír."
 
-#~ msgid "No categories are selected."
-#~ msgstr "Nincs kategória kiválaszta."
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "Nincs megjelölendő hír."
 
-#, fuzzy
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Frissítési hiba"
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 
+#: js/viewfeed.js:1374
 #, 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?"
+msgid "Loading..."
+msgstr "Hírcsatornák töltése, kérem várjon..."
 
+#: js/viewfeed.js:1848
 #, fuzzy
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "Visszaállítja a címkeszíneket az alapértelmezettre?"
+msgid "Open original article"
+msgstr "Eredeti hír tartalmának megjelenítése"
 
+#: js/viewfeed.js:1854
 #, fuzzy
-#~ msgid "No profiles are selected."
-#~ msgstr "Nincs kiválasztott hír."
+msgid "View in a tt-rss tab"
+msgstr "Hír megnyitása új ablakban"
 
+#: js/viewfeed.js:1862
 #, fuzzy
-#~ msgid "Activate selected profile?"
-#~ msgstr "Eltávolítja a kiválasztott szűrőket?"
-
-#~ msgid "Label Editor"
-#~ msgstr "Címke Szerkesztő"
+msgid "Mark above as read"
+msgstr "Olvasottá tesz"
 
+#: js/viewfeed.js:1868
 #, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "Címkék szerkesztése"
+msgid "Mark below as read"
+msgstr "Olvasottá tesz"
 
+#: js/viewfeed.js:1914
 #, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "Eltávolítja a kiválasztott szűrőket?"
+msgid "Remove label"
+msgstr "Eltávolítja a kiválasztott címkéket?"
 
+#: js/viewfeed.js:1938
 #, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "Nincs kiválasztott szűrő."
+msgid "Playing..."
+msgstr "Hírcsatornák töltése, kérem várjon..."
 
+#: js/viewfeed.js:1939
 #, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "Kérem csak egy szűrőt jelöljön meg!"
-
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Minden hírt olvasottá tesz?"
-
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "Ebből a kategóriából nem ."
+msgid "Click to pause"
+msgstr "Kattintson ide a szerkesztéshez"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Válasszon hírcsatorná(ka)t!"
+#~ msgid "Help"
+#~ msgstr "Segítség"
 
 #, fuzzy
-#~ msgid "New version available!"
-#~ msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
-
-#~ msgid "No articles are selected."
-#~ msgstr "Nincsen kiválasztott hír."
-
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "Olvasottá teszi az összes látható hírt itt: %s?"
+#~ msgid "Importing using DOMXML."
+#~ msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
 
 #, fuzzy
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "OPML importálása (DOMDocument kiterjesztés használatával)"
 
-#, fuzzy
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "Eltávolítja a kijelölt híreket a címke alól?"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "Az ötösnél alacsonyabb verziószámű PHP-hez szükséges DOMXMLkiterjesztés "
+#~ "nem található."
 
 #, fuzzy
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
-
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "Képek helyi tárolása"
 
 #, fuzzy
-#~ msgid "Edit article Tags"
-#~ msgstr "Címkék szerkesztése"
+#~ msgid "Publish"
+#~ msgstr "Publikált"
 
-#~ msgid "No article is selected."
-#~ msgstr "Nincs kiválasztott hír."
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "A következő felhasználó jelszava megváltoztatva: <b>%s</b>."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "Nincs megjelölendő hír."
+#~ msgid "Content filtering"
+#~ msgstr "Tartalomszűrő"
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
+#~ msgid "See also:"
+#~ msgstr "Lásd még:"
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "Hírcsatornák töltése, kérem várjon..."
+#~ msgid "Add category..."
+#~ msgstr "Hírcsatorna-kategória hozzáadása..."
 
 #, fuzzy
-#~ msgid "Open original article"
-#~ msgstr "Eredeti hír tartalmának megjelenítése"
+#~ msgid "Add label..."
+#~ msgstr "Hírcsatorna-kategória hozzáadása..."
 
 #, fuzzy
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Hír megnyitása új ablakban"
+#~ msgid "description"
+#~ msgstr "Kiválasztottakat"
 
 #, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "Eltávolítja a kiválasztott címkéket?"
+#~ msgid "Dismiss article"
+#~ msgstr "Hír publikálása"
 
 #, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "Hírcsatornák töltése, kérem várjon..."
+#~ msgid "Remove:"
+#~ msgstr "Eltávolít"
 
 #, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "Kattintson ide a szerkesztéshez"
+#~ msgid "Assign:"
+#~ msgstr "Besorolás címke alá:"
 
-#, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Hír csillagozása"
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Kategória-újrarendezés bekapcsolása"
+
+#~ msgid "Update all feeds"
+#~ msgstr "Összes hírcsatorna frissítése"
+
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Név vagy olvasatlan hírek száma alapján történő rendezés"
 
 #~ msgid "Click to expand article"
 #~ msgstr "Hír kinyitása"
@@ -2754,28 +3151,14 @@ msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 #~ msgid "Fatal Exception"
 #~ msgstr "Végzetes Hiba"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Hírcsatorna-kategória hozzáadása..."
-
 #~ msgid "audio/mpeg"
 #~ msgstr "audio/mpeg"
 
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Hírcsatorna-kategória hozzáadása..."
-
-#~ msgid "General"
-#~ msgstr "Általános"
-
 #~ msgid "Synchronize new articles for offline reading using Google Gears."
 #~ msgstr ""
 #~ "Új hírek szinkronizálása kapcsolat nélküli módban való olvasáshoz a "
 #~ "Google Gears használatával."
 
-#~ msgid "Interface"
-#~ msgstr "Kezelőfelület"
-
 #~ msgid "Default article limit"
 #~ msgstr "Hírek maximális száma"
 
@@ -2808,9 +3191,6 @@ msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 #~ "közben bármikor megjelenítheti. Kisebb képernyővel rendelkező "
 #~ "felhasználók számára hasznos."
 
-#~ msgid "Advanced"
-#~ msgstr "Speciális"
-
 #~ msgid "Enable feed icons"
 #~ msgstr "Hírcsatorna-ikonok engedélyezése"
 
@@ -3096,10 +3476,6 @@ msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 #~ msgid "Adding feed..."
 #~ msgstr "Hírcsatorna hozzáadása..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "Hírcsatorna hozzáadása..."
-
 #~ msgid "Adding user..."
 #~ msgstr "Felhasználó hozzáadása..."
 
@@ -3194,11 +3570,6 @@ msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 #~ msgid "Removing selected users..."
 #~ msgstr "Kijelölt felhasználók eltávolítása..."
 
-#, fuzzy
-#~ msgid "Rescore last 100 articles in selected feeds?"
-#~ msgstr ""
-#~ "Eltávolítja az összes csillag nélküli hírt a kijelölt hírcsatornából?"
-
 #, fuzzy
 #~ msgid "Rescoring articles..."
 #~ msgstr "Hírek szinkronizálása..."
@@ -3361,10 +3732,6 @@ msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 #~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
 #~ msgstr "&nbsp;&nbsp;Hírek törlése"
 
-#, fuzzy
-#~ msgid "description"
-#~ msgstr "Kiválasztottakat"
-
 #~ msgid "Saving label..."
 #~ msgstr "Címke mentése"
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 36aed4b5..a6abc0cd 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 1daf7499..fef0d0f3 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttrss-1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2011-05-04 17:31+0200\n"
 "Last-Translator: Andrea Zagli <azagli@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -17,153 +17,134 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Utilizza predefiniti"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Non pulire mai"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "Vecchi di 1 settimana"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "Vecchi di 2 settimane"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "Vecchi di 1 mese"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "Vecchi di 2 mesi"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "Vecchi di 3 mesi"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Intervallo predefinito"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Disabilitare aggiornamenti"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Ogni 15 minuti"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Ogni 30 minuti"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "A ogni ora"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Ogni 4 ore"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Ogni 12 ore"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Giornalmente"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Settimanalmente"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Predefinito"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr "Twitter OAuth"
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Utente"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Utente con più autorizzazioni"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Notiziari"
-
-#: backend.php:201
-msgid "Article not found."
-msgstr "Articolo non trovato."
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Notiziario non trovato."
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "Caricamento, attendere prego..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "Il livello di accesso non è sufficiente per eseguire questo script."
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Aggiornatore database"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "Impossibile aggiornare il database"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr "Impossibile trovare il file schema necessario; serve la versione:"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", trovato: "
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Il database di Tiny Tiny RSS è aggiornato."
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "Fare il backup del database prima di procedere."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -172,32 +153,32 @@ msgstr ""
 "Il database di Tiny Tiny RSS deve essere aggiornato all&apos;ultima versione "
 "(<b>%d</b> a <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Effettuare gli aggiornamenti"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "Esecuzione aggiornamenti..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Aggiornamento alla versione %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Controllo della versione..."
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "ERRORE"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -206,16 +187,16 @@ msgstr ""
 "Fine. Eseguito/i <b>%d</b> aggiornamento/i fino\n"
 "\t\t\tallo schema versione <b>%d</b>."
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr "Lo schema del database è di una versione più recente di Tiny Tiny RSS."
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr "Versione dello schema trovata: <b>%d</b>, richiesta: <b>%d</b>."
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
@@ -223,7 +204,7 @@ msgstr ""
 "Impossibile aggiornare lo schema. Aggiornare i file di Tiny Tiny RSS a una "
 "nuova versione e continuare."
 
-#: digest.php:57
+#: digest.php:58
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\t\tfor this application to function properly. Please check your\n"
@@ -233,16 +214,23 @@ msgstr ""
 "\t\t\tda questa applicazione per funzionare correttamente. Controllare\n"
 "\t\t\tle impostazioni del browser."
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "Caricamento, attendere prego..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Salve,"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Esci"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -250,7 +238,7 @@ msgstr ""
 "Questo programma richiede XmlHttpRequest per funzionare correttamente. Il "
 "browser sembra non supportarla."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -258,15 +246,15 @@ msgstr ""
 "Questo programma richiede i cookie per funzionare correttamente. Il browser "
 "sembra non supportarli."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "Controllo sul backend fallito"
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "Controllo sul frontend fallito."
 
-#: errors.php:18
+#: errors.php:19
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
 "update&lt;/a&gt;."
@@ -274,15 +262,15 @@ msgstr ""
 "Versione dello schema del database non corretta. &lt;a href='db-updater."
 "php'&gt;Aggiornarla&lt;/a&gt;."
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Richiesta non autorizzata."
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Nessuna operazione da eseguire."
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -290,16 +278,16 @@ msgstr ""
 "Impossibile visualizzare il notiziario. Controllare che l&apos;etichetta "
 "corrisponda alla sintassi o la configurazione locale."
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr ""
 "Negato. Il livello di accesso non è sufficiente per accedere a questa pagina."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "Controllo della configurazione fallito"
 
-#: errors.php:30
+#: errors.php:31
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
 "\t\tofficial site for more information."
@@ -307,441 +295,254 @@ msgstr ""
 "La versione di MySQL non è attualmente supportata. Vedere \n"
 "\t\til sito ufficiale per maggiori informazioni."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "Commenti?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr "Notizie"
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Contrai elenco notiziari"
 
-#: index.php:127
+#: index.php:148
 msgid "Show articles"
 msgstr "Mostra articoli"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Adattivo"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Con stella"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Pubblicati"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Non letti"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: index.php:139
+#: index.php:160
 msgid "Sort articles"
 msgstr "Ordina articoli"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Data"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Titolo"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "Punteggio"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Aggiorna"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Azioni..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Cerca..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Azioni notiziari:"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Modifica questo notiziario..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr "Passa al sommario..."
 
-#: index.php:173
+#: index.php:194
 msgid "Show tag cloud..."
 msgstr "Mostra nuvola etichette..."
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Crea etichetta..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Crea filtro..."
 
-#: index.php:177
+#: index.php:198
 msgid "Keyboard shortcuts help"
 msgstr "Aiuto scorciatoie da tastiera"
 
-#: index.php:178
-msgid "About..."
-msgstr "Informazioni su..."
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Titolo o contenuto"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Collegamento"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Contenuto"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Data dell&apos;articolo"
-
-#: localized_schema.php:9
-msgid "Delete article"
-msgstr "Elimina articolo"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Imposta con stella"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Pubblica articolo"
+#: opml.php:70
+#, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "<li>Aggiunta della categoria <b>%s</b>.</li>"
 
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Assegna etichette"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Impostazione della voce delle preferenze %s a %s"
 
-#: localized_schema.php:14
-msgid "Assign label"
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
 msgstr "Assegna etichetta"
 
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Questa opzione è utile quando si stanno leggendo vari aggregatori di tipo "
-"«planet» con utenti che collidono parzialmente. Quando disabilitata forza le "
-"stesse notizie da differenti notiziari ad apparire una volta sola."
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Visualizza un elenco espanso di articoli di notiziario, invece di "
-"visualizzazioni separate per sommario e contenuto dell'articolo"
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"Quando viene fatto clic sul pulsante \"Segna come letto\" nella barra degli "
-"strumenti, automaticamente si apre il notiziario successivo con articoli non "
-"letti."
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Questa opzione abilita l&apos;invio del un riassunto giornaliero dei sommari "
-"nuovi (e non letti) all&apos;indirizzo email configurato"
-
-#: localized_schema.php:20
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Questa opzione abilita la segnatura automatica degli articoli come letti "
-"quando si scorre l'elenco articoli."
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-"Toglie tutte le etichette HTML più comuni durante la lettura degli articoli."
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Quando è attiva l&apos;individuazioni automatica delle etichette negli "
-"articoli, queste etichette non saranno applicate (elenco separato da "
-"virgola)."
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Quando questa opzione è abilitata, i sommari nei notiziari speciali e nelle "
-"etichette vengono raggruppati per notiziario"
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-"Utilizzare per l'ordinamento dei sommari la data specificata dal notiziario "
-"invece della data di importazione in locale."
-
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr "Personalizza a piacimento il foglio di stile CSS"
-
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr "Fare clic per registrare il certificato SSL client su tt-rss"
-
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr ""
-"Eliminare le notizie vecchie dopo questo numero di giorni (0 - disabilitato)"
-
-#: localized_schema.php:28
-msgid "Default interval between feed updates"
-msgstr "Intervallo predefinito tra gli aggiornamenti dei notiziari"
-
-#: localized_schema.php:29
-msgid "Amount of articles to display at once"
-msgstr "Numero di articoli da visualizzare alla volta"
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Permettere articoli duplicati"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Abilitare le categorie dei notiziari"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "Mostrare l&apos;anteprima del contenuto nell&apos;elenco del sommario"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Formato data corta"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Formato data lunga"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Visualizzazione combinata di notiziari"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Nascondere i notiziari senza messaggi non letti"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Su lettura passare al prossimo notiziario"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Ordinare i notiziari per numero di articoli non letti"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Invertire l&apos;ordine del sommario (prima i più vecchi)"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Abilitare email riassunto"
-
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Richiedere conferma segnatura del notiziario come letto"
-
-#: localized_schema.php:42
-msgid "Automatically mark articles as read"
-msgstr "Segnare automaticamente gli articoli come letti"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Togliere le etichette non buone dagli articoli"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Etichette in lista nera"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Età massima degli articoli nuovi (in ore)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "Segna gli articoli del riassunto email come letti"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "Espandere automaticamente gli articoli nella modalità combinata"
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Eliminare articoli non letti"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
-"Mostrare i notiziari speciali quando vengono nascosti i notiziari letti"
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Raggruppare i sommari in notiziari virtuali"
 
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "Non mostrare le immagini negli articoli"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "Aggiunta notiziario..."
 
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr "Abilita API esterna"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Crea filtro"
 
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr "Fuso orario dell'utente"
+#: opml.php:230
+msgid "is already imported."
+msgstr "già importato."
 
-#: localized_schema.php:54
-msgid "Sort headlines by feed date"
-msgstr "Ordinare i sommari per data del notiziario"
+#: opml.php:250
+msgid "OK"
+msgstr "OK"
 
-#: localized_schema.php:55
-msgid "Customize stylesheet"
-msgstr "Personalizza il foglio di stile"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Errore durante l&apos;analisi del documento."
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr "Accesso con un certificato SSL"
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Errore: caricare il file OPML."
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "Utilità OPML"
 
-#: opml.php:188
+#: opml.php:492
 msgid "Importing OPML..."
 msgstr "Importazione OPML..."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Ritorna alle preferenze"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Notiziari"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "Etichette"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "Utenti"
 
-#: prefs.php:109
+#: prefs.php:108
 msgid "Linked"
 msgstr "Collegato"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "Crea un nuovo utente"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr ""
 "La registrazione di nuovi utenti è disabilitata dall&apos;amministratore."
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -751,180 +552,405 @@ msgstr ""
 "eseguono l'accesso almeno una volta, vengono cancellati automaticamente 24 "
 "ore dopo che la password temporanea è stata inviata."
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "Accesso desiderato:"
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "Controlla disponibilità"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "Quanto fa due più due:"
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "Invia registrazione"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "Le informazioni di registrazione sono incomplete."
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "Il nome utente esiste già."
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "Registrazione fallita."
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "Utente creato con successo."
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr "Registra su Twitter"
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 "Impossibile connettersi a Twitter. Aggiornare la pagina o provare più tardi."
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "Registrazione su Twitter effettuata con successo."
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 msgid "Register"
 msgstr "Registro"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-msgid "Default profile"
-msgstr "Profilo predefinito"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Scorciatoie da tastiera"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "nessuna etichetta"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Navigazione"
 
-#: modules/backend-rpc.php:836
-msgid "Your request could not be completed."
-msgstr "La richiesta non può essere completata."
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Sposta tra notiziari"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr "L'aggiornamento del notiziario è stato pianificato con successo."
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Sposta tra articoli"
 
-#: modules/backend-rpc.php:848
-msgid "Category update has been scheduled."
-msgstr "Pianificato l'aggiornamento della categoria."
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Mostra il dialogo di ricerca"
 
-#: modules/backend-rpc.php:861
-msgid "Can't update this kind of feed."
-msgstr "Impossibile aggiornare questo tipo di notiziario."
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Azioni sull&apos;articolo attivo"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Aiuto"
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Inverti con stella"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Argomento dell&apos;aiuto non trovato."
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Inverti pubblicati"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Inverti non letti"
 
-#: modules/opml_domdoc.php:60
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>Aggiunta della categoria <b>%s</b>.</li>"
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Modifica etichette"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Impostazione della voce delle preferenze %s a %s"
+#: help/main.php:20
+msgid "Dismiss selected articles"
+msgstr "Rimuovi gli articoli selezionati"
 
-#: modules/opml_domdoc.php:128
-msgid "is already imported."
-msgstr "già importato."
+#: help/main.php:21
+msgid "Dismiss read articles"
+msgstr "Rimuovi articoli letti"
 
-#: modules/opml_domdoc.php:148
-msgid "OK"
-msgstr "OK"
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Aprire gli articoli in una nuova finestra"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Errore durante l&apos;analisi del documento."
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Segnare gli articoli sopra e sotto quello attivo come letti"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Errore: caricare il file OPML."
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Scorri il contenuto dell&apos;articolo"
+
+#: help/main.php:25
+#, fuzzy
+msgid "Email article"
+msgstr "Tutti gli articoli"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Altre azioni"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Crea etichetta"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Crea filtro"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Contrai la barra laterale"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "Visualizza questo dialogo di aiuto"
+
+#: help/main.php:41
+#, fuzzy
+msgid "Multiple articles actions"
+msgstr "Articoli multipli"
+
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "Elimina articolo"
+
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Eliminare articoli non letti"
+
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Azioni sull&apos;articolo attivo"
+
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "Elimina articolo"
+
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Azioni notiziari"
+
+#: help/main.php:53
+msgid "Refresh active feed"
+msgstr "Aggiorna notiziario attivo"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "Sottoscrivi il notiziario"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Modifica notiziario"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Segna notiziario come letto"
 
-#: modules/popup-dialog.php:34
-msgid "Importing using DOMXML."
-msgstr "Importazione utilizzando DOMXML."
+#: help/main.php:58
+msgid "Reverse headlines order"
+msgstr "Invertire l&apos;ordine dei sommari"
 
-#: modules/popup-dialog.php:40
-msgid "Importing using DOMDocument."
-msgstr "Importazione utilizzando DOMDocument."
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Segna tutti i notiziari come letti"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "Se in visualizzazione categoria, contraila/espandila"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "Vai a..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Tutti gli articoli"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Articoli nuovi"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Articoli con stella"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Articoli pubblicati"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Nuvola etichette"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
-"L&apos;estensione DOMXML non è stata trovata. È richiesta per versioni di "
-"PHP inferiori alla 5."
+"Nel wiki di Tiny Tiny RSS sono disponibili altri suggerimenti per "
+"l'interfaccia."
 
-#: modules/popup-dialog.php:80
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Premere qualsiasi tasto per chiudere questa finestra."
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Notiziari"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Altri notiziari"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Riquadro azioni"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "Primi 25 notiziari"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Modifica categorie notiziari"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Crea utente"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "Attiva la ricerca (se presente)"
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+"<b>Notare:</b> non tutte le azioni potrebbero essere disponibili, in base "
+"alla configurazione di Tiny Tiny RSS e al proprio livello di accesso."
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Accedi"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Accesso:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Password:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr "Casa"
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Speciale"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
+msgstr "Non trovato (fare clic per ricaricare il notiziario)."
+
+#: mobile/prefs.php:24
+msgid "Enable categories"
+msgstr "Abilitare le categorie"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr "Acceso"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr "Spento"
+
+#: mobile/prefs.php:29
+msgid "Browse categories like folders"
+msgstr "Sfoglia le categorie come cartelle"
+
+#: mobile/prefs.php:35
+msgid "Show images in posts"
+msgstr "Mostrare le immagini negli articoli"
+
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Nascondi notiziari letti"
+
+#: mobile/prefs.php:45
+msgid "Sort feeds by unread count"
+msgstr "Ordinare i notiziari per numero di non letti"
+
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Articolo non trovato."
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Argomento dell&apos;aiuto non trovato."
+
+#: classes/dlg.php:26
+#, fuzzy
+msgid "Prepare data"
+msgstr "Salva dati"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Chiudi questa finestra"
+
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
+msgstr ""
+
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "Crea profilo"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 msgid "(active)"
 msgstr "(attivo)"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+msgid "Default profile"
+msgstr "Profilo predefinito"
+
+#: classes/dlg.php:170
 msgid "Remove selected profiles"
 msgstr "Rimuovi i profili selezionati"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 msgid "Activate profile"
 msgstr "Attiva profilo"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "Notifica"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -935,11 +961,11 @@ msgstr ""
 "aggiornameto di tutti i notiziari. Avviare il processo del demone o "
 "contattare il proprietario dell&apos;istanza."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -950,166 +976,169 @@ msgstr ""
 "crash o uno stallo. Controllare il processo del demone o contattare il "
 "proprietario dell&apos;istanza."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Notiziario"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Accesso"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 msgid "Password"
 msgstr "Password"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l&apos;autenticazione"
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 msgid "More feeds"
 msgstr "Altri notiziari"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Annulla"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Cerca"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 msgid "Feed archive"
 msgstr "Archivio notiziari"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 msgid "limit:"
 msgstr "limite:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr "Cerca"
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 msgid "match on"
 msgstr "corrisponde a"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Contenuto"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Titolo o contenuto"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Limitare la ricerca a:"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Questo notiziario"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Corrisponde"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "prima"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "dopo"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "Controllalo"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "al campo"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "in"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Esegui azione"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "con parametri:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Opzioni"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "Corrispondenza inversa"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "Mettere nella categoria:"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "Prova"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Crea"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
@@ -1117,99 +1146,74 @@ msgstr ""
 "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi "
 "(più vecchi prima):"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Salva"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 msgid "Tag Cloud"
 msgstr "Nuvola etichette"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 #, fuzzy
 msgid "Match:"
 msgstr "Corrisponde"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "visualizza notiziari"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr "[Inoltrato]"
-
-#: modules/popup-dialog.php:813
-msgid "Multiple articles"
-msgstr "Articoli multipli"
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr "Da:"
-
-#: modules/popup-dialog.php:843
-msgid "To:"
-msgstr "A:"
-
-#: modules/popup-dialog.php:856
-msgid "Subject:"
-msgstr "Oggetto:"
-
-#: modules/popup-dialog.php:872
-msgid "Send e-mail"
-msgstr "Invia email"
-
-#: modules/popup-dialog.php:881
+#: classes/dlg.php:821 classes/feeds.php:152
 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 "È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 msgid "Details"
 msgstr "Dettagli"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr "Scarica"
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1221,74 +1225,221 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può "
 "essere utilizzato come base."
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr "Istanza"
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr "URL dell'istanza"
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 msgid "Access key:"
 msgstr "Chiave di accesso:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 msgid "Access key"
 msgstr "Chiave di accesso"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr "Utilizzare una chiave di accesso per entrambe le istanze collegate."
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 msgid "Generate new key"
 msgstr "Genera nuova chiave"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 msgid "Create link"
 msgstr "Crea collegamento"
 
-#: modules/popup-dialog.php:1094
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: classes/feeds.php:94 include/functions.php:3346
+msgid "Visit the website"
+msgstr "Visita il sito web"
+
+#: classes/feeds.php:107
+msgid "View as RSS feed"
+msgstr "Visualizza come RSS del notiziario"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Seleziona:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Tutti"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Inverti"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Nessuno"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Inverti selezione:"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Selezione:"
+
+#: classes/feeds.php:138
+msgid "Archive"
+msgstr "Archivio"
+
+#: classes/feeds.php:140
+msgid "Move back"
+msgstr "Sposta indietro"
+
+#: classes/feeds.php:141
+msgid "Delete"
+msgstr "Elimina"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+msgid "Forward by email"
+msgstr "Inoltra per email"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "Notiziario:"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Notiziario non trovato."
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "segna come letto"
+
+#: classes/feeds.php:625 include/functions.php:3318
+msgid "Originally from:"
+msgstr "Originariamente da:"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Modifica le etichette per questo articolo"
+
+#: classes/feeds.php:712 include/functions.php:3285
+msgid "Open article in new tab"
+msgstr "Apri articolo in una nuova scheda"
+
+#: classes/feeds.php:723 include/functions.php:3301
 #, fuzzy
-msgid "You can share this article by the following unique URL:"
+msgid "Close article"
+msgstr "Elimina articolo"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "Nessun articolo non letto trovato da visualizzare."
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "Nessun articolo non aggiornato trovato da visualizzare."
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "Nessun articolo con stella trovato da visualizzare."
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
 msgstr ""
-"È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
+"Nessun articolo trovato da visualizzare. Si possono assegnare manualmente "
+"gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
+"filtro."
 
-#: modules/pref-feeds.php:4
-msgid "Check to enable field"
-msgstr "Spuntare per abilitare il campo"
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "Nessun articolo trovato da visualizzare."
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
-#, fuzzy, php-format
-msgid "(%d feeds)"
-msgstr "Modifica notiziari"
+#: classes/feeds.php:771 include/functions.php:4486
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Ultimo aggiornamento notiziari alle %s"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr ""
+"Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
-#: modules/pref-feeds.php:96
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
-#: modules/pref-feeds.php:306
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr "[Inoltrato]"
+
+#: classes/mail_button.php:52
+msgid "Multiple articles"
+msgstr "Articoli multipli"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr "Da:"
+
+#: classes/mail_button.php:82
+msgid "To:"
+msgstr "A:"
+
+#: classes/mail_button.php:95
+msgid "Subject:"
+msgstr "Oggetto:"
+
+#: classes/mail_button.php:111
+msgid "Send e-mail"
+msgstr "Invia email"
+
+#: classes/note_button.php:7 js/note_button.js:11
+msgid "Edit article note"
+msgstr "Modifica note articolo"
+
+#: classes/pref_feeds.php:11
+msgid "Check to enable field"
+msgstr "Spuntare per abilitare il campo"
+
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
+#, fuzzy, php-format
+msgid "(%d feeds)"
+msgstr "Modifica notiziari"
+
+#: classes/pref_feeds.php:299
 msgid "Feed Title"
 msgstr "Titolo notiziario"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr "utilizzando"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1297,222 +1448,205 @@ msgstr ""
 "proprio notiziario richiede l'autenticazione, eccetto per i notiziari di "
 "Twitter."
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 msgid "Hide from Popular feeds"
 msgstr "Nascondere nei notiziari popolari"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Contenuto da destra a sinistra"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "Includere nell&apos;email riassunto"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: modules/pref-feeds.php:472
-msgid "Cache images locally (SimplePie only)"
-msgstr "Memorizzare le immagini localmente (solo SimplePie)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
+msgstr "Memorizzare le immagini localmente"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 msgid "Mark updated articles as unread"
 msgstr "Segnare gli articoli aggiornati come non letti"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr "Segnare gli articoli come aggiornati al cambiamento del contenuto"
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 msgid "Icon"
 msgstr "Icona"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 msgid "Resubscribe to push updates"
 msgstr "Sottoscrivi per inviare aggiornamenti"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 "Reimposta lo stato di sottoscrizione a PubSubHubbub per notiziari abilitati "
 "all'invio."
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Memorizzare le immagini localmente"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Fatto tutto."
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Sottoscrizione avvenuta a <b>%s</b>."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Impossibile sottoscrivere <b>%s</b>."
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Nessun notiziario trovato."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Si ha già una sottoscrizione a <b>%s</b>."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 "Impossibile sottoscrivere <b>%s</b>.<br>Impossibile scaricare l'URL del "
 "notiziario."
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 msgid "Subscribe to selected feed"
 msgstr "Sottoscrivi il notiziario selezionato"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Modifica opzioni di sottoscrizione"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "La categoria <b>%s</b> esiste già nel database."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Crea categoria"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "Nessuna categoria notiziari definita."
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 msgid "Remove selected categories"
 msgstr "Rimuovi le categorie selezionate"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 msgid "Feeds with errors"
 msgstr "Notiziari con errori"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 msgid "Inactive feeds"
 msgstr "Notiziari non attivi"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 msgid "Select"
 msgstr "Seleziona"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Tutti"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Nessuno"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "Sottoscrivi il notiziario"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 msgid "Edit selected feeds"
 msgstr "Modifica i notiziari selezionati"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 msgid "Reset sort order"
 msgstr "Reimposta ordinamento"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 msgid "Categories"
 msgstr "Categorie"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Modifica categorie"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 msgid "More actions..."
 msgstr "Altre azioni..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Eliminazione manuale"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Pulisci i dati del notiziario"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "Cambio punteggio degli articoli"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 "<b>Suggerimento:</b> si possono trascinare in giro i notiziari e le "
 "categorie."
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
+#, fuzzy
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 "Utilizzando OPML si possono esportare e importare le impostazioni dei "
 "notiziari e di Tiny Tiny RSS."
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+#, fuzzy
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 "Nota: solo le impostazioni del profilo principale possono essere migrate "
 "utilizzando OPML."
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importa"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Esporta OPML"
+msgid "Import my OPML"
+msgstr "Importazione OPML..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo"
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "Includere nell&apos;email riassunto"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Pubblicati"
+msgid "Export OPML"
+msgstr "Esporta OPML"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
@@ -1520,24 +1654,46 @@ msgstr ""
 "OPML può essere pubblicato e può essere sottoscritto da chiunque conosca "
 "l&apos;URL seguente."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
+#, fuzzy
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 "Nota: l'OPML pubblicato non contiene le impostazioni di Tiny Tiny RSS, i "
 "notiziari che richiedono l'autenticazione o i notiziari nascosti dai "
 "notiziari popolari."
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
-msgstr "Visualizza URL"
+#: classes/pref_feeds.php:1439
+#, fuzzy
+msgid "Display published OPML URL"
+msgstr "URL OPML pubblico"
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1442
+#, fuzzy
+msgid "Article archive"
+msgstr "Data dell&apos;articolo"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "Esporta OPML"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importa"
+
+#: classes/pref_feeds.php:1469
 msgid "Firefox integration"
 msgstr "Integrazione con Firefox"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1545,15 +1701,15 @@ msgstr ""
 "Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
 "di Firefox facendo clic sul collegamento qui sotto."
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr "Sottoscrizione utilizzando bookmarklet"
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1562,25 +1718,25 @@ msgstr ""
 "aprire il notiziario al quale si è interessati nel browser a fare clic sul "
 "collegamento per sottoscriverlo."
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Sottoscrivere %s in Tiny Tiny RSS?"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Sottoscrive in Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "Articoli pubblicati e notiziari generati"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 msgid "Published articles and generated feeds"
 msgstr "Articoli pubblicati e notiziari generati"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1589,28 +1745,32 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+msgid "Display URL"
+msgstr "Visualizza URL"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr "Pulisci tutti gli URL generati"
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Articoli non letti"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 msgid "Twitter"
 msgstr "Twitter"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1618,7 +1778,7 @@ msgstr ""
 "Prima di poter aggiornare i notiziari di Twitter, occorre registrare questa "
 "instanza di Tiny Tiny RSS su Twitter.com."
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
@@ -1626,54 +1786,41 @@ msgstr ""
 "La registrazione su Twitter.com è avvenuta con successo; adesso si è in "
 "grado di accedere a notiziari di Twitter."
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr "Registra su Twitter.com"
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 msgid "Clear stored credentials"
 msgstr "Pulisci le credenziali memorizzate"
 
-#: modules/pref-feeds.php:1654
-#, php-format
-msgid "%d archived articles"
-msgstr "%d articoli archiviati"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "Nessun notiziario trovato."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr "Articoli che corrispondono a questo filtro:"
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 msgid "No articles matching this filter has been found."
 msgstr "Nessun articolo trovato che corrisponde a questo filtro."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Filtro <b>%s</b> creato"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Crea filtro"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Modifica"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr "Collega istanza"
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
@@ -1682,1073 +1829,1256 @@ msgstr ""
 "condividere i notiziari popolari. Collegare questa istanza di Tiny Tiny RSS "
 "utilizzando questo URL:"
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr "Ultimo connesso"
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 msgid "Stored feeds"
 msgstr "Notiziari memorizzati"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Fare clic per modificare"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "Intestazione"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 msgid "Colors"
 msgstr "Colori"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Foreground:"
 msgstr "Primo piano:"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Background:"
 msgstr "Sfondo:"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Etichetta <b>%s</b> creata"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Crea etichetta"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Pulisci colori"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "La vecchia password non può essere vuota."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "La nuova password non può essere vuota."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "Le password inserite non corrispondono."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "La password è stata cambiata"
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "La vecchia password non è corretta."
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "La configurazione è stata salvata."
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Opzione sconosciuta: %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr "I dati personali sono stati salvati."
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Dati personali"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr "Nome completo"
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "Email"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Livello di accesso"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 msgid "Save data"
 msgstr "Salva dati"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 msgid "Your password is at default value, please change it."
 msgstr "La password è impostata al valore predefinito: cambiarla."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Nuova password"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Conferma password"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Cambia password"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Seleziona tema"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr "Personalizza"
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Sì"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "No"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr "Pulisci"
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Salva configurazione"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr "Gestisci profili"
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Reimposta ai valori predefiniti"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Dettagli utente"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Registrato"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Ultimo accesso"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Numero notiziari sottoscritti"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Sottoscrivi notiziari"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Editor utente"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Livello di accesso: "
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Cambiare la password a"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "Email:"
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "Password dell&apos;utente <b>%s</b> cambiata."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Aggiunto l&apos;utente <b>%s</b> con password <b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Impossibile creare l&apos;utente <b>%s<b>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "L&apos;utente <b>%s</b> esiste già."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "Password cambiata all&apos;utente <b>%s</b>\n"
 "\t\t\t\t\t a <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Notifica a <b>%s</b>"
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifica di cambio password"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Crea utente"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Reimposta password"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Livello di accesso"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "Nessun utente definito."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "Nessun utente corrispondente trovato."
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Filtro contenuti"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
-msgstr ""
-"Tiny Tiny RSS ha il supporto per il filtraggio (o il processamento) degli "
-"articoli. Il filtro viene fatto una volta quando i nuovi articoli vengono "
-"importati nel database dal notiziario, il campo specificato viene "
-"confrontato con l&apos;espressione regolare e viene effettuata qualche "
-"azione. La corrispondenza all&apos;espressione regolare tiene conto di "
-"maiuscole e minuscole."
-
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Le azioni supportate sono: filtra articolo (non importare), segna articolo "
-"come letto, imposta con stella, assegna etichetta(e) e imposta punteggio. I "
-"filtri possono essere definiti globalmente e per ogni notiziario specifico."
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-"Sono supportate le corrispondenze multiple e inverse. Tutti i filtri di "
-"corrispondenza vengono considerati quando gli articoli vengono importati e "
-"tutte le azioni vengono poi eseguite in sequenza. La corrispondenza inversa "
-"inverte il risultato della corrispondenza; es. il filtro con corrispondenza "
-"XYZZY nel titolo con l&apos;opzione di inversione troverà tutti gli "
-"articoli, eccetto quelli che contengono la stringa XYZZY nel titolo."
-
-#: help/2.php:9
-msgid "See also:"
-msgstr "Vedere anche:"
-
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Scorciatoie da tastiera"
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "nessuna etichetta"
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Navigazione"
+#: classes/rpc.php:741
+msgid "Your request could not be completed."
+msgstr "La richiesta non può essere completata."
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Sposta tra notiziari"
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
+msgstr "L'aggiornamento del notiziario è stato pianificato con successo."
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Sposta tra articoli"
+#: classes/rpc.php:753
+msgid "Category update has been scheduled."
+msgstr "Pianificato l'aggiornamento della categoria."
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Mostra il dialogo di ricerca"
+#: classes/rpc.php:766
+msgid "Can't update this kind of feed."
+msgstr "Impossibile aggiornare questo tipo di notiziario."
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Azioni sull&apos;articolo attivo"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "Metti la stella all&apos;articolo"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "Inverti con stella"
+#: classes/share_button.php:29
+#, fuzzy
+msgid "You can share this article by the following unique URL:"
+msgstr ""
+"È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Inverti pubblicati"
+#: classes/tweet_button.php:7
+msgid "Share on Twitter"
+msgstr "Condividi su Twitter"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Inverti non letti"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "La validazione della sessione è fallita (IP non corretto)"
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Modifica etichette"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "Nome utente o password sbagliati"
 
-#: help/3.php:20
-msgid "Dismiss selected articles"
-msgstr "Rimuovi gli articoli selezionati"
+#: include/functions.php:2013
+msgid "Archived articles"
+msgstr "Articoli archiviati"
 
-#: help/3.php:21
-msgid "Dismiss read articles"
-msgstr "Rimuovi articoli letti"
+#: include/functions.php:3109 js/viewfeed.js:1945
+msgid "Click to play"
+msgstr "Fare clic per riprodurre"
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Aprire gli articoli in una nuova finestra"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr "Riproduci"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Segnare gli articoli sopra e sotto quello attivo come letti"
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Scorri il contenuto dell&apos;articolo"
+#: include/functions.php:4061
+msgid "(edit note)"
+msgstr "(modifica note)"
 
-#: help/3.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "Tutti gli articoli"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "Nessun notiziario selezionato."
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Altre azioni"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "tipo sconosciuto"
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Allegato:"
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Contrai la barra laterale"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Allegati:"
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "Visualizza questo dialogo di aiuto"
+#: include/functions.php:5091
+#, php-format
+msgid "%d archived articles"
+msgstr "%d articoli archiviati"
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Articoli multipli"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "Nessun notiziario trovato."
 
-#: help/3.php:44
+#: include/functions.php:5161
 #, fuzzy
-msgid "Select all articles"
-msgstr "Elimina articolo"
+msgid "Could not import: incorrect schema version."
+msgstr "Impossibile trovare il file schema necessario; serve la versione:"
 
-#: help/3.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "Eliminare articoli non letti"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Azioni sull&apos;articolo attivo"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
+
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Titolo o contenuto"
+
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Collegamento"
+
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Data dell&apos;articolo"
+
+#: include/localized_schema.php:9
+msgid "Delete article"
 msgstr "Elimina articolo"
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Azioni notiziari"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Imposta con stella"
 
-#: help/3.php:53
-msgid "Refresh active feed"
-msgstr "Aggiorna notiziario attivo"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Pubblica articolo"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Modifica notiziario"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Assegna etichette"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Segna notiziario come letto"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Assegna etichetta"
 
-#: help/3.php:58
-msgid "Reverse headlines order"
-msgstr "Invertire l&apos;ordine dei sommari"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Segna tutti i notiziari come letti"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Generali"
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "Se in visualizzazione categoria, contraila/espandila"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Interfaccia"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "Vai a..."
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Avanzate"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Tutti gli articoli"
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+"Questa opzione è utile quando si stanno leggendo vari aggregatori di tipo "
+"«planet» con utenti che collidono parzialmente. Quando disabilitata forza le "
+"stesse notizie da differenti notiziari ad apparire una volta sola."
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Articoli nuovi"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Visualizza un elenco espanso di articoli di notiziario, invece di "
+"visualizzazioni separate per sommario e contenuto dell'articolo"
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Articoli con stella"
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"Quando viene fatto clic sul pulsante \"Segna come letto\" nella barra degli "
+"strumenti, automaticamente si apre il notiziario successivo con articoli non "
+"letti."
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Articoli pubblicati"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Questa opzione abilita l&apos;invio del un riassunto giornaliero dei sommari "
+"nuovi (e non letti) all&apos;indirizzo email configurato"
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Nuvola etichette"
+#: include/localized_schema.php:25
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Questa opzione abilita la segnatura automatica degli articoli come letti "
+"quando si scorre l'elenco articoli."
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
-"Nel wiki di Tiny Tiny RSS sono disponibili altri suggerimenti per "
-"l'interfaccia."
+"Toglie tutte le etichette HTML più comuni durante la lettura degli articoli."
+
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Quando è attiva l&apos;individuazioni automatica delle etichette negli "
+"articoli, queste etichette non saranno applicate (elenco separato da "
+"virgola)."
+
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+"Quando questa opzione è abilitata, i sommari nei notiziari speciali e nelle "
+"etichette vengono raggruppati per notiziario"
+
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
+"Utilizzare per l'ordinamento dei sommari la data specificata dal notiziario "
+"invece della data di importazione in locale."
+
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr "Personalizza a piacimento il foglio di stile CSS"
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Premere qualsiasi tasto per chiudere questa finestra."
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr "Fare clic per registrare il certificato SSL client su tt-rss"
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Notiziari"
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+"Eliminare le notizie vecchie dopo questo numero di giorni (0 - disabilitato)"
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Altri notiziari"
+#: include/localized_schema.php:33
+msgid "Default interval between feed updates"
+msgstr "Intervallo predefinito tra gli aggiornamenti dei notiziari"
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Riquadro azioni"
+#: include/localized_schema.php:34
+msgid "Amount of articles to display at once"
+msgstr "Numero di articoli da visualizzare alla volta"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "Primi 25 notiziari"
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Permettere articoli duplicati"
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Modifica categorie notiziari"
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "Abilitare le categorie dei notiziari"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "Attiva la ricerca (se presente)"
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "Mostrare l&apos;anteprima del contenuto nell&apos;elenco del sommario"
 
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>Notare:</b> non tutte le azioni potrebbero essere disponibili, in base "
-"alla configurazione di Tiny Tiny RSS e al proprio livello di accesso."
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Formato data corta"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Accedi"
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Formato data lunga"
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Accesso:"
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Visualizzazione combinata di notiziari"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Password:"
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Nascondere i notiziari senza messaggi non letti"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr "Casa"
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Su lettura passare al prossimo notiziario"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Speciale"
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "Ordinare i notiziari per numero di articoli non letti"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr "Non trovato (fare clic per ricaricare il notiziario)."
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Invertire l&apos;ordine del sommario (prima i più vecchi)"
 
-#: mobile/prefs.php:24
-msgid "Enable categories"
-msgstr "Abilitare le categorie"
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Abilitare email riassunto"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
-msgstr "Acceso"
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Richiedere conferma segnatura del notiziario come letto"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
-msgstr "Spento"
+#: include/localized_schema.php:47
+msgid "Automatically mark articles as read"
+msgstr "Segnare automaticamente gli articoli come letti"
 
-#: mobile/prefs.php:29
-msgid "Browse categories like folders"
-msgstr "Sfoglia le categorie come cartelle"
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Togliere le etichette non buone dagli articoli"
 
-#: mobile/prefs.php:35
-msgid "Show images in posts"
-msgstr "Mostrare le immagini negli articoli"
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Etichette in lista nera"
 
-#: mobile/prefs.php:40
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Nascondi notiziari letti"
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Età massima degli articoli nuovi (in ore)"
 
-#: mobile/prefs.php:45
-msgid "Sort feeds by unread count"
-msgstr "Ordinare i notiziari per numero di non letti"
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "Segna gli articoli del riassunto email come letti"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "La validazione della sessione è fallita (IP non corretto)"
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "Espandere automaticamente gli articoli nella modalità combinata"
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Nome utente o password sbagliati"
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Eliminare articoli non letti"
 
-#~ msgid "Archived articles"
-#~ msgstr "Articoli archiviati"
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr ""
+"Mostrare i notiziari speciali quando vengono nascosti i notiziari letti"
 
-#~ msgid "Select:"
-#~ msgstr "Seleziona:"
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Raggruppare i sommari in notiziari virtuali"
 
-#~ msgid "Invert"
-#~ msgstr "Inverti"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "Non mostrare le immagini negli articoli"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Inverti selezione:"
+#: include/localized_schema.php:57
+msgid "Enable external API"
+msgstr "Abilita API esterna"
 
-#~ msgid "Selection:"
-#~ msgstr "Selezione:"
+#: include/localized_schema.php:58
+msgid "User timezone"
+msgstr "Fuso orario dell'utente"
 
-#~ msgid "Archive"
-#~ msgstr "Archivio"
+#: include/localized_schema.php:59
+msgid "Sort headlines by feed date"
+msgstr "Ordinare i sommari per data del notiziario"
 
-#~ msgid "Move back"
-#~ msgstr "Sposta indietro"
+#: include/localized_schema.php:60 js/prefs.js:1762
+msgid "Customize stylesheet"
+msgstr "Personalizza il foglio di stile"
 
-#~ msgid "Delete"
-#~ msgstr "Elimina"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr "Accesso con un certificato SSL"
 
-#~ msgid "Forward by email"
-#~ msgstr "Inoltra per email"
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Lingua:"
 
-#~ msgid "Feed:"
-#~ msgstr "Notiziario:"
+#: include/login_form.php:148
+msgid "Profile:"
+msgstr "Profilo:"
 
-#~ msgid "Visit the website"
-#~ msgstr "Visita il sito web"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr "Utilizzare minor traffico"
 
-#~ msgid "View as RSS feed"
-#~ msgstr "Visualizza come RSS del notiziario"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
-#~ msgid "Click to play"
-#~ msgstr "Fare clic per riprodurre"
+#: js/digest.js:69
+msgid "Mark %d displayed articles as read?"
+msgstr "Segnare %d articolo/i visualizzato/i come letto/i?"
 
-#~ msgid "Play"
-#~ msgstr "Riproduci"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Togli la stella all&apos;articolo"
 
-#~ msgid " - "
-#~ msgstr " - "
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Metti la stella all&apos;articolo"
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Modifica le etichette per questo articolo"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Non pubblicare articolo"
 
-#~ msgid "Open article in new tab"
-#~ msgstr "Apri articolo in una nuova scheda"
+#: js/digest.js:265
+#, fuzzy
+msgid "Original article"
+msgstr "Apri articolo di origine"
 
-#~ msgid "Edit article note"
-#~ msgstr "Modifica note articolo"
+#: js/digest.js:267
+msgid "Close this panel"
+msgstr "Chiudi questo pannello"
 
-#~ msgid "Share on Twitter"
-#~ msgstr "Condividi su Twitter"
+#: js/digest.js:290
+msgid "Error: unable to load article."
+msgstr "Errore: impossibile caricare l'articolo."
 
-#~ msgid "Close this panel"
-#~ msgstr "Chiudi questo pannello"
+#: js/digest.js:444
+msgid "Click to expand article."
+msgstr "Fare clic per espandere l&apos;articolo."
 
-#~ msgid "Originally from:"
-#~ msgstr "Originariamente da:"
+#: js/digest.js:519
+msgid "%d more..."
+msgstr "%d altri..."
 
-#~ msgid "mark as read"
-#~ msgstr "segna come letto"
+#: js/digest.js:526
+msgid "No unread feeds."
+msgstr "Nessun notiziario non letto."
 
-#~ msgid "Dismiss article"
-#~ msgstr "Rimuovi articolo"
+#: js/digest.js:628
+msgid "Load more..."
+msgstr "Carica altri..."
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "Nessun articolo non letto trovato da visualizzare."
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr ""
+"Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "Nessun articolo non aggiornato trovato da visualizzare."
+#: js/FeedTree.js:137
+msgid "Update feed"
+msgstr "Aggiorna notiziario"
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "Nessun articolo con stella trovato da visualizzare."
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
+"Si vuole notificare questa eccezione a tt-rss.org? La notifica includerà le "
+"informazioni sul browser. L'IP verrà salvato in un database."
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "Nessun articolo trovato da visualizzare. Si possono assegnare manualmente "
-#~ "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare "
-#~ "un filtro."
+#: js/functions.js:647
+msgid "Date syntax appears to be correct:"
+msgstr "La sintassi della data appare con corretta:"
 
-#~ msgid "No articles found to display."
-#~ msgstr "Nessun articolo trovato da visualizzare."
+#: js/functions.js:650
+msgid "Date syntax is incorrect."
+msgstr "La sintassi della data non è corretta."
 
-#~ msgid "Feeds last updated at %s"
-#~ msgstr "Ultimo aggiornamento notiziari alle %s"
+#: js/functions.js:777
+msgid "Remove stored feed icon?"
+msgstr "Rimuovi le icone salvate dei notiziari?"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr ""
-#~ "Qualche notiziario ha degli errori di aggiornamento (fare clic per "
-#~ "dettagli)"
+#: js/functions.js:809
+msgid "Please select an image file to upload."
+msgstr "Selezionare un file immagine da caricare."
 
-#~ msgid "Remove:"
-#~ msgstr "Rimuovi:"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr "Caricare una nuova icona per questo notiziario?"
 
-#~ msgid "Assign:"
-#~ msgstr "Assegna:"
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Inserire l'intestazione dell'etichetta:"
 
-#~ msgid "(edit note)"
-#~ msgstr "(modifica note)"
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "Impossibile creare l'etichetta: intestazione mancante."
 
-#~ msgid "No feed selected."
-#~ msgstr "Nessun notiziario selezionato."
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "Sottoscrivi il notiziario"
 
-#~ msgid "unknown type"
-#~ msgstr "tipo sconosciuto"
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "Sottoscrizione al notiziario..."
 
-#~ msgid "Attachment:"
-#~ msgstr "Allegato:"
+#: js/functions.js:901
+msgid "Subscribed to %s"
+msgstr "Sottoscrizione effettuata a «%s»"
 
-#~ msgid "Attachments:"
-#~ msgstr "Allegati:"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr "L'URL specifica sembra essere non valido."
 
-#~ msgid "Language:"
-#~ msgstr "Lingua:"
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr "L'URL specificato non sembra contenere alcun notiziario."
 
-#~ msgid "Profile:"
-#~ msgstr "Profilo:"
+#: js/functions.js:945
+msgid "Couldn't download the specified URL."
+msgstr "Impossibile scaricare l'URL specificato."
 
-#~ msgid "Use less traffic"
-#~ msgstr "Utilizzare minor traffico"
+#: js/functions.js:948
+msgid "You are already subscribed to this feed."
+msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
 
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Inverti modalità riordinamento categoria"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Crea filtro"
 
-#~ msgid "Update all feeds"
-#~ msgstr "Aggiorna tutti i notiziari"
+#: js/functions.js:987 js/prefs.js:165
+msgid "Filter Test Results"
+msgstr "Filtra risultati di prova"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Ordinare per nome o numero non letti"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+"Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo "
+"aggiornamento del notiziario a sottoscrivere il centro notifiche."
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Segnare tutti gli articoli in «%s» come letti?"
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "Annullare la sottoscrizione a «%s»?"
 
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "Segnare %d articolo/i visualizzato/i come letto/i?"
+#: js/functions.js:1173
+msgid "Please enter category title:"
+msgstr "Inserire il titolo della categoria:"
 
-#~ msgid "Unstar article"
-#~ msgstr "Togli la stella all&apos;articolo"
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#~ msgid "Star article"
-#~ msgstr "Metti la stella all&apos;articolo"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "Impossibile modificare questo tipo di notiziario."
 
-#~ msgid "Unpublish article"
-#~ msgstr "Non pubblicare articolo"
+#: js/functions.js:1400
+msgid "Edit Feed"
+msgstr "Modifica notiziario"
 
-#, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Apri articolo di origine"
+#: js/functions.js:1438
+msgid "More Feeds"
+msgstr "Altri notiziari"
 
-#~ msgid "Error: unable to load article."
-#~ msgstr "Errore: impossibile caricare l'articolo."
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "Nessun notiziario selezionato."
 
-#~ msgid "Click to expand article."
-#~ msgstr "Fare clic per espandere l&apos;articolo."
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
+"Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
+"archiviati non saranno rimossi."
 
-#~ msgid "%d more..."
-#~ msgstr "%d altri..."
+#: js/functions.js:1580
+msgid "Feeds with update errors"
+msgstr "Notiziari con errori di aggiornamento"
 
-#~ msgid "No unread feeds."
-#~ msgstr "Nessun notiziario non letto."
+#: js/functions.js:1591 js/prefs.js:1229
+msgid "Remove selected feeds?"
+msgstr "Rimuovere i notiziari selezionati?"
 
-#~ msgid "Load more..."
-#~ msgstr "Carica altri..."
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "Nessun articolo selezionato."
 
-#~ msgid "New articles available in this feed (click to show)"
-#~ msgstr ""
-#~ "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
+#: js/mail_button.js:21
+msgid "Forward article by email"
+msgstr "Inoltra l'articolo per email"
 
-#~ msgid "Update feed"
-#~ msgstr "Aggiorna notiziario"
+#: js/PrefFilterTree.js:32
+msgid "Inverse"
+msgstr "Inverso"
 
-#~ msgid ""
-#~ "Are you sure to report this exception to tt-rss.org? The report will "
-#~ "include your browser information. Your IP would be saved in the database."
-#~ msgstr ""
-#~ "Si vuole notificare questa eccezione a tt-rss.org? La notifica includerà "
-#~ "le informazioni sul browser. L'IP verrà salvato in un database."
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Inserire l'accesso:"
 
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "La sintassi della data appare con corretta:"
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "Impossibile creare l'utente: nessun accesso specificato."
 
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "La sintassi della data non è corretta."
+#: js/prefs.js:134
+msgid "Edit Filter"
+msgstr "Modifica filtro"
 
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Rimuovi le icone salvate dei notiziari?"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "Rimuovere il filtro «%s»?"
 
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Selezionare un file immagine da caricare."
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "Rimuovere le etichette selezionate?"
 
-#~ msgid "Upload new icon for this feed?"
-#~ msgstr "Caricare una nuova icona per questo notiziario?"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "Nessuna etichetta selezionata."
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Inserire l'intestazione dell'etichetta:"
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
+"Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore "
+"predefinito e il proprio utente."
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "Impossibile creare l'etichetta: intestazione mancante."
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "Nessun utente selezionato."
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Sottoscrivi il notiziario"
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Rimuovere i filtri selezionati?"
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Sottoscrizione al notiziario..."
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "Nessun filtro selezionato."
 
-#~ msgid "Subscribed to %s"
-#~ msgstr "Sottoscrizione effettuata a «%s»"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 
-#~ msgid "Specified URL seems to be invalid."
-#~ msgstr "L'URL specifica sembra essere non valido."
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Selezionare solo un notiziario."
 
-#~ msgid "Specified URL doesn't seem to contain any feeds."
-#~ msgstr "L'URL specificato non sembra contenere alcun notiziario."
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr ""
+"Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
 
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "Impossibile scaricare l'URL specificato."
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
 
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "Il campo accesso non può essere vuoto."
 
-#~ msgid "Create Filter"
-#~ msgstr "Crea filtro"
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Selezionare un solo utente."
 
-#~ msgid "Filter Test Results"
-#~ msgstr "Filtra risultati di prova"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "Reimpostare la password per l&apos;utente selezionato?"
 
-#~ msgid ""
-#~ "Reset subscription? Tiny Tiny RSS will try to subscribe to the "
-#~ "notification hub again on next feed update."
-#~ msgstr ""
-#~ "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo "
-#~ "aggiornamento del notiziario a sottoscrivere il centro notifiche."
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Selezionare solo un filtro."
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "Annullare la sottoscrizione a «%s»?"
+#: js/prefs.js:652
+msgid "Edit Multiple Feeds"
+msgstr "Modifica notiziari multipli"
 
-#~ msgid "Please enter category title:"
-#~ msgstr "Inserire il titolo della categoria:"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 
-#~ msgid "Generate new syndication address for this feed?"
-#~ msgstr "Generare un nuovo indirizzo per questo notiziario?"
+#: js/prefs.js:768
+msgid "OPML Import"
+msgstr "Importazione OPML"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "Impossibile modificare questo tipo di notiziario."
+#: js/prefs.js:795
+msgid "Please choose an OPML file first."
+msgstr "Scegliere prima un file OPML."
 
-#~ msgid "Edit Feed"
-#~ msgstr "Modifica notiziario"
+#: js/prefs.js:811
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "Scegliere prima un file OPML."
 
-#~ msgid "More Feeds"
-#~ msgstr "Altri notiziari"
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "Reimpostare ai valori predefiniti?"
 
-#~ msgid "No feeds are selected."
-#~ msgstr "Nessun notiziario selezionato."
+#: js/prefs.js:1149
+msgid "Feed Categories"
+msgstr "Categorie notiziario"
 
-#~ msgid ""
-#~ "Remove selected feeds from the archive? Feeds with stored articles will "
-#~ "not be removed."
-#~ msgstr ""
-#~ "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
-#~ "archiviati non saranno rimossi."
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Rimuovere le categorie selezionate?"
 
-#~ msgid "Feeds with update errors"
-#~ msgstr "Notiziari con errori di aggiornamento"
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "Nessuna categoria selezionata."
 
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Rimuovere i notiziari selezionati?"
+#: js/prefs.js:1218
+msgid "Feeds without recent updates"
+msgstr "Notiziari senza aggiornamenti recenti"
 
-#~ msgid "Inverse"
-#~ msgstr "Inverso"
+#: js/prefs.js:1267
+msgid "Replace current OPML publishing address with a new one?"
+msgstr ""
+"Sostituire l&apos;indirizzo di pubblicazione OPML attuale con uno nuovo?"
 
-#~ msgid "Please enter login:"
-#~ msgstr "Inserire l'accesso:"
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "Impossibile creare l'utente: nessun accesso specificato."
+#: js/prefs.js:1399
+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."
 
-#~ msgid "Edit Filter"
-#~ msgstr "Modifica filtro"
+#: js/prefs.js:1419
+msgid "Reset selected labels to default colors?"
+msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "Rimuovere il filtro «%s»?"
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr "Impostazioni dei profili"
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "Rimuovere le etichette selezionate?"
+#: js/prefs.js:1465
+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."
 
-#~ msgid "No labels are selected."
-#~ msgstr "Nessuna etichetta selezionata."
+#: js/prefs.js:1483
+msgid "No profiles are selected."
+msgstr "Nessun profilo selezionato."
 
-#~ msgid ""
-#~ "Remove selected users? Neither default admin nor your account will be "
-#~ "removed."
-#~ msgstr ""
-#~ "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore "
-#~ "predefinito e il proprio utente."
+#: js/prefs.js:1491 js/prefs.js:1544
+msgid "Activate selected profile?"
+msgstr "Attivare il profilo selezionato?"
 
-#~ msgid "No users are selected."
-#~ msgstr "Nessun utente selezionato."
+#: js/prefs.js:1507 js/prefs.js:1560
+msgid "Please choose a profile to activate."
+msgstr "Scegliere un profilo da attivare"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Rimuovere i filtri selezionati?"
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
+"Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
+"Continuare?"
 
-#~ msgid "No filters are selected."
-#~ msgstr "Nessun filtro selezionato."
+#: js/prefs.js:1587
+#, fuzzy
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
+"Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
+"Continuare?"
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "Editor etichette"
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Selezionare solo un notiziario."
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
+"Questo pulirà le informazioni di autenticazione memorizzate per Twitter. "
+"Continuare?"
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr ""
-#~ "Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
+#: js/prefs.js:1804
+msgid "Link Instance"
+msgstr "Collega istanza"
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr ""
-#~ "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
+#: js/prefs.js:1855
+msgid "Edit Instance"
+msgstr "Modifica istanza"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "Il campo accesso non può essere vuoto."
+#: js/prefs.js:1904
+msgid "Remove selected instances?"
+msgstr "Rimuovere le istanze selezionate?"
 
-#~ msgid "Please select only one user."
-#~ msgstr "Selezionare un solo utente."
+#: js/prefs.js:1921 js/prefs.js:1933
+msgid "No instances are selected."
+msgstr "Nessun istanza selezionata."
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "Reimpostare la password per l&apos;utente selezionato?"
+#: js/prefs.js:1938
+msgid "Please select only one instance."
+msgstr "Selezionare solo un'istanza."
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Selezionare solo un filtro."
+#: js/prefs.js:1973
+#, fuzzy
+msgid "Export Data"
+msgstr "Esporta OPML"
 
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Modifica notiziari multipli"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Salvare i cambiamenti ai notiziari selezionati?"
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "Importa"
 
-#~ msgid "OPML Import"
-#~ msgstr "Importazione OPML"
+#: js/share_button.js:10
+#, fuzzy
+msgid "Share article by URL"
+msgstr "Metti la stella all&apos;articolo"
 
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Scegliere prima un file OPML."
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "Segnare tutti gli articoli come letti?"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "Reimpostare ai valori predefiniti?"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#~ msgid "Feed Categories"
-#~ msgstr "Categorie notiziario"
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Selezionare prima qualche notiziario."
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Rimuovere le categorie selezionate?"
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#~ msgid "No categories are selected."
-#~ msgstr "Nessuna categoria selezionata."
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "Cambiare il punteggio degli articoli in «%s»?"
 
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Notiziari senza aggiornamenti recenti"
+#: js/tt-rss.js:1083
+msgid "New version available!"
+msgstr "Nuova versione disponibile."
 
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr ""
-#~ "Sostituire l&apos;indirizzo di pubblicazione OPML attuale con uno nuovo?"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
+#: js/viewfeed.js:901
+msgid "Delete %d selected articles in %s?"
+msgstr "Eliminare i %d articoli selezionati in «%s»?"
 
-#~ 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."
+#: js/viewfeed.js:903
+msgid "Delete %d selected articles?"
+msgstr "Eliminare i %d articoli selezionati?"
 
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
+#: js/viewfeed.js:945
+msgid "Archive %d selected articles in %s?"
+msgstr "Archiviare i %d articoli selezionati in «%s»?"
 
-#~ msgid "Settings Profiles"
-#~ msgstr "Impostazioni dei profili"
+#: js/viewfeed.js:948
+msgid "Move %d archived articles back?"
+msgstr "Spostare %d articoli archiviati indietro?"
 
-#~ 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."
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Segnare %d articoli selezionati in «%s» come letti?"
 
-#~ msgid "No profiles are selected."
-#~ msgstr "Nessun profilo selezionato."
+#: js/viewfeed.js:1016
+msgid "Edit article Tags"
+msgstr "Modifica etichette articolo"
 
-#~ msgid "Activate selected profile?"
-#~ msgstr "Attivare il profilo selezionato?"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "Nessun articolo selezionato."
 
-#~ msgid "Please choose a profile to activate."
-#~ msgstr "Scegliere un profilo da attivare"
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "Nessun articolo trovato da segnare"
 
-#~ msgid "This will invalidate all previously generated feed URLs. Continue?"
-#~ msgstr ""
-#~ "Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
-#~ "Continuare?"
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "Segnare %d articolo/i come letto/i?"
 
-#, fuzzy
-#~ msgid "This will invalidate all previously shared article URLs. Continue?"
-#~ msgstr ""
-#~ "Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
-#~ "Continuare?"
+#: js/viewfeed.js:1374
+msgid "Loading..."
+msgstr "Caricamento..."
 
-#~ msgid "Label Editor"
-#~ msgstr "Editor etichette"
+#: js/viewfeed.js:1848
+msgid "Open original article"
+msgstr "Apri articolo di origine"
 
-#~ msgid ""
-#~ "This will clear your stored authentication information for Twitter. "
-#~ "Continue?"
-#~ msgstr ""
-#~ "Questo pulirà le informazioni di autenticazione memorizzate per Twitter. "
-#~ "Continuare?"
+#: js/viewfeed.js:1854
+msgid "View in a tt-rss tab"
+msgstr "Visualizza in una scheda tt-rss"
 
-#~ msgid "Link Instance"
-#~ msgstr "Collega istanza"
+#: js/viewfeed.js:1862
+#, fuzzy
+msgid "Mark above as read"
+msgstr "Segna come letto"
 
-#~ msgid "Edit Instance"
-#~ msgstr "Modifica istanza"
+#: js/viewfeed.js:1868
+#, fuzzy
+msgid "Mark below as read"
+msgstr "Segna come letto"
 
-#~ msgid "Remove selected instances?"
-#~ msgstr "Rimuovere le istanze selezionate?"
+#: js/viewfeed.js:1914
+msgid "Remove label"
+msgstr "Rimuovi etichetta"
 
-#~ msgid "No instances are selected."
-#~ msgstr "Nessun istanza selezionata."
+#: js/viewfeed.js:1938
+msgid "Playing..."
+msgstr "In riproduzione..."
 
-#~ msgid "Please select only one instance."
-#~ msgstr "Selezionare solo un'istanza."
+#: js/viewfeed.js:1939
+msgid "Click to pause"
+msgstr "Fare clic per mettere in pausa"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Segnare tutti gli articoli come letti?"
+#~ msgid "About..."
+#~ msgstr "Informazioni su..."
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "Impossibile annullare la sottoscrizione alla categoria."
+#~ msgid "Help"
+#~ msgstr "Aiuto"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Selezionare prima qualche notiziario."
+#~ msgid "Importing using DOMXML."
+#~ msgstr "Importazione utilizzando DOMXML."
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "Importazione utilizzando DOMDocument."
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "Cambiare il punteggio degli articoli in «%s»?"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "L&apos;estensione DOMXML non è stata trovata. È richiesta per versioni di "
+#~ "PHP inferiori alla 5."
 
-#~ msgid "New version available!"
-#~ msgstr "Nuova versione disponibile."
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "Memorizzare le immagini localmente (solo SimplePie)"
 
-#~ msgid "No articles are selected."
-#~ msgstr "Nessun articolo selezionato."
+#~ msgid ""
+#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
+#~ "settings."
+#~ msgstr ""
+#~ "Utilizzando OPML si possono esportare e importare le impostazioni dei "
+#~ "notiziari e di Tiny Tiny RSS."
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
+#~ msgid "Note: Only main settings profile can be migrated using OPML."
+#~ msgstr ""
+#~ "Nota: solo le impostazioni del profilo principale possono essere migrate "
+#~ "utilizzando OPML."
 
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "Eliminare i %d articoli selezionati in «%s»?"
+#, fuzzy
+#~ msgid "Publish"
+#~ msgstr "Pubblicati"
 
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "Eliminare i %d articoli selezionati?"
+#~ msgid ""
+#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+#~ "that require authentication or feeds hidden from Popular feeds."
+#~ msgstr ""
+#~ "Nota: l'OPML pubblicato non contiene le impostazioni di Tiny Tiny RSS, i "
+#~ "notiziari che richiedono l'autenticazione o i notiziari nascosti dai "
+#~ "notiziari popolari."
 
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "Archiviare i %d articoli selezionati in «%s»?"
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "Password dell&apos;utente <b>%s</b> cambiata."
 
-#~ msgid "Move %d archived articles back?"
-#~ msgstr "Spostare %d articoli archiviati indietro?"
+#~ msgid "Content filtering"
+#~ msgstr "Filtro contenuti"
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "Segnare %d articoli selezionati in «%s» come letti?"
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny Tiny RSS ha il supporto per il filtraggio (o il processamento) degli "
+#~ "articoli. Il filtro viene fatto una volta quando i nuovi articoli vengono "
+#~ "importati nel database dal notiziario, il campo specificato viene "
+#~ "confrontato con l&apos;espressione regolare e viene effettuata qualche "
+#~ "azione. La corrispondenza all&apos;espressione regolare tiene conto di "
+#~ "maiuscole e minuscole."
 
-#~ msgid "Edit article Tags"
-#~ msgstr "Modifica etichette articolo"
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "Le azioni supportate sono: filtra articolo (non importare), segna "
+#~ "articolo come letto, imposta con stella, assegna etichetta(e) e imposta "
+#~ "punteggio. I filtri possono essere definiti globalmente e per ogni "
+#~ "notiziario specifico."
 
-#~ msgid "No article is selected."
-#~ msgstr "Nessun articolo selezionato."
+#~ msgid ""
+#~ "Multiple and inverse matching are supported. All matching filters are "
+#~ "considered when article is being imported and all actions executed in "
+#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
+#~ "XYZZY in title with inverse flag will match all articles, except those "
+#~ "containing string XYZZY in title."
+#~ msgstr ""
+#~ "Sono supportate le corrispondenze multiple e inverse. Tutti i filtri di "
+#~ "corrispondenza vengono considerati quando gli articoli vengono importati "
+#~ "e tutte le azioni vengono poi eseguite in sequenza. La corrispondenza "
+#~ "inversa inverte il risultato della corrispondenza; es. il filtro con "
+#~ "corrispondenza XYZZY nel titolo con l&apos;opzione di inversione troverà "
+#~ "tutti gli articoli, eccetto quelli che contengono la stringa XYZZY nel "
+#~ "titolo."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "Nessun articolo trovato da segnare"
+#~ msgid "See also:"
+#~ msgstr "Vedere anche:"
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "Segnare %d articolo/i come letto/i?"
+#, fuzzy
+#~ msgid "Add category..."
+#~ msgstr "Aggiunta categoria notiziario..."
 
-#~ msgid "Loading..."
-#~ msgstr "Caricamento..."
+#, fuzzy
+#~ msgid "Add label..."
+#~ msgstr "Aggiunta categoria notiziario..."
 
-#~ msgid "Forward article by email"
-#~ msgstr "Inoltra l'articolo per email"
+#, fuzzy
+#~ msgid "description"
+#~ msgstr "Selezione"
 
-#~ msgid "Open original article"
-#~ msgstr "Apri articolo di origine"
+#~ msgid "Dismiss article"
+#~ msgstr "Rimuovi articolo"
 
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Visualizza in una scheda tt-rss"
+#~ msgid "Remove:"
+#~ msgstr "Rimuovi:"
 
-#~ msgid "Remove label"
-#~ msgstr "Rimuovi etichetta"
+#~ msgid "Assign:"
+#~ msgstr "Assegna:"
 
-#~ msgid "Playing..."
-#~ msgstr "In riproduzione..."
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Inverti modalità riordinamento categoria"
 
-#~ msgid "Click to pause"
-#~ msgstr "Fare clic per mettere in pausa"
+#~ msgid "Update all feeds"
+#~ msgstr "Aggiorna tutti i notiziari"
 
-#, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Metti la stella all&apos;articolo"
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Ordinare per nome o numero non letti"
 
 #~ msgid "feeds"
 #~ msgstr "notiziari"
@@ -2973,20 +3303,9 @@ msgstr "Ordinare i notiziari per numero di non letti"
 #~ msgid "Fatal Exception"
 #~ msgstr "Errore fatale"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Aggiunta categoria notiziario..."
-
 #~ msgid "audio/mpeg"
 #~ msgstr "audio/mpeg"
 
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Aggiunta categoria notiziario..."
-
-#~ msgid "General"
-#~ msgstr "Generali"
-
 #~ msgid "Enable offline reading"
 #~ msgstr "Abilitare lettura fuori linea"
 
@@ -2995,9 +3314,6 @@ msgstr "Ordinare i notiziari per numero di non letti"
 #~ "Sincronizzare i nuovi articoli per la lettura fuori linea utilizzando "
 #~ "Google Gears."
 
-#~ msgid "Interface"
-#~ msgstr "Interfaccia"
-
 #~ msgid "Default article limit"
 #~ msgstr "Limite articoli predefinito"
 
@@ -3031,9 +3347,6 @@ msgstr "Ordinare i notiziari per numero di non letti"
 #~ "Questa opzione nasconde l&apos;elenco dei notiziari e permette di "
 #~ "mostrarlo al volo. Utile per schermi piccoli."
 
-#~ msgid "Advanced"
-#~ msgstr "Avanzate"
-
 #~ msgid "Enable feed icons"
 #~ msgstr "Abilitare icone notiziari"
 
@@ -3263,10 +3576,6 @@ msgstr "Ordinare i notiziari per numero di non letti"
 #~ msgid "Adding feed..."
 #~ msgstr "Aggiunta notiziario..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "Aggiunta notiziario..."
-
 #~ msgid "Adding user..."
 #~ msgstr "Aggiunta utente..."
 
@@ -3535,10 +3844,6 @@ msgstr "Ordinare i notiziari per numero di non letti"
 #~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
 #~ msgstr "&nbsp;&nbsp;Scorciatoie da tastiera"
 
-#, fuzzy
-#~ msgid "description"
-#~ msgstr "Selezione"
-
 #~ msgid "Can't add user: no login specified."
 #~ msgstr "Impossibile aggiungere l&apos;utente: nessun accesso specificato."
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 4edab320..3d5843df 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index bd02edc2..33bf5273 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -16,155 +16,135 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "標準を使用する"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "ずっと削除しない"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "1 週間前"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "2 週間前"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "1 ヶ月前"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "2 日月前"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "3 ヶ月前"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "更新の間隔"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "更新を無効にする"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "各 15 分"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "各 30 分"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "毎時"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "各 4 時間"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "各 12 時間"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "毎日"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "毎週"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "標準"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "ユーザー"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "パワーユーザー"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "管理者"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "フィード"
-
-#: backend.php:201
-#, fuzzy
-msgid "Article not found."
-msgstr "フィードが見つかりません。"
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "フィードが見つかりません。"
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "読み込みんでいます。しばらくお待ちください..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "このスクリプトを実行するにはアクセスレベルが不十分です。"
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "データベースアップデーター"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "データベースを更新できません"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr ""
 "必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ""
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "実行前にデータベースのバックアップをしてください。"
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -173,32 +153,32 @@ msgstr ""
 "Tiny Tiny RSS は最新のバージョンに更新する必要があります (<b>%d</b> から <b>"
 "%d</b>)。"
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "更新の実行"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "更新を実行しています..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "バージョン %d を確認しています..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "バージョンを確認しています..."
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "エラー!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -207,38 +187,45 @@ msgstr ""
 "完了しました。<b>%d</b> 個のテーブルをスキーマーバージョン<b>%d</b> に更新し"
 "ました。"
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
+#: digest.php:58
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\t\tfor this application to function properly. Please check your\n"
 "\t\t\tbrowser settings."
 msgstr ""
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "読み込みんでいます。しばらくお待ちください..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "ようこそ、"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "ログアウト"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -246,7 +233,7 @@ msgstr ""
 "このプログラムは XmlHttpRequest が正しく機能することを要求します。あなたのブ"
 "ラウザーはそれをサポートしていないように見えます。"
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -254,15 +241,15 @@ msgstr ""
 "このプログラムは Cookie が正しく機能することを要求します。あなたのブラウザー"
 "はそれをサポートしていないように見えます。"
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "バックエンドの健全さの確認に失敗しました"
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "フロントエンドの健全さの確認に失敗しました。"
 
-#: errors.php:18
+#: errors.php:19
 #, fuzzy
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
@@ -271,15 +258,15 @@ msgstr ""
 "データベーススキーマのバージョンが適切ではありません。&lt;a href='update."
 "php'&gt;更新してください&lt;/a&gt;。"
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "要求は認証されていません。"
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "実行する操作がありません。"
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -287,16 +274,16 @@ msgstr ""
 "フィードを表示することができません: 問い合わせに失敗しました。ラベルに一致す"
 "る文法、またはローカルの設定を確認してください。"
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr ""
 "拒否します。このページへのアクセスをするにはアクセスレベルが不足します。"
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "設定の確認で失敗"
 
-#: errors.php:30
+#: errors.php:31
 #, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
@@ -305,916 +292,943 @@ msgstr ""
 "MySQL のバージョンが現在サポートされていません。オフィシャルウェブサイト\n"
 "\t\tの追加情報を参照してください。"
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "設定"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "コメントしますか?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
-#: index.php:127
+#: index.php:148
 #, fuzzy
 msgid "Show articles"
 msgstr "記事を保管しました"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "すべての記事"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "お気に入り"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "公開済み"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "未読"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "更新日時"
 
-#: index.php:139
+#: index.php:160
 #, fuzzy
 msgid "Sort articles"
 msgstr "記事を保管しました"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "日付"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "題名"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "スコア"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "更新"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "操作..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "検索..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "フィード操作"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "その他の操作:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:173
+#: index.php:194
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "タグクラウド"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 
-#: index.php:177
+#: index.php:198
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "題名か内容"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "リンク"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "内容"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "記事の日付"
-
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "記事を消去する"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "お気に入りに設定する"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "公開記事"
-
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "タグの割り当て"
-
-#: localized_schema.php:14
-msgid "Assign label"
-msgstr "ラベルの割り当て"
-
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"ツールバーの「既読に設定する」をクリックしたとき、自動的に次のフィードの未読"
-"記事を開きます。"
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-
-#: localized_schema.php:20
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
+#: opml.php:70
+#, fuzzy, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "カテゴリー <b>%s</b> の追加中です。"
 
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "ラベルの割り当て"
 
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
 
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
-
-#: localized_schema.php:28
-#, fuzzy
-msgid "Default interval between feed updates"
-msgstr "フィードの更新までの標準間隔 (単位:分)"
-
-#: localized_schema.php:29
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "表示する記事が見つかりません。"
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "複製投稿の許可"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "フィードカテゴリーを有効にする"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "ヘッドライン一覧に内容のプレビューを表示する"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "短い日付の形式"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "完全な日付の形式"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "フィード表示の組み合わせ"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "未読でないメッセージとフィードを隠す"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "次のフィードの表示をキャッチアップする"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "未読記事数によるフィードの並び替え"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "ヘッドラインの逆順 (古いものがはじめに)"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "電子メールでのダイジェストを有効にする"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "フィードを追加しています..."
 
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "既読としてフィードのマーキングについて確認する"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "フィルターを作成する"
 
-#: localized_schema.php:42
+#: opml.php:230
 #, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "組み合わせモードで記事を自動的に展開する"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "記事から安全でないタグを取り除く"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "ブラックリスト化したタグ"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "新規記事としての取り扱い期限 (単位: 時間)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "既読として電子メールのダイジェストに含まれる記事を設定する"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "組み合わせモードで記事を自動的に展開する"
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "未読記事を削除する"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr ""
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "仮想フィードのグループヘッドライン"
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "記事内に画像を表示しない"
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
-
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
+msgid "is already imported."
+msgstr "既にインポート済みです。"
 
-#: localized_schema.php:54
+#: opml.php:250
 #, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "未読記事数によるフィードの並び替え"
+msgid "OK"
+msgstr "OK!"
 
-#: localized_schema.php:55
-#, fuzzy
-msgid "Customize stylesheet"
-msgstr "ユーザースタイルシートの URL"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "ドキュメントの解析中のエラーです。"
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "エラー: OPML ファイルをアップロードしてください。"
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "OPML ユーティリティ"
 
-#: opml.php:188
+#: opml.php:492
 #, fuzzy
 msgid "Importing OPML..."
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "設定に戻る"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "フィード"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "フィルター"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "ラベル"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "ユーザー"
 
-#: prefs.php:109
+#: prefs.php:108
 #, fuzzy
 msgid "Linked"
 msgstr "リンク"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "新規アカウントの作成"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr "新規ユーザーの登録は管理者によって無効になっています。"
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr ""
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr ""
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "電子メール:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "登録を送信する"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "登録情報が完成していません。"
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "すみませんがこのユーザー名は既にいます。"
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "登録に失敗しました。"
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "アカウントの作成に成功しました。"
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr ""
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 #, fuzzy
 msgid "Register"
 msgstr "登録済み"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-#, fuzzy
-msgid "Default profile"
-msgstr "標準の記事制限"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "キーボードショートカット"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "タグがありません"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "ナビゲーション"
 
-#: modules/backend-rpc.php:836
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "登録情報が完成していません。"
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "フィード間で移動する"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr ""
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "記事間で移動する"
 
-#: modules/backend-rpc.php:848
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "パスワードを変更しました。"
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "検索ダイアログを表示する"
 
-#: modules/backend-rpc.php:861
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "有効な記事の操作"
+
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "お気に入りを切り替える"
+
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "公開を切り替える"
+
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "未読に切り替える"
+
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "タグを編集する"
+
+#: help/main.php:20
 #, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "フィードのこの種類を消去できません。"
+msgid "Dismiss selected articles"
+msgstr "ラベルから選択した記事を削除しますか?"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "ヘルプ"
+#: help/main.php:21
+#, fuzzy
+msgid "Dismiss read articles"
+msgstr "読んだ記事が見えないように隠す"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "ヘルプのトピックが見つかりません。"
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "新しいウィンドウで記事を開く"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "このウィンドウを閉じる"
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr ""
 
-#: modules/opml_domdoc.php:60
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "カテゴリー <b>%s</b> の追加中です。"
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "記事の内容をスクロールする"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
+#: help/main.php:25
+#, fuzzy
+msgid "Email article"
+msgstr "すべての記事"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "その他の操作"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "マウスカーソルの下の記事を選択する"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "ラベルを作成する"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "フィルターを作成する"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "サイドバーを縮小する"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "このヘルプダイアログの表示"
+
+#: help/main.php:41
+#, fuzzy
+msgid "Multiple articles actions"
+msgstr "すべての記事"
+
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "記事を消去する"
+
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "未読記事を削除する"
+
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "有効な記事の操作"
+
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "記事を消去する"
+
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "フィード操作"
+
+#: help/main.php:53
+#, fuzzy
+msgid "Refresh active feed"
+msgstr "有効なフィードの更新"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "フィードを購読する"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "フィードを編集する"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "マークしたフィードを既読にする"
+
+#: help/main.php:58
+#, fuzzy
+msgid "Reverse headlines order"
+msgstr "ヘッドラインの逆順 (古いものがはじめに)"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "すべてのフィードを既読に設定する"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr ""
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "移動..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "すべての記事"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "新しい記事"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "お気に入りの記事"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "公開済みの記事"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "タグクラウド"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "何かキーを押して、このウィンドウを閉じてください。"
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "自分のフィード"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "その他のフィード"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "パネル操作"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "トップ 25 フィード"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "フィードカテゴリーを編集する"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "ユーザーの作成"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr ""
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "ログイン"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "ログイン:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "パスワード:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr ""
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "特別"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
 msgstr ""
 
-#: modules/opml_domdoc.php:128
+#: mobile/prefs.php:24
 #, fuzzy
-msgid "is already imported."
-msgstr "既にインポート済みです。"
+msgid "Enable categories"
+msgstr "フィードカテゴリーを有効にする"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr ""
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr ""
+
+#: mobile/prefs.php:29
+#, fuzzy
+msgid "Browse categories like folders"
+msgstr "カテゴリーの順序をリセットする"
 
-#: modules/opml_domdoc.php:148
+#: mobile/prefs.php:35
 #, fuzzy
-msgid "OK"
-msgstr "OK!"
+msgid "Show images in posts"
+msgstr "記事内に画像を表示しない"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "ドキュメントの解析中のエラーです。"
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "読んだフィードを隠す/再表示する"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "エラー: OPML ファイルをアップロードしてください。"
+#: mobile/prefs.php:45
+#, fuzzy
+msgid "Sort feeds by unread count"
+msgstr "未読記事数によるフィードの並び替え"
 
-#: modules/popup-dialog.php:34
+#: classes/article.php:25
 #, fuzzy
-msgid "Importing using DOMXML."
-msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
+msgid "Article not found."
+msgstr "フィードが見つかりません。"
 
-#: modules/popup-dialog.php:40
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "ヘルプのトピックが見つかりません。"
+
+#: classes/dlg.php:26
 #, fuzzy
-msgid "Importing using DOMDocument."
-msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
+msgid "Prepare data"
+msgstr "保存"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "このウィンドウを閉じる"
+
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "フィルターを作成する"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 msgid "(active)"
 msgstr ""
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+#, fuzzy
+msgid "Default profile"
+msgstr "標準の記事制限"
+
+#: classes/dlg.php:170
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 #, fuzzy
 msgid "Activate profile"
 msgstr "選択されたフィルターを削除しますか?"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr ""
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "通知"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 "process or contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "最終更新:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
 "contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "フィード"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 #, fuzzy
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "認証"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "ログイン"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "購読"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 #, fuzzy
 msgid "More feeds"
 msgstr "さらなるフィード"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "取り消し"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "検索"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 #, fuzzy
 msgid "Popular feeds"
 msgstr "フィードの表示"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 #, fuzzy
 msgid "Feed archive"
 msgstr "フィード操作"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 #, fuzzy
 msgid "limit:"
 msgstr "制限:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "削除"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 #, fuzzy
 msgid "match on"
 msgstr "対象項目:"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "内容"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "題名か内容"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "対象範囲"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "このフィード"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "一致"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "前"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "後"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr ""
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "操作の実行"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "パラメーター:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "オプション"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "有効にする"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "一致しない"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "カテゴリーの場所:"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "テスト"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "作成"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 #, fuzzy
 msgid "Match:"
 msgstr "一致"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "フィードの表示"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
-#, fuzzy
-msgid "Multiple articles"
-msgstr "すべての記事"
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr ""
-
-#: modules/popup-dialog.php:843
-#, fuzzy
-msgid "To:"
-msgstr "トップ"
-
-#: modules/popup-dialog.php:856
-#, fuzzy
-msgid "Subject:"
-msgstr "選択:"
-
-#: modules/popup-dialog.php:872
-#, fuzzy
-msgid "Send e-mail"
-msgstr "電子メールを変更する"
-
-#: modules/popup-dialog.php:881
+#: classes/dlg.php:821 classes/feeds.php:152
 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
 
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1222,323 +1236,482 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr ""
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr ""
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "アクセスレベル: "
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "アクセスレベル"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "生成したフィード"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 #, fuzzy
 msgid "Create link"
 msgstr "作成"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
+
+#: classes/feeds.php:94 include/functions.php:3346
+#, fuzzy
+msgid "Visit the website"
+msgstr "オフィシャルサイトに訪問する"
+
+#: classes/feeds.php:107
+#, fuzzy
+msgid "View as RSS feed"
+msgstr "フィードを閲覧する"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "選択:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "すべて"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "反転"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "なし"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "選択の切り替え:"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "選択:"
+
+#: classes/feeds.php:138
+#, fuzzy
+msgid "Archive"
+msgstr "記事の日付"
+
+#: classes/feeds.php:140
+#, fuzzy
+msgid "Move back"
+msgstr "戻る"
+
+#: classes/feeds.php:141
+#, fuzzy
+msgid "Delete"
+msgstr "標準"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+#, fuzzy
+msgid "Forward by email"
+msgstr "記事をお気に入りにする"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "フィード:"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "フィードが見つかりません。"
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "既読にする"
+
+#: classes/feeds.php:625 include/functions.php:3318
+#, fuzzy
+msgid "Originally from:"
+msgstr "元の記事内容を表示する"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "この記事のタグを編集する"
+
+#: classes/feeds.php:712 include/functions.php:3285
+#, fuzzy
+msgid "Open article in new tab"
+msgstr "新しいウィンドウで記事を開く"
+
+#: classes/feeds.php:723 include/functions.php:3301
+#, fuzzy
+msgid "Close article"
+msgstr "記事を消去する"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "表示する未読記事が見つかりませんでした。"
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "表示する更新された記事が見つかりませんでした。"
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "表示するお気に入りの記事が見つかりませんでした。"
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
+"ニューを参照します)、フィルターを使うことができます。"
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "表示する記事が見つかりません。"
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr ""
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
+msgid "Uncategorized"
+msgstr "カテゴリー割り当てなし"
+
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
 msgstr ""
 
-#: modules/pref-feeds.php:4
+#: classes/mail_button.php:52
+#, fuzzy
+msgid "Multiple articles"
+msgstr "すべての記事"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr ""
+
+#: classes/mail_button.php:82
+#, fuzzy
+msgid "To:"
+msgstr "トップ"
+
+#: classes/mail_button.php:95
+#, fuzzy
+msgid "Subject:"
+msgstr "選択:"
+
+#: classes/mail_button.php:111
+#, fuzzy
+msgid "Send e-mail"
+msgstr "電子メールを変更する"
+
+#: classes/note_button.php:7 js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "タグを編集する"
+
+#: classes/pref_feeds.php:11
 msgid "Check to enable field"
 msgstr ""
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "フィードを編集する"
 
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr "カテゴリー割り当てなし"
-
-#: modules/pref-feeds.php:306
+#: classes/pref_feeds.php:299
 #, fuzzy
 msgid "Feed Title"
 msgstr "題名"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "記事の削除:"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "自分のフィード一覧から隠す"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "右から左のコンテンツ"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "電子メールダイジェストに含む"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:472
-#, fuzzy
-msgid "Cache images locally (SimplePie only)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
 msgstr "ローカルに画像をキャッシュする"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "すべての記事を既読にしますか?"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "フィードを購読する:"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "ローカルに画像をキャッシュする"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "すべて終了しました。"
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "<b>%s</b> を購読しました。"
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "フィードがありません。"
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "<b>%s</b> は既に購読しています。"
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "選択されたフィードの購読をやめますか?"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "購読オプションの編集"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "カテゴリーの作成"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "フィードカテゴリーが定義されていません。"
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "選択されたカテゴリーを削除しますか?"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "フィードエディター"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "元のフィード"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 #, fuzzy
 msgid "Select"
 msgstr "選択:"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "すべて"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "なし"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "フィードを購読する"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "選択したフィードを削除しています..."
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 #, fuzzy
 msgid "Reset sort order"
 msgstr "パスワードのリセット"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 #, fuzzy
 msgid "Categories"
 msgstr "カテゴリー:"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "カテゴリーの編集"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 #, fuzzy
 msgid "More actions..."
 msgstr "操作..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "手動削除"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "記事のスコアの再集計"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "インポート"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "OPML エクスポート"
+msgid "Import my OPML"
+msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr ""
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "電子メールダイジェストに含む"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "公開済み"
+msgid "Export OPML"
+msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
+#: classes/pref_feeds.php:1439
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1442
 #, fuzzy
-msgid "Display URL"
-msgstr "タグの表示"
+msgid "Article archive"
+msgstr "記事の日付"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "OPML エクスポート"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "インポート"
+
+#: classes/pref_feeds.php:1469
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1546,1131 +1719,1353 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+#, fuzzy
+msgid "Display URL"
+msgstr "タグの表示"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "記事のお気に入りを解除する"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 #, fuzzy
 msgid "Twitter"
 msgstr "題名"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "フィードデータの消去"
 
-#: modules/pref-feeds.php:1654
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "お気に入りの記事"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "フィードがありません。"
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "一致するフィルターが見つかりません。"
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "フィルター <b>%s</b> を作成しました"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "フィルターを作成する"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "編集"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "このタブを開くにはアクセスレベルが不十分です。"
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "さらなるフィード"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "編集するにはクリック"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "キャプション"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 #, fuzzy
 msgid "Colors"
 msgstr "閉じる"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Foreground:"
 msgstr "前景色"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Background:"
 msgstr "背景色"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "ラベル <b>%s</b> を作成しました"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "ラベルを作成する"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "色の消去"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "古いパスワードを空にできません。"
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "新しいパスワードを空にできません。"
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "パスワードが一致しません。"
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "パスワードを変更しました。"
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "古いパスワードが不正確です。"
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "設定を保存しました。"
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "不明なオプション: %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "個人データ"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "電子メール"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "アクセスレベル"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 #, fuzzy
 msgid "Save data"
 msgstr "保存"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "パスワードが標準のままです。\n"
 "                                                変更してください。"
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "現在のパスワード"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "新しいパスワード(確認)"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "テーマを選択する"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "はい"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "いいえ"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "設定を保存する"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "標準に戻す"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "ユーザーの詳細"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "ユーザーが見つかりません"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "登録済み"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "最終ログイン"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "購読フィード数"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "購読したフィード"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "ユーザーエディター"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "アクセスレベル: "
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "次のパスワードに変更する:"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "電子メール: "
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "ユーザー <b>%s</b> のパスワードを変更しました。"
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "ユーザー名 <b>%s</b> とパスワード <b>%s</b> で追加しました"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "ユーザー <b>%s</b> の追加中です。"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "ユーザー <b>%s</b> は既に存在します。"
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "ユーザー <b>%s</b> のパスワードを\n"
 "                                        <b>%s</b>に変更しました"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "<b>%s</b> の通知中です。"
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] パスワード変更通知"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "ユーザーの作成"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "パスワードのリセット"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "アクセスレベル"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "最終ログイン"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "ユーザーが定義されていません。"
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "ユーザーが見つかりません。"
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "コンテンツフィルタリング"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
 
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
-msgstr ""
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "タグがありません"
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
+#: classes/rpc.php:741
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "登録情報が完成していません。"
+
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
 msgstr ""
 
-#: help/2.php:9
-msgid "See also:"
-msgstr "参考:"
+#: classes/rpc.php:753
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "パスワードを変更しました。"
 
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "キーボードショートカット"
+#: classes/rpc.php:766
+#, fuzzy
+msgid "Can't update this kind of feed."
+msgstr "フィードのこの種類を消去できません。"
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "ナビゲーション"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "記事をお気に入りにする"
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "フィード間で移動する"
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "記事間で移動する"
+#: classes/tweet_button.php:7
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "題名"
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "検索ダイアログを表示する"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "セッションの検査に失敗しました (IP が正しくない)"
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "有効な記事の操作"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "ユーザー名かパスワードが正しくありません"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "お気に入りを切り替える"
+#: include/functions.php:2013
+#, fuzzy
+msgid "Archived articles"
+msgstr "未読記事"
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "公開を切り替える"
+#: include/functions.php:3109 js/viewfeed.js:1945
+#, fuzzy
+msgid "Click to play"
+msgstr "編集するにはクリック"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "未読に切り替える"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr ""
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "タグを編集する"
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
 
-#: help/3.php:20
+#: include/functions.php:4061
 #, fuzzy
-msgid "Dismiss selected articles"
-msgstr "ラベルから選択した記事を削除しますか?"
+msgid "(edit note)"
+msgstr "ノートの編集"
 
-#: help/3.php:21
-#, fuzzy
-msgid "Dismiss read articles"
-msgstr "読んだ記事が見えないように隠す"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "フィードは選択されていません。"
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "新しいウィンドウで記事を開く"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "未知の種類"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr ""
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "添付:"
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "記事の内容をスクロールする"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "添付:"
 
-#: help/3.php:25
+#: include/functions.php:5091
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "お気に入りの記事"
+
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "フィードがありません。"
+
+#: include/functions.php:5161
 #, fuzzy
-msgid "Email article"
-msgstr "すべての記事"
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "その他の操作"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "マウスカーソルの下の記事を選択する"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "サイドバーを縮小する"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "このヘルプダイアログの表示"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "題名か内容"
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "すべての記事"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "リンク"
+
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "記事の日付"
 
-#: help/3.php:44
+#: include/localized_schema.php:9
 #, fuzzy
-msgid "Select all articles"
+msgid "Delete article"
 msgstr "記事を消去する"
 
-#: help/3.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "未読記事を削除する"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "お気に入りに設定する"
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "有効な記事の操作"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "公開記事"
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "記事を消去する"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "タグの割り当て"
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "フィード操作"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "ラベルの割り当て"
 
-#: help/3.php:53
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "有効なフィードの更新"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "フィードを編集する"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "全体"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "マークしたフィードを既読にする"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "インターフェース"
 
-#: help/3.php:58
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "ヘッドラインの逆順 (古いものがはじめに)"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "高度"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "すべてのフィードを既読に設定する"
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
 msgstr ""
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "移動..."
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"ツールバーの「既読に設定する」をクリックしたとき、自動的に次のフィードの未読"
+"記事を開きます。"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "すべての記事"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "新しい記事"
+#: include/localized_schema.php:25
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "お気に入りの記事"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "公開済みの記事"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "タグクラウド"
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
 msgstr ""
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "何かキーを押して、このウィンドウを閉じてください。"
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr ""
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "自分のフィード"
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "その他のフィード"
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "パネル操作"
+#: include/localized_schema.php:33
+#, fuzzy
+msgid "Default interval between feed updates"
+msgstr "フィードの更新までの標準間隔 (単位:分)"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "トップ 25 フィード"
+#: include/localized_schema.php:34
+#, fuzzy
+msgid "Amount of articles to display at once"
+msgstr "表示する記事が見つかりません。"
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "フィードカテゴリーを編集する"
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "複製投稿の許可"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr ""
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "フィードカテゴリーを有効にする"
 
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "ヘッドライン一覧に内容のプレビューを表示する"
+
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "短い日付の形式"
+
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "完全な日付の形式"
+
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "フィード表示の組み合わせ"
+
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "未読でないメッセージとフィードを隠す"
+
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "次のフィードの表示をキャッチアップする"
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "未読記事数によるフィードの並び替え"
+
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "ヘッドラインの逆順 (古いものがはじめに)"
+
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "電子メールでのダイジェストを有効にする"
+
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "既読としてフィードのマーキングについて確認する"
+
+#: include/localized_schema.php:47
+#, fuzzy
+msgid "Automatically mark articles as read"
+msgstr "組み合わせモードで記事を自動的に展開する"
+
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "記事から安全でないタグを取り除く"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "ログイン"
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "ブラックリスト化したタグ"
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "ログイン:"
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "新規記事としての取り扱い期限 (単位: 時間)"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "パスワード:"
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "既読として電子メールのダイジェストに含まれる記事を設定する"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr ""
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "組み合わせモードで記事を自動的に展開する"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "特別"
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "未読記事を削除する"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
-#: mobile/prefs.php:24
-#, fuzzy
-msgid "Enable categories"
-msgstr "フィードカテゴリーを有効にする"
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "仮想フィードのグループヘッドライン"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "記事内に画像を表示しない"
+
+#: include/localized_schema.php:57
+msgid "Enable external API"
 msgstr ""
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
+#: include/localized_schema.php:58
+msgid "User timezone"
 msgstr ""
 
-#: mobile/prefs.php:29
+#: include/localized_schema.php:59
 #, fuzzy
-msgid "Browse categories like folders"
-msgstr "カテゴリーの順序をリセットする"
+msgid "Sort headlines by feed date"
+msgstr "未読記事数によるフィードの並び替え"
 
-#: mobile/prefs.php:35
+#: include/localized_schema.php:60 js/prefs.js:1762
 #, fuzzy
-msgid "Show images in posts"
-msgstr "記事内に画像を表示しない"
+msgid "Customize stylesheet"
+msgstr "ユーザースタイルシートの URL"
 
-#: mobile/prefs.php:40
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "読んだフィードを隠す/再表示する"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr ""
 
-#: mobile/prefs.php:45
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "言語:"
+
+#: include/login_form.php:148
 #, fuzzy
-msgid "Sort feeds by unread count"
-msgstr "未読記事数によるフィードの並び替え"
+msgid "Profile:"
+msgstr "ファイル:"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "セッションの検査に失敗しました (IP が正しくない)"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr ""
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "ユーザー名かパスワードが正しくありません"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "「%s」のすべての記事を既読に設定しますか?"
 
+#: js/digest.js:69
 #, fuzzy
-#~ msgid "Archived articles"
-#~ msgstr "未読記事"
+msgid "Mark %d displayed articles as read?"
+msgstr "%d 件のマークした記事を既読として設定しますか?"
 
-#~ msgid "Select:"
-#~ msgstr "選択:"
-
-#~ msgid "Invert"
-#~ msgstr "反転"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "記事のお気に入りを解除する"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "選択の切り替え:"
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "記事をお気に入りにする"
 
-#~ msgid "Selection:"
-#~ msgstr "選択:"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "非公開記事"
 
+#: js/digest.js:265
 #, fuzzy
-#~ msgid "Move back"
-#~ msgstr "戻る"
+msgid "Original article"
+msgstr "元の記事内容を表示する"
 
+#: js/digest.js:267
 #, fuzzy
-#~ msgid "Delete"
-#~ msgstr "標準"
+msgid "Close this panel"
+msgstr "このウィンドウを閉じる"
 
-#~ msgid "Feed:"
-#~ msgstr "フィード:"
+#: js/digest.js:290
+#, fuzzy
+msgid "Error: unable to load article."
+msgstr "エラー: OPML ファイルをアップロードしてください。"
 
+#: js/digest.js:444
 #, fuzzy
-#~ msgid "Visit the website"
-#~ msgstr "オフィシャルサイトに訪問する"
+msgid "Click to expand article."
+msgstr "開いた記事のクリック"
 
+#: js/digest.js:519
 #, fuzzy
-#~ msgid "View as RSS feed"
-#~ msgstr "フィードを閲覧する"
+msgid "%d more..."
+msgstr "ヘルプを読み込んでいます..."
 
+#: js/digest.js:526
 #, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "編集するにはクリック"
+msgid "No unread feeds."
+msgstr "読んだフィードを隠す/再表示する"
 
-#~ msgid " - "
-#~ msgstr " - "
+#: js/digest.js:628
+#, fuzzy
+msgid "Load more..."
+msgstr "ヘルプを読み込んでいます..."
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "この記事のタグを編集する"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr ""
 
+#: js/FeedTree.js:137
 #, fuzzy
-#~ msgid "Open article in new tab"
-#~ msgstr "新しいウィンドウで記事を開く"
+msgid "Update feed"
+msgstr "すべてのフィードの更新"
 
-#, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "タグを編集する"
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
 
+#: js/functions.js:647
 #, fuzzy
-#~ msgid "Close this panel"
-#~ msgstr "このウィンドウを閉じる"
+msgid "Date syntax appears to be correct:"
+msgstr "古いパスワードが不正確です。"
 
-#~ msgid "mark as read"
-#~ msgstr "既読にする"
+#: js/functions.js:650
+#, fuzzy
+msgid "Date syntax is incorrect."
+msgstr "古いパスワードが不正確です。"
 
+#: js/functions.js:777
 #, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "公開記事"
+msgid "Remove stored feed icon?"
+msgstr "保存したデータを削除する"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "表示する未読記事が見つかりませんでした。"
+#: js/functions.js:809
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "フィードをひとつ選択してください"
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "表示する更新された記事が見つかりませんでした。"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr ""
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "表示するお気に入りの記事が見つかりませんでした。"
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "ラベルのキャプションを入力してください:"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
-#~ "ニューを参照します)、フィルターを使うことができます。"
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "ラベルが作成できません: キャプションが見当たりません。"
 
-#~ msgid "No articles found to display."
-#~ msgstr "表示する記事が見つかりません。"
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "フィードを購読する"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "フィードを購読しています..."
 
+#: js/functions.js:901
 #, fuzzy
-#~ msgid "Remove:"
-#~ msgstr "削除"
+msgid "Subscribed to %s"
+msgstr "フィードを購読する:"
 
-#, fuzzy
-#~ msgid "Assign:"
-#~ msgstr "ラベルの割り当て:"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr ""
 
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
+
+#: js/functions.js:945
 #, fuzzy
-#~ msgid "(edit note)"
-#~ msgstr "ノートの編集"
+msgid "Couldn't download the specified URL."
+msgstr "購読できません: フィード URL が入力されていません。"
 
-#~ msgid "No feed selected."
-#~ msgstr "フィードは選択されていません。"
+#: js/functions.js:948
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "カテゴリーから購読をやめることができません。"
 
-#~ msgid "unknown type"
-#~ msgstr "未知の種類"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "フィルターを作成する"
 
-#~ msgid "Attachment:"
-#~ msgstr "添付:"
+#: js/functions.js:987 js/prefs.js:165
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "フィルター表現"
 
-#~ msgid "Attachments:"
-#~ msgstr "添付:"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
 
-#~ msgid "Language:"
-#~ msgstr "言語:"
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "%s の購読をやめますか?"
 
+#: js/functions.js:1173
 #, fuzzy
-#~ msgid "Profile:"
-#~ msgstr "ファイル:"
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "カテゴリーの並び替えモードの切り替え"
-
-#~ msgid "Update all feeds"
-#~ msgstr "すべてのフィードの更新"
+msgid "Please enter category title:"
+msgstr "このアーティクルのノートを入力してください:"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "名前か未読数で並び替える"
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr ""
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "「%s」のすべての記事を既読に設定しますか?"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+#, fuzzy
+msgid "You can't edit this kind of feed."
+msgstr "フィードのこの種類を消去できません。"
 
+#: js/functions.js:1400
 #, fuzzy
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "%d 件のマークした記事を既読として設定しますか?"
+msgid "Edit Feed"
+msgstr "フィードを編集する"
 
-#~ msgid "Unstar article"
-#~ msgstr "記事のお気に入りを解除する"
+#: js/functions.js:1438
+#, fuzzy
+msgid "More Feeds"
+msgstr "さらなるフィード"
 
-#~ msgid "Star article"
-#~ msgstr "記事をお気に入りにする"
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "選択されたフィードはありません。"
 
-#~ msgid "Unpublish article"
-#~ msgstr "非公開記事"
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
 
+#: js/functions.js:1580
 #, fuzzy
-#~ msgid "Original article"
-#~ msgstr "元の記事内容を表示する"
+msgid "Feeds with update errors"
+msgstr "フィードエディター"
 
+#: js/functions.js:1591 js/prefs.js:1229
 #, fuzzy
-#~ msgid "Error: unable to load article."
-#~ msgstr "エラー: OPML ファイルをアップロードしてください。"
+msgid "Remove selected feeds?"
+msgstr "選択されたフィルターを削除しますか?"
 
-#, fuzzy
-#~ msgid "Click to expand article."
-#~ msgstr "開いた記事のクリック"
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "記事は選択されていません。"
 
+#: js/mail_button.js:21
 #, fuzzy
-#~ msgid "No unread feeds."
-#~ msgstr "読んだフィードを隠す/再表示する"
+msgid "Forward article by email"
+msgstr "記事をお気に入りにする"
 
+#: js/PrefFilterTree.js:32
 #, fuzzy
-#~ msgid "Load more..."
-#~ msgstr "ヘルプを読み込んでいます..."
+msgid "Inverse"
+msgstr "反転"
 
-#, fuzzy
-#~ msgid "Update feed"
-#~ msgstr "すべてのフィードの更新"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "ログイン名を入力してください:"
 
-#, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "古いパスワードが不正確です。"
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
 
+#: js/prefs.js:134
 #, fuzzy
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "古いパスワードが不正確です。"
+msgid "Edit Filter"
+msgstr "フィルター"
 
-#, fuzzy
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "保存したデータを削除する"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "フィルター %s を削除しますか?"
 
-#, fuzzy
-#~ msgid "Please select an image file to upload."
-#~ msgstr "フィードをひとつ選択してください"
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "選択したラベルを削除しますか?"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "ラベルのキャプションを入力してください:"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "選択されたラベルはありません。"
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "ラベルが作成できません: キャプションが見当たりません。"
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "フィードを購読する"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "選択されたユーザーはありません。"
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "フィードを購読しています..."
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "選択されたフィルターを削除しますか?"
 
-#, fuzzy
-#~ msgid "Subscribed to %s"
-#~ msgstr "フィードを購読する:"
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "選択されたフィルターはありません。"
 
-#, fuzzy
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "購読できません: フィード URL が入力されていません。"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "選択されたフィードの購読をやめますか?"
 
-#, fuzzy
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "カテゴリーから購読をやめることができません。"
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "フィードをひとつだけ選択してください。"
 
-#~ msgid "Create Filter"
-#~ msgstr "フィルターを作成する"
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr ""
+"選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
 
-#, fuzzy
-#~ msgid "Filter Test Results"
-#~ msgstr "フィルター表現"
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "記事を維持したい日数は? (0: 標準を使う)"
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "%s の購読をやめますか?"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "ログイン名の項目は空にできません。"
 
-#, fuzzy
-#~ msgid "Please enter category title:"
-#~ msgstr "このアーティクルのノートを入力してください:"
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "ひとつだけユーザーを選択してください。"
 
-#, fuzzy
-#~ msgid "Edit Feed"
-#~ msgstr "フィードを編集する"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "選択したユーザーのパスワードをリセットしますか?"
+
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "フィルターをひとつだけ選択してください。"
 
+#: js/prefs.js:652
 #, fuzzy
-#~ msgid "More Feeds"
-#~ msgstr "さらなるフィード"
+msgid "Edit Multiple Feeds"
+msgstr "複数フィードエディター"
 
-#~ msgid "No feeds are selected."
-#~ msgstr "選択されたフィードはありません。"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "選択したフィードの変更を保存しますか?"
 
+#: js/prefs.js:768
 #, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "選択されたフィルターを削除しますか?"
+msgid "OPML Import"
+msgstr "インポート"
 
+#: js/prefs.js:795
 #, fuzzy
-#~ msgid "Inverse"
-#~ msgstr "反転"
+msgid "Please choose an OPML file first."
+msgstr "はじめにいくつかのフィードを選択してください。"
 
-#~ msgid "Please enter login:"
-#~ msgstr "ログイン名を入力してください:"
+#: js/prefs.js:811
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "はじめにいくつかのフィードを選択してください。"
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "ユーザーが追加できません: ログイン名が指定されていません。"
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "標準に戻しますか?"
 
+#: js/prefs.js:1149
 #, fuzzy
-#~ msgid "Edit Filter"
-#~ msgstr "フィルター"
+msgid "Feed Categories"
+msgstr "カテゴリー:"
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "フィルター %s を削除しますか?"
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "選択されたカテゴリーを削除しますか?"
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "選択したラベルを削除しますか?"
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "選択されたカテゴリーはありません。"
 
-#~ msgid "No labels are selected."
-#~ msgstr "選択されたラベルはありません。"
+#: js/prefs.js:1218
+msgid "Feeds without recent updates"
+msgstr ""
 
-#~ msgid "No users are selected."
-#~ msgstr "選択されたユーザーはありません。"
+#: js/prefs.js:1267
+#, fuzzy
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "選択されたフィルターを削除しますか?"
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
-#~ msgid "No filters are selected."
-#~ msgstr "選択されたフィルターはありません。"
+#: js/prefs.js:1399
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+"すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "選択されたフィードの購読をやめますか?"
+#: js/prefs.js:1419
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "ラベルの色を標準にリセットしますか?"
 
-#~ msgid "Please select only one feed."
-#~ msgstr "フィードをひとつだけ選択してください。"
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr ""
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr ""
-#~ "選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: js/prefs.js:1483
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "選択された記事はありません。"
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr "記事を維持したい日数は? (0: 標準を使う)"
+#: js/prefs.js:1491 js/prefs.js:1544
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "選択されたフィルターを削除しますか?"
+
+#: js/prefs.js:1507 js/prefs.js:1560
+#, fuzzy
+msgid "Please choose a profile to activate."
+msgstr "はじめにいくつかのフィードを選択してください。"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "ログイン名の項目は空にできません。"
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#~ msgid "Please select only one user."
-#~ msgstr "ひとつだけユーザーを選択してください。"
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "選択したユーザーのパスワードをリセットしますか?"
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "ラベルエディター"
 
-#~ msgid "Please select only one filter."
-#~ msgstr "フィルターをひとつだけ選択してください。"
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
 
+#: js/prefs.js:1804
 #, fuzzy
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "複数フィードエディター"
+msgid "Link Instance"
+msgstr "タグを編集する"
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "選択したフィードの変更を保存しますか?"
+#: js/prefs.js:1855
+#, fuzzy
+msgid "Edit Instance"
+msgstr "タグを編集する"
 
+#: js/prefs.js:1904
 #, fuzzy
-#~ msgid "OPML Import"
-#~ msgstr "インポート"
+msgid "Remove selected instances?"
+msgstr "選択されたフィルターを削除しますか?"
 
+#: js/prefs.js:1921 js/prefs.js:1933
 #, fuzzy
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "はじめにいくつかのフィードを選択してください。"
+msgid "No instances are selected."
+msgstr "選択されたフィルターはありません。"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "標準に戻しますか?"
+#: js/prefs.js:1938
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "フィルターをひとつだけ選択してください。"
 
+#: js/prefs.js:1973
 #, fuzzy
-#~ msgid "Feed Categories"
-#~ msgstr "カテゴリー:"
+msgid "Export Data"
+msgstr "OPML エクスポート"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "選択されたカテゴリーを削除しますか?"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "No categories are selected."
-#~ msgstr "選択されたカテゴリーはありません。"
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "インポート"
 
+#: js/share_button.js:10
 #, fuzzy
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "新しいもので現在の公開アドレスを置き換えますか?"
+msgid "Share article by URL"
+msgstr "記事をお気に入りにする"
+
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "すべての記事を既読にしますか?"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "選択したフィードの記事のスコアを再計算しますか?"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "カテゴリーから購読をやめることができません。"
 
-#~ msgid "Rescore all articles? This operation may take a lot of time."
-#~ msgstr ""
-#~ "すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "はじめにいくつかのフィードを選択してください。"
 
+#: js/tt-rss.js:592
 #, fuzzy
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "ラベルの色を標準にリセットしますか?"
+msgid "You can't rescore this kind of feed."
+msgstr "フィードのこの種類を消去できません。"
 
-#, fuzzy
-#~ msgid "No profiles are selected."
-#~ msgstr "選択された記事はありません。"
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "%s の記事のスコアを再計算しますか?"
 
+#: js/tt-rss.js:1083
 #, fuzzy
-#~ msgid "Activate selected profile?"
-#~ msgstr "選択されたフィルターを削除しますか?"
+msgid "New version available!"
+msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
-#~ msgid "Label Editor"
-#~ msgstr "ラベルエディター"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "「%s」のすべての可視記事を既読に設定しますか?"
 
+#: js/viewfeed.js:901
 #, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "タグを編集する"
+msgid "Delete %d selected articles in %s?"
+msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
+#: js/viewfeed.js:903
 #, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "選択されたフィルターを削除しますか?"
+msgid "Delete %d selected articles?"
+msgstr "ラベルから選択した記事を削除しますか?"
 
+#: js/viewfeed.js:945
 #, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "選択されたフィルターはありません。"
+msgid "Archive %d selected articles in %s?"
+msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
+#: js/viewfeed.js:948
 #, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "フィルターをひとつだけ選択してください。"
+msgid "Move %d archived articles back?"
+msgstr "お気に入りの記事"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "すべての記事を既読にしますか?"
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "カテゴリーから購読をやめることができません。"
+#: js/viewfeed.js:1016
+#, fuzzy
+msgid "Edit article Tags"
+msgstr "タグを編集する"
+
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "選択された記事はありません。"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "はじめにいくつかのフィードを選択してください。"
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "マークした記事が見つかりません"
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "%s の記事のスコアを再計算しますか?"
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "%d 件のマークした記事を既読として設定しますか?"
 
+#: js/viewfeed.js:1374
 #, fuzzy
-#~ msgid "New version available!"
-#~ msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
+msgid "Loading..."
+msgstr "フィード一覧を読み込んでいます..."
 
-#~ msgid "No articles are selected."
-#~ msgstr "記事は選択されていません。"
+#: js/viewfeed.js:1848
+#, fuzzy
+msgid "Open original article"
+msgstr "元の記事内容を表示する"
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "「%s」のすべての可視記事を既読に設定しますか?"
+#: js/viewfeed.js:1854
+#, fuzzy
+msgid "View in a tt-rss tab"
+msgstr "新しいウィンドウで記事を開く"
 
+#: js/viewfeed.js:1862
 #, fuzzy
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "選択した %d 件の記事を「%s」に設定しますか?"
+msgid "Mark above as read"
+msgstr "既読にする"
 
+#: js/viewfeed.js:1868
 #, fuzzy
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "ラベルから選択した記事を削除しますか?"
+msgid "Mark below as read"
+msgstr "既読にする"
 
+#: js/viewfeed.js:1914
 #, fuzzy
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "選択した %d 件の記事を「%s」に設定しますか?"
+msgid "Remove label"
+msgstr "選択したラベルを削除しますか?"
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "選択した %d 件の記事を「%s」に設定しますか?"
+#: js/viewfeed.js:1938
+#, fuzzy
+msgid "Playing..."
+msgstr "フィード一覧を読み込んでいます..."
 
+#: js/viewfeed.js:1939
 #, fuzzy
-#~ msgid "Edit article Tags"
-#~ msgstr "タグを編集する"
+msgid "Click to pause"
+msgstr "編集するにはクリック"
 
-#~ msgid "No article is selected."
-#~ msgstr "選択された記事はありません。"
+#~ msgid "Help"
+#~ msgstr "ヘルプ"
+
+#, fuzzy
+#~ msgid "Importing using DOMXML."
+#~ msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "マークした記事が見つかりません"
+#, fuzzy
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "%d 件のマークした記事を既読として設定しますか?"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "フィード一覧を読み込んでいます..."
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "ローカルに画像をキャッシュする"
 
 #, fuzzy
-#~ msgid "Open original article"
-#~ msgstr "元の記事内容を表示する"
+#~ msgid "Publish"
+#~ msgstr "公開済み"
+
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "ユーザー <b>%s</b> のパスワードを変更しました。"
+
+#~ msgid "Content filtering"
+#~ msgstr "コンテンツフィルタリング"
+
+#~ msgid "See also:"
+#~ msgstr "参考:"
 
 #, fuzzy
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "新しいウィンドウで記事を開く"
+#~ msgid "Add category..."
+#~ msgstr "フィードカテゴリーを追加しています..."
 
 #, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "選択したラベルを削除しますか?"
+#~ msgid "Add label..."
+#~ msgstr "フィードカテゴリーを追加しています..."
+
+#~ msgid "description"
+#~ msgstr "説明"
 
 #, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "フィード一覧を読み込んでいます..."
+#~ msgid "Dismiss article"
+#~ msgstr "公開記事"
 
 #, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "編集するにはクリック"
+#~ msgid "Remove:"
+#~ msgstr "削除"
 
 #, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "記事をお気に入りにする"
+#~ msgid "Assign:"
+#~ msgstr "ラベルの割り当て:"
+
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "カテゴリーの並び替えモードの切り替え"
+
+#~ msgid "Update all feeds"
+#~ msgstr "すべてのフィードの更新"
+
+#~ msgid "Sort by name or unread count"
+#~ msgstr "名前か未読数で並び替える"
 
 #, fuzzy
 #~ msgid "feeds"
@@ -2741,29 +3136,15 @@ msgstr "未読記事数によるフィードの並び替え"
 #~ msgid "Fatal Exception"
 #~ msgstr "致命的なエラー"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "フィードカテゴリーを追加しています..."
-
 #~ msgid "audio/mpeg"
 #~ msgstr "audio/mpeg"
 
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "フィードカテゴリーを追加しています..."
-
-#~ msgid "General"
-#~ msgstr "全体"
-
 #~ msgid "Enable offline reading"
 #~ msgstr "オフライン処理を有効にする"
 
 #~ msgid "Synchronize new articles for offline reading using Google Gears."
 #~ msgstr "Google Gears を用いたオフライン処理の新規記事を同期します。"
 
-#~ msgid "Interface"
-#~ msgstr "インターフェース"
-
 #~ msgid "Default article limit"
 #~ msgstr "標準の記事制限"
 
@@ -2781,9 +3162,6 @@ msgstr "未読記事数によるフィードの並び替え"
 #~ msgid "Hide feedlist"
 #~ msgstr "フィード一覧を隠す"
 
-#~ msgid "Advanced"
-#~ msgstr "高度"
-
 #~ msgid "Enable feed icons"
 #~ msgstr "フィードアイコンを有効にする"
 
@@ -3035,10 +3413,6 @@ msgstr "未読記事数によるフィードの並び替え"
 #~ msgid "Adding feed..."
 #~ msgstr "フィードを追加しています..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "フィードを追加しています..."
-
 #~ msgid "Adding user..."
 #~ msgstr "ユーザーを追加しています..."
 
@@ -3526,9 +3900,6 @@ msgstr "未読記事数によるフィードの並び替え"
 #~ msgid "This program requires cookies "
 #~ msgstr "このプログラムはクッキーを要求します"
 
-#~ msgid "description"
-#~ msgstr "説明"
-
 #~ msgid "filter_type_descr"
 #~ msgstr "filter_type_descr"
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index bf26edbb..db7721b2 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index 912923db..e14e336d 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -16,154 +16,134 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Bruk standard"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Slett aldri"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "1 uke gammel"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "2 uker gammel"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "1 måned gammel"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "2 måneder gammel"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "3 måneder gammel"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Standard intervall:"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Slå av oppdateringer"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Hvert 15. minutt"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Hvert 30. minutt"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "PÃ¥ timen"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Hver 4. time"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Hver 12. time"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Daglig"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Standard"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Bruker"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Superbruker"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Administrator"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Nyhetsstrømmer"
-
-#: backend.php:201
-#, fuzzy
-msgid "Article not found."
-msgstr "Nyhetsstrømmen ble ikke funnet"
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Nyhetsstrømmen ble ikke funnet"
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "laster, vennligst vent"
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "Adgangsnivået ditt er for lavt for å kjøre dette scriptet"
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Databaseoppdaterer"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "Kunne ikke oppdatere databasen"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", funnet: "
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "Vennligst gjør backup av din database før du fortsetter."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -172,32 +152,32 @@ msgstr ""
 "Din Tiny Tiny RSS-database trenger å oppdateres til siste utgave (<b>%d</b> "
 "til  <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Utfør oppdateringene"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "Utfører oppdateringer..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Oppdaterer til versjon %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Sjekker utgave..."
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "Feil!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -206,22 +186,22 @@ msgstr ""
 "Ferdig. <b>%d</b> utførte oppdatering(er)i følge skjema\n"
 "\t\t\tversjon <b>%d</b>."
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
+#: digest.php:58
 #, fuzzy
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -232,16 +212,23 @@ msgstr ""
 "\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
 "\t\tnettlesers instillinger."
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "laster, vennligst vent"
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Hei, "
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Logg ut"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -249,7 +236,7 @@ msgstr ""
 "Dette programmet krever XmlHttpRequest for å fungere slik det skal. Din "
 "nettleser ser ikke ut til å støtte dette."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
@@ -257,15 +244,15 @@ msgstr ""
 "Dette programmet krever cookies for å fungere ordentlig. Din nettleser ser "
 "ikke ut til å støtte dette."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "Bakgrunnsprogramsjekk feilet"
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "Frontprogramsjekk feilet"
 
-#: errors.php:18
+#: errors.php:19
 #, fuzzy
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
@@ -274,15 +261,15 @@ msgstr ""
 "Feil databaseskjemautgave. &lt;a href='update.php'&gt;Vennligst oppdater&lt;/"
 "a&gt;."
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Forespørsel ikke autorisert"
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Ingen handling å utføre"
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -290,16 +277,16 @@ msgstr ""
 "Kunne ikke vise nyhetsstrøm: spørring feilet. Vennligst sjekk "
 "merkelappsyntaks eller den lokale konfigurasjonen"
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr ""
 "Adgang nektet. Ditt adgangsnivå er ikke høyt nok for å besøke denne siden."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "Konfigurasjonssjekken feilet"
 
-#: errors.php:30
+#: errors.php:31
 #, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
@@ -308,447 +295,260 @@ msgstr ""
 "Din utgave av MySQL er i øyeblikket ikke støttet. Vennligst besøk den \n"
 "\t\toffisielle siden for mer informasjon."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "Kommentarer?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: index.php:127
+#: index.php:148
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Favoritter"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Publisert"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Ulest"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: index.php:139
+#: index.php:160
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Dato"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Tittel"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "Poeng"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Oppdater"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Søk..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Avabonner"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:173
+#: index.php:194
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Lag filter..."
 
-#: index.php:177
+#: index.php:198
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Tittel eller innhold"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Lenke"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Innhold"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Artikkeldato"
-
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Fjern artikler"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Sett som favorittartikkel"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Publiser artiklen"
-
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Tildel stikkord"
-
-#: localized_schema.php:14
-msgid "Assign label"
-msgstr "Tildel stikkord"
-
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Dette valget er brukervennlig hvis du leser flere globale "
-"nyhetsstrømssamlere som har delvis overlappende brukerbase. Når denne er "
-"avskrudd kan samme post fra flere forskjellige nyhetsstrømmer vises på en "
-"gang."
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Viser en utvidet liste over nyhetsstrømsartikler isteden for en separat "
-"visning av titler og artikler."
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"Når \"Marker som lest\" knappen blir klikket, åpne neste nyhetsstrøm med "
-"uleste artikler."
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Dette valget muliggjør utsendingen av daglige sammendrag over nye (og "
-"uleste) tittler til din e-postadresse"
-
-#: localized_schema.php:20
-#, fuzzy
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Dette valge muliggjør markeringen av artikler som leste automatisk i "
-"kombinert modus, mens du blar i artikkellisten (med unntak for ferske "
-"artikler nyhetsstrømmen)."
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Når stikkord blir automatisk funnet i artikler skal følgende stikkord ikke "
-"bli oppdaget (komma-separert liste)"
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Med dette valget haket av så vil overskriftene i spesielle nyhetskanaler og "
-"merkelapper grupperes etter nyhetskanalene"
+#: opml.php:70
+#, fuzzy, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "Legger til kategori <b>%s</b>."
 
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Tildel stikkord"
 
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
 
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
-
-#: localized_schema.php:28
-#, fuzzy
-msgid "Default interval between feed updates"
-msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
-
-#: localized_schema.php:29
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "Ingen artikler funnet som kan vises"
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Tillatt duplikate artikler"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Tillatt kategorisering av nyhetsstrømmer"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "Vis innholdsforhåndsvisning i titteloversikten"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Kort datoformat"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Langt datoformat"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Kombinert nyhetsstrømsvisning"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Ved oppdatering vis neste nyhetsstrøm"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Motsatt titteloversikt (eldste først)"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Tillatt e-postsammendrag"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "Legger til nyhetsstrøm..."
 
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Bekreft markeringen av nyhetsstrøm som lest"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Lag filter"
 
-#: localized_schema.php:42
+#: opml.php:230
 #, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "Utvid artikler automatisk i kombinert modus"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Fjern utrygge html-koder fra artiklene"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Svartelistede stikkord"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Maksimal alder på ferske artikler (i timer)"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "Marker artikler i e--postsammendrag som leste"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "Utvid artikler automatisk i kombinert modus"
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Slett uleste artikler"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "Ikke vis bilder i artiklene"
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
-
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
+msgid "is already imported."
+msgstr "Allerede importert."
 
-#: localized_schema.php:54
+#: opml.php:250
 #, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+msgid "OK"
+msgstr "OK!"
 
-#: localized_schema.php:55
-#, fuzzy
-msgid "Customize stylesheet"
-msgstr "URL til brukerbestemt utseendemal (CSS)"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Feil under behandling av dokumentet"
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "OPML-verktøy"
 
-#: opml.php:188
+#: opml.php:492
 #, fuzzy
 msgid "Importing OPML..."
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Returner til innstillinger"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Nyhetsstrømmer"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "Filtre"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "Brukere"
 
-#: prefs.php:109
+#: prefs.php:108
 #, fuzzy
 msgid "Linked"
 msgstr "Lenke"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "Lag ny konto"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr "Registrering av nye brukere er administrativt avskrudd"
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
@@ -758,193 +558,419 @@ msgstr ""
 "som ikke blir logget inn på, blir slettet automatisk 24 timer etter at "
 "passordet ble sendt."
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "Ønsket brukernavn:"
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "Sjekk tilgjengeligheten"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "E-post:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "Hvor mye er to pluss to:"
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "Send registreringen"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "Beklager, brukernavn er allerede tatt."
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "Registrering feilet"
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "Kontoen ble opprettet med suksess."
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr ""
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 #, fuzzy
 msgid "Register"
 msgstr "Registrert"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-#, fuzzy
-msgid "Default profile"
-msgstr "Standard artikkelbegrensning"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Tastatursnarveier"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "Ingen stikkord"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Navigasjon"
+
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Beveg deg mellom nyhetsstrømmene"
+
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Beveg deg mellom artikler"
+
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Vis søkevinduet"
+
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Handlinger for aktive artikler"
+
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Sett som favoritt"
+
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Sett som publisert"
+
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Sett som ulest"
+
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Endre stikkord"
 
-#: modules/backend-rpc.php:836
+#: help/main.php:20
 #, fuzzy
-msgid "Your request could not be completed."
-msgstr "Registreringsinformasjonen din er ufullstendig."
+msgid "Dismiss selected articles"
+msgstr "Fjerne merkede artikler fra merkelappen?"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr ""
+#: help/main.php:21
+#, fuzzy
+msgid "Dismiss read articles"
+msgstr "Skjul synlige leste artikler"
+
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Åpne artikkel i nytt nettleservindu"
+
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Marker alle artikler under/over den aktive som lest"
+
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Rullevisning av artkkelens innhold"
 
-#: modules/backend-rpc.php:848
+#: help/main.php:25
 #, fuzzy
-msgid "Category update has been scheduled."
-msgstr "Passord har blitt endret."
+msgid "Email article"
+msgstr "Alle artikler"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Andre handlinger"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Velg artikkelen under musepekeren"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Lag merkelapp"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Lag filter"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Skjul nyhetskanalsslisten"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "Vis denne hjelpdialogen"
 
-#: modules/backend-rpc.php:861
+#: help/main.php:41
 #, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "Du kan ikke endre denne typen nyhetsstrøm"
+msgid "Multiple articles actions"
+msgstr "Alle artikler"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Hjelp"
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "Fjern artikler"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Hjelp-emne kunne ikke bli funnet"
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Slett uleste artikler"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Handlinger for aktive artikler"
 
-#: modules/opml_domdoc.php:60
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Legger til kategori <b>%s</b>."
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "Fjern artikler"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Nyhetsstrømshandlinger"
+
+#: help/main.php:53
+#, fuzzy
+msgid "Refresh active feed"
+msgstr "Oppdater aktive nyhetsstrømmer"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "Abonner på nyhetsstrøm"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Rediger nyhetsstrømmen"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Marker nyhetsstrøm som lest"
+
+#: help/main.php:58
+#, fuzzy
+msgid "Reverse headlines order"
+msgstr "Motsatt titteloversikt (eldste først)"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Marker alle nyhetsstrømmer som lest"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "Hvis kategorien vises, brett ut/klapp den sammen."
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "GÃ¥ til..."
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Alle artikler"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Ferske artikler"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Favorittartikler"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Publiserte artikler"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Tag-sky"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Trykk på en knapp for å lukk dette vinduet"
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Mine nyhetsstrømmer"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Andres nyhetsstrømmer"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Panelhandlinger"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "Topp 25 nyhetsstrømmer"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Rediger nyyhetsstrømskategorier"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Lag bruker"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "Fokuser søk (hvis mulig)"
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+"<b>Advarsel:</b> ikke alle handlinger er nødvendigvis tilgjengelig, det "
+"avhenger av konfigureringen av Tiny Tiny RSS og ditt tilgangsnivå."
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Logg inn"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Brukernavn:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Passord:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr ""
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Snarveier"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
 msgstr ""
 
-#: modules/opml_domdoc.php:128
+#: mobile/prefs.php:24
 #, fuzzy
-msgid "is already imported."
-msgstr "Allerede importert."
+msgid "Enable categories"
+msgstr "Tillatt kategorisering av nyhetsstrømmer"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr ""
 
-#: modules/opml_domdoc.php:148
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr ""
+
+#: mobile/prefs.php:29
 #, fuzzy
-msgid "OK"
-msgstr "OK!"
+msgid "Browse categories like folders"
+msgstr "Tilbakestill kategorirekkefølgen"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Feil under behandling av dokumentet"
+#: mobile/prefs.php:35
+#, fuzzy
+msgid "Show images in posts"
+msgstr "Ikke vis bilder i artiklene"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#: modules/popup-dialog.php:34
+#: mobile/prefs.php:45
 #, fuzzy
-msgid "Importing using DOMXML."
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
+msgid "Sort feeds by unread count"
+msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+
+#: classes/article.php:25
+#, fuzzy
+msgid "Article not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Hjelp-emne kunne ikke bli funnet"
 
-#: modules/popup-dialog.php:40
+#: classes/dlg.php:26
 #, fuzzy
-msgid "Importing using DOMDocument."
-msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
+msgid "Prepare data"
+msgstr "Lagre"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"DOMXML-utvidelsen ble ikke funnet. Den er påkrevet for PHPversjoner under 5."
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+#, fuzzy
+msgid "Default profile"
+msgstr "Standard artikkelbegrensning"
+
+#: classes/dlg.php:170
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Fjerne valgte filtre?"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 #, fuzzy
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr ""
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "Notis"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -954,11 +980,11 @@ msgstr ""
 "ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst "
 "start prosessen eller konakt administratoren."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -969,280 +995,254 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Autentifisering"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Logg inn"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Søk"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Fjern"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 #, fuzzy
 msgid "match on"
 msgstr "Match på:"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Innhold"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Tittel eller innhold"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Match"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "før"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "etter"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "Sjekk det"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "PÃ¥ felt:"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "i"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Utfør handlingen"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "med parametrene:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Alternativer:"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Tillatt"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "Motsatt markering"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "Plasser i kategori..."
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "Test"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Lag"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Lagre"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tag-sky"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 msgid "Match:"
 msgstr "Matcher:"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "Vis nyhetsstrømmer"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
+#: classes/dlg.php:821 classes/feeds.php:152
 #, fuzzy
-msgid "Multiple articles"
-msgstr "Alle artikler"
+msgid "View as RSS"
+msgstr "Se stikkord"
 
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr ""
-
-#: modules/popup-dialog.php:843
-#, fuzzy
-msgid "To:"
-msgstr "Topp"
-
-#: modules/popup-dialog.php:856
-#, fuzzy
-msgid "Subject:"
-msgstr "Velg:"
-
-#: modules/popup-dialog.php:872
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Skift e-post"
-
-#: modules/popup-dialog.php:881
-#, fuzzy
-msgid "View as RSS"
-msgstr "Se stikkord"
-
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 #, fuzzy
 msgid "Details"
 msgstr "Daglig"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1250,301 +1250,441 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr ""
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "Nettadresse:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr ""
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "Tilgangsnivå:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "Tilgangsnivå"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generert nyhetsstrøm"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 #, fuzzy
 msgid "Create link"
 msgstr "Lag"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:4
+#: classes/feeds.php:94 include/functions.php:3346
+#, fuzzy
+msgid "Visit the website"
+msgstr "Besøk den offisielle siden"
+
+#: classes/feeds.php:107
+#, fuzzy
+msgid "View as RSS feed"
+msgstr "Se nyhetsstrømmene"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Velg:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Alle"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Motsatt"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Ingen"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Marker utvalg:"
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Utvalg:"
+
+#: classes/feeds.php:138
+#, fuzzy
+msgid "Archive"
+msgstr "Artikkeldato"
+
+#: classes/feeds.php:140
+#, fuzzy
+msgid "Move back"
+msgstr "GÃ¥ tilbake"
+
+#: classes/feeds.php:141
+#, fuzzy
+msgid "Delete"
+msgstr "Standard"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+#, fuzzy
+msgid "Forward by email"
+msgstr "Marker artikkel som favoritt"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "Nyhetsstrøm:"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Nyhetsstrømmen ble ikke funnet"
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "marker som lest"
+
+#: classes/feeds.php:625 include/functions.php:3318
+#, fuzzy
+msgid "Originally from:"
+msgstr "Vis opprinnelig artikkelinnhold"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Rediger stikkordene for denne artikkelen"
+
+#: classes/feeds.php:712 include/functions.php:3285
+#, fuzzy
+msgid "Open article in new tab"
+msgstr "Åpne artikkel i nytt nettleservindu"
+
+#: classes/feeds.php:723 include/functions.php:3301
+#, fuzzy
+msgid "Close article"
+msgstr "Fjern artikler"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "Ingen uleste artikler funnet som kunne vises"
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "Ingen oppdaterte artikler funnet som kunne vises"
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "Ingen markerte artikler som kan vises"
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
+"menyen ovenfor) eller bruke et filter."
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "Ingen artikler funnet som kan vises"
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, fuzzy, php-format
+msgid "Feeds last updated at %s"
+msgstr "Oppdateringsfeil"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
+msgid "Uncategorized"
+msgstr "Ukategorisert"
+
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr ""
+
+#: classes/mail_button.php:52
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Alle artikler"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr ""
+
+#: classes/mail_button.php:82
+#, fuzzy
+msgid "To:"
+msgstr "Topp"
+
+#: classes/mail_button.php:95
+#, fuzzy
+msgid "Subject:"
+msgstr "Velg:"
+
+#: classes/mail_button.php:111
+#, fuzzy
+msgid "Send e-mail"
+msgstr "Skift e-post"
+
+#: classes/note_button.php:7 js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Endre Stikkord"
+
+#: classes/pref_feeds.php:11
 msgid "Check to enable field"
 msgstr "Marker for å tillate felt"
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
 #, fuzzy, php-format
 msgid "(%d feeds)"
 msgstr "Rediger nyhetsstrømmen"
 
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr "Ukategorisert"
-
-#: modules/pref-feeds.php:306
+#: classes/pref_feeds.php:299
 #, fuzzy
 msgid "Feed Title"
 msgstr "Tittel"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr "bruker"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Slett artikler:"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "Skjul fra min nyhetsstrømslisten"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Innhold som vises fra høyre til venstre"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "Inkluder i e-postsammendraget"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:472
-#, fuzzy
-msgid "Cache images locally (SimplePie only)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
 msgstr "Mellomlagre bilder lokalt på serveren"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marker alle artikler som leste?"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 #, fuzzy
 msgid "Icon"
 msgstr "Handling"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Mellomlagre bilder lokalt på serveren"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Alt ferdig."
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Abonnerer på <b>%s</b>"
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Abonnerer allerede på <b>%s</b>"
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Rediger abonnementsalternativer"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "Ingen kategorier ble markert"
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Fjerne valgte kategorier?"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Nyhetsstrømsredigerer"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Hele nyhetsstrømmen"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 #, fuzzy
 msgid "Select"
 msgstr "Velg:"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Alle"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Ingen"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "Abonner på nyhetsstrøm"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Sletter den valgte nyhetsstrømmen..."
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Nullstill passordet"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 #, fuzzy
 msgid "Categories"
 msgstr "Kategori:"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Rediger kategorier"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 #, fuzzy
 msgid "More actions..."
 msgstr "Handlinger..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Slett manuelt"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "Tilbakestill poengsummene for artiklene"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importer"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Eksporter OPML"
+msgid "Import my OPML"
+msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr ""
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "Inkluder i e-postsammendraget"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Publisert"
+msgid "Export OPML"
+msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1553,23 +1693,42 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: classes/pref_feeds.php:1439
+msgid "Display published OPML URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
+#: classes/pref_feeds.php:1442
 #, fuzzy
-msgid "Display URL"
-msgstr "Vis stikkord"
+msgid "Article archive"
+msgstr "Artikkeldato"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "Eksporter OPML"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importer"
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1469
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1577,41 +1736,41 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1619,1119 +1778,1366 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+#, fuzzy
+msgid "Display URL"
+msgstr "Vis stikkord"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Uleste artikler"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 #, fuzzy
 msgid "Twitter"
 msgstr "Tittel"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Slett nyhetsstrømsdata"
 
-#: modules/pref-feeds.php:1654
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Favorittartikler"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "Ingen nyhetsstrømmer ble funnet."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Ingen filtre ble funnet."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Laget filter <b>%s</b>"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Lag filter"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Rediger"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Flere nyhetsstrømmer"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Trykk for å endre"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "Overskrift"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 #, fuzzy
 msgid "Colors"
 msgstr "Steng"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Foreground:"
 msgstr "Forgrunn"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 #, fuzzy
 msgid "Background:"
 msgstr "bakgrunn"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Laget merkelappen <b>%s</b>"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Lag merkelapp"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Fjern farger"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "Gammelt passord kan ikke være blankt."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "Nytt passord kan ikke vært blankt."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "Innskrivne passord matcher ikke."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "Passord har blitt endret."
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "Gammelt passord er feil"
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "Konfigurasjonen er lagret."
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Ukjent valg: %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Personlig informasjon"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "E-post"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 #, fuzzy
 msgid "Save data"
 msgstr "Lagre"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Passordet ditt er et standardpassord, \n"
 "\t\t\t\t\t\tVennligst bytt."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Nytt passord"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Endre passord"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Velg utseende"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Ja"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "Nei"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Lagre konfigurasjonen"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Tilbake til standard"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Brukerdetaljer"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "Brukeren ble  ikke funnet"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Registrert"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Sist innlogget"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Antall nyhetsstrømmer som abonneres på"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Nyhetsstrømmer som abonneres på"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Brukeradministrering"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Tilgangsnivå:"
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Endre passordet til"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "E-post: "
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "Byttet passord for bruker <b>%s</b>."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Kunne ikke lage brukeren <b>%s</b>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "Brukeren <b>%s</b> finnes allerede."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "Byttet passord forbruker <b>%s</b>\n"
 "\t\t\t\t\t til <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Gir beskjed til <b>%s</b>"
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Varsel om endring av passord"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Lag bruker"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Nullstill passordet"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Tilgangsnivå"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Siste innlogging"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "Ingen brukere er valgt"
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "Ingen matchende brukere ble funnet"
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Innholdsfiltering"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
-msgstr ""
-"Tiny Tiny RSS har støtte for filtrering (eller prosesering) av artikler. "
-"Filtreringen blir gjort engang, når nye artikler blir importert til "
-"databasen fra nyhetsstrømmene, Spesifike felt blir sammenlignet med regulære "
-"uttrykk og handlinger blir foretatt på bakgrunn av dette.Sammenligningen med "
-"regulære uttrykk tar ikke hensyn til om det er strore eller små bokstaver."
-
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Støttede handlinger er: filtrering (ikke importering) av artikler, markere "
-"artikler som leste, sett som favoritt, tilordne stikkord, og å gi poeng. "
-"Filtre kan bli definert globalt og/eller for den enkelte nyhetsstrøm."
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-"Sammenligning med basis i flere uttrykk og motsatt av uttrykk er støttet. "
-"Alle filtre blir vurdert når en artikkel blir importert og alle handlinger "
-"blir utført i rekkefølge. Motsatt sammenlignings snur det matchende "
-"resultatet slik at for eksempel et filter som søker etter XYZZY i "
-"tittelfeltet med beskjed om å bli snudd vil vise alle artikler som ikke "
-"inneholder XYZZY i tittelen."
-
-#: help/2.php:9
-msgid "See also:"
-msgstr "Se også:"
-
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Tastatursnarveier"
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "Ingen stikkord"
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Navigasjon"
+#: classes/rpc.php:741
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Registreringsinformasjonen din er ufullstendig."
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Beveg deg mellom nyhetsstrømmene"
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
+msgstr ""
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Beveg deg mellom artikler"
+#: classes/rpc.php:753
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "Passord har blitt endret."
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Vis søkevinduet"
+#: classes/rpc.php:766
+#, fuzzy
+msgid "Can't update this kind of feed."
+msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Handlinger for aktive artikler"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "Marker artikkel som favoritt"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "Sett som favoritt"
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Sett som publisert"
+#: classes/tweet_button.php:7
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Tittel"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Sett som ulest"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Endre stikkord"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "Feil brukernavn og/eller passord"
 
-#: help/3.php:20
+#: include/functions.php:2013
 #, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Fjerne merkede artikler fra merkelappen?"
+msgid "Archived articles"
+msgstr "Lagrede artikler"
 
-#: help/3.php:21
+#: include/functions.php:3109 js/viewfeed.js:1945
 #, fuzzy
-msgid "Dismiss read articles"
-msgstr "Skjul synlige leste artikler"
+msgid "Click to play"
+msgstr "Trykk for å endre"
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Åpne artikkel i nytt nettleservindu"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr ""
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Marker alle artikler under/over den aktive som lest"
+#: include/functions.php:3236
+msgid " - "
+msgstr "-"
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Rullevisning av artkkelens innhold"
-
-#: help/3.php:25
+#: include/functions.php:4061
 #, fuzzy
-msgid "Email article"
-msgstr "Alle artikler"
+msgid "(edit note)"
+msgstr "Rediger notat"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Andre handlinger"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "Ingen valgt nyhetsstrøm"
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Velg artikkelen under musepekeren"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "Ukjent type"
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Skjul nyhetskanalsslisten"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Vedlegg:"
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "Vis denne hjelpdialogen"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Vedlegg:"
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Alle artikler"
+#: include/functions.php:5091
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "Favorittartikler"
 
-#: help/3.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Fjern artikler"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "Ingen nyhetsstrømmer ble funnet."
 
-#: help/3.php:45
+#: include/functions.php:5161
 #, fuzzy
-msgid "Select unread articles"
-msgstr "Slett uleste artikler"
+msgid "Could not import: incorrect schema version."
+msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Handlinger for aktive artikler"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Fjern artikler"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Nyhetsstrømshandlinger"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:53
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Oppdater aktive nyhetsstrømmer"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Tittel eller innhold"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Rediger nyhetsstrømmen"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Lenke"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Marker nyhetsstrøm som lest"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Artikkeldato"
 
-#: help/3.php:58
+#: include/localized_schema.php:9
 #, fuzzy
-msgid "Reverse headlines order"
-msgstr "Motsatt titteloversikt (eldste først)"
+msgid "Delete article"
+msgstr "Fjern artikler"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Marker alle nyhetsstrømmer som lest"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Sett som favorittartikkel"
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "Hvis kategorien vises, brett ut/klapp den sammen."
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Publiser artiklen"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "GÃ¥ til..."
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Tildel stikkord"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Alle artikler"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Tildel stikkord"
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Ferske artikler"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Favorittartikler"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Generelt"
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Publiserte artikler"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Grensesnitt"
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Tag-sky"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Avansert"
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
 msgstr ""
+"Dette valget er brukervennlig hvis du leser flere globale "
+"nyhetsstrømssamlere som har delvis overlappende brukerbase. Når denne er "
+"avskrudd kan samme post fra flere forskjellige nyhetsstrømmer vises på en "
+"gang."
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Trykk på en knapp for å lukk dette vinduet"
-
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Mine nyhetsstrømmer"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Viser en utvidet liste over nyhetsstrømsartikler isteden for en separat "
+"visning av titler og artikler."
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Andres nyhetsstrømmer"
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"Når \"Marker som lest\" knappen blir klikket, åpne neste nyhetsstrøm med "
+"uleste artikler."
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Panelhandlinger"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Dette valget muliggjør utsendingen av daglige sammendrag over nye (og "
+"uleste) tittler til din e-postadresse"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "Topp 25 nyhetsstrømmer"
+#: include/localized_schema.php:25
+#, fuzzy
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+"Dette valge muliggjør markeringen av artikler som leste automatisk i "
+"kombinert modus, mens du blar i artikkellisten (med unntak for ferske "
+"artikler nyhetsstrømmen)."
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Rediger nyyhetsstrømskategorier"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "Fokuser søk (hvis mulig)"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Når stikkord blir automatisk funnet i artikler skal følgende stikkord ikke "
+"bli oppdaget (komma-separert liste)"
 
-#: help/4.php:39
+#: include/localized_schema.php:28
 msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
 msgstr ""
-"<b>Advarsel:</b> ikke alle handlinger er nødvendigvis tilgjengelig, det "
-"avhenger av konfigureringen av Tiny Tiny RSS og ditt tilgangsnivå."
+"Med dette valget haket av så vil overskriftene i spesielle nyhetskanaler og "
+"merkelapper grupperes etter nyhetskanalene"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Logg inn"
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Brukernavn:"
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr ""
+
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
+
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
+
+#: include/localized_schema.php:33
+#, fuzzy
+msgid "Default interval between feed updates"
+msgstr "Standard intervall mellom nyhetsstrømsoppdateringer (i minutter)"
+
+#: include/localized_schema.php:34
+#, fuzzy
+msgid "Amount of articles to display at once"
+msgstr "Ingen artikler funnet som kan vises"
+
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Tillatt duplikate artikler"
+
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "Tillatt kategorisering av nyhetsstrømmer"
+
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "Vis innholdsforhåndsvisning i titteloversikten"
+
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Kort datoformat"
+
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Langt datoformat"
+
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Kombinert nyhetsstrømsvisning"
+
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Skjul nyhetsstrømmer med ingen uleste meldinger"
+
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Ved oppdatering vis neste nyhetsstrøm"
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Motsatt titteloversikt (eldste først)"
+
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Tillatt e-postsammendrag"
+
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Bekreft markeringen av nyhetsstrøm som lest"
+
+#: include/localized_schema.php:47
+#, fuzzy
+msgid "Automatically mark articles as read"
+msgstr "Utvid artikler automatisk i kombinert modus"
+
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Fjern utrygge html-koder fra artiklene"
+
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Svartelistede stikkord"
+
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Maksimal alder på ferske artikler (i timer)"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Passord:"
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "Marker artikler i e--postsammendrag som leste"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr ""
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "Utvid artikler automatisk i kombinert modus"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Snarveier"
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Slett uleste artikler"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr ""
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
 
-#: mobile/prefs.php:24
-#, fuzzy
-msgid "Enable categories"
-msgstr "Tillatt kategorisering av nyhetsstrømmer"
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Grupper overskriftene i virtuelle nyhetskanaler"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "Ikke vis bilder i artiklene"
+
+#: include/localized_schema.php:57
+msgid "Enable external API"
 msgstr ""
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
+#: include/localized_schema.php:58
+msgid "User timezone"
 msgstr ""
 
-#: mobile/prefs.php:29
+#: include/localized_schema.php:59
 #, fuzzy
-msgid "Browse categories like folders"
-msgstr "Tilbakestill kategorirekkefølgen"
+msgid "Sort headlines by feed date"
+msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: mobile/prefs.php:35
+#: include/localized_schema.php:60 js/prefs.js:1762
 #, fuzzy
-msgid "Show images in posts"
-msgstr "Ikke vis bilder i artiklene"
+msgid "Customize stylesheet"
+msgstr "URL til brukerbestemt utseendemal (CSS)"
 
-#: mobile/prefs.php:40
-#, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Skjul/vis leste nyhetsstrømmer"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr ""
 
-#: mobile/prefs.php:45
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Språk:"
+
+#: include/login_form.php:148
 #, fuzzy
-msgid "Sort feeds by unread count"
-msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+msgid "Profile:"
+msgstr "Fil:"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "Sesjonen kunne ikke valideres (feil IP)"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr ""
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Feil brukernavn og/eller passord"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "Marker alle artikler i %s som leste?"
 
+#: js/digest.js:69
 #, fuzzy
-#~ msgid "Archived articles"
-#~ msgstr "Lagrede artikler"
-
-#~ msgid "Select:"
-#~ msgstr "Velg:"
+msgid "Mark %d displayed articles as read?"
+msgstr "Marker %d artikkel/artikler som leste?"
 
-#~ msgid "Invert"
-#~ msgstr "Motsatt"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Fjern favorittmerkingen fra artiklen"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Marker utvalg:"
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Marker artikkel som favoritt"
 
-#~ msgid "Selection:"
-#~ msgstr "Utvalg:"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Fjern publiseringen av artikkelen."
 
+#: js/digest.js:265
 #, fuzzy
-#~ msgid "Move back"
-#~ msgstr "GÃ¥ tilbake"
+msgid "Original article"
+msgstr "Vis opprinnelig artikkelinnhold"
 
+#: js/digest.js:267
 #, fuzzy
-#~ msgid "Delete"
-#~ msgstr "Standard"
+msgid "Close this panel"
+msgstr "Lukk dette vinduet"
 
-#~ msgid "Feed:"
-#~ msgstr "Nyhetsstrøm:"
+#: js/digest.js:290
+#, fuzzy
+msgid "Error: unable to load article."
+msgstr "Feil: Kan ikke laste opp OPMLfil"
 
+#: js/digest.js:444
 #, fuzzy
-#~ msgid "Visit the website"
-#~ msgstr "Besøk den offisielle siden"
+msgid "Click to expand article."
+msgstr "Trykk for å utvide artikkel"
 
+#: js/digest.js:519
 #, fuzzy
-#~ msgid "View as RSS feed"
-#~ msgstr "Se nyhetsstrømmene"
+msgid "%d more..."
+msgstr "Laster hjelp..."
 
+#: js/digest.js:526
 #, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "Trykk for å endre"
+msgid "No unread feeds."
+msgstr "Skjul/vis leste nyhetsstrømmer"
 
-#~ msgid " - "
-#~ msgstr "-"
+#: js/digest.js:628
+#, fuzzy
+msgid "Load more..."
+msgstr "Laster hjelp..."
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Rediger stikkordene for denne artikkelen"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr ""
 
+#: js/FeedTree.js:137
 #, fuzzy
-#~ msgid "Open article in new tab"
-#~ msgstr "Åpne artikkel i nytt nettleservindu"
+msgid "Update feed"
+msgstr "Oppdater alle nyhetsstrømmer"
 
-#, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "Endre Stikkord"
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
 
+#: js/functions.js:647
 #, fuzzy
-#~ msgid "Close this panel"
-#~ msgstr "Lukk dette vinduet"
+msgid "Date syntax appears to be correct:"
+msgstr "Gammelt passord er feil"
 
-#~ msgid "mark as read"
-#~ msgstr "marker som lest"
+#: js/functions.js:650
+#, fuzzy
+msgid "Date syntax is incorrect."
+msgstr "Gammelt passord er feil"
 
+#: js/functions.js:777
 #, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Publiser artiklen"
+msgid "Remove stored feed icon?"
+msgstr "Fjern lagrede data"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "Ingen uleste artikler funnet som kunne vises"
+#: js/functions.js:809
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "Vennligst velg en nyhetsstrøm"
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "Ingen oppdaterte artikler funnet som kunne vises"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr ""
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "Ingen markerte artikler som kan vises"
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Vennligst skriv inn merkelappstekst:"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se "
-#~ "aksjon-menyen ovenfor) eller bruke et filter."
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "Kan ikke skape merkelapp, mangler overskrift."
 
-#~ msgid "No articles found to display."
-#~ msgstr "Ingen artikler funnet som kan vises"
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "Abonner på nyhetsstrøm"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "Abonnerer på nyhetsstrømmen..."
 
+#: js/functions.js:901
 #, fuzzy
-#~ msgid "Remove:"
-#~ msgstr "Fjern"
+msgid "Subscribed to %s"
+msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
-#, fuzzy
-#~ msgid "Assign:"
-#~ msgstr "Tildel stikkord:"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr ""
+
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
 
+#: js/functions.js:945
 #, fuzzy
-#~ msgid "(edit note)"
-#~ msgstr "Rediger notat"
+msgid "Couldn't download the specified URL."
+msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 
-#~ msgid "No feed selected."
-#~ msgstr "Ingen valgt nyhetsstrøm"
+#: js/functions.js:948
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#~ msgid "unknown type"
-#~ msgstr "Ukjent type"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Lag filter"
 
-#~ msgid "Attachment:"
-#~ msgstr "Vedlegg:"
+#: js/functions.js:987 js/prefs.js:165
+#, fuzzy
+msgid "Filter Test Results"
+msgstr "Filteruttrykk"
 
-#~ msgid "Attachments:"
-#~ msgstr "Vedlegg:"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
 
-#~ msgid "Language:"
-#~ msgstr "Språk:"
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "Fjerne abonnement på %s?"
 
+#: js/functions.js:1173
 #, fuzzy
-#~ msgid "Profile:"
-#~ msgstr "Fil:"
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Tillatt endringer i kategorirekkefølgen?"
-
-#~ msgid "Update all feeds"
-#~ msgstr "Oppdater alle nyhetsstrømmer"
+msgid "Please enter category title:"
+msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Sorter nyhetsstrømer ut i fra navn eller antall uleste artikler"
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr ""
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Marker alle artikler i %s som leste?"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
+#: js/functions.js:1400
 #, fuzzy
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "Marker %d artikkel/artikler som leste?"
+msgid "Edit Feed"
+msgstr "Rediger nyhetsstrømmen"
 
-#~ msgid "Unstar article"
-#~ msgstr "Fjern favorittmerkingen fra artiklen"
+#: js/functions.js:1438
+#, fuzzy
+msgid "More Feeds"
+msgstr "Flere nyhetsstrømmer"
 
-#~ msgid "Star article"
-#~ msgstr "Marker artikkel som favoritt"
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "Ingen nyhetsstrømmer er valgt"
 
-#~ msgid "Unpublish article"
-#~ msgstr "Fjern publiseringen av artikkelen."
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
 
+#: js/functions.js:1580
 #, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Vis opprinnelig artikkelinnhold"
+msgid "Feeds with update errors"
+msgstr "Oppdateringsfeil"
 
+#: js/functions.js:1591 js/prefs.js:1229
 #, fuzzy
-#~ msgid "Error: unable to load article."
-#~ msgstr "Feil: Kan ikke laste opp OPMLfil"
+msgid "Remove selected feeds?"
+msgstr "Fjerne valgte filtre?"
 
-#, fuzzy
-#~ msgid "Click to expand article."
-#~ msgstr "Trykk for å utvide artikkel"
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "Ingen artikler er valgt."
 
+#: js/mail_button.js:21
 #, fuzzy
-#~ msgid "No unread feeds."
-#~ msgstr "Skjul/vis leste nyhetsstrømmer"
+msgid "Forward article by email"
+msgstr "Marker artikkel som favoritt"
 
+#: js/PrefFilterTree.js:32
 #, fuzzy
-#~ msgid "Load more..."
-#~ msgstr "Laster hjelp..."
+msgid "Inverse"
+msgstr "(Motsatt)"
 
-#, fuzzy
-#~ msgid "Update feed"
-#~ msgstr "Oppdater alle nyhetsstrømmer"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Vennligst skriv inn brukernavn:"
 
-#, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "Gammelt passord er feil"
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
+#: js/prefs.js:134
 #, fuzzy
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "Gammelt passord er feil"
+msgid "Edit Filter"
+msgstr "Filtre"
 
-#, fuzzy
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Fjern lagrede data"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "Fjerne %s filteret?"
 
-#, fuzzy
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Vennligst velg en nyhetsstrøm"
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "Fjerne merkede merkelapper?"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Vennligst skriv inn merkelappstekst:"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "Ingen merkelapper er markert"
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "Kan ikke skape merkelapp, mangler overskrift."
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Abonner på nyhetsstrøm"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "Ingen bruker er markert"
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Abonnerer på nyhetsstrømmen..."
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Fjerne valgte filtre?"
 
-#, fuzzy
-#~ msgid "Subscribed to %s"
-#~ msgstr "Abonnerer på følgende nyhetsstrømmer:"
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "Ingen filtre er valgt"
 
-#, fuzzy
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
-#, fuzzy
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Du kan ikke fjerne abonnement fra kategorien."
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Vennligst velg kun en nyhetsstrøm"
 
-#~ msgid "Create Filter"
-#~ msgstr "Lag filter"
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
 
-#, fuzzy
-#~ msgid "Filter Test Results"
-#~ msgstr "Filteruttrykk"
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "Fjerne abonnement på %s?"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "Brukernavn kan ikke være blankt"
 
-#, fuzzy
-#~ msgid "Please enter category title:"
-#~ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Vennligst velg kun en bruker"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "Du kan ikke endre denne typen nyhetsstrøm"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "Nullstill passordet til utvalgte bruker?"
 
-#, fuzzy
-#~ msgid "Edit Feed"
-#~ msgstr "Rediger nyhetsstrømmen"
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Vennligst velg kun et filter"
 
+#: js/prefs.js:652
 #, fuzzy
-#~ msgid "More Feeds"
-#~ msgstr "Flere nyhetsstrømmer"
+msgid "Edit Multiple Feeds"
+msgstr "Nyhetsstrømsredigerer"
 
-#~ msgid "No feeds are selected."
-#~ msgstr "Ingen nyhetsstrømmer er valgt"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
+#: js/prefs.js:768
 #, fuzzy
-#~ msgid "Feeds with update errors"
-#~ msgstr "Oppdateringsfeil"
+msgid "OPML Import"
+msgstr "Importer"
 
+#: js/prefs.js:795
 #, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Fjerne valgte filtre?"
+msgid "Please choose an OPML file first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
+#: js/prefs.js:811
 #, fuzzy
-#~ msgid "Inverse"
-#~ msgstr "(Motsatt)"
-
-#~ msgid "Please enter login:"
-#~ msgstr "Vennligst skriv inn brukernavn:"
+msgid "Please choose the file first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "Kan ikke legge til bruker: brukernavn mangler."
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "Tilbakefør til standardinnstillingene"
 
+#: js/prefs.js:1149
 #, fuzzy
-#~ msgid "Edit Filter"
-#~ msgstr "Filtre"
+msgid "Feed Categories"
+msgstr "Kategori:"
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "Fjerne %s filteret?"
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Fjerne valgte kategorier?"
+
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "Ingen kategorier er valgt."
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "Fjerne merkede merkelapper?"
+#: js/prefs.js:1218
+#, fuzzy
+msgid "Feeds without recent updates"
+msgstr "Oppdateringsfeil"
 
-#~ msgid "No labels are selected."
-#~ msgstr "Ingen merkelapper er markert"
+#: js/prefs.js:1267
+#, fuzzy
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
-#~ msgid "No users are selected."
-#~ msgstr "Ingen bruker er markert"
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Fjerne valgte filtre?"
+#: js/prefs.js:1399
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 
-#~ msgid "No filters are selected."
-#~ msgstr "Ingen filtre er valgt"
+#: js/prefs.js:1419
+#, fuzzy
+msgid "Reset selected labels to default colors?"
+msgstr "Sett merkelappsfargene til standard?"
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr ""
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Vennligst velg kun en nyhetsstrøm"
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
+#: js/prefs.js:1483
+#, fuzzy
+msgid "No profiles are selected."
+msgstr "Ingen artikkel er valgt."
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
+#: js/prefs.js:1491 js/prefs.js:1544
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "Fjerne valgte filtre?"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "Brukernavn kan ikke være blankt"
+#: js/prefs.js:1507 js/prefs.js:1560
+#, fuzzy
+msgid "Please choose a profile to activate."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#~ msgid "Please select only one user."
-#~ msgstr "Vennligst velg kun en bruker"
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "Nullstill passordet til utvalgte bruker?"
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Vennligst velg kun et filter"
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "Merkelappredigerer"
 
-#, fuzzy
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Nyhetsstrømsredigerer"
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
+#: js/prefs.js:1804
+#, fuzzy
+msgid "Link Instance"
+msgstr "Endre stikkord"
 
+#: js/prefs.js:1855
 #, fuzzy
-#~ msgid "OPML Import"
-#~ msgstr "Importer"
+msgid "Edit Instance"
+msgstr "Endre stikkord"
 
+#: js/prefs.js:1904
 #, fuzzy
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+msgid "Remove selected instances?"
+msgstr "Fjerne valgte filtre?"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "Tilbakefør til standardinnstillingene"
+#: js/prefs.js:1921 js/prefs.js:1933
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Ingen filtre er valgt"
 
+#: js/prefs.js:1938
 #, fuzzy
-#~ msgid "Feed Categories"
-#~ msgstr "Kategori:"
+msgid "Please select only one instance."
+msgstr "Vennligst velg kun et filter"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Fjerne valgte kategorier?"
+#: js/prefs.js:1973
+#, fuzzy
+msgid "Export Data"
+msgstr "Eksporter OPML"
 
-#~ msgid "No categories are selected."
-#~ msgstr "Ingen kategorier er valgt."
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
+#: js/prefs.js:2053
 #, fuzzy
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Oppdateringsfeil"
+msgid "Data Import"
+msgstr "Importer"
 
+#: js/share_button.js:10
 #, fuzzy
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
+msgid "Share article by URL"
+msgstr "Marker artikkel som favoritt"
+
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "Marker alle artikler som leste?"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
-#~ msgid "Rescore all articles? This operation may take a lot of time."
-#~ msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
-#, fuzzy
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "Sett merkelappsfargene til standard?"
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
-#, fuzzy
-#~ msgid "No profiles are selected."
-#~ msgstr "Ingen artikkel er valgt."
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "Endre poengene for artiklene i %s?"
 
+#: js/tt-rss.js:1083
 #, fuzzy
-#~ msgid "Activate selected profile?"
-#~ msgstr "Fjerne valgte filtre?"
+msgid "New version available!"
+msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
-#~ msgid "Label Editor"
-#~ msgstr "Merkelappredigerer"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "Marker alle synlige artikler i %s som leste?"
 
+#: js/viewfeed.js:901
 #, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "Endre stikkord"
+msgid "Delete %d selected articles in %s?"
+msgstr "Marker %d valgte artikler i %s som leste?"
 
+#: js/viewfeed.js:903
 #, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "Fjerne valgte filtre?"
+msgid "Delete %d selected articles?"
+msgstr "Fjerne merkede artikler fra merkelappen?"
 
+#: js/viewfeed.js:945
 #, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "Ingen filtre er valgt"
+msgid "Archive %d selected articles in %s?"
+msgstr "Marker %d valgte artikler i %s som leste?"
 
+#: js/viewfeed.js:948
 #, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "Vennligst velg kun et filter"
+msgid "Move %d archived articles back?"
+msgstr "Favorittartikler"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Marker alle artikler som leste?"
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Marker %d valgte artikler i %s som leste?"
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "Du kan ikke fjerne abonnement fra kategorien."
+#: js/viewfeed.js:1016
+#, fuzzy
+msgid "Edit article Tags"
+msgstr "Endre Stikkord"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "Ingen artikkel er valgt."
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "Ingen artikler funnet som kan markeres"
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "Endre poengene for artiklene i %s?"
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "Marker %d artikkel/artikler som leste?"
 
+#: js/viewfeed.js:1374
 #, fuzzy
-#~ msgid "New version available!"
-#~ msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
+msgid "Loading..."
+msgstr "Laster nyhetsstrømmer..."
 
-#~ msgid "No articles are selected."
-#~ msgstr "Ingen artikler er valgt."
+#: js/viewfeed.js:1848
+#, fuzzy
+msgid "Open original article"
+msgstr "Vis opprinnelig artikkelinnhold"
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "Marker alle synlige artikler i %s som leste?"
+#: js/viewfeed.js:1854
+#, fuzzy
+msgid "View in a tt-rss tab"
+msgstr "Åpne artikkel i nytt nettleservindu"
 
+#: js/viewfeed.js:1862
 #, fuzzy
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "Marker %d valgte artikler i %s som leste?"
+msgid "Mark above as read"
+msgstr "Marker som lest"
 
+#: js/viewfeed.js:1868
 #, fuzzy
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "Fjerne merkede artikler fra merkelappen?"
+msgid "Mark below as read"
+msgstr "Marker som lest"
 
+#: js/viewfeed.js:1914
 #, fuzzy
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "Marker %d valgte artikler i %s som leste?"
+msgid "Remove label"
+msgstr "Fjerne merkede merkelapper?"
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "Marker %d valgte artikler i %s som leste?"
+#: js/viewfeed.js:1938
+#, fuzzy
+msgid "Playing..."
+msgstr "Laster nyhetsstrømmer..."
 
+#: js/viewfeed.js:1939
 #, fuzzy
-#~ msgid "Edit article Tags"
-#~ msgstr "Endre Stikkord"
+msgid "Click to pause"
+msgstr "Trykk for å endre"
 
-#~ msgid "No article is selected."
-#~ msgstr "Ingen artikkel er valgt."
+#~ msgid "Help"
+#~ msgstr "Hjelp"
+
+#, fuzzy
+#~ msgid "Importing using DOMXML."
+#~ msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "Ingen artikler funnet som kan markeres"
+#, fuzzy
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "Marker %d artikkel/artikler som leste?"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "DOMXML-utvidelsen ble ikke funnet. Den er påkrevet for PHPversjoner under "
+#~ "5."
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "Laster nyhetsstrømmer..."
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "Mellomlagre bilder lokalt på serveren"
 
 #, fuzzy
-#~ msgid "Open original article"
-#~ msgstr "Vis opprinnelig artikkelinnhold"
+#~ msgid "Publish"
+#~ msgstr "Publisert"
+
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "Byttet passord for bruker <b>%s</b>."
+
+#~ msgid "Content filtering"
+#~ msgstr "Innholdsfiltering"
+
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny Tiny RSS har støtte for filtrering (eller prosesering) av artikler. "
+#~ "Filtreringen blir gjort engang, når nye artikler blir importert til "
+#~ "databasen fra nyhetsstrømmene, Spesifike felt blir sammenlignet med "
+#~ "regulære uttrykk og handlinger blir foretatt på bakgrunn av dette."
+#~ "Sammenligningen med regulære uttrykk tar ikke hensyn til om det er strore "
+#~ "eller små bokstaver."
+
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "Støttede handlinger er: filtrering (ikke importering) av artikler, "
+#~ "markere artikler som leste, sett som favoritt, tilordne stikkord, og å gi "
+#~ "poeng. Filtre kan bli definert globalt og/eller for den enkelte "
+#~ "nyhetsstrøm."
+
+#~ msgid ""
+#~ "Multiple and inverse matching are supported. All matching filters are "
+#~ "considered when article is being imported and all actions executed in "
+#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
+#~ "XYZZY in title with inverse flag will match all articles, except those "
+#~ "containing string XYZZY in title."
+#~ msgstr ""
+#~ "Sammenligning med basis i flere uttrykk og motsatt av uttrykk er støttet. "
+#~ "Alle filtre blir vurdert når en artikkel blir importert og alle "
+#~ "handlinger blir utført i rekkefølge. Motsatt sammenlignings snur det "
+#~ "matchende resultatet slik at for eksempel et filter som søker etter XYZZY "
+#~ "i tittelfeltet med beskjed om å bli snudd vil vise alle artikler som ikke "
+#~ "inneholder XYZZY i tittelen."
+
+#~ msgid "See also:"
+#~ msgstr "Se også:"
 
 #, fuzzy
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Åpne artikkel i nytt nettleservindu"
+#~ msgid "Add category..."
+#~ msgstr "Legger til kategori for nyhetsstrømmer"
 
 #, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "Fjerne merkede merkelapper?"
+#~ msgid "Add label..."
+#~ msgstr "Legger til kategori for nyhetsstrømmer"
+
+#~ msgid "description"
+#~ msgstr "beskrivelse"
+
+#~ msgid "short_desc"
+#~ msgstr "kort beskrivelse"
 
 #, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "Laster nyhetsstrømmer..."
+#~ msgid "Dismiss article"
+#~ msgstr "Publiser artiklen"
 
 #, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "Trykk for å endre"
+#~ msgid "Remove:"
+#~ msgstr "Fjern"
 
 #, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Marker artikkel som favoritt"
+#~ msgid "Assign:"
+#~ msgstr "Tildel stikkord:"
+
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Tillatt endringer i kategorirekkefølgen?"
+
+#~ msgid "Update all feeds"
+#~ msgstr "Oppdater alle nyhetsstrømmer"
+
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Sorter nyhetsstrømer ut i fra navn eller antall uleste artikler"
 
 #, fuzzy
 #~ msgid "feeds"
@@ -2805,20 +3211,9 @@ msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 #~ msgid "Fatal Exception"
 #~ msgstr "Alvorlig feil"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Legger til kategori for nyhetsstrømmer"
-
 #~ msgid "audio/mpeg"
 #~ msgstr "Lyd/mpeg"
 
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Legger til kategori for nyhetsstrømmer"
-
-#~ msgid "General"
-#~ msgstr "Generelt"
-
 #~ msgid "Enable offline reading"
 #~ msgstr "Tillatt lesning uten internett-tilgang"
 
@@ -2827,9 +3222,6 @@ msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 #~ "Synkroniser nye artikler for å kunne bytte modus til å kunne lese uten "
 #~ "internett-tilgang med Google Gears."
 
-#~ msgid "Interface"
-#~ msgstr "Grensesnitt"
-
 #~ msgid "Default article limit"
 #~ msgstr "Standard artikkelbegrensning"
 
@@ -2862,9 +3254,6 @@ msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 #~ "Dette valget skjuler kanallisten og tillater at den vises etter ønske, "
 #~ "brukbart for små skjermer."
 
-#~ msgid "Advanced"
-#~ msgstr "Avansert"
-
 #~ msgid "Enable feed icons"
 #~ msgstr "Bruk nyhetsstrømsikoner"
 
@@ -3153,10 +3542,6 @@ msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 #~ msgid "Adding feed..."
 #~ msgstr "Legger til nyhetsstrøm..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "Legger til nyhetsstrøm..."
-
 #~ msgid "Adding user..."
 #~ msgstr "Legger til bruker.."
 
@@ -3441,18 +3826,12 @@ msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 #~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
 #~ msgstr "&nbsp;&nbsp;Tastatursnarveier"
 
-#~ msgid "description"
-#~ msgstr "beskrivelse"
-
 #~ msgid "filter_type_descr"
 #~ msgstr "Beskrivelse av filtertype"
 
 #~ msgid "action_description"
 #~ msgstr "Handlingsbeskrivelse"
 
-#~ msgid "short_desc"
-#~ msgstr "kort beskrivelse"
-
 #~ msgid "Can't add user: no login specified."
 #~ msgstr "Kan ikke legge til bruker: brukernavn mangler."
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index d0f07595..21e63c8e 100644
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 253e6a71..f6f675ce 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -17,275 +17,261 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "Usar o padrão"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Nunca remover"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "1 semana atrás"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "2 semanas atrás"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "1 mês atrás"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "2 meses atrás"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "3 meses atrás"
 
-#: backend.php:93
+#: backend.php:91
 #, fuzzy
 msgid "Default interval"
 msgstr "Padrão"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Desabilitar updates"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "Toda hora"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Diariamente"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "Padrão"
 
-#: backend.php:115
+#: backend.php:113
 #, fuzzy
 msgid "Magpie"
 msgstr "Página"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Usuário"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr ""
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Administrador"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-#, fuzzy
-msgid "Feeds"
-msgstr "Feed"
-
-#: backend.php:201
-#, fuzzy
-msgid "Article not found."
-msgstr "Feed não encontrado."
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Feed não encontrado."
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr ""
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "Seu nível de acesso é insuficiente para executar esse script."
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr ""
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr ""
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr ""
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", encontrou:"
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr ""
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "Faça uma cópia-de-segurança de seus dados antes de prosseguir."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
 "<b>%d</b>)."
 msgstr ""
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr ""
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr ""
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Atualizando para a versão %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Verificando a versão…"
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "ERRO!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
 "\t\t\tversion <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
+#: digest.php:58
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\t\tfor this application to function properly. Please check your\n"
 "\t\t\tbrowser settings."
 msgstr ""
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr ""
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Olá,"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Sair"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
 msgstr ""
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
 msgstr ""
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr ""
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr ""
 
-#: errors.php:18
+#: errors.php:19
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
 "update&lt;/a&gt;."
 msgstr ""
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "Pedido não autorizado."
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr ""
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr "Negado. Seu nível de acesso é insuficiente para acessar esta página."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "A checagem da configuração falhou"
 
-#: errors.php:30
+#: errors.php:31
 #, fuzzy
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
@@ -294,923 +280,971 @@ msgstr ""
 "Sua versão do MySQL não é atualmente suportada. Por favor acesse \n"
 "\t\to site oficial para mais informações."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Preferências"
 
-#: index.php:80
+#: index.php:103
 #, fuzzy
 msgid "Comments?"
 msgstr "Conteúdo"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
-#: index.php:127
+#: index.php:148
 #, fuzzy
 msgid "Show articles"
 msgstr "Favoritos"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr ""
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Favoritos"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Publicado"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Não Lido"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr ""
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Atualizado"
 
-#: index.php:139
+#: index.php:160
 #, fuzzy
 msgid "Sort articles"
 msgstr "Favoritos"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Título"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr ""
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Atualizar"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Ações..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr ""
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Ações do Feed:"
 
-#: index.php:164
+#: index.php:185
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "Removendo o Feed..."
 
-#: index.php:165
+#: index.php:186
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Editar"
 
-#: index.php:166
+#: index.php:187
 #, fuzzy
 msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr ""
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Outras ações:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:173
+#: index.php:194
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "núvem de tags"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:175
+#: index.php:196
 #, fuzzy
 msgid "Create label..."
 msgstr "Criar um usuário"
 
-#: index.php:176
+#: index.php:197
 #, fuzzy
 msgid "Create filter..."
 msgstr "Criar um usuário"
 
-#: index.php:177
+#: index.php:198
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Título ou Conteúdo"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Link"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Conteúdo"
-
-#: localized_schema.php:7
-#, fuzzy
-msgid "Article Date"
-msgstr "Feed não encontrado."
-
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Favoritos"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Marcar como favorito"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr ""
-
-#: localized_schema.php:13
-#, fuzzy
-msgid "Assign tags"
-msgstr "sem tags"
-
-#: localized_schema.php:14
-msgid "Assign label"
-msgstr ""
-
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-
-#: localized_schema.php:20
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
-
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
-
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
-
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr ""
-
-#: localized_schema.php:28
-#, fuzzy
-msgid "Default interval between feed updates"
-msgstr "Padrão"
-
-#: localized_schema.php:29
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "Sem Feeds para exibir."
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Permitir publicações duplicadas"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr ""
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr ""
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Formato de data curto"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Formato de data longo"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr ""
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr ""
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr ""
+#: opml.php:70
+#, fuzzy, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "Adicionando a categoria <b>%s</b>."
 
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr ""
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Adicionando o Feed..."
 
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
 
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Confirme marcando o Feed como lido"
-
-#: localized_schema.php:42
-#, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "Marcando todos os feeds como lidos..."
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr ""
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "Adicionando o Feed..."
 
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr ""
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "Remover os filtros selecionados?"
 
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
+#: opml.php:230
+msgid "is already imported."
 msgstr ""
 
-#: localized_schema.php:46
+#: opml.php:250
 #, fuzzy
-msgid "Mark articles in e-mail digest as read"
-msgstr "Marcando todos os feeds como lidos..."
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr ""
-
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr ""
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr ""
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr ""
-
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr ""
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
-
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
-
-#: localized_schema.php:54
-msgid "Sort headlines by feed date"
-msgstr ""
+msgid "OK"
+msgstr "OK!"
 
-#: localized_schema.php:55
-msgid "Customize stylesheet"
+#: opml.php:259
+msgid "Error while parsing document."
 msgstr ""
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
+#: opml.php:263
+msgid "Error: please upload OPML file."
 msgstr ""
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "Utilitário OPML"
 
-#: opml.php:188
+#: opml.php:492
 #, fuzzy
 msgid "Importing OPML..."
 msgstr "Importando OPML (usando a extensão DOMXML)..."
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "Retornar às preferências"
 
-#: prefs.php:82
+#: prefs.php:81
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+#, fuzzy
+msgid "Feeds"
+msgstr "Feed"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 #, fuzzy
 msgid "Filters"
 msgstr "Arquivo:"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr ""
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 #, fuzzy
 msgid "Users"
 msgstr "Usuário"
 
-#: prefs.php:109
+#: prefs.php:108
 #, fuzzy
 msgid "Linked"
 msgstr "Link"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr ""
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr ""
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr ""
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr ""
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr ""
 
-#: register.php:225
+#: register.php:226
 #, fuzzy
 msgid "Email:"
 msgstr "E-mail:"
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr ""
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr ""
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr ""
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr ""
 
-#: register.php:282
+#: register.php:283
 #, fuzzy
 msgid "Registration failed."
 msgstr "A checagem da configuração falhou"
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr ""
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr ""
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr ""
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr ""
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 #, fuzzy
 msgid "Register"
 msgstr "Remover as categorias selecionadas?"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
+#: help/main.php:1 help/prefs.php:1
 #, fuzzy
-msgid "Default profile"
-msgstr "Padrão"
-
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "sem tags"
+msgid "Keyboard Shortcuts"
+msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: modules/backend-rpc.php:836
-msgid "Your request could not be completed."
-msgstr ""
+#: help/main.php:5
+#, fuzzy
+msgid "Navigation"
+msgstr "Salvar configuração"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
+#: help/main.php:8
+msgid "Move between feeds"
 msgstr ""
 
-#: modules/backend-rpc.php:848
-msgid "Category update has been scheduled."
-msgstr ""
+#: help/main.php:9
+#, fuzzy
+msgid "Move between articles"
+msgstr "Favoritos"
 
-#: modules/backend-rpc.php:861
-msgid "Can't update this kind of feed."
-msgstr ""
+#: help/main.php:10
+#, fuzzy
+msgid "Show search dialog"
+msgstr "Favoritos"
 
-#: modules/help.php:6
+#: help/main.php:13
 #, fuzzy
-msgid "Help"
-msgstr "Olá,"
+msgid "Active article actions"
+msgstr "Favoritos"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Tópico de ajuda não encontrado."
+#: help/main.php:16
+#, fuzzy
+msgid "Toggle starred"
+msgstr "Marcar como favorito"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
+#: help/main.php:17
+#, fuzzy
+msgid "Toggle published"
+msgstr "Publicado"
+
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr ""
+
+#: help/main.php:19
+#, fuzzy
+msgid "Edit tags"
+msgstr "Editar Tags"
+
+#: help/main.php:20
+#, fuzzy
+msgid "Dismiss selected articles"
+msgstr "Remover os filtros selecionados?"
+
+#: help/main.php:21
+#, fuzzy
+msgid "Dismiss read articles"
+msgstr "Favoritos"
+
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr ""
+
+#: help/main.php:23
+#, fuzzy
+msgid "Mark articles below/above active one as read"
+msgstr "Marcando todos os feeds como lidos..."
+
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr ""
+
+#: help/main.php:25
+#, fuzzy
+msgid "Email article"
+msgstr "Favoritos"
+
+#: help/main.php:29 help/prefs.php:30
+#, fuzzy
+msgid "Other actions"
+msgstr "Outras ações:"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr ""
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr ""
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr ""
+
+#: help/main.php:35
+#, fuzzy
+msgid "Collapse sidebar"
+msgstr "Todos os feeds"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr ""
+
+#: help/main.php:41
+#, fuzzy
+msgid "Multiple articles actions"
+msgstr "Favoritos"
+
+#: help/main.php:44
+#, fuzzy
+msgid "Select all articles"
+msgstr "Favoritos"
+
+#: help/main.php:45
+#, fuzzy
+msgid "Select unread articles"
+msgstr "Favoritos"
+
+#: help/main.php:46
+#, fuzzy
+msgid "Invert article selection"
+msgstr "Favoritos"
+
+#: help/main.php:47
+#, fuzzy
+msgid "Deselect all articles"
+msgstr "Favoritos"
+
+#: help/main.php:50
+#, fuzzy
+msgid "Feed actions"
+msgstr "Ações do Feed:"
+
+#: help/main.php:53
+#, fuzzy
+msgid "Refresh active feed"
+msgstr "Favoritos"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr ""
+
+#: help/main.php:56 js/FeedTree.js:131
+#, fuzzy
+msgid "Edit feed"
+msgstr "Editar"
+
+#: help/main.php:57
+#, fuzzy
+msgid "Mark feed as read"
+msgstr "Marcar como lido"
+
+#: help/main.php:58
+#, fuzzy
+msgid "Reverse headlines order"
+msgstr "Remover as categorias selecionadas?"
+
+#: help/main.php:59
+#, fuzzy
+msgid "Mark all feeds as read"
+msgstr "Marcando todos os feeds como lidos..."
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr ""
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr ""
+
+#: help/main.php:66 include/functions.php:2011
+#, fuzzy
+msgid "All articles"
+msgstr "Favoritos"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr ""
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr ""
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr ""
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Núvem de tags"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
+
+#: help/main.php:79 help/prefs.php:41
+#, fuzzy
+msgid "Press any key to close this window."
 msgstr "Fechar esta janela"
 
-#: modules/opml_domdoc.php:60
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Adicionando a categoria <b>%s</b>."
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Meus Feeds"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Outros Feeds"
+
+#: help/prefs.php:19
+#, fuzzy
+msgid "Panel actions"
+msgstr "Ações do Feed:"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
 msgstr ""
 
-#: modules/opml_domdoc.php:128
-msgid "is already imported."
+#: help/prefs.php:24
+#, fuzzy
+msgid "Edit feed categories"
+msgstr "Editar categorias"
+
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Criar um usuário"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr ""
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
 msgstr ""
 
-#: modules/opml_domdoc.php:148
+#: mobile/login_form.php:28 include/login_form.php:161
 #, fuzzy
-msgid "OK"
-msgstr "OK!"
+msgid "Log in"
+msgstr "Login"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Login:"
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Senha:"
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
 msgstr ""
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Especial"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
 msgstr ""
 
-#: modules/popup-dialog.php:34
+#: mobile/prefs.php:24
 #, fuzzy
-msgid "Importing using DOMXML."
-msgstr "Importando OPML (usando a extensão DOMXML)..."
+msgid "Enable categories"
+msgstr "Editar categorias"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr ""
 
-#: modules/popup-dialog.php:40
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr ""
+
+#: mobile/prefs.php:29
+msgid "Browse categories like folders"
+msgstr ""
+
+#: mobile/prefs.php:35
+msgid "Show images in posts"
+msgstr ""
+
+#: mobile/prefs.php:40
+#, fuzzy
+msgid "Hide read articles and feeds"
+msgstr "Favoritos"
+
+#: mobile/prefs.php:45
+msgid "Sort feeds by unread count"
+msgstr ""
+
+#: classes/article.php:25
+#, fuzzy
+msgid "Article not found."
+msgstr "Feed não encontrado."
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Tópico de ajuda não encontrado."
+
+#: classes/dlg.php:26
 #, fuzzy
-msgid "Importing using DOMDocument."
-msgstr "Importando OPML (usando a extensão DOMDocument)…"
+msgid "Prepare data"
+msgstr "Salvar"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Fechar esta janela"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
 msgstr ""
-"A extensão DOMXML não foi encontrada. Ela é exigida para versões do PHP "
-"menores que 5."
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 #, fuzzy
 msgid "Create profile"
 msgstr "Criar um usuário"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 msgid "(active)"
 msgstr ""
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+#, fuzzy
+msgid "Default profile"
+msgstr "Padrão"
+
+#: classes/dlg.php:170
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Remover os filtros selecionados?"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 #, fuzzy
 msgid "Activate profile"
 msgstr "Remover os filtros selecionados?"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr ""
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 msgid "Your Public OPML URL is:"
 msgstr ""
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Gerar um outro endereço"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr ""
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 "process or contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr ""
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
 "contact instance owner."
 msgstr ""
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 #, fuzzy
 msgid "Place in category:"
 msgstr "Salvando categoria..."
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 #, fuzzy
 msgid "Available feeds"
 msgstr "Todos os feeds"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr ""
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Login"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr ""
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 #, fuzzy
 msgid "More feeds"
 msgstr "Removendo o Feed..."
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr ""
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Todos os feeds"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 #, fuzzy
 msgid "Feed archive"
 msgstr "Ações do Feed:"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 #, fuzzy
 msgid "limit:"
 msgstr "Limite:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Remover"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 msgid "match on"
 msgstr ""
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Conteúdo"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Título ou conteúdo"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr ""
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr ""
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 #, fuzzy
 msgid "after"
 msgstr "Atualizar"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr ""
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 #, fuzzy
 msgid "in"
 msgstr "Link"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 #, fuzzy
 msgid "Perform Action"
 msgstr "Ação"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 #, fuzzy
 msgid "Options"
 msgstr "Opções:"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Ativado"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr ""
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "Salvando categoria..."
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "Teste"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Criar"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Favoritos"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Removendo o Feed..."
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Salvar"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvem de tags"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 msgid "Match:"
 msgstr ""
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 msgid "Display entries"
 msgstr ""
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
+#: classes/dlg.php:821 classes/feeds.php:152
 #, fuzzy
-msgid "Multiple articles"
-msgstr "Favoritos"
+msgid "View as RSS"
+msgstr "Editar Tags"
 
-#: modules/popup-dialog.php:834
-msgid "From:"
+#: classes/dlg.php:832
+msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:843
-msgid "To:"
+#: classes/dlg.php:860
+#, php-format
+msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
-#: modules/popup-dialog.php:856
+#: classes/dlg.php:870 classes/pref_users.php:383
 #, fuzzy
-msgid "Subject:"
-msgstr "Selecione:"
-
-#: modules/popup-dialog.php:872
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Mudar E-mail"
+msgid "Details"
+msgstr "Diariamente"
 
-#: modules/popup-dialog.php:881
-#, fuzzy
-msgid "View as RSS"
-msgstr "Editar Tags"
-
-#: modules/popup-dialog.php:892
-msgid "You can view this feed as RSS using the following URL:"
-msgstr ""
-
-#: modules/popup-dialog.php:919
-#, php-format
-msgid "New version of Tiny Tiny RSS is available (%s)."
-msgstr ""
-
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
-#, fuzzy
-msgid "Details"
-msgstr "Diariamente"
-
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr ""
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1218,1357 +1252,1845 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr ""
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr ""
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "Nível de acesso:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "Nível de acesso:"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr ""
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "Gerar um outro endereço"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 #, fuzzy
 msgid "Create link"
 msgstr "Criar"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:4
-msgid "Check to enable field"
+#: classes/feeds.php:94 include/functions.php:3346
+msgid "Visit the website"
+msgstr ""
+
+#: classes/feeds.php:107
+#, fuzzy
+msgid "View as RSS feed"
+msgstr "Todos os feeds"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Selecione:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Todos"
+
+#: classes/feeds.php:118
+#, fuzzy
+msgid "Invert"
+msgstr "(Inverso)"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Nenhum"
+
+#: classes/feeds.php:127
+#, fuzzy
+msgid "Selection toggle:"
+msgstr "Seleção"
+
+#: classes/feeds.php:133
+#, fuzzy
+msgid "Selection:"
+msgstr "Seleção"
+
+#: classes/feeds.php:138
+#, fuzzy
+msgid "Archive"
+msgstr "Feed não encontrado."
+
+#: classes/feeds.php:140
+msgid "Move back"
+msgstr ""
+
+#: classes/feeds.php:141
+#, fuzzy
+msgid "Delete"
+msgstr "Padrão"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+#, fuzzy
+msgid "Forward by email"
+msgstr "Favoritos"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "Feed:"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Feed não encontrado."
+
+#: classes/feeds.php:446 classes/feeds.php:528
+#, fuzzy
+msgid "mark as read"
+msgstr "Marcar como lido"
+
+#: classes/feeds.php:625 include/functions.php:3318
+#, fuzzy
+msgid "Originally from:"
+msgstr "Favoritos"
+
+#: classes/feeds.php:685 include/functions.php:3275
+#, fuzzy
+msgid "Edit tags for this article"
+msgstr "Favoritos"
+
+#: classes/feeds.php:712 include/functions.php:3285
+msgid "Open article in new tab"
 msgstr ""
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
+#: classes/feeds.php:723 include/functions.php:3301
+#, fuzzy
+msgid "Close article"
+msgstr "Favoritos"
+
+#: classes/feeds.php:744
+#, fuzzy
+msgid "No unread articles found to display."
+msgstr "Sem Feeds para exibir."
+
+#: classes/feeds.php:747
+#, fuzzy
+msgid "No updated articles found to display."
+msgstr "Sem Feeds para exibir."
+
+#: classes/feeds.php:750
+#, fuzzy
+msgid "No starred articles found to display."
+msgstr "Sem Feeds para exibir."
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+
+#: classes/feeds.php:756
+#, fuzzy
+msgid "No articles found to display."
+msgstr "Sem Feeds para exibir."
+
+#: classes/feeds.php:771 include/functions.php:4486
 #, fuzzy, php-format
-msgid "(%d feeds)"
-msgstr "Editar"
+msgid "Feeds last updated at %s"
+msgstr "Atualizar"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
-#: modules/pref-feeds.php:96
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: modules/pref-feeds.php:306
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr ""
+
+#: classes/mail_button.php:52
+#, fuzzy
+msgid "Multiple articles"
+msgstr "Favoritos"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr ""
+
+#: classes/mail_button.php:82
+msgid "To:"
+msgstr ""
+
+#: classes/mail_button.php:95
+#, fuzzy
+msgid "Subject:"
+msgstr "Selecione:"
+
+#: classes/mail_button.php:111
+#, fuzzy
+msgid "Send e-mail"
+msgstr "Mudar E-mail"
+
+#: classes/note_button.php:7 js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Editar Tags"
+
+#: classes/pref_feeds.php:11
+msgid "Check to enable field"
+msgstr ""
+
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
+#, fuzzy, php-format
+msgid "(%d feeds)"
+msgstr "Editar"
+
+#: classes/pref_feeds.php:299
 #, fuzzy
 msgid "Feed Title"
 msgstr "Título"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr ""
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 msgid "Hide from Popular feeds"
 msgstr ""
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr ""
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr ""
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:472
-msgid "Cache images locally (SimplePie only)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 #, fuzzy
 msgid "Mark updated articles as unread"
 msgstr "Marcando todos os feeds como lidos..."
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr ""
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 #, fuzzy
 msgid "Icon"
 msgstr "Ação"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 #, fuzzy
 msgid "Resubscribe to push updates"
 msgstr "Removendo o Feed..."
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr ""
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Sem Feeds para exibir."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Removendo o Feed..."
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "A categoria <b>$%s</b> já existe na base de dados."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Criar categoria"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr ""
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Remover as categorias selecionadas?"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 #, fuzzy
 msgid "Feeds with errors"
 msgstr "Editor de Feed"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "Editar"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 #, fuzzy
 msgid "Select"
 msgstr "Selecione:"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Todos"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Nenhum"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr ""
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 #, fuzzy
 msgid "Edit selected feeds"
 msgstr "Removendo filtros selecionados…"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 #, fuzzy
 msgid "Reset sort order"
 msgstr "Remover as categorias selecionadas?"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 #, fuzzy
 msgid "Categories"
 msgstr "Categoria:"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Editar categorias"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 #, fuzzy
 msgid "More actions..."
 msgstr "Ações..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 #, fuzzy
 msgid "Clear feed data"
 msgstr "Salvando o Feed..."
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 #, fuzzy
 msgid "Rescore articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Importar"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Exportar OPML"
+msgid "Import my OPML"
+msgstr "Importando OPML (usando a extensão DOMXML)..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr ""
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 msgid "Include settings"
 msgstr ""
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Publicado"
+msgid "Export OPML"
+msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr ""
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
+#: classes/pref_feeds.php:1439
+msgid "Display published OPML URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1442
+#, fuzzy
+msgid "Article archive"
+msgstr "Feed não encontrado."
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
+
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "Exportar OPML"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Importar"
+
+#: classes/pref_feeds.php:1469
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Informações do Feed:"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Removendo o Feed..."
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr ""
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Remover os filtros selecionados?"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+msgid "Display URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 #, fuzzy
 msgid "Twitter"
 msgstr "Título"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Salvando o Feed..."
 
-#: modules/pref-feeds.php:1654
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Favoritos"
-
-#: modules/pref-feeds.php:1678
-#, fuzzy
-msgid "No feeds found."
-msgstr "Sem Feeds para exibir."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Sem Feeds para exibir."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr ""
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr ""
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Editar"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 #, fuzzy
 msgid "Your access level is insufficient to open this tab."
 msgstr "Seu nível de acesso é insuficiente para executar esse script."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Removendo o Feed..."
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 #, fuzzy
 msgid "Caption"
 msgstr "Opções:"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 #, fuzzy
 msgid "Colors"
 msgstr "Fechar"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Foreground:"
 msgstr ""
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Background:"
 msgstr ""
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr ""
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr ""
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 #, fuzzy
 msgid "Clear colors"
 msgstr "Favoritos"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "A senha antiga não pode ser vazia."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "A nova senha não pode ser vazia."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "As senhas informadas não conferem."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr ""
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "Senha antiga incorreta"
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr ""
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr ""
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr ""
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 #, fuzzy
 msgid "Access level"
 msgstr "Nível de acesso:"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 #, fuzzy
 msgid "Save data"
 msgstr "Salvar"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 #, fuzzy
 msgid "Your password is at default value, please change it."
 msgstr ""
 "Sua senha é a padrão, \n"
 "\t\t\t\t\t\tvocê deve mudá-la."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Senha nova"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Mudar senha"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Selecionar o tema"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Sim"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "Não"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Salvar configuração"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr ""
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Detalhes do usuário"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 #, fuzzy
 msgid "User not found"
 msgstr "Feed não encontrado."
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr ""
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 #, fuzzy
 msgid "Last logged in"
 msgstr "Último Login"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr ""
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr ""
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 #, fuzzy
 msgid "User Editor"
 msgstr "Editor de usuário"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 #, fuzzy
 msgid "Access level: "
 msgstr "Nível de acesso:"
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 #, fuzzy
 msgid "Change password to"
 msgstr "Mudar senha"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 #, fuzzy
 msgid "E-mail: "
 msgstr "E-mail:"
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "Alterada a senha do usuário <b>%s</b>."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Adicionado usuário  <b>%s</b> com senha <b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Não pode criar o usuário <b>%s</b>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "O usuário <b>%s</b> já existe."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "Alterada a senha do usuário <b>%s</b>\n"
 "\t\t\t\t\t para <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Adicionando a categoria <b>%s</b>."
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Criar um usuário"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr ""
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Nível de acesso"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Último Login"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 #, fuzzy
 msgid "No users defined."
 msgstr "Nenhum usuário foi selecionado."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr ""
 
-#: help/2.php:1
-#, fuzzy
-msgid "Content filtering"
-msgstr "Filtrando o conteúdo"
+#: classes/readitlater_button.php:7
+msgid "Read it later"
+msgstr ""
 
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "sem tags"
+
+#: classes/rpc.php:741
+msgid "Your request could not be completed."
 msgstr ""
 
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
 msgstr ""
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
+#: classes/rpc.php:753
+msgid "Category update has been scheduled."
 msgstr ""
 
-#: help/2.php:9
-msgid "See also:"
+#: classes/rpc.php:766
+msgid "Can't update this kind of feed."
 msgstr ""
 
-#: help/3.php:1 help/4.php:1
+#: classes/share_button.php:7
 #, fuzzy
-msgid "Keyboard Shortcuts"
-msgstr "&nbsp;&nbsp;Criar filtro"
+msgid "Share by URL"
+msgstr "Favoritos"
 
-#: help/3.php:5
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr ""
+
+#: classes/tweet_button.php:7
 #, fuzzy
-msgid "Navigation"
-msgstr "Salvar configuração"
+msgid "Share on Twitter"
+msgstr "Título"
 
-#: help/3.php:8
-msgid "Move between feeds"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: help/3.php:9
-#, fuzzy
-msgid "Move between articles"
-msgstr "Favoritos"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr ""
 
-#: help/3.php:10
+#: include/functions.php:2013
 #, fuzzy
-msgid "Show search dialog"
+msgid "Archived articles"
 msgstr "Favoritos"
 
-#: help/3.php:13
+#: include/functions.php:3109 js/viewfeed.js:1945
 #, fuzzy
-msgid "Active article actions"
+msgid "Click to play"
 msgstr "Favoritos"
 
-#: help/3.php:16
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr ""
+
+#: include/functions.php:3236
 #, fuzzy
-msgid "Toggle starred"
-msgstr "Marcar como favorito"
+msgid " - "
+msgstr " - por "
+
+#: include/functions.php:4061
+msgid "(edit note)"
+msgstr ""
+
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "Nenhum feed foi selecionado."
 
-#: help/3.php:17
+#: include/functions.php:4660
 #, fuzzy
-msgid "Toggle published"
-msgstr "Publicado"
+msgid "unknown type"
+msgstr "Erro desconhecido"
 
-#: help/3.php:18
-msgid "Toggle unread"
+#: include/functions.php:4700
+msgid "Attachment:"
 msgstr ""
 
-#: help/3.php:19
+#: include/functions.php:4702
 #, fuzzy
-msgid "Edit tags"
-msgstr "Editar Tags"
+msgid "Attachments:"
+msgstr "Conteúdo"
 
-#: help/3.php:20
+#: include/functions.php:5091
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "Favoritos"
+
+#: include/functions.php:5115
 #, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Remover os filtros selecionados?"
+msgid "No feeds found."
+msgstr "Sem Feeds para exibir."
+
+#: include/functions.php:5161
+msgid "Could not import: incorrect schema version."
+msgstr ""
+
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
+
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
+
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:21
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Título ou Conteúdo"
+
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Link"
+
+#: include/localized_schema.php:7
 #, fuzzy
-msgid "Dismiss read articles"
+msgid "Article Date"
+msgstr "Feed não encontrado."
+
+#: include/localized_schema.php:9
+#, fuzzy
+msgid "Delete article"
 msgstr "Favoritos"
 
-#: help/3.php:22
-msgid "Open article in new window"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Marcar como favorito"
+
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
 msgstr ""
 
-#: help/3.php:23
+#: include/localized_schema.php:13
 #, fuzzy
-msgid "Mark articles below/above active one as read"
-msgstr "Marcando todos os feeds como lidos..."
+msgid "Assign tags"
+msgstr "sem tags"
 
-#: help/3.php:24
-msgid "Scroll article content"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr ""
+
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
+
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Geral"
+
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Interface"
+
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Avançado"
+
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+
+#: include/localized_schema.php:25
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr ""
+
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr ""
+
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
+
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
 msgstr ""
 
-#: help/3.php:25
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
+
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr ""
+
+#: include/localized_schema.php:33
 #, fuzzy
-msgid "Email article"
-msgstr "Favoritos"
+msgid "Default interval between feed updates"
+msgstr "Padrão"
 
-#: help/3.php:29 help/4.php:30
+#: include/localized_schema.php:34
 #, fuzzy
-msgid "Other actions"
-msgstr "Outras ações:"
+msgid "Amount of articles to display at once"
+msgstr "Sem Feeds para exibir."
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Permitir publicações duplicadas"
+
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
 msgstr ""
 
-#: help/3.php:35
-#, fuzzy
-msgid "Collapse sidebar"
-msgstr "Todos os feeds"
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr ""
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Formato de data curto"
+
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Formato de data longo"
+
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr ""
+
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr ""
+
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr ""
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr ""
+
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr ""
+
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
 msgstr ""
 
-#: help/3.php:41
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Confirme marcando o Feed como lido"
+
+#: include/localized_schema.php:47
 #, fuzzy
-msgid "Multiple articles actions"
-msgstr "Favoritos"
+msgid "Automatically mark articles as read"
+msgstr "Marcando todos os feeds como lidos..."
 
-#: help/3.php:44
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr ""
+
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr ""
+
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr ""
+
+#: include/localized_schema.php:51
 #, fuzzy
-msgid "Select all articles"
-msgstr "Favoritos"
+msgid "Mark articles in e-mail digest as read"
+msgstr "Marcando todos os feeds como lidos..."
+
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr ""
+
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr ""
+
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr ""
 
-#: help/3.php:45
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr ""
+
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr ""
+
+#: include/localized_schema.php:57
+msgid "Enable external API"
+msgstr ""
+
+#: include/localized_schema.php:58
+msgid "User timezone"
+msgstr ""
+
+#: include/localized_schema.php:59
+msgid "Sort headlines by feed date"
+msgstr ""
+
+#: include/localized_schema.php:60 js/prefs.js:1762
+msgid "Customize stylesheet"
+msgstr ""
+
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr ""
+
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Língua:"
+
+#: include/login_form.php:148
 #, fuzzy
-msgid "Select unread articles"
-msgstr "Favoritos"
+msgid "Profile:"
+msgstr "Arquivo:"
 
-#: help/3.php:46
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr ""
+
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
 #, fuzzy
-msgid "Invert article selection"
-msgstr "Favoritos"
+msgid "Mark all articles in %s as read?"
+msgstr "Marcando todos os feeds como lidos..."
 
-#: help/3.php:47
+#: js/digest.js:69
 #, fuzzy
-msgid "Deselect all articles"
-msgstr "Favoritos"
+msgid "Mark %d displayed articles as read?"
+msgstr "Marcando todos os feeds como lidos..."
 
-#: help/3.php:50
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
 #, fuzzy
-msgid "Feed actions"
-msgstr "Ações do Feed:"
+msgid "Unstar article"
+msgstr "Favoritos"
 
-#: help/3.php:53
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
 #, fuzzy
-msgid "Refresh active feed"
+msgid "Star article"
 msgstr "Favoritos"
 
-#: help/3.php:56
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
 #, fuzzy
-msgid "Edit feed"
-msgstr "Editar"
+msgid "Unpublish article"
+msgstr "Publicado"
 
-#: help/3.php:57
+#: js/digest.js:265
 #, fuzzy
-msgid "Mark feed as read"
-msgstr "Marcar como lido"
+msgid "Original article"
+msgstr "Favoritos"
 
-#: help/3.php:58
+#: js/digest.js:267
 #, fuzzy
-msgid "Reverse headlines order"
-msgstr "Remover as categorias selecionadas?"
+msgid "Close this panel"
+msgstr "Fechar esta janela"
 
-#: help/3.php:59
+#: js/digest.js:290
 #, fuzzy
-msgid "Mark all feeds as read"
-msgstr "Marcando todos os feeds como lidos..."
+msgid "Error: unable to load article."
+msgstr "Favoritos"
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr ""
+#: js/digest.js:444
+#, fuzzy
+msgid "Click to expand article."
+msgstr "Favoritos"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
+#: js/digest.js:519
+msgid "%d more..."
 msgstr ""
 
-#: help/3.php:66
+#: js/digest.js:526
 #, fuzzy
-msgid "All articles"
+msgid "No unread feeds."
 msgstr "Favoritos"
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr ""
+#: js/digest.js:628
+#, fuzzy
+msgid "Load more..."
+msgstr "Salvando o Feed..."
 
-#: help/3.php:68
-msgid "Starred articles"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr ""
-
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Núvem de tags"
+#: js/FeedTree.js:137
+#, fuzzy
+msgid "Update feed"
+msgstr "Favoritos"
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: help/3.php:79 help/4.php:41
+#: js/functions.js:647
 #, fuzzy
-msgid "Press any key to close this window."
-msgstr "Fechar esta janela"
+msgid "Date syntax appears to be correct:"
+msgstr "Senha antiga incorreta"
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Meus Feeds"
+#: js/functions.js:650
+#, fuzzy
+msgid "Date syntax is incorrect."
+msgstr "Senha antiga incorreta"
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Outros Feeds"
+#: js/functions.js:777
+#, fuzzy
+msgid "Remove stored feed icon?"
+msgstr "Remover as categorias selecionadas?"
 
-#: help/4.php:19
+#: js/functions.js:809
 #, fuzzy
-msgid "Panel actions"
-msgstr "Ações do Feed:"
+msgid "Please select an image file to upload."
+msgstr "Por favor selecione  um feed."
 
-#: help/4.php:23
-msgid "Top 25 feeds"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: help/4.php:24
+#: js/functions.js:828
 #, fuzzy
-msgid "Edit feed categories"
-msgstr "Editar categorias"
+msgid "Please enter label caption:"
+msgstr "Último Login"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
 msgstr ""
 
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
+#: js/functions.js:875
+#, fuzzy
+msgid "Subscribe to Feed"
+msgstr "Removendo o Feed..."
 
-#: mobile/login_form.php:28
+#: js/functions.js:883
 #, fuzzy
-msgid "Log in"
-msgstr "Login"
+msgid "Subscribing to feed..."
+msgstr "Removendo o Feed..."
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Login:"
+#: js/functions.js:901
+#, fuzzy
+msgid "Subscribed to %s"
+msgstr "Removendo o Feed..."
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Senha:"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr ""
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Especial"
+#: js/functions.js:945
+msgid "Couldn't download the specified URL."
+msgstr ""
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
+#: js/functions.js:948
+msgid "You are already subscribed to this feed."
 msgstr ""
 
-#: mobile/prefs.php:24
+#: js/functions.js:977
 #, fuzzy
-msgid "Enable categories"
-msgstr "Editar categorias"
+msgid "Create Filter"
+msgstr "Criar um usuário"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
+#: js/functions.js:987 js/prefs.js:165
+msgid "Filter Test Results"
 msgstr ""
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
 msgstr ""
 
-#: mobile/prefs.php:29
-msgid "Browse categories like folders"
+#: js/functions.js:1066 js/tt-rss.js:395
+#, fuzzy
+msgid "Unsubscribe from %s?"
+msgstr "Removendo o Feed..."
+
+#: js/functions.js:1173
+#, fuzzy
+msgid "Please enter category title:"
+msgstr "Salvando categoria..."
+
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: mobile/prefs.php:35
-msgid "Show images in posts"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: mobile/prefs.php:40
+#: js/functions.js:1400
 #, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "Favoritos"
+msgid "Edit Feed"
+msgstr "Editar"
 
-#: mobile/prefs.php:45
-msgid "Sort feeds by unread count"
+#: js/functions.js:1438
+#, fuzzy
+msgid "More Feeds"
+msgstr "Removendo o Feed..."
+
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "Nenhum feed foi selecionado."
+
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
 msgstr ""
 
+#: js/functions.js:1580
 #, fuzzy
-#~ msgid "Archived articles"
-#~ msgstr "Favoritos"
+msgid "Feeds with update errors"
+msgstr "Atualizar"
 
-#~ msgid "Select:"
-#~ msgstr "Selecione:"
+#: js/functions.js:1591 js/prefs.js:1229
+#, fuzzy
+msgid "Remove selected feeds?"
+msgstr "Remover os filtros selecionados?"
 
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
 #, fuzzy
-#~ msgid "Invert"
-#~ msgstr "(Inverso)"
+msgid "No articles are selected."
+msgstr "Nenhum filtro foi selecionado."
 
+#: js/mail_button.js:21
 #, fuzzy
-#~ msgid "Selection toggle:"
-#~ msgstr "Seleção"
+msgid "Forward article by email"
+msgstr "Favoritos"
 
+#: js/PrefFilterTree.js:32
 #, fuzzy
-#~ msgid "Selection:"
-#~ msgstr "Seleção"
+msgid "Inverse"
+msgstr "(Inverso)"
 
+#: js/prefs.js:64
 #, fuzzy
-#~ msgid "Delete"
-#~ msgstr "Padrão"
+msgid "Please enter login:"
+msgstr "Último Login"
 
-#~ msgid "Feed:"
-#~ msgstr "Feed:"
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr ""
 
+#: js/prefs.js:134
 #, fuzzy
-#~ msgid "View as RSS feed"
-#~ msgstr "Todos os feeds"
+msgid "Edit Filter"
+msgstr "Arquivo:"
 
+#: js/prefs.js:138
 #, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "Favoritos"
+msgid "Remove filter %s?"
+msgstr "Remover os filtros selecionados?"
 
+#: js/prefs.js:272
 #, fuzzy
-#~ msgid " - "
-#~ msgstr " - por "
+msgid "Remove selected labels?"
+msgstr "Remover os filtros selecionados?"
 
+#: js/prefs.js:288 js/prefs.js:1433
 #, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "Editar Tags"
+msgid "No labels are selected."
+msgstr "Nenhum filtro foi selecionado."
 
-#, fuzzy
-#~ msgid "Close this panel"
-#~ msgstr "Fechar esta janela"
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
-#, fuzzy
-#~ msgid "mark as read"
-#~ msgstr "Marcar como lido"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "Nenhum usuário foi selecionado."
 
-#, fuzzy
-#~ msgid "No unread articles found to display."
-#~ msgstr "Sem Feeds para exibir."
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Remover os filtros selecionados?"
 
-#, fuzzy
-#~ msgid "No updated articles found to display."
-#~ msgstr "Sem Feeds para exibir."
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "Nenhum filtro foi selecionado."
 
+#: js/prefs.js:371
 #, fuzzy
-#~ msgid "No starred articles found to display."
-#~ msgstr "Sem Feeds para exibir."
+msgid "Unsubscribe from selected feeds?"
+msgstr "Removendo o Feed..."
+
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Por favor selecione somente um feed"
 
+#: js/prefs.js:411
 #, fuzzy
-#~ msgid "No articles found to display."
-#~ msgstr "Sem Feeds para exibir."
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Remover os filtros selecionados?"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Remove:"
-#~ msgstr "Remover"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "O campo de Login não pode ser vazio."
 
-#~ msgid "No feed selected."
-#~ msgstr "Nenhum feed foi selecionado."
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Por favor selecione somente um usuário."
 
+#: js/prefs.js:530
 #, fuzzy
-#~ msgid "unknown type"
-#~ msgstr "Erro desconhecido"
+msgid "Reset password of selected user?"
+msgstr "Removendo usuários selecionados…"
 
-#~ msgid "Language:"
-#~ msgstr "Língua:"
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Por favor selecione somente um filtro."
 
+#: js/prefs.js:652
 #, fuzzy
-#~ msgid "Profile:"
-#~ msgstr "Arquivo:"
+msgid "Edit Multiple Feeds"
+msgstr "Editor de Feed"
 
+#: js/prefs.js:676
 #, fuzzy
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Remover as categorias selecionadas?"
+msgid "Save changes to selected feeds?"
+msgstr "Remover os filtros selecionados?"
 
+#: js/prefs.js:768
 #, fuzzy
-#~ msgid "Update all feeds"
-#~ msgstr "Favoritos"
+msgid "OPML Import"
+msgstr "Importar"
 
+#: js/prefs.js:795
 #, fuzzy
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Marcando todos os feeds como lidos..."
+msgid "Please choose an OPML file first."
+msgstr "Por favor selecione somente um filtro."
 
+#: js/prefs.js:811
 #, fuzzy
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "Marcando todos os feeds como lidos..."
+msgid "Please choose the file first."
+msgstr "Por favor selecione somente um filtro."
 
+#: js/prefs.js:938
 #, fuzzy
-#~ msgid "Star article"
-#~ msgstr "Favoritos"
+msgid "Reset to defaults?"
+msgstr "Usar o padrão"
 
+#: js/prefs.js:1149
 #, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Favoritos"
+msgid "Feed Categories"
+msgstr "Categoria:"
 
-#, fuzzy
-#~ msgid "Click to expand article."
-#~ msgstr "Favoritos"
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Remover as categorias selecionadas?"
 
-#, fuzzy
-#~ msgid "No unread feeds."
-#~ msgstr "Favoritos"
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "Nenhuma categoria foi selecionada."
 
+#: js/prefs.js:1218
 #, fuzzy
-#~ msgid "Update feed"
-#~ msgstr "Favoritos"
+msgid "Feeds without recent updates"
+msgstr "Atualizar"
 
-#, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "Senha antiga incorreta"
+#: js/prefs.js:1267
+msgid "Replace current OPML publishing address with a new one?"
+msgstr ""
 
+#: js/prefs.js:1376
 #, fuzzy
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "Senha antiga incorreta"
+msgid "Rescore articles in selected feeds?"
+msgstr "Remover os filtros selecionados?"
 
-#, fuzzy
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Remover as categorias selecionadas?"
+#: js/prefs.js:1399
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Por favor selecione  um feed."
+#: js/prefs.js:1419
+msgid "Reset selected labels to default colors?"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Removendo o Feed..."
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Subscribed to %s"
-#~ msgstr "Removendo o Feed..."
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
 
+#: js/prefs.js:1483
 #, fuzzy
-#~ msgid "Create Filter"
-#~ msgstr "Criar um usuário"
+msgid "No profiles are selected."
+msgstr "Nenhum filtro foi selecionado."
 
+#: js/prefs.js:1491 js/prefs.js:1544
 #, fuzzy
-#~ msgid "Please enter category title:"
-#~ msgstr "Salvando categoria..."
+msgid "Activate selected profile?"
+msgstr "Remover os filtros selecionados?"
 
+#: js/prefs.js:1507 js/prefs.js:1560
 #, fuzzy
-#~ msgid "Edit Feed"
-#~ msgstr "Editar"
+msgid "Please choose a profile to activate."
+msgstr "Por favor selecione somente um filtro."
 
-#, fuzzy
-#~ msgid "More Feeds"
-#~ msgstr "Removendo o Feed..."
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#~ msgid "No feeds are selected."
-#~ msgstr "Nenhum feed foi selecionado."
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
 
+#: js/prefs.js:1670
 #, fuzzy
-#~ msgid "Feeds with update errors"
-#~ msgstr "Atualizar"
+msgid "Label Editor"
+msgstr "Editor de Feed"
 
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
+
+#: js/prefs.js:1804
 #, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Remover os filtros selecionados?"
+msgid "Link Instance"
+msgstr "Editar Tags"
 
+#: js/prefs.js:1855
 #, fuzzy
-#~ msgid "Inverse"
-#~ msgstr "(Inverso)"
+msgid "Edit Instance"
+msgstr "Editar Tags"
 
+#: js/prefs.js:1904
 #, fuzzy
-#~ msgid "Please enter login:"
-#~ msgstr "Último Login"
+msgid "Remove selected instances?"
+msgstr "Remover os filtros selecionados?"
 
+#: js/prefs.js:1921 js/prefs.js:1933
 #, fuzzy
-#~ msgid "Edit Filter"
-#~ msgstr "Arquivo:"
+msgid "No instances are selected."
+msgstr "Nenhum filtro foi selecionado."
 
+#: js/prefs.js:1938
 #, fuzzy
-#~ msgid "Remove filter %s?"
-#~ msgstr "Remover os filtros selecionados?"
+msgid "Please select only one instance."
+msgstr "Por favor selecione somente um filtro."
 
-#~ msgid "No users are selected."
-#~ msgstr "Nenhum usuário foi selecionado."
+#: js/prefs.js:1973
+#, fuzzy
+msgid "Export Data"
+msgstr "Exportar OPML"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Remover os filtros selecionados?"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "No filters are selected."
-#~ msgstr "Nenhum filtro foi selecionado."
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "Importar"
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Por favor selecione somente um feed"
+#: js/share_button.js:10
+#, fuzzy
+msgid "Share article by URL"
+msgstr "Favoritos"
 
+#: js/tt-rss.js:146
 #, fuzzy
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr "Remover os filtros selecionados?"
+msgid "Mark all articles as read?"
+msgstr "Marcando todos os feeds como lidos..."
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "O campo de Login não pode ser vazio."
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr ""
 
-#~ msgid "Please select only one user."
-#~ msgstr "Por favor selecione somente um usuário."
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#, fuzzy
+msgid "Please select some feed first."
+msgstr "Por favor selecione somente um feed"
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Por favor selecione somente um filtro."
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr ""
 
+#: js/tt-rss.js:602
 #, fuzzy
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Editor de Feed"
+msgid "Rescore articles in %s?"
+msgstr "Favoritos"
 
-#, fuzzy
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Remover os filtros selecionados?"
+#: js/tt-rss.js:1083
+msgid "New version available!"
+msgstr ""
 
+#: js/viewfeed.js:873
 #, fuzzy
-#~ msgid "OPML Import"
-#~ msgstr "Importar"
+msgid "Mark all visible articles in %s as read?"
+msgstr "Marcando todos os feeds como lidos..."
 
+#: js/viewfeed.js:901
 #, fuzzy
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Por favor selecione somente um filtro."
+msgid "Delete %d selected articles in %s?"
+msgstr "Favoritos"
 
+#: js/viewfeed.js:903
 #, fuzzy
-#~ msgid "Feed Categories"
-#~ msgstr "Categoria:"
+msgid "Delete %d selected articles?"
+msgstr "Remover os filtros selecionados?"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Remover as categorias selecionadas?"
+#: js/viewfeed.js:945
+#, fuzzy
+msgid "Archive %d selected articles in %s?"
+msgstr "Favoritos"
 
-#~ msgid "No categories are selected."
-#~ msgstr "Nenhuma categoria foi selecionada."
+#: js/viewfeed.js:948
+#, fuzzy
+msgid "Move %d archived articles back?"
+msgstr "Favoritos"
 
+#: js/viewfeed.js:992
 #, fuzzy
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Atualizar"
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Marcando todos os feeds como lidos..."
 
+#: js/viewfeed.js:1016
 #, fuzzy
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "Remover os filtros selecionados?"
+msgid "Edit article Tags"
+msgstr "Editar Tags"
 
+#: js/viewfeed.js:1173
 #, fuzzy
-#~ msgid "No profiles are selected."
-#~ msgstr "Nenhum filtro foi selecionado."
+msgid "No article is selected."
+msgstr "Nenhum filtro foi selecionado."
 
+#: js/viewfeed.js:1208
 #, fuzzy
-#~ msgid "Activate selected profile?"
-#~ msgstr "Remover os filtros selecionados?"
+msgid "No articles found to mark"
+msgstr "Sem Feeds para exibir."
 
+#: js/viewfeed.js:1210
 #, fuzzy
-#~ msgid "Label Editor"
-#~ msgstr "Editor de Feed"
+msgid "Mark %d article(s) as read?"
+msgstr "Marcando todos os feeds como lidos..."
 
+#: js/viewfeed.js:1374
 #, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "Editar Tags"
+msgid "Loading..."
+msgstr "Salvando o Feed..."
 
+#: js/viewfeed.js:1848
 #, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "Remover os filtros selecionados?"
+msgid "Open original article"
+msgstr "Favoritos"
+
+#: js/viewfeed.js:1854
+msgid "View in a tt-rss tab"
+msgstr ""
 
+#: js/viewfeed.js:1862
 #, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "Nenhum filtro foi selecionado."
+msgid "Mark above as read"
+msgstr "Marcar como lido"
 
+#: js/viewfeed.js:1868
 #, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "Por favor selecione somente um filtro."
+msgid "Mark below as read"
+msgstr "Marcar como lido"
 
+#: js/viewfeed.js:1914
 #, fuzzy
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Marcando todos os feeds como lidos..."
+msgid "Remove label"
+msgstr "Remover"
 
+#: js/viewfeed.js:1938
 #, fuzzy
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "Favoritos"
+msgid "Playing..."
+msgstr "Salvando o Feed..."
 
+#: js/viewfeed.js:1939
 #, fuzzy
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "Favoritos"
+msgid "Click to pause"
+msgstr "Favoritos"
 
 #, fuzzy
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "Remover os filtros selecionados?"
+#~ msgid "Help"
+#~ msgstr "Olá,"
 
 #, fuzzy
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "Favoritos"
+#~ msgid "Importing using DOMXML."
+#~ msgstr "Importando OPML (usando a extensão DOMXML)..."
 
 #, fuzzy
-#~ msgid "Edit article Tags"
-#~ msgstr "Editar Tags"
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "Importando OPML (usando a extensão DOMDocument)…"
+
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "A extensão DOMXML não foi encontrada. Ela é exigida para versões do PHP "
+#~ "menores que 5."
 
 #, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "Salvando o Feed..."
+#~ msgid "Publish"
+#~ msgstr "Publicado"
+
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "Alterada a senha do usuário <b>%s</b>."
 
 #, fuzzy
-#~ msgid "Open original article"
-#~ msgstr "Favoritos"
+#~ msgid "Content filtering"
+#~ msgstr "Filtrando o conteúdo"
 
 #, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "Remover"
+#~ msgid "Add category..."
+#~ msgstr "Adicionando o Feed..."
+
+#~ msgid "description"
+#~ msgstr "descrição"
+
+#~ msgid "short_desc"
+#~ msgstr "short_desc"
 
 #, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "Salvando o Feed..."
+#~ msgid "Remove:"
+#~ msgstr "Remover"
 
 #, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "Favoritos"
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Remover as categorias selecionadas?"
 
 #, fuzzy
-#~ msgid "Share article by URL"
+#~ msgid "Update all feeds"
 #~ msgstr "Favoritos"
 
 #, fuzzy
@@ -2579,20 +3101,12 @@ msgstr ""
 #~ msgid "Click to expand article"
 #~ msgstr "Favoritos"
 
-#, fuzzy
-#~ msgid "Unable to load article."
-#~ msgstr "Favoritos"
-
 #~ msgid "Importing OPML (using DOMXML extension)..."
 #~ msgstr "Importando OPML (usando a extensão DOMXML)..."
 
 #~ msgid "Importing OPML (using DOMDocument extension)..."
 #~ msgstr "Importando OPML (usando a extensão DOMDocument)…"
 
-#, fuzzy
-#~ msgid "No profiles selected."
-#~ msgstr "Nenhum filtro foi selecionado."
-
 #~ msgid "Unknown error"
 #~ msgstr "Erro desconhecido"
 
@@ -2604,23 +3118,6 @@ msgstr ""
 #~ msgid "Fatal Exception"
 #~ msgstr "Erro Fatal"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Adicionando o Feed..."
-
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Adicionando o Feed..."
-
-#~ msgid "General"
-#~ msgstr "Geral"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Advanced"
-#~ msgstr "Avançado"
-
 #, fuzzy
 #~ msgid "Feed Browser"
 #~ msgstr "Editor de Feed"
@@ -2712,20 +3209,12 @@ msgstr ""
 #~ msgid "No feeds to display."
 #~ msgstr "Sem Feeds para exibir."
 
-#, fuzzy
-#~ msgid "Published Articles"
-#~ msgstr "Publicado"
-
 #~ msgid "Remove selected users?"
 #~ msgstr "Remover os usuários selecionados?"
 
 #~ msgid "Adding feed..."
 #~ msgstr "Adicionando o Feed..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "Adicionando o Feed..."
-
 #~ msgid "Adding user..."
 #~ msgstr "Adicionando o usuário…"
 
@@ -2757,10 +3246,6 @@ msgstr ""
 #~ msgid "Clearing selected feed..."
 #~ msgstr "Removendo filtros selecionados…"
 
-#, fuzzy
-#~ msgid "comments"
-#~ msgstr "Conteúdo"
-
 #, fuzzy
 #~ msgid "Feed icon removed."
 #~ msgstr "Feed não encontrado."
@@ -2807,10 +3292,6 @@ msgstr ""
 #~ msgid "Rescore last 100 articles in selected feeds?"
 #~ msgstr "Remover os filtros selecionados?"
 
-#, fuzzy
-#~ msgid "Resetting password for selected user..."
-#~ msgstr "Removendo usuários selecionados…"
-
 #, fuzzy
 #~ msgid "Saving article tags..."
 #~ msgstr "Salvando categoria..."
@@ -2905,18 +3386,12 @@ msgstr ""
 #~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
 #~ msgstr "&nbsp;&nbsp;Criar filtro"
 
-#~ msgid "description"
-#~ msgstr "descrição"
-
 #~ msgid "filter_type_descr"
 #~ msgstr "filter_type_descr"
 
 #~ msgid "action_description"
 #~ msgstr "action_description"
 
-#~ msgid "short_desc"
-#~ msgstr "short_desc"
-
 #~ msgid "Please select only one category."
 #~ msgstr "Por favor selecione somente uma categoria."
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 5aa23cca..3d4bb5a3 100644
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 5adb290e..4c1b073e 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: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2009-05-29 14:38+0300\n"
 "Last-Translator: Max Kamashev <max.kamashev@floscoeli.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -22,154 +22,134 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "Никогда"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "Неделя"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "Две недели"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "Один месяц"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "Два месяца"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "Три месяца"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "Интервал обновления:"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "Не обновлять"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "Каждые 15 минут"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "Каждые 30 минут"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "Каждый час"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "Каждые 4 часа"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "Каждые 12 часов"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "Раз в день"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "Раз в неделю"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "По умолчанию"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "Пользователь"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Активный пользователь"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "Администратор"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "Каналы"
-
-#: backend.php:201
-#, fuzzy
-msgid "Article not found."
-msgstr "Канал не найден."
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "Канал не найден."
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "Идет загрузка..."
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "В доступе отказано - недостаточный уровень привилегий."
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "Обновление базы данных"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "Не могу обновить базу данных"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr "Не могу найти необходимый файл схемы, требуется версия:"
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr ", найдена: "
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS база данных обновлена."
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "Пожалуйста, сохраните вашу базу данных перед продолжением."
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
@@ -178,32 +158,32 @@ msgstr ""
 "Вашей базе данных Tiny Tiny RSS необходимо обновиться до последней версии  "
 "(<b>%d</b> до <b>%d</b>)."
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "Применить обновления"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "Идет обновление..."
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "Обновляется до версии %d..."
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "Проверяется версия... "
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK!"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "Ошибка!"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -212,23 +192,22 @@ msgstr ""
 "Обновление завершено. Выполнено <b>%d</b> обновление(ий) схемы базы данных "
 "до версии <b>%d</b>."
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr ""
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr ""
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr ""
 
-#: digest.php:57
-#, fuzzy
+#: digest.php:58
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\t\tfor this application to function properly. Please check your\n"
@@ -238,16 +217,23 @@ msgstr ""
 "\t\tдля функционала этой программы. Пожалуйста, проверьте\n"
 "\t\tнастройки вашего браузера."
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "Идет загрузка..."
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "Привет,"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Выход"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
@@ -255,22 +241,21 @@ msgstr ""
 "Программе требуется функционал XmlHttpRequest. Ваш браузер его не "
 "поддерживает."
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
 msgstr "Для работы программы необходимы куки. Ваш браузер их не поддерживает."
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr ""
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr ""
 
-#: errors.php:18
-#, fuzzy
+#: errors.php:19
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
 "update&lt;/a&gt;."
@@ -278,15 +263,15 @@ msgstr ""
 "Некорректная версия базы данных. &lt;a href='update.php'&gt;Пожалуйста "
 "обновите её&lt;/a&gt;."
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "В доступе отказано."
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "Операция не задана."
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
@@ -294,16 +279,15 @@ msgstr ""
 "Не могу показать канал: ошибка в запросе. Пожалуйста, проверьте синтаксис "
 "или локальную конфигурацию."
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr "В доступе отказано - недостаточный уровень привилегий."
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "Тест конфигурации неудачен"
 
-#: errors.php:30
-#, fuzzy
+#: errors.php:31
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
 "\t\tofficial site for more information."
@@ -311,640 +295,658 @@ msgstr ""
 "Ваша версия MySQL сейчас не поддерживается. Пожалуйста \n"
 "\t\tпрочитайте на официальном сайте подробную информацию."
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "Настройки"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "Комментарии?"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr ""
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
-#: index.php:127
-#, fuzzy
+#: index.php:148
 msgid "Show articles"
-msgstr "Сохранённые статьи"
+msgstr "Показать статьи"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "Опубликован"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "Новые"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "Обновлено"
 
-#: index.php:139
-#, fuzzy
+#: index.php:160
 msgid "Sort articles"
-msgstr "Сохранённые статьи"
+msgstr "Сортировать статьи"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "Дата"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "Заголовок"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "Оценка"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "Обновить"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "Действия..."
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "Поиск..."
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "Все каналы:"
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
-msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
+msgstr "Показать/скрыть прочитанные"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "Другие действия:"
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
-msgstr ""
+msgstr "Перейти в дайджест..."
 
-#: index.php:173
-#, fuzzy
+#: index.php:194
 msgid "Show tag cloud..."
-msgstr "облако тегов"
+msgstr "Показать облако тегов..."
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
-msgstr ""
+msgstr "Выбрать по тегам..."
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "Создать метку..."
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "Создать фильтр..."
 
-#: index.php:177
-#, fuzzy
+#: index.php:198
 msgid "Keyboard shortcuts help"
-msgstr "Горячие Клавиши"
+msgstr "Горячие клавиши"
 
-#: index.php:178
-msgid "About..."
-msgstr ""
+#: opml.php:70
+#, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "<li>Добавляется категория <b>%s</b>.</li>"
 
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "Заголовок или содержимое"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Устанавливаю ключ настроек %s в %s"
 
-#: localized_schema.php:5
-msgid "Link"
-msgstr "Ссылка"
+#: opml.php:112
+#, php-format
+msgid "Adding label %s"
+msgstr "Добавляю метку %s"
 
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "Содержимое"
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Метка уже существует: %s"
 
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "Дата Статьи"
+#: opml.php:169
+#, php-format
+msgid "Adding filter %s"
+msgstr "Добавляю фильтр %s"
 
-#: localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Очистить статьи"
+#: opml.php:185
+#, php-format
+msgid "Duplicate filter %s"
+msgstr "Фильтр %s уже существует"
 
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "Отметить"
+#: opml.php:230
+msgid "is already imported."
+msgstr "уже импортирован."
 
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "Опубликовать"
+#: opml.php:250
+msgid "OK"
+msgstr "OK"
 
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "Применить теги"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "Ошибка при разборе документа."
 
-#: localized_schema.php:14
-msgid "Assign label"
-msgstr "Применить метку"
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "Ошибка: пожалуйста загрузите OPML файл."
 
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"Эта опция полезна, если вы читаете несколько агрегаторов типа \"планета\" с "
-"пересекающимися статьями. Когда запрещено, статья показывается лишь один раз."
+#: opml.php:469 opml.php:474
+msgid "OPML Utility"
+msgstr "Утилита OPML"
 
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr ""
-"Показывать развёрнутый список статей, вместо разделения экрана на заголовки "
-"и содержимое статей"
+#: opml.php:492
+msgid "Importing OPML..."
+msgstr "Импортирую OPML..."
 
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
-msgstr ""
-"После выбора опции \"Отметить как прочитанное\" в верхней панели, "
-"автоматически открывать следующий канал с не прочитанными статьями."
+#: opml.php:496
+msgid "Return to preferences"
+msgstr "Вернуться к настройкам"
 
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr ""
-"Эта опция разрешает отправку ежедневного обзора новых (и непрочитанных) "
-"заголовков на ваш адрес электронной почты"
+#: prefs.php:81
+msgid "Keyboard shortcuts"
+msgstr "Горячие Клавиши"
 
-#: localized_schema.php:20
-#, fuzzy
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr ""
-"Эта опция разрешает автоматически отмечать статьи как прочитанные в "
-"комбинированном режиме (исключение для специального канала \"Свежие статьи"
-"\" ), пока вы прокручиваете список статей."
+#: prefs.php:82 help/prefs.php:14
+msgid "Exit preferences"
+msgstr "Закрыть настройки"
 
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr "Вырезать все, кроме основных HTML тегов при показе статей."
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "Каналы"
 
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr ""
-"Когда автоопределение тегов в статьях, эти теги не будут применяться (список "
-"значений, разделённых запятыми)."
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+msgid "Filters"
+msgstr "Фильтры"
 
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr ""
-"Когда эта опция включена, заголовки в Особом канале и Метки группируются по "
-"каналам"
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
+msgid "Labels"
+msgstr "Метки"
 
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr ""
+#: prefs.php:103 help/prefs.php:13
+msgid "Users"
+msgstr "Пользователи"
 
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr ""
+#: prefs.php:108
+msgid "Linked"
+msgstr "Связанные"
 
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
+#: register.php:186 include/login_form.php:164
+msgid "Create new account"
+msgstr "Создать новый аккаунт"
 
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "Стирать статьи старше этого количества дней (0 - выключает)"
+#: register.php:190
+msgid "New user registrations are administratively disabled."
+msgstr "Регистрация новых пользователей запрещена."
 
-#: localized_schema.php:28
-#, fuzzy
-msgid "Default interval between feed updates"
-msgstr "Интервал между обновлениями каналов по умолчанию (в минутах)"
+#: register.php:215
+msgid ""
+"Your temporary password will be sent to the specified email. Accounts, which "
+"were not logged in once, are erased automatically 24 hours after temporary "
+"password is sent."
+msgstr ""
+"Временный пароль будет отправлен на указанный e-mail. Если аккаунт не будет "
+"активирован в течении 24 часов, то он будет удалён."
 
-#: localized_schema.php:29
-#, fuzzy
-msgid "Amount of articles to display at once"
-msgstr "Статей не найдено."
+#: register.php:221
+msgid "Desired login:"
+msgstr "Желаемый логин:"
 
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "Разрешить дубликаты статей"
+#: register.php:224
+msgid "Check availability"
+msgstr "Проверить доступность"
 
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "Включить категории каналов"
+#: register.php:226
+msgid "Email:"
+msgstr "E-mail: "
 
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "Показать предпросмотр содержимого в списке заголовков"
+#: register.php:229
+msgid "How much is two plus two:"
+msgstr "Сколько будет, два плюс два:"
 
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "Короткий формат даты"
+#: register.php:232
+msgid "Submit registration"
+msgstr "Зарегистрироваться"
 
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "Длинный формат даты"
+#: register.php:250
+msgid "Your registration information is incomplete."
+msgstr "Не полностью заполнена ваша регистрационная информация."
 
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "Комбинированный режим отображения"
+#: register.php:265
+msgid "Sorry, this username is already taken."
+msgstr "Извините, такое имя пользователя уже существует."
 
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "Спрятать каналы без непрочитанных статей"
+#: register.php:283
+msgid "Registration failed."
+msgstr "Неудачная регистрация."
 
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "Показывать следующий канал при отметке как прочитанный"
+#: register.php:367
+msgid "Account created successfully."
+msgstr "Аккаунт успешно создан."
 
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "Сортировать каналы по количеству непрочитанных статей"
+#: register.php:389
+msgid "New user registrations are currently closed."
+msgstr "Регистрация новых пользователей временно закрыта."
 
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "Обратный порядок заголовков (старые впереди)"
+#: twitter.php:98
+msgid "Register with Twitter"
+msgstr ""
 
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "Включить почтовый дайджест"
+#: twitter.php:102
+msgid "Could not connect to Twitter. Refresh the page or try again later."
+msgstr ""
 
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "Подтвердить отметку каналка как прочитанный"
+#: twitter.php:106
+msgid "Congratulations! You have successfully registered with Twitter."
+msgstr ""
 
-#: localized_schema.php:42
-#, fuzzy
-msgid "Automatically mark articles as read"
-msgstr "Автоматически раскрывать статьи в комбинированном режиме"
+#: twitter.php:118 classes/pref_prefs.php:452
+msgid "Register"
+msgstr "Регистрация"
 
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "Вырезать небезопасные теги из статей"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "Горячие Клавиши"
 
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "Черный список тегов"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "Навигация"
 
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "Максимальный возраст свежих статей (в часах)"
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "Перемещаться между каналами"
 
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "Отметить все статьи в e-mail дайджесте как прочитанные?"
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "Перемещаться между статьями"
 
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "Автоматически раскрывать статьи в комбинированном режиме"
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "Показать диалог поиска"
 
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "Очистить непрочитанные статьи"
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "Действия над текущей статьёй"
 
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "Показывать специальные каналы, когда скрываются прочитанные каналы"
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "Изм. отмеченное"
 
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "Группировать заголовки в виртуальные каналы"
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "Отметить / снять отметку"
 
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "Не показывать изображения в статьях"
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "Прочитано / не прочитано"
 
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr ""
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "Редактировать теги"
 
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr ""
+#: help/main.php:20
+msgid "Dismiss selected articles"
+msgstr "Скрыть выбранные статьи"
 
-#: localized_schema.php:54
-#, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Сортировать каналы по количеству непрочитанных статей"
+#: help/main.php:21
+msgid "Dismiss read articles"
+msgstr "Скрыть прочитанные статьи"
 
-#: localized_schema.php:55
-#, fuzzy
-msgid "Customize stylesheet"
-msgstr "URL пользовательского файла стилей"
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "Открыть статью в новом окне"
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr ""
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "Отметить статью выше/ниже текущей, как прочитанную"
 
-#: opml.php:165 opml.php:170
-msgid "OPML Utility"
-msgstr "Утилита OPML"
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "Прокрутить содержимое статьи"
 
-#: opml.php:188
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "Импортирую OPML (с помощью расширения DOMXML)..."
+#: help/main.php:25
+msgid "Email article"
+msgstr "Отправить по почте"
 
-#: opml.php:193
-msgid "Return to preferences"
-msgstr "Вернуться к настройкам"
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "Другие действия:"
 
-#: prefs.php:82
-msgid "Keyboard shortcuts"
-msgstr "Горячие Клавиши"
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "Выбрать статью под курсором мыши"
 
-#: prefs.php:83 help/4.php:14
-msgid "Exit preferences"
-msgstr "Закрыть настройки"
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "Создать метку"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
-msgid "Filters"
-msgstr "Фильтры"
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "Создать фильтр"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
-msgid "Labels"
-msgstr "Метки"
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "Развернуть боковую панель"
 
-#: prefs.php:104 help/4.php:13
-msgid "Users"
-msgstr "Пользователи"
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "Показать этот диалог помощи"
 
-#: prefs.php:109
-#, fuzzy
-msgid "Linked"
-msgstr "Ссылка"
+#: help/main.php:41
+msgid "Multiple articles actions"
+msgstr "Действия над несколькими статьями"
 
-#: register.php:185
-msgid "Create new account"
-msgstr "Создать новый аккаунт"
+#: help/main.php:44
+msgid "Select all articles"
+msgstr "Выбрать все статьи"
 
-#: register.php:189
-msgid "New user registrations are administratively disabled."
-msgstr "Регистрация новых пользователей запрещена."
+#: help/main.php:45
+msgid "Select unread articles"
+msgstr "Выбрать непрочитанные статьи"
 
-#: register.php:214
-msgid ""
-"Your temporary password will be sent to the specified email. Accounts, which "
-"were not logged in once, are erased automatically 24 hours after temporary "
-"password is sent."
-msgstr ""
-"Временный пароль будет отправлен на указанный e-mail. Если аккаунт не будет "
-"активирован в течении 24 часов, то он будет удалён."
+#: help/main.php:46
+msgid "Invert article selection"
+msgstr "Инвертировать выделение"
 
-#: register.php:220
-msgid "Desired login:"
-msgstr "Желаемый логин:"
+#: help/main.php:47
+msgid "Deselect all articles"
+msgstr "Очистить выделение статей"
 
-#: register.php:223
-msgid "Check availability"
-msgstr "Проверить доступность"
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "Действия над каналом"
 
-#: register.php:225
-msgid "Email:"
-msgstr "E-mail: "
+#: help/main.php:53
+msgid "Refresh active feed"
+msgstr "Обновить активный канал"
 
-#: register.php:228
-msgid "How much is two plus two:"
-msgstr "Сколько будет, два плюс два:"
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "Подписаться на канал"
 
-#: register.php:231
-msgid "Submit registration"
-msgstr "Зарегистрироваться"
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "Редактировать канал"
 
-#: register.php:249
-msgid "Your registration information is incomplete."
-msgstr "Не полностью заполнена ваша регистрационная информация."
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "Отметить канал как прочитанный"
 
-#: register.php:264
-msgid "Sorry, this username is already taken."
-msgstr "Извините, такое имя пользователя уже существует."
+#: help/main.php:58
+msgid "Reverse headlines order"
+msgstr "Обратный порядок заголовков"
 
-#: register.php:282
-msgid "Registration failed."
-msgstr "Неудачная регистрация."
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "Отметить все каналы как прочитанные"
 
-#: register.php:366
-msgid "Account created successfully."
-msgstr "Аккаунт успешно создан."
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "Если котегория видна, (раз)свернуть её"
 
-#: register.php:388
-msgid "New user registrations are currently closed."
-msgstr "Регистрация новых пользователей временно закрыта."
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "Перейти к.."
 
-#: twitter.php:97
-msgid "Register with Twitter"
-msgstr ""
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "Все статьи"
 
-#: twitter.php:101
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "Свежие"
 
-#: twitter.php:105
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "Отмеченные"
 
-#: twitter.php:117 modules/pref-prefs.php:464
-#, fuzzy
-msgid "Register"
-msgstr "Зарегистрирован"
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "Опубликованные"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-#, fuzzy
-msgid "Default profile"
-msgstr "Количество статей по умолчанию"
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "Облако тегов"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "нет тегов"
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr ""
 
-#: modules/backend-rpc.php:836
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "Не полностью заполнена ваша регистрационная информация."
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "Нажмите любую клавишу для закрытия этого окна"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr ""
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "Мои каналы"
 
-#: modules/backend-rpc.php:848
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "Пароль был изменен."
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "Другие каналы"
 
-#: modules/backend-rpc.php:861
-#, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "Вы не можете редактировать этот канал."
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "Действия над каналами"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "Помощь"
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "Лучшие 25 каналов"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "Раздел помощи не найден."
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "Редактировать категории канала"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "Закрыть это окно"
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "Добавить пользователя"
 
-#: modules/opml_domdoc.php:60
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Добавляется категория <b>%s</b>."
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "Фокус на поиск (если поиск показан)"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
 msgstr ""
+"<b>Замечание:</b> не все действия могут быть доступны. Это зависит от "
+"конфигурации Tiny Tiny RSS и вашего уровня доступа."
 
-#: modules/opml_domdoc.php:128
-#, fuzzy
-msgid "is already imported."
-msgstr "Уже импортирован."
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "Войти"
 
-#: modules/opml_domdoc.php:148
-#, fuzzy
-msgid "OK"
-msgstr "OK!"
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "Логин:"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "Ошибка при разборе документа."
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "Пароль:"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "Ошибка: пожалуйста загрузите OPML файл."
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr ""
 
-#: modules/popup-dialog.php:34
-#, fuzzy
-msgid "Importing using DOMXML."
-msgstr "Импортирую OPML (с помощью расширения DOMXML)..."
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "Особые"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
+msgstr ""
 
-#: modules/popup-dialog.php:40
+#: mobile/prefs.php:24
 #, fuzzy
-msgid "Importing using DOMDocument."
-msgstr "Импортирую OPML (с помощью расширения DOMDocument)..."
+msgid "Enable categories"
+msgstr "Включить категории каналов"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr ""
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr "Расширение DOMXML не найдено. Оно необходимо для версий PHP старее 5."
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr ""
 
-#: modules/popup-dialog.php:80
+#: mobile/prefs.php:29
 #, fuzzy
-msgid "Create profile"
-msgstr "Создать фильтр"
+msgid "Browse categories like folders"
+msgstr "Сбросить порядок категорий"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: mobile/prefs.php:35
 #, fuzzy
-msgid "(active)"
-msgstr "Адаптивно"
+msgid "Show images in posts"
+msgstr "Не показывать изображения в статьях"
 
-#: modules/popup-dialog.php:166
+#: mobile/prefs.php:40
 #, fuzzy
-msgid "Remove selected profiles"
-msgstr "Удалить выбранные фильтры?"
+msgid "Hide read articles and feeds"
+msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 
-#: modules/popup-dialog.php:168
+#: mobile/prefs.php:45
 #, fuzzy
-msgid "Activate profile"
-msgstr "Удалить выбранные фильтры?"
+msgid "Sort feeds by unread count"
+msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: modules/popup-dialog.php:179
-msgid "Public OPML URL"
-msgstr ""
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "Статья не найдена"
 
-#: modules/popup-dialog.php:184
-#, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "Ссылка на общий канал со статьями."
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "Раздел помощи не найден."
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:26
 #, fuzzy
-msgid "Generate new URL"
-msgstr "Генерировать канал"
+msgid "Prepare data"
+msgstr "Сохранить"
+
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "Закрыть это окно"
+
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
+msgstr ""
+"Если вы импортировали метки или фильтры, вам возможно придется перезагрузить "
+"настройки чтобы увидеть новые данные."
+
+#: classes/dlg.php:87
+msgid "Create profile"
+msgstr "Создать профиль"
+
+#: classes/dlg.php:107 classes/dlg.php:136
+#, fuzzy
+msgid "(active)"
+msgstr "Адаптивно"
+
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+msgid "Default profile"
+msgstr "Профиль по умолчанию"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:170
+msgid "Remove selected profiles"
+msgstr "Удалить выбранные профили?"
+
+#: classes/dlg.php:172
+msgid "Activate profile"
+msgstr "Активировать профиль"
+
+#: classes/dlg.php:182
+msgid "Public OPML URL"
+msgstr "Публичная ссылка на OPML"
+
+#: classes/dlg.php:187
+msgid "Your Public OPML URL is:"
+msgstr "Ссылка на ваш опубликованный OPML:"
+
+#: classes/dlg.php:196 classes/dlg.php:841
+msgid "Generate new URL"
+msgstr "Создать новую ссылку"
+
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "Сообщение"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -954,11 +956,11 @@ msgstr ""
 "запущен. Он необходим для обновления всех каналов.\n"
 "Пожалуйста, запустите демон обновлений или сообщите администратору."
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "Последнее обновление:"
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -968,280 +970,245 @@ msgstr ""
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "Канал"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
-msgstr "Поместить в категорию..."
+msgstr "Поместить в категорию:"
 
-#: modules/popup-dialog.php:265
-#, fuzzy
+#: classes/dlg.php:266
 msgid "Available feeds"
-msgstr "Все каналы"
+msgstr "Доступные каналы"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "Авторизация"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "Пользователь:"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
-#, fuzzy
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 msgid "Password"
-msgstr "Пароль:"
+msgstr "Пароль"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: modules/popup-dialog.php:300
-#, fuzzy
+#: classes/dlg.php:301
 msgid "More feeds"
-msgstr "Больше каналов"
+msgstr "Другие каналы"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "Отмена"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "Поиск"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 #, fuzzy
 msgid "Popular feeds"
 msgstr "показать каналы"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 #, fuzzy
 msgid "Feed archive"
 msgstr "Действия над каналом:"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 #, fuzzy
 msgid "limit:"
 msgstr "Сколько:"
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "Удалить"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 #, fuzzy
 msgid "match on"
 msgstr "соответствие:"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "Содержимое"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "Ограничить поиск:"
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "Этот канал"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "Искать"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "перед"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "после"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "по полю:"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "в"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "Выполнить действия"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "с параметрами:"
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "Опции:"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "Включен"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "Инвертировать фильтр"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+msgid "Apply to category"
+msgstr "Применить к категории"
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "Проверить"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "Создать"
 
-#: modules/popup-dialog.php:571
-#, fuzzy
+#: classes/dlg.php:577
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
-msgstr "Эти каналы не были обновлены из-за ошибок:"
+msgstr "Эти каналы не были обновлены в течение трех месяцев:"
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
-#, fuzzy
+#: classes/dlg.php:601 classes/dlg.php:657
 msgid "Click to edit feed"
 msgstr "Щёлкните для редактирования"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
-#, fuzzy
+#: classes/dlg.php:619 classes/dlg.php:677
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписаться от выбранных каналов?"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не были обновлены из-за ошибок:"
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "Сохранить"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Облако тегов"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr ""
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 msgid "Match:"
 msgstr "Поиск:"
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr ""
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 #, fuzzy
 msgid "Display entries"
 msgstr "показать каналы"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr ""
-
-#: modules/popup-dialog.php:813
-#, fuzzy
-msgid "Multiple articles"
-msgstr "Все статьи"
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr ""
-
-#: modules/popup-dialog.php:843
-#, fuzzy
-msgid "To:"
-msgstr "Топ"
-
-#: modules/popup-dialog.php:856
-#, fuzzy
-msgid "Subject:"
-msgstr "Выбрать:"
-
-#: modules/popup-dialog.php:872
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Изменить e-mail"
-
-#: modules/popup-dialog.php:881
-#, fuzzy
+#: classes/dlg.php:821 classes/feeds.php:152
 msgid "View as RSS"
-msgstr "Теги"
+msgstr "Показать в формате RSS"
 
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
-#: modules/popup-dialog.php:919
-#, fuzzy, php-format
+#: classes/dlg.php:860
+#, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
-msgstr "Доступная новая версия Tiny Tiny RSS!"
+msgstr "Доступна новая версия Tiny Tiny RSS!"
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
-#, fuzzy
+#: classes/dlg.php:870 classes/pref_users.php:383
 msgid "Details"
-msgstr "Раз в день"
+msgstr "Подробнее"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
-msgstr ""
+msgstr "Скачать"
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1249,301 +1216,414 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
-msgstr ""
+msgstr "Инсталляция"
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL:"
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
-msgstr ""
+msgstr "URL инсталляции"
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 #, fuzzy
 msgid "Access key:"
 msgstr "Уровень доступа:"
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 #, fuzzy
 msgid "Access key"
 msgstr "Уровень доступа:"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
-msgstr ""
+msgstr "Используйте один ключ доступа для обоих инсталляций"
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 #, fuzzy
 msgid "Generate new key"
 msgstr "Генерировать канал"
 
-#: modules/popup-dialog.php:1068
-#, fuzzy
+#: classes/dlg.php:949
 msgid "Create link"
-msgstr "Создать"
+msgstr "Создать ссылку"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:4
-msgid "Check to enable field"
-msgstr "Проверить доступность поля"
+#: classes/feeds.php:94 include/functions.php:3346
+msgid "Visit the website"
+msgstr "Посетить официальный сайт"
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
-#, fuzzy, php-format
-msgid "(%d feeds)"
-msgstr "Редактировать канал"
+#: classes/feeds.php:107
+msgid "View as RSS feed"
+msgstr "Показать в формате RSS"
+
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "Выбрать:"
+
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "Все"
+
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "Инвертировать"
+
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "Ничего"
+
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "Переключить выбранное:"
 
-#: modules/pref-feeds.php:96
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "Выбрано:"
+
+#: classes/feeds.php:138
+msgid "Archive"
+msgstr "Архивировать"
+
+#: classes/feeds.php:140
+msgid "Move back"
+msgstr "Переместить назад"
+
+#: classes/feeds.php:141
+msgid "Delete"
+msgstr "Удалить"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+msgid "Forward by email"
+msgstr "Отправить по почте"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "Канал:"
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "Канал не найден."
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "Отметить как прочитанные"
+
+#: classes/feeds.php:625 include/functions.php:3318
+msgid "Originally from:"
+msgstr "Оригинал:"
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "Редактировать теги статьи"
+
+#: classes/feeds.php:712 include/functions.php:3285
+msgid "Open article in new tab"
+msgstr "Открыть статью в новом табе"
+
+#: classes/feeds.php:723 include/functions.php:3301
+msgid "Close article"
+msgstr "Закрыть статью"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "Не найдено не прочитанных статей"
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "Не найдено не прочитанных статей."
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "Не найдено отмеченных статей"
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
+"Действия) или используйте фильтр."
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "Статей не найдено."
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "Последнее обновление в %s"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: modules/pref-feeds.php:306
-#, fuzzy
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr ""
+
+#: classes/mail_button.php:52
+msgid "Multiple articles"
+msgstr "Все статьи"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr "От:"
+
+#: classes/mail_button.php:82
+msgid "To:"
+msgstr "Кому:"
+
+#: classes/mail_button.php:95
+msgid "Subject:"
+msgstr "Заголовок:"
+
+#: classes/mail_button.php:111
+msgid "Send e-mail"
+msgstr "Отправить письмо"
+
+#: classes/note_button.php:7 js/note_button.js:11
+msgid "Edit article note"
+msgstr "Редактировать заметку"
+
+#: classes/pref_feeds.php:11
+msgid "Check to enable field"
+msgstr "Проверить доступность поля"
+
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
+#, php-format
+msgid "(%d feeds)"
+msgstr "(%d каналов)"
+
+#: classes/pref_feeds.php:299
 msgid "Feed Title"
 msgstr "Заголовок"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
 msgid "using"
 msgstr "использование"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
 msgid "Article purging:"
 msgstr "Удаление сообщений:"
 
-#: modules/pref-feeds.php:401
+#: classes/pref_feeds.php:388
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
-#, fuzzy
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 msgid "Hide from Popular feeds"
-msgstr "Спрятать из моего списка каналов"
+msgstr "Спрятать из списка популярных каналов"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "Язык канала пишется справа налево"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "Включить в e-mail дайджест"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
-msgstr ""
+msgstr "Всегда показывать вложенные изображения"
 
-#: modules/pref-feeds.php:472
-#, fuzzy
-msgid "Cache images locally (SimplePie only)"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
 msgstr "Кэшировать изображения локально"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
-#, fuzzy
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 msgid "Mark updated articles as unread"
 msgstr "Пометить все статьи как прочитанные?"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
-msgstr ""
+msgstr "При изменении текста статьи, помечать ее как обновленную"
 
-#: modules/pref-feeds.php:504
-#, fuzzy
+#: classes/pref_feeds.php:484
 msgid "Icon"
-msgstr "Действие"
+msgstr "Иконка"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
-msgstr ""
+msgstr "Заменить"
 
-#: modules/pref-feeds.php:537
-#, fuzzy
+#: classes/pref_feeds.php:517
 msgid "Resubscribe to push updates"
-msgstr "Подписаны каналы:"
+msgstr "Переподписаться на PUSH обновления"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "Кэшировать изображения локально"
+msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
 
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "Всё выполнено."
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "Добавлена подписка на <b>%s</b>."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, fuzzy, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "Каналы не найдены."
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "Канал <b>%s</b> уже подписан."
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 #, fuzzy
 msgid "Subscribe to selected feed"
 msgstr "Отписаться от выбранных каналов?"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "Редактировать опции  подписки"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "Категория <b>$%s</b> уже существует."
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "Категории отсутствуют."
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 #, fuzzy
 msgid "Remove selected categories"
 msgstr "Удалить выбранные категории?"
 
-#: modules/pref-feeds.php:1293
-#, fuzzy
+#: classes/pref_feeds.php:1259
 msgid "Feeds with errors"
-msgstr "Редактор канала"
+msgstr "Каналы с ошибками"
 
-#: modules/pref-feeds.php:1316
-#, fuzzy
+#: classes/pref_feeds.php:1279
 msgid "Inactive feeds"
-msgstr "Весь канал"
+msgstr "Неактивные каналы"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
-#, fuzzy
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 msgid "Select"
-msgstr "Выбрать:"
-
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "Все"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "Ничего"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "Подписаться на канал"
+msgstr "Выбрать"
 
-#: modules/pref-feeds.php:1353
-#, fuzzy
+#: classes/pref_feeds.php:1316
 msgid "Edit selected feeds"
-msgstr "Очистка выбранных каналов..."
+msgstr "Редактировать выбранные каналы"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
-#, fuzzy
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 msgid "Reset sort order"
-msgstr "Сбросить пароль"
+msgstr "Сбросить сортировку"
 
-#: modules/pref-feeds.php:1360
-#, fuzzy
+#: classes/pref_feeds.php:1323
 msgid "Categories"
-msgstr "Категория:"
+msgstr "Категории"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "Редактировать категории"
 
-#: modules/pref-feeds.php:1379
-#, fuzzy
+#: classes/pref_feeds.php:1342
 msgid "More actions..."
 msgstr "Действия..."
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "Ручная очистка"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "Очистить данные канала."
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "Заново оценить статьи"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
+msgstr "Вы можете менять категории и каналы местами"
+
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
-msgstr ""
+#: classes/pref_feeds.php:1407
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "Только главный профиль настроек будет экспортирован в OPML."
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "Импортировать"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
+#: classes/pref_feeds.php:1420
 #, fuzzy
-msgid "Export"
-msgstr "Экспортировать OPML"
+msgid "Import my OPML"
+msgstr "Импортирую OPML..."
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr ""
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 #, fuzzy
 msgid "Include settings"
 msgstr "Включить в e-mail дайджест"
 
-#: modules/pref-feeds.php:1471
+#: classes/pref_feeds.php:1430
 #, fuzzy
-msgid "Publish"
-msgstr "Опубликован"
+msgid "Export OPML"
+msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
@@ -1552,23 +1632,41 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
+msgid ""
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: classes/pref_feeds.php:1439
+msgid "Display published OPML URL"
+msgstr ""
+
+#: classes/pref_feeds.php:1442
+msgid "Article archive"
+msgstr "Архив статей"
+
+#: classes/pref_feeds.php:1444
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
 msgstr ""
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
+#: classes/pref_feeds.php:1447
 #, fuzzy
-msgid "Display URL"
-msgstr "показать теги"
+msgid "Export my data"
+msgstr "Экспортировать данные"
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "Импортировать"
+
+#: classes/pref_feeds.php:1469
 #, fuzzy
 msgid "Firefox integration"
 msgstr "Интеграция в Firefox"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1576,41 +1674,41 @@ msgstr ""
 "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
 "Для этого щёлкните по ссылке ниже."
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
 msgstr ""
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 #, fuzzy
 msgid "Published & shared articles and generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 #, fuzzy
 msgid "Published articles and generated feeds"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1618,1120 +1716,1320 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+#, fuzzy
+msgid "Display URL"
+msgstr "показать теги"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr ""
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr ""
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr ""
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 #, fuzzy
 msgid "Unshare all articles"
 msgstr "Отмеченные"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 #, fuzzy
 msgid "Twitter"
 msgstr "Заголовок"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
 msgstr ""
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr ""
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 #, fuzzy
 msgid "Clear stored credentials"
 msgstr "Очистить данные канала."
 
-#: modules/pref-feeds.php:1654
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Отмеченные"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "Каналы не найдены."
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr ""
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 #, fuzzy
 msgid "No articles matching this filter has been found."
 msgstr "Не найдено совпадений с фильтром."
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "Добавлен фильтр <b>%s</b>"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "Создать фильтр"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "Редактировать"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr ""
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
 msgstr ""
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr ""
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 #, fuzzy
 msgid "Stored feeds"
 msgstr "Больше каналов"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "Щёлкните для редактирования"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "Заголовок"
 
-#: modules/pref-labels.php:36
-#, fuzzy
+#: classes/pref_labels.php:37
 msgid "Colors"
-msgstr "Закрыть"
+msgstr "Цвета"
 
-#: modules/pref-labels.php:41
-#, fuzzy
+#: classes/pref_labels.php:42
 msgid "Foreground:"
-msgstr "передний план"
+msgstr "Передний план:"
 
-#: modules/pref-labels.php:41
-#, fuzzy
+#: classes/pref_labels.php:42
 msgid "Background:"
-msgstr "фон"
+msgstr "Фон:"
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "Добавлена метка <b>%s</b>"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "Создать метку"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "Очистить цвета"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "Старый пароль не может быть пустым."
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "Новый пароль не может быть пустым."
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "Пароль был изменен."
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "Старый пароль неправилен."
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "Конфигурация сохранена."
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "Неизвестная опция: %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr ""
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "Личные данные"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
-msgstr ""
+msgstr "Полное имя"
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "E-mail"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "Уровень доступа:"
 
-#: modules/pref-prefs.php:200
-#, fuzzy
+#: classes/pref_prefs.php:196
 msgid "Save data"
 msgstr "Сохранить"
 
-#: modules/pref-prefs.php:212
-#, fuzzy
+#: classes/pref_prefs.php:208
 msgid "Your password is at default value, please change it."
-msgstr ""
-"Используется пароль по умолчанию, \n"
-"\t\t\t\t\t\tпожалуйста, измените его."
+msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "Новый пароль"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "Выбор темы"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr ""
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "Да"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "Нет"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr ""
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "Сохранить конфигурацию"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
-msgstr ""
+msgstr "Управление профилями"
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "Сбросить настройки"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "Подробнее..."
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "Пользователь не найден"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "Зарегистрирован"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "Последний вход"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "Количество подписанных каналов"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "Подписан на каналы"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "Редактор пользователей"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "Уровень доступа:"
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "Изменить пароль на"
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "E-mail: "
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "Пароль пользователя <b>%s</b> изменен."
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "Не могу добавить пользователя <b>%s</b>"
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "Пользователь <b>%s</b> уже существует."
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "Уведомление <b>%s</b>."
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Уведомление о смене пароля"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "Добавить пользователя"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "Уровень доступа:"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "Последний вход"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "Пользователи не определены."
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "Подходящих пользователей не найдено."
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "Фильтровать содержимое"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
-msgstr ""
-"Tiny Tiny RSS поддерживает фильтрацию (обработку) статей. Фильтрация "
-"выполняется однажды, когда новая статья импортируется в базу данных из "
-"новостного канала, затем ищется совпадение с заданным регулярным выражением "
-"и выполняется заданное действие. Регулярное выражение не чувствительно к "
-"регистру."
-
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Поддерживаются события: фильтр (не импорт) статьи, отметить статью как "
-"прочитанную, пометить статью, назначить тег, и установить оценку. Фильтры "
-"могут быть определены глобально и локально для некоторых специфических "
-"каналов."
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-"Составные и инверсионные фильтры поддерживаются. Все совпадения фильтров "
-"обсчитываются при импорте статьей и все действия выполняются "
-"последовательно. Инверсное совпадение возвращает результат совпадения, т.е. "
-"фильтр совпадающий с XYZZY в заголовке с инверсным флагом, отфильтрует все "
-"статьи кроме тех, где заголовок содержит строку XYZZY."
-
-#: help/2.php:9
-msgid "See also:"
-msgstr "Смотри также:"
-
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "Горячие Клавиши"
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "нет тегов"
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "Навигация"
+#: classes/rpc.php:741
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Не полностью заполнена ваша регистрационная информация."
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "Перемещаться между каналами"
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
+msgstr "Обновление канала запланировано"
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "Перемещаться между статьями"
+#: classes/rpc.php:753
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "Пароль был изменен."
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "Показать диалог поиска"
+#: classes/rpc.php:766
+msgid "Can't update this kind of feed."
+msgstr "Вы не можете обновить этот канал."
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "Действия над текущей статьёй"
+#: classes/share_button.php:7
+#, fuzzy
+msgid "Share by URL"
+msgstr "Расшарить статью по ссылке"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "Изм. отмеченное"
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr ""
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "Отметить / снять отметку"
+#: classes/tweet_button.php:7
+#, fuzzy
+msgid "Share on Twitter"
+msgstr "Заголовок"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "Прочитано / не прочитано"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Ошибка проверки сессии (некорректный IP)"
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "Редактировать теги"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "Некорректное имя пользователя или пароль"
 
-#: help/3.php:20
-#, fuzzy
-msgid "Dismiss selected articles"
-msgstr "Удалить выбранные статьи из меток?"
+#: include/functions.php:2013
+msgid "Archived articles"
+msgstr "Архив статей"
+
+#: include/functions.php:3109 js/viewfeed.js:1945
+msgid "Click to play"
+msgstr "Щёлкните для проигрывания"
 
-#: help/3.php:21
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr "Играть"
+
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
+
+#: include/functions.php:4061
 #, fuzzy
-msgid "Dismiss read articles"
-msgstr "Скрыть видимые прочитанные статьи"
+msgid "(edit note)"
+msgstr "править заметку"
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "Открыть статью в новом окне"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "Канал не выбран."
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "Отметить статью выше/ниже текущей, как прочитанную"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "неизвестный тип"
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "Прокрутить содержимое статьи"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "Вложение:"
 
-#: help/3.php:25
-#, fuzzy
-msgid "Email article"
-msgstr "Все статьи"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "Вложения:"
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "Другие действия:"
+#: include/functions.php:5091
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "Отмеченные"
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "Выбрать статью под курсором мыши"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "Каналы не найдены."
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "Развернуть боковую панель"
+#: include/functions.php:5161
+msgid "Could not import: incorrect schema version."
+msgstr "Не могу импортировать данные: некорректная версия схемы."
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "Показать этот диалог помощи"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr "Не могу импортировать данные: неизвестынй формат данных."
 
-#: help/3.php:41
-#, fuzzy
-msgid "Multiple articles actions"
-msgstr "Все статьи"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:44
-#, fuzzy
-msgid "Select all articles"
-msgstr "Очистить статьи"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr "Не могу загрузить XML документ."
 
-#: help/3.php:45
-#, fuzzy
-msgid "Select unread articles"
-msgstr "Очистить непрочитанные статьи"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Заголовок или содержимое"
 
-#: help/3.php:46
-#, fuzzy
-msgid "Invert article selection"
-msgstr "Действия над текущей статьёй"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Ссылка"
 
-#: help/3.php:47
-#, fuzzy
-msgid "Deselect all articles"
-msgstr "Очистить статьи"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Дата Статьи"
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "Действия над каналом:"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "Удалить статью"
 
-#: help/3.php:53
-#, fuzzy
-msgid "Refresh active feed"
-msgstr "Обновить активный канал"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Отметить"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "Редактировать канал"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "Опубликовать"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "Отметить канал как прочитанный"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Применить теги"
 
-#: help/3.php:58
-#, fuzzy
-msgid "Reverse headlines order"
-msgstr "Обратный порядок заголовков (старые впереди)"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "Применить метку"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "Отметить все каналы как прочитанные"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr "Изменить оценку"
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "Если котегория видна, (раз)свернуть её"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Общие"
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "Перейти к.."
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Интерфейс"
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "Все статьи"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Расширенные"
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "Свежие"
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+"Эта опция полезна, если вы читаете несколько агрегаторов типа \"планета\" с "
+"пересекающимися статьями. Когда запрещено, статья показывается лишь один раз."
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "Отмеченные"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr ""
+"Показывать развёрнутый список статей, вместо разделения экрана на заголовки "
+"и содержимое статей"
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "Опубликованные"
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"После выбора опции \"Отметить как прочитанное\" в верхней панели, "
+"автоматически открывать следующий канал с не прочитанными статьями."
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "Облако тегов"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr ""
+"Эта опция разрешает отправку ежедневного обзора новых (и непрочитанных) "
+"заголовков на ваш адрес электронной почты"
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: include/localized_schema.php:25
+#, fuzzy
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
 msgstr ""
+"Эта опция разрешает автоматически отмечать статьи как прочитанные в "
+"комбинированном режиме (исключение для специального канала \"Свежие статьи"
+"\" ), пока вы прокручиваете список статей."
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "Нажмите любую клавишу для закрытия этого окна"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "Вырезать все, кроме основных HTML тегов при показе статей."
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "Мои каналы"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr ""
+"Когда автоопределение тегов в статьях, эти теги не будут применяться (список "
+"значений, разделённых запятыми)."
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "Другие каналы"
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+"Когда эта опция включена, заголовки в Особом канале и Метки группируются по "
+"каналам"
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "Действия над каналами"
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr ""
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "Лучшие 25 каналов"
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr ""
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "Редактировать категории канала"
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr ""
+
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "Стирать статьи старше этого количества дней (0 - выключает)"
+
+#: include/localized_schema.php:33
+msgid "Default interval between feed updates"
+msgstr "Интервал между обновлениями каналов по умолчанию (в минутах)"
+
+#: include/localized_schema.php:34
+msgid "Amount of articles to display at once"
+msgstr "Количество статей на странице"
+
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "Разрешить дубликаты статей"
+
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "Включить категории каналов"
+
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "Показать предпросмотр содержимого в списке заголовков"
+
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "Короткий формат даты"
+
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "Длинный формат даты"
+
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "Комбинированный режим отображения"
+
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "Спрятать каналы без непрочитанных статей"
+
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "Показывать следующий канал при отметке как прочитанный"
+
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "Сортировать каналы по количеству непрочитанных статей"
+
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "Обратный порядок заголовков (старые впереди)"
+
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "Включить почтовый дайджест"
+
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "Подтвердить отметку каналка как прочитанный"
+
+#: include/localized_schema.php:47
+msgid "Automatically mark articles as read"
+msgstr "Автоматически помечать статьи как прочитанные"
+
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "Вырезать небезопасные теги из статей"
+
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "Черный список тегов"
+
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "Максимальный возраст свежих статей (в часах)"
+
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "Отметить все статьи в e-mail дайджесте как прочитанные?"
+
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "Автоматически раскрывать статьи в комбинированном режиме"
+
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "Очистить непрочитанные статьи"
+
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "Показывать специальные каналы, когда скрываются прочитанные каналы"
+
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "Группировать заголовки в виртуальные каналы"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "Фокус на поиск (если поиск показан)"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "Не показывать изображения в статьях"
 
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
+#: include/localized_schema.php:57
+msgid "Enable external API"
 msgstr ""
-"<b>Замечание:</b> не все действия могут быть доступны. Это зависит от "
-"конфигурации Tiny Tiny RSS и вашего уровня доступа."
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "Войти"
+#: include/localized_schema.php:58
+msgid "User timezone"
+msgstr "Часовой пояс"
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "Логин:"
+#: include/localized_schema.php:59
+msgid "Sort headlines by feed date"
+msgstr "Сортировать каналы по дате, указанной в канале"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "Пароль:"
+#: include/localized_schema.php:60 js/prefs.js:1762
+msgid "Customize stylesheet"
+msgstr "Изменить пользовательские стили"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr ""
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr "Вход с помощью SSL сертификата"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "Особые"
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "Язык:"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr ""
+#: include/login_form.php:148
+msgid "Profile:"
+msgstr "Профиль:"
 
-#: mobile/prefs.php:24
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr "Использовать меньше трафика"
+
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "Отметить все статьи в %s как прочитанные?"
+
+#: js/digest.js:69
 #, fuzzy
-msgid "Enable categories"
-msgstr "Включить категории каналов"
+msgid "Mark %d displayed articles as read?"
+msgstr "Отметить %d статью(ей) как прочитанные?"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
-msgstr ""
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "Не отмеченные"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
-msgstr ""
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "Отмеченные"
 
-#: mobile/prefs.php:29
-#, fuzzy
-msgid "Browse categories like folders"
-msgstr "Сбросить порядок категорий"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "Не публиковать"
 
-#: mobile/prefs.php:35
+#: js/digest.js:265
 #, fuzzy
-msgid "Show images in posts"
-msgstr "Не показывать изображения в статьях"
+msgid "Original article"
+msgstr "Показать оригинальное содержимое статьи"
 
-#: mobile/prefs.php:40
+#: js/digest.js:267
 #, fuzzy
-msgid "Hide read articles and feeds"
-msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
+msgid "Close this panel"
+msgstr "Закрыть это окно"
 
-#: mobile/prefs.php:45
+#: js/digest.js:290
 #, fuzzy
-msgid "Sort feeds by unread count"
-msgstr "Сортировать каналы по количеству непрочитанных статей"
+msgid "Error: unable to load article."
+msgstr "Ошибка: пожалуйста загрузите OPML файл."
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "Ошибка проверки сессии (некорректный IP)"
+#: js/digest.js:444
+#, fuzzy
+msgid "Click to expand article."
+msgstr "Щёлкните чтобы развернуть статью"
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "Некорректное имя пользователя или пароль"
+#: js/digest.js:519
+#, fuzzy
+msgid "%d more..."
+msgstr "Идет загрузка помощи..."
 
+#: js/digest.js:526
 #, fuzzy
-#~ msgid "Archived articles"
-#~ msgstr "Сохранённые статьи"
+msgid "No unread feeds."
+msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 
-#~ msgid "Select:"
-#~ msgstr "Выбрать:"
+#: js/digest.js:628
+#, fuzzy
+msgid "Load more..."
+msgstr "Идет загрузка помощи..."
 
-#~ msgid "Invert"
-#~ msgstr "Инвертировать"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr ""
 
-#~ msgid "Selection toggle:"
-#~ msgstr "Переключить выбранное:"
+#: js/FeedTree.js:137
+#, fuzzy
+msgid "Update feed"
+msgstr "Обновить все каналы"
 
-#~ msgid "Selection:"
-#~ msgstr "Выбрано:"
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
 
+#: js/functions.js:647
 #, fuzzy
-#~ msgid "Move back"
-#~ msgstr "Идти назад"
+msgid "Date syntax appears to be correct:"
+msgstr "Старый пароль неправилен."
 
+#: js/functions.js:650
 #, fuzzy
-#~ msgid "Delete"
-#~ msgstr "По умолчанию"
-
-#~ msgid "Feed:"
-#~ msgstr "Канал:"
+msgid "Date syntax is incorrect."
+msgstr "Старый пароль неправилен."
 
+#: js/functions.js:777
 #, fuzzy
-#~ msgid "Visit the website"
-#~ msgstr "Посетить официальный сайт"
+msgid "Remove stored feed icon?"
+msgstr "Удалить сохранённые данные"
 
+#: js/functions.js:809
 #, fuzzy
-#~ msgid "View as RSS feed"
-#~ msgstr "Каналы"
+msgid "Please select an image file to upload."
+msgstr "Пожалуйста выберите только один канал."
 
-#, fuzzy
-#~ msgid "Click to play"
-#~ msgstr "Щёлкните для редактирования"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr ""
 
-#~ msgid " - "
-#~ msgstr " - "
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "Пожалуйста, введите заголовок метки:"
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "Редактировать теги статьи"
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "Не могу создать метку: отсутствует заголовок."
+
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "Подписаться на канал"
+
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "Подписаться на канал..."
 
+#: js/functions.js:901
 #, fuzzy
-#~ msgid "Open article in new tab"
-#~ msgstr "Открыть статью в новом окне"
+msgid "Subscribed to %s"
+msgstr "Подписаны каналы:"
+
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr ""
+
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
 
+#: js/functions.js:945
 #, fuzzy
-#~ msgid "Edit article note"
-#~ msgstr "Редактировать теги"
+msgid "Couldn't download the specified URL."
+msgstr "Не могу подписаться: нет URL"
 
+#: js/functions.js:948
 #, fuzzy
-#~ msgid "Close this panel"
-#~ msgstr "Закрыть это окно"
+msgid "You are already subscribed to this feed."
+msgstr "Нельзя отписаться от категории."
 
-#~ msgid "mark as read"
-#~ msgstr "Отметить как прочитанные"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "Создать фильтр"
 
+#: js/functions.js:987 js/prefs.js:165
 #, fuzzy
-#~ msgid "Dismiss article"
-#~ msgstr "Опубликовать"
+msgid "Filter Test Results"
+msgstr "Выражение"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "Не найдено не прочитанных статей"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "Не найдено не прочитанных статей."
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "Отписаться от %s?"
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "Не найдено отмеченных статей"
+#: js/functions.js:1173
+#, fuzzy
+msgid "Please enter category title:"
+msgstr "Пожалуйста, укажите заметку для статьи:"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше "
-#~ "меню Действия) или используйте фильтр."
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr ""
 
-#~ msgid "No articles found to display."
-#~ msgstr "Статей не найдено."
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "Вы не можете редактировать этот канал."
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr ""
-#~ "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
+#: js/functions.js:1400
+#, fuzzy
+msgid "Edit Feed"
+msgstr "Редактировать канал"
 
+#: js/functions.js:1438
 #, fuzzy
-#~ msgid "Remove:"
-#~ msgstr "Удалить"
+msgid "More Feeds"
+msgstr "Больше каналов"
+
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "Нет выбранных каналов."
+
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
 
+#: js/functions.js:1580
 #, fuzzy
-#~ msgid "Assign:"
-#~ msgstr "Применить метку:"
+msgid "Feeds with update errors"
+msgstr "Ошибки обновления"
 
+#: js/functions.js:1591 js/prefs.js:1229
 #, fuzzy
-#~ msgid "(edit note)"
-#~ msgstr "править заметку"
+msgid "Remove selected feeds?"
+msgstr "Удалить выбранные фильтры?"
 
-#~ msgid "No feed selected."
-#~ msgstr "Канал не выбран."
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "Нет выбранных статей."
 
-#~ msgid "unknown type"
-#~ msgstr "Неизвестный тип"
+#: js/mail_button.js:21
+#, fuzzy
+msgid "Forward article by email"
+msgstr "Отмеченные"
 
-#~ msgid "Attachment:"
-#~ msgstr "Вложение:"
+#: js/PrefFilterTree.js:32
+#, fuzzy
+msgid "Inverse"
+msgstr "(Инвертирован)"
 
-#~ msgid "Attachments:"
-#~ msgstr "Вложения:"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "Пожалуйста, введите логин:"
 
-#~ msgid "Language:"
-#~ msgstr "Язык:"
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "Не могу добавить пользователя: не указан логин."
 
+#: js/prefs.js:134
 #, fuzzy
-#~ msgid "Profile:"
-#~ msgstr "Файл:"
+msgid "Edit Filter"
+msgstr "Фильтры"
 
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "Переключить изменение режима категории"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "Удалить фильтр %s?"
 
-#~ msgid "Update all feeds"
-#~ msgstr "Обновить все каналы"
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "Удалить выбранные метки?"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "Сортировать по имени или количеству непрочитанных"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "Нет выбранных меток."
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "Отметить все статьи в %s как прочитанные?"
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "Отметить %d статью(ей) как прочитанные?"
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "Нет выбранных пользователей."
 
-#~ msgid "Unstar article"
-#~ msgstr "Не отмеченные"
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "Удалить выбранные фильтры?"
 
-#~ msgid "Star article"
-#~ msgstr "Отмеченные"
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "Нет выбранных фильтров."
 
-#~ msgid "Unpublish article"
-#~ msgstr "Не публиковать"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "Отписаться от выбранных каналов?"
 
-#, fuzzy
-#~ msgid "Original article"
-#~ msgstr "Показать оригинальное содержимое статьи"
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "Пожалуйста выберите только один канал."
 
-#, fuzzy
-#~ msgid "Error: unable to load article."
-#~ msgstr "Ошибка: пожалуйста загрузите OPML файл."
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "Стереть все не отмеченные статьи в выбранном канале?"
 
-#, fuzzy
-#~ msgid "Click to expand article."
-#~ msgstr "Щёлкните чтобы развернуть статью"
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
 
-#, fuzzy
-#~ msgid "No unread feeds."
-#~ msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "Поле логина не может быть пустым."
 
-#, fuzzy
-#~ msgid "Load more..."
-#~ msgstr "Идет загрузка помощи..."
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "Пожалуйста выберите только одного пользователя."
 
-#, fuzzy
-#~ msgid "Update feed"
-#~ msgstr "Обновить все каналы"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "Сбросить пароль выбранного пользователя?"
 
-#, fuzzy
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "Старый пароль неправилен."
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "Пожалуйста выберите только один фильтр."
 
+#: js/prefs.js:652
 #, fuzzy
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "Старый пароль неправилен."
+msgid "Edit Multiple Feeds"
+msgstr "Редактор канала"
 
-#, fuzzy
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "Удалить сохранённые данные"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "Сохранить изменения выбранных каналов?"
 
-#, fuzzy
-#~ msgid "Please select an image file to upload."
-#~ msgstr "Пожалуйста выберите только один канал."
+#: js/prefs.js:768
+msgid "OPML Import"
+msgstr "Импорт OPML"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "Пожалуйста, введите заголовок метки:"
+#: js/prefs.js:795
+msgid "Please choose an OPML file first."
+msgstr "Пожалуйста выберите файл OPML."
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "Не могу создать метку: отсутствует заголовок."
+#: js/prefs.js:811
+msgid "Please choose the file first."
+msgstr "Пожалуйста выберите файл."
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "Подписаться на канал"
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "Сбросить настройки?"
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "Подписаться на канал..."
+#: js/prefs.js:1149
+msgid "Feed Categories"
+msgstr "Категории"
 
-#, fuzzy
-#~ msgid "Subscribed to %s"
-#~ msgstr "Подписаны каналы:"
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "Удалить выбранные категории?"
 
-#, fuzzy
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "Не могу подписаться: нет URL"
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "Нет выбранных категорий."
 
-#, fuzzy
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "Нельзя отписаться от категории."
+#: js/prefs.js:1218
+msgid "Feeds without recent updates"
+msgstr "Давно не обновлявшиеся каналы"
 
-#~ msgid "Create Filter"
-#~ msgstr "Создать фильтр"
+#: js/prefs.js:1267
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "Изменить текущий адрес публикации OPML на новый?"
 
-#, fuzzy
-#~ msgid "Filter Test Results"
-#~ msgstr "Выражение"
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr "Заново оценить статьи в выбранных каналах?"
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "Отписаться от %s?"
+#: js/prefs.js:1399
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+"Оценить заново все статьи? Эта операция может продолжаться длительное время."
 
+#: js/prefs.js:1419
 #, fuzzy
-#~ msgid "Please enter category title:"
-#~ msgstr "Пожалуйста, укажите заметку для статьи:"
+msgid "Reset selected labels to default colors?"
+msgstr "Сбросить метку цветов, на цвета по умолчанию?"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "Вы не можете редактировать этот канал."
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr "Профили настроек"
 
-#, fuzzy
-#~ msgid "Edit Feed"
-#~ msgstr "Редактировать канал"
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
 
-#, fuzzy
-#~ msgid "More Feeds"
-#~ msgstr "Больше каналов"
+#: js/prefs.js:1483
+msgid "No profiles are selected."
+msgstr "Профиль не выбран"
 
-#~ msgid "No feeds are selected."
-#~ msgstr "Нет выбранных каналов."
+#: js/prefs.js:1491 js/prefs.js:1544
+msgid "Activate selected profile?"
+msgstr "Активировать выбранный профиль?"
 
-#, fuzzy
-#~ msgid "Feeds with update errors"
-#~ msgstr "Ошибки обновления"
+#: js/prefs.js:1507 js/prefs.js:1560
+msgid "Please choose a profile to activate."
+msgstr "Пожалуйста выберите какой-нибудь профиль."
 
-#, fuzzy
-#~ msgid "Remove selected feeds?"
-#~ msgstr "Удалить выбранные фильтры?"
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Inverse"
-#~ msgstr "(Инвертирован)"
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr ""
 
-#~ msgid "Please enter login:"
-#~ msgstr "Пожалуйста, введите логин:"
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "Редактор Меток"
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "Не могу добавить пользователя: не указан логин."
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr ""
 
+#: js/prefs.js:1804
 #, fuzzy
-#~ msgid "Edit Filter"
-#~ msgstr "Фильтры"
-
-#~ msgid "Remove filter %s?"
-#~ msgstr "Удалить фильтр %s?"
+msgid "Link Instance"
+msgstr "Редактировать теги"
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "Удалить выбранные метки?"
+#: js/prefs.js:1855
+#, fuzzy
+msgid "Edit Instance"
+msgstr "Редактировать теги"
 
-#~ msgid "No labels are selected."
-#~ msgstr "Нет выбранных меток."
+#: js/prefs.js:1904
+#, fuzzy
+msgid "Remove selected instances?"
+msgstr "Удалить выбранные фильтры?"
 
-#~ msgid "No users are selected."
-#~ msgstr "Нет выбранных пользователей."
+#: js/prefs.js:1921 js/prefs.js:1933
+#, fuzzy
+msgid "No instances are selected."
+msgstr "Нет выбранных фильтров."
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "Удалить выбранные фильтры?"
+#: js/prefs.js:1938
+#, fuzzy
+msgid "Please select only one instance."
+msgstr "Пожалуйста выберите только один фильтр."
 
-#~ msgid "No filters are selected."
-#~ msgstr "Нет выбранных фильтров."
+#: js/prefs.js:1973
+msgid "Export Data"
+msgstr "Экспортировать данные"
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "Отписаться от выбранных каналов?"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "Please select only one feed."
-#~ msgstr "Пожалуйста выберите только один канал."
+#: js/prefs.js:2053
+msgid "Data Import"
+msgstr "Импортировать данные"
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr "Стереть все не отмеченные статьи в выбранном канале?"
+#: js/share_button.js:10
+msgid "Share article by URL"
+msgstr "Расшарить статью по ссылке"
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "Пометить все статьи как прочитанные?"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "Поле логина не может быть пустым."
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "Нельзя отписаться от категории."
 
-#~ msgid "Please select only one user."
-#~ msgstr "Пожалуйста выберите только одного пользователя."
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "Пожалуйста выберите какой-нибудь канал."
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "Сбросить пароль выбранного пользователя?"
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "Вы не можете снова оценить этот канал."
 
-#~ msgid "Please select only one filter."
-#~ msgstr "Пожалуйста выберите только один фильтр."
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "Установить оценку статьям в %s?"
 
+#: js/tt-rss.js:1083
 #, fuzzy
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "Редактор канала"
-
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "Сохранить изменения выбранных каналов?"
+msgid "New version available!"
+msgstr "Доступная новая версия Tiny Tiny RSS!"
 
-#, fuzzy
-#~ msgid "OPML Import"
-#~ msgstr "Импортировать"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "Отметить все видимые статьи в %s как прочитанные?"
 
+#: js/viewfeed.js:901
 #, fuzzy
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "Пожалуйста выберите какой-нибудь канал."
+msgid "Delete %d selected articles in %s?"
+msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "Сбросить настройки?"
+#: js/viewfeed.js:903
+msgid "Delete %d selected articles?"
+msgstr "Удалить %d выбранных статей?"
 
-#, fuzzy
-#~ msgid "Feed Categories"
-#~ msgstr "Категория:"
+#: js/viewfeed.js:945
+msgid "Archive %d selected articles in %s?"
+msgstr "Архивировать %d выбранных статей в %s?"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "Удалить выбранные категории?"
+#: js/viewfeed.js:948
+msgid "Move %d archived articles back?"
+msgstr "Переместить %d архивированных статей назад?"
 
-#~ msgid "No categories are selected."
-#~ msgstr "Нет выбранных категорий."
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
-#, fuzzy
-#~ msgid "Feeds without recent updates"
-#~ msgstr "Ошибки обновления"
+#: js/viewfeed.js:1016
+msgid "Edit article Tags"
+msgstr "Редактировать теги"
 
-#, fuzzy
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "Изменить текущий адрес публикации на новый?"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "Статья не выбрана"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "Заново оценить статьи в выбранных каналах?"
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "Статей для отметки не найдено."
 
-#~ msgid "Rescore all articles? This operation may take a lot of time."
-#~ msgstr ""
-#~ "Оценить заново все статьи? Эта операция может продолжаться длительное "
-#~ "время."
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "Отметить %d статью(ей) как прочитанные?"
 
-#, fuzzy
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "Сбросить метку цветов, на цвета по умолчанию?"
+#: js/viewfeed.js:1374
+msgid "Loading..."
+msgstr "Идет загрузка..."
 
-#, fuzzy
-#~ msgid "No profiles are selected."
-#~ msgstr "Статья не выбрана"
+#: js/viewfeed.js:1848
+msgid "Open original article"
+msgstr "Показать оригинальное содержимое статьи"
 
-#, fuzzy
-#~ msgid "Activate selected profile?"
-#~ msgstr "Удалить выбранные фильтры?"
+#: js/viewfeed.js:1854
+msgid "View in a tt-rss tab"
+msgstr "Открыть статью в новой закладке tt-rss"
 
-#~ msgid "Label Editor"
-#~ msgstr "Редактор Меток"
+#: js/viewfeed.js:1862
+msgid "Mark above as read"
+msgstr "Отметить статьи выше как прочитанные"
 
-#, fuzzy
-#~ msgid "Edit Instance"
-#~ msgstr "Редактировать теги"
+#: js/viewfeed.js:1868
+msgid "Mark below as read"
+msgstr "Отметить статьи ниже как прочитанные"
 
-#, fuzzy
-#~ msgid "Remove selected instances?"
-#~ msgstr "Удалить выбранные фильтры?"
+#: js/viewfeed.js:1914
+msgid "Remove label"
+msgstr "Удалить метку"
 
-#, fuzzy
-#~ msgid "No instances are selected."
-#~ msgstr "Нет выбранных фильтров."
+#: js/viewfeed.js:1938
+msgid "Playing..."
+msgstr "Проигрываю..."
 
-#, fuzzy
-#~ msgid "Please select only one instance."
-#~ msgstr "Пожалуйста выберите только один фильтр."
+#: js/viewfeed.js:1939
+msgid "Click to pause"
+msgstr "Пауза"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "Пометить все статьи как прочитанные?"
+#~ msgid "About..."
+#~ msgstr "О программе..."
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "Нельзя отписаться от категории."
+#~ msgid "Help"
+#~ msgstr "Помощь"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "Пожалуйста выберите какой-нибудь канал."
+#~ msgid "Importing using DOMXML."
+#~ msgstr "Импортирую OPML (с помощью расширения DOMXML)..."
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "Вы не можете снова оценить этот канал."
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "Импортирую OPML (с помощью расширения DOMDocument)..."
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "Установить оценку статьям в %s?"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr ""
+#~ "Расширение DOMXML не найдено. Оно необходимо для версий PHP старее 5."
 
 #, fuzzy
-#~ msgid "New version available!"
-#~ msgstr "Доступная новая версия Tiny Tiny RSS!"
-
-#~ msgid "No articles are selected."
-#~ msgstr "Нет выбранных статей."
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "Кэшировать изображения локально"
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "Отметить все видимые статьи в %s как прочитанные?"
+#~ msgid "Note: Only main settings profile can be migrated using OPML."
+#~ msgstr "Только главный профиль настроек будет экспортирован в OPML."
 
 #, fuzzy
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
+#~ msgid "Publish"
+#~ msgstr "Опубликован"
 
-#, fuzzy
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "Удалить выбранные статьи из меток?"
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "Пароль пользователя <b>%s</b> изменен."
 
-#, fuzzy
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
+#~ msgid "Content filtering"
+#~ msgstr "Фильтровать содержимое"
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny Tiny RSS поддерживает фильтрацию (обработку) статей. Фильтрация "
+#~ "выполняется однажды, когда новая статья импортируется в базу данных из "
+#~ "новостного канала, затем ищется совпадение с заданным регулярным "
+#~ "выражением и выполняется заданное действие. Регулярное выражение не "
+#~ "чувствительно к регистру."
 
-#, fuzzy
-#~ msgid "Edit article Tags"
-#~ msgstr "Редактировать теги"
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "Поддерживаются события: фильтр (не импорт) статьи, отметить статью как "
+#~ "прочитанную, пометить статью, назначить тег, и установить оценку. Фильтры "
+#~ "могут быть определены глобально и локально для некоторых специфических "
+#~ "каналов."
 
-#~ msgid "No article is selected."
-#~ msgstr "Статья не выбрана"
+#~ msgid ""
+#~ "Multiple and inverse matching are supported. All matching filters are "
+#~ "considered when article is being imported and all actions executed in "
+#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
+#~ "XYZZY in title with inverse flag will match all articles, except those "
+#~ "containing string XYZZY in title."
+#~ msgstr ""
+#~ "Составные и инверсионные фильтры поддерживаются. Все совпадения фильтров "
+#~ "обсчитываются при импорте статьей и все действия выполняются "
+#~ "последовательно. Инверсное совпадение возвращает результат совпадения, т."
+#~ "е. фильтр совпадающий с XYZZY в заголовке с инверсным флагом, отфильтрует "
+#~ "все статьи кроме тех, где заголовок содержит строку XYZZY."
 
-#~ msgid "No articles found to mark"
-#~ msgstr "Статей для отметки не найдено."
+#~ msgid "See also:"
+#~ msgstr "Смотри также:"
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "Отметить %d статью(ей) как прочитанные?"
+#~ msgid "Add category..."
+#~ msgstr "Добавить категорию..."
 
-#, fuzzy
-#~ msgid "Loading..."
-#~ msgstr "Загрузка списка каналов..."
+#~ msgid "Add label..."
+#~ msgstr "Добавить метку..."
 
-#, fuzzy
-#~ msgid "Open original article"
-#~ msgstr "Показать оригинальное содержимое статьи"
+#~ msgid "description"
+#~ msgstr "описание"
 
-#, fuzzy
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "Открыть статью в новом окне"
+#~ msgid "short_desc"
+#~ msgstr "краткое описание"
 
 #, fuzzy
-#~ msgid "Remove label"
-#~ msgstr "Удалить выбранные метки?"
+#~ msgid "Dismiss article"
+#~ msgstr "Опубликовать"
 
 #, fuzzy
-#~ msgid "Playing..."
-#~ msgstr "Загрузка списка каналов..."
+#~ msgid "Remove:"
+#~ msgstr "Удалить"
 
 #, fuzzy
-#~ msgid "Click to pause"
-#~ msgstr "Щёлкните для редактирования"
+#~ msgid "Assign:"
+#~ msgstr "Применить метку:"
 
-#, fuzzy
-#~ msgid "Share article by URL"
-#~ msgstr "Отмеченные"
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "Переключить изменение режима категории"
+
+#~ msgid "Update all feeds"
+#~ msgstr "Обновить все каналы"
+
+#~ msgid "Sort by name or unread count"
+#~ msgstr "Сортировать по имени или количеству непрочитанных"
 
 #, fuzzy
 #~ msgid "feeds"
@@ -2805,20 +3103,9 @@ msgstr "Сортировать каналы по количеству непро
 #~ msgid "Fatal Exception"
 #~ msgstr "Фатальная Ошибка"
 
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "Категория добавляется..."
-
 #~ msgid "audio/mpeg"
 #~ msgstr "audio/mpeg"
 
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Категория добавляется..."
-
-#~ msgid "General"
-#~ msgstr "Общие"
-
 #~ msgid "Enable offline reading"
 #~ msgstr "Разрешить чтение оффлайн"
 
@@ -2826,9 +3113,6 @@ msgstr "Сортировать каналы по количеству непро
 #~ msgstr ""
 #~ "Синхронизация новых статей для чтения оффлайн, использую Google Gears."
 
-#~ msgid "Interface"
-#~ msgstr "Интерфейс"
-
 #~ msgid "Default article limit"
 #~ msgstr "Количество статей по умолчанию"
 
@@ -2861,9 +3145,6 @@ msgstr "Сортировать каналы по количеству непро
 #~ "Эта опция скрывает список каналов и позволяет его переключать на лету, "
 #~ "удобно для маленьких экранов"
 
-#~ msgid "Advanced"
-#~ msgstr "Расширенные"
-
 #~ msgid "Enable feed icons"
 #~ msgstr "Разрешить иконки каналов"
 
@@ -3147,10 +3428,6 @@ msgstr "Сортировать каналы по количеству непро
 #~ msgid "Adding feed..."
 #~ msgstr "Канал добавляется..."
 
-#, fuzzy
-#~ msgid "Adding profile..."
-#~ msgstr "Канал добавляется..."
-
 #~ msgid "Adding user..."
 #~ msgstr "Пользователь добавляется..."
 
@@ -3432,18 +3709,12 @@ msgstr "Сортировать каналы по количеству непро
 #~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
 #~ msgstr "&nbsp;&nbsp;Горячие клавиши"
 
-#~ msgid "description"
-#~ msgstr "описание"
-
 #~ msgid "filter_type_descr"
 #~ msgstr "описание типа фильтра"
 
 #~ msgid "action_description"
 #~ msgstr "описание действия"
 
-#~ msgid "short_desc"
-#~ msgstr "краткое описание"
-
 #~ msgid "Can't add user: no login specified."
 #~ msgstr "Не могу добавить пользователя без логина"
 
@@ -3582,9 +3853,6 @@ msgstr "Сортировать каналы по количеству непро
 #~ "и прочитайте о других способах обновления каналов в <a href='http://tt-"
 #~ "rss.spb.ru/trac/wiki/UpdatingFeeds'>wiki</a>."
 
-#~ msgid "Modify score"
-#~ msgstr "Изменить оценку"
-
 #~ msgid "<h1>User not found</h1>"
 #~ msgstr "<h1>Пользователь не найден</h1>"
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index ad80dc19..9d5eebef 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index c801d825..b58ec40f 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-12 13:32+0400\n"
+"POT-Creation-Date: 2011-12-28 13:30+0400\n"
 "PO-Revision-Date: 2011-11-23 00:49+0800\n"
 "Last-Translator: lazycai <lazycai.ffsky@gmail.com>\n"
 "Language-Team: \n"
@@ -18,185 +18,166 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: backend.php:84
+#: backend.php:82
 msgid "Use default"
 msgstr "使用默认"
 
-#: backend.php:85
+#: backend.php:83
 msgid "Never purge"
 msgstr "从不清理"
 
-#: backend.php:86
+#: backend.php:84
 msgid "1 week old"
 msgstr "1周前"
 
-#: backend.php:87
+#: backend.php:85
 msgid "2 weeks old"
 msgstr "2周前"
 
-#: backend.php:88
+#: backend.php:86
 msgid "1 month old"
 msgstr "1个月前"
 
-#: backend.php:89
+#: backend.php:87
 msgid "2 months old"
 msgstr "2个月前"
 
-#: backend.php:90
+#: backend.php:88
 msgid "3 months old"
 msgstr "3个月前"
 
-#: backend.php:93
+#: backend.php:91
 msgid "Default interval"
 msgstr "默认间隔"
 
-#: backend.php:94 backend.php:104
+#: backend.php:92 backend.php:102
 msgid "Disable updates"
 msgstr "禁用更新"
 
-#: backend.php:95 backend.php:105
+#: backend.php:93 backend.php:103
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
-#: backend.php:96 backend.php:106
+#: backend.php:94 backend.php:104
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
-#: backend.php:97 backend.php:107
+#: backend.php:95 backend.php:105
 msgid "Hourly"
 msgstr "每小时"
 
-#: backend.php:98 backend.php:108
+#: backend.php:96 backend.php:106
 msgid "Each 4 hours"
 msgstr "每4小时"
 
-#: backend.php:99 backend.php:109
+#: backend.php:97 backend.php:107
 msgid "Each 12 hours"
 msgstr "每12小时"
 
-#: backend.php:100 backend.php:110
+#: backend.php:98 backend.php:108
 msgid "Daily"
 msgstr "每天"
 
-#: backend.php:101 backend.php:111
+#: backend.php:99 backend.php:109
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:114 index.php:142 modules/pref-prefs.php:350
+#: backend.php:112 index.php:163 classes/pref_prefs.php:345
 msgid "Default"
 msgstr "默认"
 
-#: backend.php:115
+#: backend.php:113
 msgid "Magpie"
 msgstr "Magpie"
 
-#: backend.php:116
+#: backend.php:114
 msgid "SimplePie"
 msgstr "SimplePie"
 
-#: backend.php:117
+#: backend.php:115
 msgid "Twitter OAuth"
 msgstr "Twitter OAuth 认证"
 
-#: backend.php:126 modules/pref-users.php:131
+#: backend.php:124 classes/pref_users.php:139
 msgid "User"
 msgstr "用户"
 
-#: backend.php:127
+#: backend.php:125
 msgid "Power User"
 msgstr "Power User"
 
-#: backend.php:128
+#: backend.php:126
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:173 prefs.php:94 modules/pref-feeds.php:45
-#: modules/pref-feeds.php:1278 modules/pref-feeds.php:1348
-msgid "Feeds"
-msgstr "信息源"
-
-#: backend.php:201
-msgid "Article not found."
-msgstr "找不到文章。"
-
-#: backend.php:291
-msgid "Feed not found."
-msgstr "找不到信息源。"
-
-#: backend.php:450 digest.php:63 index.php:64 index.php:108 index.php:193
-#: prefs.php:67 modules/pref-feeds.php:1401 modules/pref-filters.php:550
-#: modules/pref-labels.php:293
-msgid "Loading, please wait..."
-msgstr "读取中，请稍等……"
-
-#: db-updater.php:18
+#: db-updater.php:19
 msgid "Your access level is insufficient to run this script."
 msgstr "访问级别不足，无法运行脚本。"
 
-#: db-updater.php:43
+#: db-updater.php:44
 msgid "Database Updater"
 msgstr "数据库更新管理器"
 
-#: db-updater.php:84
+#: db-updater.php:85
 msgid "Could not update database"
 msgstr "无法更新数据库"
 
-#: db-updater.php:87
+#: db-updater.php:88
 msgid "Could not find necessary schema file, need version:"
 msgstr "无法找到必要的表结构文件，需要版本："
 
-#: db-updater.php:88
+#: db-updater.php:89
 msgid ", found: "
 msgstr "，找到："
 
-#: db-updater.php:91
+#: db-updater.php:92
 msgid "Tiny Tiny RSS database is up to date."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: db-updater.php:93 db-updater.php:160 db-updater.php:173 register.php:193
-#: register.php:238 register.php:251 register.php:266 register.php:284
-#: register.php:369 register.php:379 register.php:391 twitter.php:110
-#: twitter.php:122 modules/pref-feeds.php:1096
+#: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
+#: register.php:239 register.php:252 register.php:267 register.php:285
+#: register.php:370 register.php:380 register.php:392 twitter.php:111
+#: twitter.php:123 classes/pref_feeds.php:1079
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
-#: db-updater.php:99
+#: db-updater.php:100
 msgid "Please backup your database before proceeding."
 msgstr "执行下一步前请先备份数据库。"
 
-#: db-updater.php:101
+#: db-updater.php:102
 #, php-format
 msgid ""
 "Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to "
 "<b>%d</b>)."
 msgstr "您的 Tiny Tiny RSS 数据库需要升级到最新版（<b>%d</b> 到 <b>%d</b>）。"
 
-#: db-updater.php:115
+#: db-updater.php:116
 msgid "Perform updates"
 msgstr "执行更新"
 
-#: db-updater.php:120
+#: db-updater.php:121
 msgid "Performing updates..."
 msgstr "正在更新……"
 
-#: db-updater.php:126
+#: db-updater.php:127
 #, php-format
 msgid "Updating to version %d..."
 msgstr "正在更新到 %d 版本……"
 
-#: db-updater.php:139
+#: db-updater.php:140
 msgid "Checking version... "
 msgstr "正在检查版本……"
 
-#: db-updater.php:145
+#: db-updater.php:146
 msgid "OK!"
 msgstr "OK！"
 
-#: db-updater.php:147
+#: db-updater.php:148
 msgid "ERROR!"
 msgstr "错误！"
 
-#: db-updater.php:155
+#: db-updater.php:156
 #, php-format
 msgid ""
 "Finished. Performed <b>%d</b> update(s) up to schema\n"
@@ -205,22 +186,22 @@ msgstr ""
 "完成。完成了 <b>%d</b> 个更新，\n"
 "\t\t\t表结构版本升级至 <b>%d</b>。"
 
-#: db-updater.php:165
+#: db-updater.php:166
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
 msgstr "您的数据库表结构来自一个较新版本的 Tiny Tiny RSS。"
 
-#: db-updater.php:167
+#: db-updater.php:168
 #, php-format
 msgid "Found schema version: <b>%d</b>, required: <b>%d</b>."
 msgstr "发现新版本的表结构：<b>%d</b>，需要的版本：<b>%d</b>。"
 
-#: db-updater.php:169
+#: db-updater.php:170
 msgid ""
 "Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer "
 "version and continue."
 msgstr "无法升级表结构。请将 Tiny Tiny RSS 更新到最新版本之后再来尝试。"
 
-#: digest.php:57
+#: digest.php:58
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\t\tfor this application to function properly. Please check your\n"
@@ -229,65 +210,72 @@ msgstr ""
 "本页面需要JavaScript支持。\n"
 "\t\t\t请检查您的浏览器设置。"
 
-#: digest.php:71 index.php:74
+#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
+#: classes/backend.php:6 classes/pref_feeds.php:1364
+#: classes/pref_filters.php:602 classes/pref_labels.php:296
+#: js/viewfeed.js:1099 js/viewfeed.js:1276
+msgid "Loading, please wait..."
+msgstr "读取中，请稍等……"
+
+#: digest.php:72 index.php:97
 msgid "Hello,"
 msgstr "你好，"
 
-#: digest.php:74 index.php:84 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "注销"
 
-#: errors.php:8
+#: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 "doesn't seem to support it."
 msgstr "本程序需要 XmlHttpRequest 的支持。您的浏览器似乎不支持。"
 
-#: errors.php:11
+#: errors.php:12
 msgid ""
 "This program requires cookies to function properly. Your browser doesn't "
 "seem to support them."
 msgstr "本程序需要 cookie 支持。您的浏览器似乎不支持。"
 
-#: errors.php:14
+#: errors.php:15
 msgid "Backend sanity check failed"
 msgstr "后端完整性检查失败"
 
-#: errors.php:16
+#: errors.php:17
 msgid "Frontend sanity check failed."
 msgstr "前端完整性检查失败。"
 
-#: errors.php:18
+#: errors.php:19
 msgid ""
 "Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please "
 "update&lt;/a&gt;."
 msgstr ""
 "数据库表结构版本错误。&lt;a href='db-updater.php'&gt;请更新&lt;/a&gt;。"
 
-#: errors.php:20
+#: errors.php:21
 msgid "Request not authorized."
 msgstr "请求未经授权。"
 
-#: errors.php:22
+#: errors.php:23
 msgid "No operation to perform."
 msgstr "没有需要执行的操作。"
 
-#: errors.php:24
+#: errors.php:25
 msgid ""
 "Could not display feed: query failed. Please check label match syntax or "
 "local configuration."
 msgstr "无法显示信息源：查询失败。请核对标签匹配语法或本地配置。"
 
-#: errors.php:26
+#: errors.php:27
 msgid "Denied. Your access level is insufficient to access this page."
 msgstr "错误，您的访问级别不够访问本页面。"
 
-#: errors.php:28
+#: errors.php:29
 msgid "Configuration check failed"
 msgstr "配置检查失败"
 
-#: errors.php:30
+#: errors.php:31
 msgid ""
 "Your version of MySQL is not currently supported. Please see\n"
 "\t\tofficial site for more information."
@@ -295,596 +283,646 @@ msgstr ""
 "你的 MySQL 版本与本程序不兼容。\n"
 "\t\t请去官方网站查阅相关信息。"
 
-#: errors.php:35
+#: errors.php:36
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
-#: index.php:76 prefs.php:91 modules/pref-prefs.php:265 help/3.php:71
-#: help/4.php:8
+#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
+#: classes/pref_prefs.php:261
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: index.php:80
+#: index.php:103
 msgid "Comments?"
 msgstr "评论些什么？"
 
-#: index.php:90
+#: index.php:113
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS 有新版本啦！"
 
-#: index.php:115
+#: index.php:136
 msgid "News"
 msgstr "新闻"
 
-#: index.php:124
+#: index.php:145
 msgid "Collapse feedlist"
 msgstr "收缩信息列表"
 
-#: index.php:127
+#: index.php:148
 msgid "Show articles"
 msgstr "显示文章"
 
-#: index.php:130
+#: index.php:151
 msgid "Adaptive"
 msgstr "自动适应"
 
-#: index.php:131
+#: index.php:152
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:132
+#: index.php:153 classes/feeds.php:130
 msgid "Starred"
 msgstr "加星标的"
 
-#: index.php:133
+#: index.php:154 classes/feeds.php:131
 msgid "Published"
 msgstr "已发布"
 
-#: index.php:134
+#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
 msgid "Unread"
 msgstr "未读"
 
-#: index.php:135
+#: index.php:156
 msgid "Ignore Scoring"
 msgstr "忽略评分"
 
-#: index.php:136
+#: index.php:157
 msgid "Updated"
 msgstr "有更新的"
 
-#: index.php:139
+#: index.php:160
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:143 modules/pref-filters.php:228
+#: index.php:164 classes/pref_filters.php:246
 msgid "Date"
 msgstr "日期"
 
-#: index.php:144 localized_schema.php:3 modules/popup-dialog.php:378
+#: index.php:165 classes/dlg.php:374 include/localized_schema.php:3
 msgid "Title"
 msgstr "标题"
 
-#: index.php:145
+#: index.php:166
 msgid "Score"
 msgstr "评分"
 
-#: index.php:150 modules/pref-feeds.php:347 modules/pref-feeds.php:600
+#: index.php:171 classes/pref_feeds.php:340 classes/pref_feeds.php:583
 msgid "Update"
 msgstr "更新列表"
 
-#: index.php:154 index.php:169 localized_schema.php:10
+#: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
+#: js/FeedTree.js:151
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: index.php:160
+#: index.php:181 classes/feeds.php:125
 msgid "Actions..."
 msgstr "动作……"
 
-#: index.php:162
+#: index.php:183
 msgid "Search..."
 msgstr "搜索……"
 
-#: index.php:163
+#: index.php:184
 msgid "Feed actions:"
 msgstr "信息源操作："
 
-#: index.php:164
+#: index.php:185
 msgid "Subscribe to feed..."
 msgstr "订阅信息源……"
 
-#: index.php:165
+#: index.php:186
 msgid "Edit this feed..."
 msgstr "编辑信息源……"
 
-#: index.php:166
+#: index.php:187
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:167 modules/pref-feeds.php:530 modules/pref-feeds.php:1374
+#: index.php:188 classes/pref_feeds.php:510 classes/pref_feeds.php:1337
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
-#: index.php:168
+#: index.php:189
 msgid "All feeds:"
 msgstr "全部信息源："
 
-#: index.php:170 help/3.php:54
+#: index.php:191 help/main.php:54
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: index.php:171
+#: index.php:192
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:172
+#: index.php:193
 msgid "Switch to digest..."
 msgstr "切换至摘要……"
 
-#: index.php:173
+#: index.php:194
 msgid "Show tag cloud..."
 msgstr "显示标签云……"
 
-#: index.php:174
+#: index.php:195
 msgid "Select by tags..."
 msgstr "通过自定义标签选择……"
 
-#: index.php:175
+#: index.php:196
 msgid "Create label..."
 msgstr "创建预定义标签……"
 
-#: index.php:176
+#: index.php:197
 msgid "Create filter..."
 msgstr "创建过滤器……"
 
-#: index.php:177
+#: index.php:198
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
-#: index.php:178
-msgid "About..."
-msgstr "关于……"
-
-#: localized_schema.php:4
-msgid "Title or Content"
-msgstr "标题或内容"
-
-#: localized_schema.php:5
-msgid "Link"
-msgstr "链接"
-
-#: localized_schema.php:6 modules/popup-dialog.php:379
-msgid "Content"
-msgstr "内容"
-
-#: localized_schema.php:7
-msgid "Article Date"
-msgstr "文章发布时间"
-
-#: localized_schema.php:9
-msgid "Delete article"
-msgstr "删除文章"
-
-#: localized_schema.php:11
-msgid "Set starred"
-msgstr "加星标"
-
-#: localized_schema.php:12
-msgid "Publish article"
-msgstr "发布文章"
+#: opml.php:70
+#, php-format
+msgid "<li>Adding category <b>%s</b>.</li>"
+msgstr "<li>添加类别：<b>%s</b>。</li>"
 
-#: localized_schema.php:13
-msgid "Assign tags"
-msgstr "添加自定义标签"
+#: opml.php:92
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "将偏好按键从 %s 设置为 %s"
 
-#: localized_schema.php:14
-msgid "Assign label"
+#: opml.php:112
+#, fuzzy, php-format
+msgid "Adding label %s"
 msgstr "添加预定义标签"
 
-#: localized_schema.php:16
-msgid ""
-"This option is useful when you are reading several planet-type aggregators "
-"with partially colliding userbase. When disabled, it forces same posts from "
-"different feeds to appear only once."
-msgstr ""
-"您可能订阅了一些聚合类型的信息源，这种情况下可能遇到同一用户的文章在不同源多"
-"次出现。当该选项被禁用时，来自不同 RSS 源的同一文章将只会显示一次。"
-
-#: localized_schema.php:17
-msgid ""
-"Display expanded list of feed articles, instead of separate displays for "
-"headlines and article content"
-msgstr "将文章列表展开显示，而不是将标题和内容分别显示"
-
-#: localized_schema.php:18
-msgid ""
-"When \"Mark as read\" button is clicked in toolbar, automatically open next "
-"feed with unread articles."
+#: opml.php:115
+#, php-format
+msgid "Duplicate label: %s"
 msgstr ""
-"当工具栏上 \"标记为已读 \" 按钮被点击时，自动打开下一个信息源中的未读文章。"
-
-#: localized_schema.php:19
-msgid ""
-"This option enables sending daily digest of new (and unread) headlines on "
-"your configured e-mail address"
-msgstr "每天将更新的和未读的文章标题通过邮件发送摘要到您设置的邮箱中"
-
-#: localized_schema.php:20
-msgid ""
-"This option enables marking articles as read automatically while you scroll "
-"article list."
-msgstr "在滚动页面的同时自动将文章标记为已读。"
-
-#: localized_schema.php:21
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr "仅加载几个最常用的 HTML 标签"
-
-#: localized_schema.php:22
-msgid ""
-"When auto-detecting tags in articles these tags will not be applied (comma-"
-"separated list)."
-msgstr "自动检测文章标签时，这些标签将被忽略（半角逗号隔开的列表）。"
-
-#: localized_schema.php:23
-msgid ""
-"When this option is enabled, headlines in Special feeds and Labels are "
-"grouped by feeds"
-msgstr "选择本项可让特殊区域和预定义标签中的文章标题以信息源顺序排列"
-
-#: localized_schema.php:24
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr "使用信息源中定义的时间，而非本地导入的时间来排序。"
-
-#: localized_schema.php:25
-msgid "Customize CSS stylesheet to your liking"
-msgstr "自定义 CSS 样式"
-
-#: localized_schema.php:26
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr "在 tt-rss 处注册您的 SSL 证书"
-
-#: localized_schema.php:27
-msgid "Purge old posts after this number of days (0 - disables)"
-msgstr "清除多少天之前的文章？（0为不启用）"
-
-#: localized_schema.php:28
-msgid "Default interval between feed updates"
-msgstr "信息源更新的默认时间间隔"
-
-#: localized_schema.php:29
-msgid "Amount of articles to display at once"
-msgstr "同时显示的文章数量"
-
-#: localized_schema.php:30
-msgid "Allow duplicate posts"
-msgstr "允许重复文章"
-
-#: localized_schema.php:31
-msgid "Enable feed categories"
-msgstr "启用信息源分类"
-
-#: localized_schema.php:32
-msgid "Show content preview in headlines list"
-msgstr "在标题列表中显示内容预览"
-
-#: localized_schema.php:33
-msgid "Short date format"
-msgstr "短时间格式"
-
-#: localized_schema.php:34
-msgid "Long date format"
-msgstr "长时间格式"
-
-#: localized_schema.php:35
-msgid "Combined feed display"
-msgstr "合并显示模式"
-
-#: localized_schema.php:36
-msgid "Hide feeds with no unread messages"
-msgstr "隐藏没有未读信息的信息源"
-
-#: localized_schema.php:37
-msgid "On catchup show next feed"
-msgstr "自动显示下一个信息源"
-
-#: localized_schema.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "以未读文章数量排序信息源"
-
-#: localized_schema.php:39
-msgid "Reverse headline order (oldest first)"
-msgstr "反转标题列表顺序（最旧的在上面）"
-
-#: localized_schema.php:40
-msgid "Enable e-mail digest"
-msgstr "启用电子邮件摘要"
-
-#: localized_schema.php:41
-msgid "Confirm marking feed as read"
-msgstr "标记信息源为已读之前弹出确认"
-
-#: localized_schema.php:42
-msgid "Automatically mark articles as read"
-msgstr "自动标记文章为已读"
-
-#: localized_schema.php:43
-msgid "Strip unsafe tags from articles"
-msgstr "从文章中剔除不安全的标签"
-
-#: localized_schema.php:44
-msgid "Blacklisted tags"
-msgstr "被列入黑名单的标签"
-
-#: localized_schema.php:45
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "最新更新文章的保鲜期（以小时为单位）"
-
-#: localized_schema.php:46
-msgid "Mark articles in e-mail digest as read"
-msgstr "将邮件摘要中的文章标记为已读"
-
-#: localized_schema.php:47
-msgid "Automatically expand articles in combined mode"
-msgstr "在组合模式下自动展开文章"
 
-#: localized_schema.php:48
-msgid "Purge unread articles"
-msgstr "清除未读文章"
-
-#: localized_schema.php:49
-msgid "Show special feeds when hiding read feeds"
-msgstr "隐藏已读信息之后显示特殊区域的内容"
-
-#: localized_schema.php:50
-msgid "Group headlines in virtual feeds"
-msgstr "对虚拟源中的文章按源分组"
+#: opml.php:169
+#, fuzzy, php-format
+msgid "Adding filter %s"
+msgstr "移除这个过滤器： %s ？"
 
-#: localized_schema.php:51
-msgid "Do not show images in articles"
-msgstr "不要显示文章中的图片"
-
-#: localized_schema.php:52
-msgid "Enable external API"
-msgstr "允许使用外部 API"
+#: opml.php:185
+#, fuzzy, php-format
+msgid "Duplicate filter %s"
+msgstr "创建过滤器"
 
-#: localized_schema.php:53
-msgid "User timezone"
-msgstr "用户所在时区"
+#: opml.php:230
+msgid "is already imported."
+msgstr "已经导入过。"
 
-#: localized_schema.php:54
-msgid "Sort headlines by feed date"
-msgstr "以信息源的日期排序"
+#: opml.php:250
+msgid "OK"
+msgstr "OK"
 
-#: localized_schema.php:55
-msgid "Customize stylesheet"
-msgstr "自定义样式"
+#: opml.php:259
+msgid "Error while parsing document."
+msgstr "解析文档时发生错误。"
 
-#: localized_schema.php:56
-msgid "Login with an SSL certificate"
-msgstr "使用 SSL 证书登录"
+#: opml.php:263
+msgid "Error: please upload OPML file."
+msgstr "错误：请上传 OPML 文件。"
 
-#: opml.php:165 opml.php:170
+#: opml.php:469 opml.php:474
 msgid "OPML Utility"
 msgstr "OPML 工具"
 
-#: opml.php:188
+#: opml.php:492
 msgid "Importing OPML..."
 msgstr "导入 OPML ……"
 
-#: opml.php:193
+#: opml.php:496
 msgid "Return to preferences"
 msgstr "返回偏好设置"
 
-#: prefs.php:82
+#: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: prefs.php:83 help/4.php:14
+#: prefs.php:82 help/prefs.php:14
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 
-#: prefs.php:97 modules/pref-filters.php:90 help/4.php:11
+#: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:42
+#: classes/pref_feeds.php:1248 classes/pref_feeds.php:1311
+msgid "Feeds"
+msgstr "信息源"
+
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:100 modules/pref-labels.php:89 help/4.php:12
-#: mobile/mobile-functions.php:205
+#: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
+#: classes/pref_labels.php:90 include/functions.php:1383
+#: include/functions.php:1959
 msgid "Labels"
 msgstr "预定义标签"
 
-#: prefs.php:104 help/4.php:13
+#: prefs.php:103 help/prefs.php:13
 msgid "Users"
 msgstr "用户"
 
-#: prefs.php:109
+#: prefs.php:108
 msgid "Linked"
 msgstr "链接"
 
-#: register.php:185
+#: register.php:186 include/login_form.php:164
 msgid "Create new account"
 msgstr "创建新的帐号"
 
-#: register.php:189
+#: register.php:190
 msgid "New user registrations are administratively disabled."
 msgstr "新用户注册功能被管理员禁用。"
 
-#: register.php:214
+#: register.php:215
 msgid ""
 "Your temporary password will be sent to the specified email. Accounts, which "
 "were not logged in once, are erased automatically 24 hours after temporary "
 "password is sent."
 msgstr "您的临时密码将被发送至您的邮箱。24小时之内没有登录的帐号会被自动清理。"
 
-#: register.php:220
+#: register.php:221
 msgid "Desired login:"
 msgstr "希望使用的用户名："
 
-#: register.php:223
+#: register.php:224
 msgid "Check availability"
 msgstr "检查可用性"
 
-#: register.php:225
+#: register.php:226
 msgid "Email:"
 msgstr "电子邮箱："
 
-#: register.php:228
+#: register.php:229
 msgid "How much is two plus two:"
 msgstr "二加二等于几："
 
-#: register.php:231
+#: register.php:232
 msgid "Submit registration"
 msgstr "提交注册信息"
 
-#: register.php:249
+#: register.php:250
 msgid "Your registration information is incomplete."
 msgstr "您的注册信息不完整。"
 
-#: register.php:264
+#: register.php:265
 msgid "Sorry, this username is already taken."
 msgstr "抱歉，该用户名已被占用。"
 
-#: register.php:282
+#: register.php:283
 msgid "Registration failed."
 msgstr "注册失败。"
 
-#: register.php:366
+#: register.php:367
 msgid "Account created successfully."
 msgstr "帐号创建成功。"
 
-#: register.php:388
+#: register.php:389
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 
-#: twitter.php:97
+#: twitter.php:98
 msgid "Register with Twitter"
 msgstr "通过 Twitter 注册"
 
-#: twitter.php:101
+#: twitter.php:102
 msgid "Could not connect to Twitter. Refresh the page or try again later."
 msgstr "无法连接 Twitter 。请刷新页面或过会儿重试。"
 
-#: twitter.php:105
+#: twitter.php:106
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "恭喜！您已经成功通过 Twitter 注册。"
 
-#: twitter.php:117 modules/pref-prefs.php:464
+#: twitter.php:118 classes/pref_prefs.php:452
 msgid "Register"
 msgstr "注册"
 
-#: modules/backend-rpc.php:66 modules/popup-dialog.php:109
-msgid "Default profile"
-msgstr "默认偏好设置"
+#: help/main.php:1 help/prefs.php:1
+msgid "Keyboard Shortcuts"
+msgstr "快捷键"
 
-#: modules/backend-rpc.php:372
-msgid "no tags"
-msgstr "无标签"
+#: help/main.php:5
+msgid "Navigation"
+msgstr "导航"
 
-#: modules/backend-rpc.php:836
-msgid "Your request could not be completed."
-msgstr "您的请求无法完成。"
+#: help/main.php:8
+msgid "Move between feeds"
+msgstr "在信息源之间移动"
 
-#: modules/backend-rpc.php:840
-msgid "Feed update has been scheduled."
-msgstr "信息源更新的任务计划已制定。"
+#: help/main.php:9
+msgid "Move between articles"
+msgstr "在文章之间移动"
 
-#: modules/backend-rpc.php:848
-msgid "Category update has been scheduled."
-msgstr "分类更新已列入任务计划。"
+#: help/main.php:10
+msgid "Show search dialog"
+msgstr "显示搜索对话框"
 
-#: modules/backend-rpc.php:861
-msgid "Can't update this kind of feed."
-msgstr "无法更新这种类型的信息源。"
+#: help/main.php:13
+msgid "Active article actions"
+msgstr "启用文章动作"
 
-#: modules/help.php:6
-msgid "Help"
-msgstr "帮助"
+#: help/main.php:16
+msgid "Toggle starred"
+msgstr "锁定加星标的项"
 
-#: modules/help.php:17
-msgid "Help topic not found."
-msgstr "未找到帮助主题。"
+#: help/main.php:17
+msgid "Toggle published"
+msgstr "锁定发布的项"
 
-#: modules/help.php:21 modules/popup-dialog.php:53
-#: modules/popup-dialog.php:172 modules/popup-dialog.php:196
-#: modules/popup-dialog.php:234 modules/popup-dialog.php:617
-#: modules/popup-dialog.php:679 modules/popup-dialog.php:736
-#: modules/popup-dialog.php:768 modules/popup-dialog.php:904
-#: modules/popup-dialog.php:934 modules/popup-dialog.php:1021
-#: modules/popup-dialog.php:1112 modules/pref-feeds.php:1269
-#: modules/pref-filters.php:405 modules/pref-filters.php:482
-#: modules/pref-users.php:99
-msgid "Close this window"
-msgstr "关闭本窗口"
+#: help/main.php:18
+msgid "Toggle unread"
+msgstr "锁定未读项"
 
-#: modules/opml_domdoc.php:60
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>添加类别：<b>%s</b>。</li>"
+#: help/main.php:19
+msgid "Edit tags"
+msgstr "编辑自定义标签"
 
-#: modules/opml_domdoc.php:82
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "将偏好按键从 %s 设置为 %s"
+#: help/main.php:20
+msgid "Dismiss selected articles"
+msgstr "不再显示所选的文章"
 
-#: modules/opml_domdoc.php:128
-msgid "is already imported."
-msgstr "已经导入过。"
+#: help/main.php:21
+msgid "Dismiss read articles"
+msgstr "不再显示已读文章"
 
-#: modules/opml_domdoc.php:148
-msgid "OK"
-msgstr "OK"
+#: help/main.php:22
+msgid "Open article in new window"
+msgstr "在新窗口打开文章"
 
-#: modules/opml_domdoc.php:157
-msgid "Error while parsing document."
-msgstr "解析文档时发生错误。"
+#: help/main.php:23
+msgid "Mark articles below/above active one as read"
+msgstr "将当前项以下/以上的文章标记为已读"
 
-#: modules/opml_domdoc.php:161
-msgid "Error: please upload OPML file."
-msgstr "错误：请上传 OPML 文件。"
+#: help/main.php:24
+msgid "Scroll article content"
+msgstr "滚动文章内容"
+
+#: help/main.php:25
+msgid "Email article"
+msgstr "通过邮件发送文章"
+
+#: help/main.php:29 help/prefs.php:30
+msgid "Other actions"
+msgstr "其他动作"
+
+#: help/main.php:32
+msgid "Select article under mouse cursor"
+msgstr "选择鼠标指向的文章"
+
+#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+msgid "Create label"
+msgstr "创建预定义标签"
+
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+msgid "Create filter"
+msgstr "创建过滤器"
+
+#: help/main.php:35
+msgid "Collapse sidebar"
+msgstr "折叠侧边栏"
+
+#: help/main.php:36 help/prefs.php:34
+msgid "Display this help dialog"
+msgstr "显示本帮助对话框"
+
+#: help/main.php:41
+msgid "Multiple articles actions"
+msgstr "多文章动作"
+
+#: help/main.php:44
+msgid "Select all articles"
+msgstr "选择所有文章"
+
+#: help/main.php:45
+msgid "Select unread articles"
+msgstr "选择未读文章"
+
+#: help/main.php:46
+msgid "Invert article selection"
+msgstr "反选文章"
+
+#: help/main.php:47
+msgid "Deselect all articles"
+msgstr "取消选择所有文章"
+
+#: help/main.php:50
+msgid "Feed actions"
+msgstr "信息源动作"
+
+#: help/main.php:53
+msgid "Refresh active feed"
+msgstr "刷新活动的信息源"
+
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1314
+msgid "Subscribe to feed"
+msgstr "订阅信息源"
+
+#: help/main.php:56 js/FeedTree.js:131
+msgid "Edit feed"
+msgstr "编辑信息源"
+
+#: help/main.php:57
+msgid "Mark feed as read"
+msgstr "标记信息源为已读"
+
+#: help/main.php:58
+msgid "Reverse headlines order"
+msgstr "反向排序"
+
+#: help/main.php:59
+msgid "Mark all feeds as read"
+msgstr "标记所有信息源为已读"
+
+#: help/main.php:60
+msgid "If viewing category, (un)collapse it"
+msgstr "查看类别时将其折叠/展开"
+
+#: help/main.php:63 help/prefs.php:5
+msgid "Go to..."
+msgstr "跳转至……"
+
+#: help/main.php:66 include/functions.php:2011
+msgid "All articles"
+msgstr "全部文章"
+
+#: help/main.php:67 include/functions.php:2009
+msgid "Fresh articles"
+msgstr "最新更新的文章"
+
+#: help/main.php:68 include/functions.php:2005
+msgid "Starred articles"
+msgstr "加星标文章"
+
+#: help/main.php:69 include/functions.php:2007
+msgid "Published articles"
+msgstr "已发布文章"
+
+#: help/main.php:70
+msgid "Tag cloud"
+msgstr "标签云"
+
+#: help/main.php:77
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+msgstr "在 Tiny Tiny RSS 的维基上可以找到其他界面技巧。"
+
+#: help/main.php:79 help/prefs.php:41
+msgid "Press any key to close this window."
+msgstr "按任意键关闭本窗口。"
+
+#: help/prefs.php:9
+msgid "My Feeds"
+msgstr "我的信息源"
+
+#: help/prefs.php:10
+msgid "Other Feeds"
+msgstr "其他信息源"
+
+#: help/prefs.php:19
+msgid "Panel actions"
+msgstr "版面动作"
+
+#: help/prefs.php:23
+msgid "Top 25 feeds"
+msgstr "前25位的信息源"
+
+#: help/prefs.php:24
+msgid "Edit feed categories"
+msgstr "编辑信息源类别"
 
-#: modules/popup-dialog.php:34
-msgid "Importing using DOMXML."
-msgstr "通过 DOMXML 导入。"
+#: help/prefs.php:27 classes/pref_users.php:379
+msgid "Create user"
+msgstr "创建用户"
+
+#: help/prefs.php:33
+msgid "Focus search (if present)"
+msgstr "进入搜索框（页面中存在的情况）"
+
+#: help/prefs.php:39
+msgid ""
+"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
+"configuration and your access level."
+msgstr ""
+"<b>提醒：</b>根据 Tiny Tiny RSS 的配置和你的访问级别不同，并非所有的动作都可"
+"以执行。"
+
+#: mobile/login_form.php:28 include/login_form.php:161
+msgid "Log in"
+msgstr "登录"
+
+#: mobile/login_form.php:38 include/login_form.php:131
+msgid "Login:"
+msgstr "登陆："
+
+#: mobile/login_form.php:43 include/login_form.php:135
+msgid "Password:"
+msgstr "密码："
+
+#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
+#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
+#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
+#: mobile/prefs.php:19
+msgid "Home"
+msgstr "主页"
+
+#: mobile/mobile-functions.php:178 include/functions.php:1381
+#: include/functions.php:1957
+msgid "Special"
+msgstr "特殊区域"
+
+#: mobile/mobile-functions.php:418
+msgid "Nothing found (click to reload feed)."
+msgstr "啥也没找到（点击以重新加载信息源）。"
+
+#: mobile/prefs.php:24
+msgid "Enable categories"
+msgstr "启用类别"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "ON"
+msgstr "ON"
+
+#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
+#: mobile/prefs.php:41 mobile/prefs.php:46
+msgid "OFF"
+msgstr "OFF"
+
+#: mobile/prefs.php:29
+msgid "Browse categories like folders"
+msgstr "以文件夹方式浏览类别"
+
+#: mobile/prefs.php:35
+msgid "Show images in posts"
+msgstr "在帖子里显示图像"
+
+#: mobile/prefs.php:40
+msgid "Hide read articles and feeds"
+msgstr "隐藏已读的文章和信息源"
+
+#: mobile/prefs.php:45
+msgid "Sort feeds by unread count"
+msgstr "以未读文章数量排列信息源"
+
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "找不到文章。"
+
+#: classes/backend.php:20
+msgid "Help topic not found."
+msgstr "未找到帮助主题。"
+
+#: classes/dlg.php:26
+#, fuzzy
+msgid "Prepare data"
+msgstr "保存信息"
 
-#: modules/popup-dialog.php:40
-msgid "Importing using DOMDocument."
-msgstr "通过 DOMDocument 导入。"
+#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
+#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:623
+#: classes/dlg.php:681 classes/dlg.php:780 classes/dlg.php:813
+#: classes/dlg.php:844 classes/dlg.php:875 classes/dlg.php:974
+#: classes/pref_feeds.php:1239 classes/pref_filters.php:453
+#: classes/pref_filters.php:536 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3370
+msgid "Close this window"
+msgstr "关闭本窗口"
 
-#: modules/popup-dialog.php:45
-msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr "未检测到 DOMXML 扩展。PHP 5以下的版本需要用到本扩展。"
+#: classes/dlg.php:40
+msgid ""
+"If you have imported labels and/or filters, you might need to reload "
+"preferences to see your new data."
+msgstr ""
 
-#: modules/popup-dialog.php:80
+#: classes/dlg.php:87
 msgid "Create profile"
 msgstr "创建偏好文件"
 
-#: modules/popup-dialog.php:103 modules/popup-dialog.php:132
+#: classes/dlg.php:107 classes/dlg.php:136
 msgid "(active)"
 msgstr "（当前使用的）"
 
-#: modules/popup-dialog.php:166
+#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: include/login_form.php:151
+msgid "Default profile"
+msgstr "默认偏好设置"
+
+#: classes/dlg.php:170
 msgid "Remove selected profiles"
 msgstr "移除选中的偏好文件"
 
-#: modules/popup-dialog.php:168
+#: classes/dlg.php:172
 msgid "Activate profile"
 msgstr "启用偏好文件"
 
-#: modules/popup-dialog.php:179
+#: classes/dlg.php:182
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: modules/popup-dialog.php:184
+#: classes/dlg.php:187
 msgid "Your Public OPML URL is:"
 msgstr "你的公共 OPML URL 是："
 
-#: modules/popup-dialog.php:193 modules/popup-dialog.php:901
+#: classes/dlg.php:196 classes/dlg.php:841
 msgid "Generate new URL"
 msgstr "生成一个新的 URL"
 
-#: modules/popup-dialog.php:206
+#: classes/dlg.php:208
 msgid "Notice"
 msgstr "提示"
 
-#: modules/popup-dialog.php:212
+#: classes/dlg.php:214
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
@@ -893,11 +931,11 @@ msgstr ""
 "更新进程已在配置中启用，但守护进程没有运行，无法抓取信息。请启动守护进程，或"
 "联系管理员。"
 
-#: modules/popup-dialog.php:216 modules/popup-dialog.php:225
+#: classes/dlg.php:218 classes/dlg.php:227
 msgid "Last update:"
 msgstr "上次更新："
 
-#: modules/popup-dialog.php:221
+#: classes/dlg.php:223
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
 "indicate a problem like crash or a hang. Please check the daemon process or "
@@ -906,261 +944,239 @@ msgstr ""
 "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管"
 "理员。"
 
-#: modules/popup-dialog.php:247 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:561
+#: classes/dlg.php:248 classes/pref_feeds.php:293 classes/pref_feeds.php:544
 msgid "Feed"
 msgstr "信息源"
 
-#: modules/popup-dialog.php:251 modules/pref-feeds.php:319
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:312
+#: include/functions.php:3331
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: modules/popup-dialog.php:257 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:589
+#: classes/dlg.php:258 classes/pref_feeds.php:332 classes/pref_feeds.php:572
 msgid "Place in category:"
 msgstr "加入到类别："
 
-#: modules/popup-dialog.php:265
+#: classes/dlg.php:266
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: modules/popup-dialog.php:277 modules/pref-feeds.php:379
-#: modules/pref-feeds.php:632 modules/pref-prefs.php:205
-#: modules/pref-users.php:147
+#: classes/dlg.php:278 classes/pref_feeds.php:372 classes/pref_feeds.php:615
+#: classes/pref_prefs.php:201 classes/pref_users.php:155
 msgid "Authentication"
 msgstr "登录密码"
 
-#: modules/popup-dialog.php:281 modules/pref-feeds.php:389
-#: modules/pref-feeds.php:636 modules/pref-users.php:438
+#: classes/dlg.php:282 classes/pref_feeds.php:378 classes/pref_feeds.php:619
+#: classes/pref_users.php:431
 msgid "Login"
 msgstr "登陆"
 
-#: modules/popup-dialog.php:284 modules/pref-feeds.php:397
-#: modules/pref-feeds.php:642
+#: classes/dlg.php:285 classes/pref_feeds.php:384 classes/pref_feeds.php:625
 msgid "Password"
 msgstr "密码"
 
-#: modules/popup-dialog.php:294
+#: classes/dlg.php:295
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: modules/popup-dialog.php:299 modules/popup-dialog.php:352
+#: classes/dlg.php:300 classes/dlg.php:349
 msgid "Subscribe"
 msgstr "订阅"
 
-#: modules/popup-dialog.php:300
+#: classes/dlg.php:301
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: modules/popup-dialog.php:301 modules/popup-dialog.php:354
-#: modules/popup-dialog.php:433 modules/popup-dialog.php:544
-#: modules/popup-dialog.php:715 modules/popup-dialog.php:873
-#: modules/popup-dialog.php:962 modules/popup-dialog.php:989
-#: modules/popup-dialog.php:1071 modules/pref-feeds.php:547
-#: modules/pref-feeds.php:704 modules/pref-filters.php:340
-#: modules/pref-instances.php:98 modules/pref-labels.php:80
-#: modules/pref-users.php:186
+#: classes/dlg.php:302 classes/dlg.php:351 classes/dlg.php:429
+#: classes/dlg.php:552 classes/dlg.php:713 classes/dlg.php:902
+#: classes/dlg.php:952 classes/mail_button.php:112 classes/note_button.php:35
+#: classes/pref_feeds.php:527 classes/pref_feeds.php:684
+#: classes/pref_filters.php:380 classes/pref_instances.php:103
+#: classes/pref_labels.php:81 classes/pref_users.php:194
 msgid "Cancel"
 msgstr "取消"
 
-#: modules/popup-dialog.php:324 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:1335 modules/pref-users.php:369
+#: classes/dlg.php:321 classes/dlg.php:428 classes/pref_feeds.php:1298
+#: classes/pref_users.php:361 js/tt-rss.js:232
 msgid "Search"
 msgstr "搜索"
 
-#: modules/popup-dialog.php:328
+#: classes/dlg.php:325
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: modules/popup-dialog.php:329
+#: classes/dlg.php:326
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: modules/popup-dialog.php:332
+#: classes/dlg.php:329
 msgid "limit:"
 msgstr "限制："
 
-#: modules/popup-dialog.php:353 modules/pref-feeds.php:520
-#: modules/pref-filters.php:330 modules/pref-filters.php:537
-#: modules/pref-instances.php:144 modules/pref-labels.php:281
-#: modules/pref-users.php:395
+#: classes/dlg.php:350 classes/pref_feeds.php:500 classes/pref_filters.php:370
+#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/pref_labels.php:284 classes/pref_users.php:387
 msgid "Remove"
 msgstr "移除"
 
-#: modules/popup-dialog.php:365
+#: classes/dlg.php:361
 msgid "Look for"
 msgstr "查找"
 
-#: modules/popup-dialog.php:375
+#: classes/dlg.php:371
 msgid "match on"
 msgstr "匹配"
 
-#: modules/popup-dialog.php:380
+#: classes/dlg.php:375 include/localized_schema.php:6
+msgid "Content"
+msgstr "内容"
+
+#: classes/dlg.php:376
 msgid "Title or content"
 msgstr "标题或内容"
 
-#: modules/popup-dialog.php:391
+#: classes/dlg.php:387
 msgid "Limit search to:"
 msgstr "限制搜索条件："
 
-#: modules/popup-dialog.php:394
+#: classes/dlg.php:390 include/functions.php:1892
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: modules/popup-dialog.php:407
+#: classes/dlg.php:403
 msgid "This feed"
 msgstr "本信息源"
 
-#: modules/popup-dialog.php:455 modules/pref-filters.php:219
+#: classes/dlg.php:451 classes/pref_filters.php:237
 msgid "Match"
 msgstr "匹配"
 
-#: modules/popup-dialog.php:462 modules/pref-filters.php:231
+#: classes/dlg.php:458 classes/pref_filters.php:249
 msgid "before"
 msgstr "之前"
 
-#: modules/popup-dialog.php:463 modules/pref-filters.php:232
+#: classes/dlg.php:459 classes/pref_filters.php:250
 msgid "after"
 msgstr "之后"
 
-#: modules/popup-dialog.php:478 modules/pref-filters.php:245
+#: classes/dlg.php:474 classes/pref_filters.php:263
 msgid "Check it"
 msgstr "检查一下"
 
-#: modules/popup-dialog.php:481 modules/pref-filters.php:248
+#: classes/dlg.php:477 classes/pref_filters.php:266
 msgid "on field"
 msgstr "on field"
 
-#: modules/popup-dialog.php:487 modules/pref-filters.php:254
+#: classes/dlg.php:483 classes/pref_filters.php:272 js/digest.js:239
+#: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "在"
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:260
+#: classes/dlg.php:497 classes/pref_filters.php:291
 msgid "Perform Action"
 msgstr "执行动作"
 
-#: modules/popup-dialog.php:510 modules/pref-filters.php:280
+#: classes/dlg.php:514 classes/pref_filters.php:311
 msgid "with parameters:"
 msgstr "指定参数："
 
-#: modules/popup-dialog.php:524 modules/pref-feeds.php:407
-#: modules/pref-feeds.php:648 modules/pref-filters.php:300
-#: modules/pref-users.php:169
+#: classes/dlg.php:528 classes/pref_feeds.php:392 classes/pref_feeds.php:631
+#: classes/pref_filters.php:331 classes/pref_users.php:177
 msgid "Options"
 msgstr "选项"
 
-#: modules/popup-dialog.php:528 modules/pref-filters.php:312
+#: classes/dlg.php:532 classes/pref_filters.php:343
 msgid "Enabled"
 msgstr "已启用"
 
-#: modules/popup-dialog.php:531 modules/pref-filters.php:321
+#: classes/dlg.php:535 classes/pref_filters.php:352
 msgid "Inverse match"
 msgstr "反向匹配"
 
-#: modules/popup-dialog.php:538 modules/pref-filters.php:334
+#: classes/dlg.php:538 classes/pref_filters.php:361
+#, fuzzy
+msgid "Apply to category"
+msgstr "加入到类别："
+
+#: classes/dlg.php:546 classes/pref_filters.php:374
 msgid "Test"
 msgstr "测试"
 
-#: modules/popup-dialog.php:541
+#: classes/dlg.php:549
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:571
+#: classes/dlg.php:577
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: modules/popup-dialog.php:595 modules/popup-dialog.php:655
+#: classes/dlg.php:601 classes/dlg.php:657
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
-#: modules/popup-dialog.php:613 modules/popup-dialog.php:675
+#: classes/dlg.php:619 classes/dlg.php:677
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
-#: modules/popup-dialog.php:628
+#: classes/dlg.php:630
 msgid "These feeds have not been updated because of errors:"
 msgstr "信息源因为如下错误未能更新："
 
-#: modules/popup-dialog.php:688
+#: classes/dlg.php:688
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
-#: modules/popup-dialog.php:713 modules/popup-dialog.php:960
-#: modules/popup-dialog.php:987 modules/pref-feeds.php:546
-#: modules/pref-feeds.php:701 modules/pref-filters.php:337
-#: modules/pref-instances.php:95 modules/pref-labels.php:78
-#: modules/pref-users.php:184
+#: classes/dlg.php:711 classes/dlg.php:900 classes/note_button.php:33
+#: classes/pref_feeds.php:526 classes/pref_feeds.php:681
+#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:721
+#: classes/dlg.php:719
 msgid "Tag Cloud"
 msgstr "标签云"
 
-#: modules/popup-dialog.php:743
+#: classes/dlg.php:788
 msgid "Select item(s) by tags"
 msgstr "通过自定义标签选择"
 
-#: modules/popup-dialog.php:746
+#: classes/dlg.php:791
 msgid "Match:"
 msgstr "匹配："
 
-#: modules/popup-dialog.php:751
+#: classes/dlg.php:796
 msgid "Which Tags?"
 msgstr "哪些标签？"
 
-#: modules/popup-dialog.php:764
+#: classes/dlg.php:809
 msgid "Display entries"
 msgstr "显示条目"
 
-#: modules/popup-dialog.php:813 modules/popup-dialog.php:819
-msgid "[Forwarded]"
-msgstr "[已转发]"
-
-#: modules/popup-dialog.php:813
-msgid "Multiple articles"
-msgstr "多个文章"
-
-#: modules/popup-dialog.php:834
-msgid "From:"
-msgstr "发信人："
-
-#: modules/popup-dialog.php:843
-msgid "To:"
-msgstr "收信人："
-
-#: modules/popup-dialog.php:856
-msgid "Subject:"
-msgstr "主题："
-
-#: modules/popup-dialog.php:872
-msgid "Send e-mail"
-msgstr "发送邮件"
-
-#: modules/popup-dialog.php:881
+#: classes/dlg.php:821 classes/feeds.php:152
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
-#: modules/popup-dialog.php:892
+#: classes/dlg.php:832
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: modules/popup-dialog.php:919
+#: classes/dlg.php:860
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
 
-#: modules/popup-dialog.php:929 modules/pref-users.php:391
+#: classes/dlg.php:870 classes/pref_users.php:383
 msgid "Details"
 msgstr "详细"
 
-#: modules/popup-dialog.php:931
+#: classes/dlg.php:872
 msgid "Download"
 msgstr "下载"
 
-#: modules/popup-dialog.php:945
+#: classes/dlg.php:885
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
@@ -1170,317 +1186,471 @@ msgstr ""
 "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" "
 "class=\"visibleLink\" href=\"%s\">本文件</a>。"
 
-#: modules/popup-dialog.php:1030 modules/pref-instances.php:54
+#: classes/dlg.php:911 classes/pref_instances.php:59
 msgid "Instance"
 msgstr "实例"
 
-#: modules/popup-dialog.php:1036 modules/pref-feeds.php:317
-#: modules/pref-feeds.php:576 modules/pref-instances.php:62
+#: classes/dlg.php:917 classes/pref_feeds.php:310 classes/pref_feeds.php:559
+#: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL："
 
-#: modules/popup-dialog.php:1039 modules/pref-instances.php:65
-#: modules/pref-instances.php:162
+#: classes/dlg.php:920 classes/pref_instances.php:70
+#: classes/pref_instances.php:167
 msgid "Instance URL"
 msgstr "实例 URL："
 
-#: modules/popup-dialog.php:1049 modules/pref-instances.php:76
+#: classes/dlg.php:930 classes/pref_instances.php:81
 msgid "Access key:"
 msgstr "访问密钥："
 
-#: modules/popup-dialog.php:1052 modules/pref-instances.php:79
-#: modules/pref-instances.php:163
+#: classes/dlg.php:933 classes/pref_instances.php:84
+#: classes/pref_instances.php:168
 msgid "Access key"
 msgstr "访问密钥"
 
-#: modules/popup-dialog.php:1056 modules/pref-instances.php:83
+#: classes/dlg.php:937 classes/pref_instances.php:88
 msgid "Use one access key for both linked instances."
 msgstr "为两个相联的实例使用一个访问密钥。"
 
-#: modules/popup-dialog.php:1064 modules/pref-instances.php:91
+#: classes/dlg.php:945 classes/pref_instances.php:96
 msgid "Generate new key"
 msgstr "生成新的密钥"
 
-#: modules/popup-dialog.php:1068
+#: classes/dlg.php:949
 msgid "Create link"
 msgstr "创建链接"
 
-#: modules/popup-dialog.php:1094
-msgid "You can share this article by the following unique URL:"
-msgstr "您可以通过以下唯一 URL 分享本文："
+#: classes/dlg.php:967
+#, php-format
+msgid ""
+"Could not upload file. You might need to adjust upload_max_filesize\n"
+"\t\t\t\tin PHP.ini (current value = %s)"
+msgstr ""
 
-#: modules/pref-feeds.php:4
-msgid "Check to enable field"
-msgstr "勾选以启用"
+#: classes/feeds.php:94 include/functions.php:3346
+msgid "Visit the website"
+msgstr "访问网站"
 
-#: modules/pref-feeds.php:83 modules/pref-feeds.php:121
-#: modules/pref-feeds.php:127 modules/pref-feeds.php:150
-#, php-format
-msgid "(%d feeds)"
-msgstr "(%d 个信息源)"
+#: classes/feeds.php:107
+msgid "View as RSS feed"
+msgstr "以RSS信息源方式阅读"
 
-#: modules/pref-feeds.php:96
-msgid "Uncategorized"
-msgstr "未分类"
+#: classes/feeds.php:115
+msgid "Select:"
+msgstr "选择："
 
-#: modules/pref-feeds.php:306
-msgid "Feed Title"
-msgstr "信息源标题"
+#: classes/feeds.php:116 classes/pref_feeds.php:1305
+#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/pref_labels.php:275 classes/pref_users.php:374
+msgid "All"
+msgstr "全部"
 
-#: modules/pref-feeds.php:362 modules/pref-feeds.php:612
-msgid "using"
-msgstr "使用"
+#: classes/feeds.php:118
+msgid "Invert"
+msgstr "反选"
 
-#: modules/pref-feeds.php:372 modules/pref-feeds.php:623
-msgid "Article purging:"
-msgstr "文章清理："
+#: classes/feeds.php:119 classes/pref_feeds.php:1307
+#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/pref_labels.php:277 classes/pref_users.php:376
+msgid "None"
+msgstr "无"
 
-#: modules/pref-feeds.php:401
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
+#: classes/feeds.php:127
+msgid "Selection toggle:"
+msgstr "锁定选择："
+
+#: classes/feeds.php:133
+msgid "Selection:"
+msgstr "选择："
+
+#: classes/feeds.php:138
+msgid "Archive"
+msgstr "存档"
+
+#: classes/feeds.php:140
+msgid "Move back"
+msgstr "移回原位"
+
+#: classes/feeds.php:141
+msgid "Delete"
+msgstr "删除"
+
+#: classes/feeds.php:145 classes/mail_button.php:7
+msgid "Forward by email"
+msgstr "通过邮件转发"
+
+#: classes/feeds.php:148
+msgid "Feed:"
+msgstr "信息源："
+
+#: classes/feeds.php:213 classes/feeds.php:1037
+msgid "Feed not found."
+msgstr "找不到信息源。"
+
+#: classes/feeds.php:446 classes/feeds.php:528
+msgid "mark as read"
+msgstr "标记为已读"
+
+#: classes/feeds.php:625 include/functions.php:3318
+msgid "Originally from:"
+msgstr "来源："
+
+#: classes/feeds.php:685 include/functions.php:3275
+msgid "Edit tags for this article"
+msgstr "为本文编辑自定义标签"
+
+#: classes/feeds.php:712 include/functions.php:3285
+msgid "Open article in new tab"
+msgstr "在新标签页中打开文章"
+
+#: classes/feeds.php:723 include/functions.php:3301
+#, fuzzy
+msgid "Close article"
+msgstr "删除文章"
+
+#: classes/feeds.php:744
+msgid "No unread articles found to display."
+msgstr "没有未读文章。"
+
+#: classes/feeds.php:747
+msgid "No updated articles found to display."
+msgstr "没有最新更新的文章。"
+
+#: classes/feeds.php:750
+msgid "No starred articles found to display."
+msgstr "没有加星标的文章。"
+
+#: classes/feeds.php:754
+msgid ""
+"No articles found to display. You can assign articles to labels manually "
+"(see the Actions menu above) or use a filter."
+msgstr ""
+"本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
+"活动菜单）。"
+
+#: classes/feeds.php:756
+msgid "No articles found to display."
+msgstr "暂时没有文章。"
+
+#: classes/feeds.php:771 include/functions.php:4486
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr "上次信息源更新时间：%s"
+
+#: classes/feeds.php:781 include/functions.php:4496
+msgid "Some feeds have update errors (click for details)"
+msgstr "部分信息源更新错误（点击了解详情）"
+
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:93
+#: classes/pref_filters.php:181 include/functions.php:1924
+#: include/functions.php:1967
+msgid "Uncategorized"
+msgstr "未分类"
+
+#: classes/mail_button.php:52 classes/mail_button.php:58
+msgid "[Forwarded]"
+msgstr "[已转发]"
+
+#: classes/mail_button.php:52
+msgid "Multiple articles"
+msgstr "多个文章"
+
+#: classes/mail_button.php:73
+msgid "From:"
+msgstr "发信人："
+
+#: classes/mail_button.php:82
+msgid "To:"
+msgstr "收信人："
+
+#: classes/mail_button.php:95
+msgid "Subject:"
+msgstr "主题："
+
+#: classes/mail_button.php:111
+msgid "Send e-mail"
+msgstr "发送邮件"
+
+#: classes/note_button.php:7 js/note_button.js:11
+msgid "Edit article note"
+msgstr "编辑文章注记"
+
+#: classes/pref_feeds.php:11
+msgid "Check to enable field"
+msgstr "勾选以启用"
+
+#: classes/pref_feeds.php:80 classes/pref_feeds.php:118
+#: classes/pref_feeds.php:124 classes/pref_feeds.php:147
+#, php-format
+msgid "(%d feeds)"
+msgstr "(%d 个信息源)"
+
+#: classes/pref_feeds.php:299
+msgid "Feed Title"
+msgstr "信息源标题"
+
+#: classes/pref_feeds.php:355 classes/pref_feeds.php:595
+msgid "using"
+msgstr "使用"
+
+#: classes/pref_feeds.php:365 classes/pref_feeds.php:606
+msgid "Article purging:"
+msgstr "文章清理："
+
+#: classes/pref_feeds.php:388
+msgid ""
+"<b>Hint:</b> you need to fill in your login information if your feed "
+"requires authentication, except for Twitter feeds."
 msgstr ""
 "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除"
 "外。"
 
-#: modules/pref-feeds.php:421 modules/pref-feeds.php:652
+#: classes/pref_feeds.php:404 classes/pref_feeds.php:635
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: modules/pref-feeds.php:432 modules/pref-feeds.php:657
+#: classes/pref_feeds.php:415 classes/pref_feeds.php:640
 msgid "Right-to-left content"
 msgstr "右至左的内容"
 
-#: modules/pref-feeds.php:444 modules/pref-feeds.php:663
+#: classes/pref_feeds.php:427 classes/pref_feeds.php:646
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: modules/pref-feeds.php:457 modules/pref-feeds.php:669
+#: classes/pref_feeds.php:440 classes/pref_feeds.php:652
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: modules/pref-feeds.php:472
-msgid "Cache images locally (SimplePie only)"
-msgstr "在本地缓存图片（仅针对SimplePie）"
+#: classes/pref_feeds.php:454 classes/pref_feeds.php:660
+msgid "Cache images locally"
+msgstr "本地缓存图片"
 
-#: modules/pref-feeds.php:485 modules/pref-feeds.php:686
+#: classes/pref_feeds.php:466 classes/pref_feeds.php:666
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: modules/pref-feeds.php:497 modules/pref-feeds.php:692
+#: classes/pref_feeds.php:478 classes/pref_feeds.php:672
 msgid "Mark posts as updated on content change"
 msgstr "将内容更改过的文章标记为已更新状态"
 
-#: modules/pref-feeds.php:504
+#: classes/pref_feeds.php:484
 msgid "Icon"
 msgstr "图标"
 
-#: modules/pref-feeds.php:518
+#: classes/pref_feeds.php:498
 msgid "Replace"
 msgstr "替换"
 
-#: modules/pref-feeds.php:537
+#: classes/pref_feeds.php:517
 msgid "Resubscribe to push updates"
 msgstr "重新订阅以推送更新"
 
-#: modules/pref-feeds.php:544
+#: classes/pref_feeds.php:524
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
 
-#: modules/pref-feeds.php:678
-msgid "Cache images locally"
-msgstr "本地缓存图片"
-
-#: modules/pref-feeds.php:942 modules/pref-feeds.php:995
+#: classes/pref_feeds.php:926 classes/pref_feeds.php:979
 msgid "All done."
 msgstr "全部完成。"
 
-#: modules/pref-feeds.php:1027
+#: classes/pref_feeds.php:1010
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:1030
+#: classes/pref_feeds.php:1013
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "无法订阅 <b>%s</b>。"
 
-#: modules/pref-feeds.php:1033
+#: classes/pref_feeds.php:1016
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "在 <b>%s</b> 中没有找到信息源。"
 
-#: modules/pref-feeds.php:1036
+#: classes/pref_feeds.php:1019
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:1044
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
 
-#: modules/pref-feeds.php:1066
+#: classes/pref_feeds.php:1049
 msgid "Subscribe to selected feed"
 msgstr "订阅选中的信息源"
 
-#: modules/pref-feeds.php:1091
+#: classes/pref_feeds.php:1074
 msgid "Edit subscription options"
 msgstr "编辑订阅选项"
 
-#: modules/pref-feeds.php:1173
+#: classes/pref_feeds.php:1153
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "数据库中已经有 <b>$%s</b> 这个类别。"
 
-#: modules/pref-feeds.php:1189
+#: classes/pref_feeds.php:1169
 msgid "Create category"
 msgstr "创建类别"
 
-#: modules/pref-feeds.php:1259
+#: classes/pref_feeds.php:1229
 msgid "No feed categories defined."
 msgstr "没有定义过的信息源类别。"
 
-#: modules/pref-feeds.php:1265
+#: classes/pref_feeds.php:1235
 msgid "Remove selected categories"
 msgstr "移除选定的类别"
 
-#: modules/pref-feeds.php:1293
+#: classes/pref_feeds.php:1259
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: modules/pref-feeds.php:1316
+#: classes/pref_feeds.php:1279
 msgid "Inactive feeds"
 msgstr "很久不活跃的信息源"
 
-#: modules/pref-feeds.php:1339 modules/pref-filters.php:522
-#: modules/pref-instances.php:134 modules/pref-labels.php:269
-#: modules/pref-users.php:379
+#: classes/pref_feeds.php:1302 classes/pref_filters.php:574
+#: classes/pref_instances.php:139 classes/pref_labels.php:272
+#: classes/pref_users.php:371
 msgid "Select"
 msgstr "选择"
 
-#: modules/pref-feeds.php:1342 modules/pref-filters.php:525
-#: modules/pref-instances.php:137 modules/pref-labels.php:272
-#: modules/pref-users.php:382
-msgid "All"
-msgstr "全部"
-
-#: modules/pref-feeds.php:1344 modules/pref-filters.php:527
-#: modules/pref-instances.php:139 modules/pref-labels.php:274
-#: modules/pref-users.php:384
-msgid "None"
-msgstr "无"
-
-#: modules/pref-feeds.php:1351 help/3.php:55 help/4.php:22
-msgid "Subscribe to feed"
-msgstr "订阅信息源"
-
-#: modules/pref-feeds.php:1353
+#: classes/pref_feeds.php:1316
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: modules/pref-feeds.php:1355 modules/pref-feeds.php:1365
+#: classes/pref_feeds.php:1318 classes/pref_feeds.php:1328
 msgid "Reset sort order"
 msgstr "重置排序"
 
-#: modules/pref-feeds.php:1360
+#: classes/pref_feeds.php:1323
 msgid "Categories"
 msgstr "类别"
 
-#: modules/pref-feeds.php:1363
+#: classes/pref_feeds.php:1326
 msgid "Edit categories"
 msgstr "编辑类别"
 
-#: modules/pref-feeds.php:1379
+#: classes/pref_feeds.php:1342
 msgid "More actions..."
 msgstr "更多动作……"
 
-#: modules/pref-feeds.php:1383
+#: classes/pref_feeds.php:1346
 msgid "Manual purge"
 msgstr "手动清除"
 
-#: modules/pref-feeds.php:1387
+#: classes/pref_feeds.php:1350
 msgid "Clear feed data"
 msgstr "清空信息源数据"
 
-#: modules/pref-feeds.php:1388 modules/pref-filters.php:541
+#: classes/pref_feeds.php:1351 classes/pref_filters.php:593
 msgid "Rescore articles"
 msgstr "为文章重新评分"
 
-#: modules/pref-feeds.php:1430
+#: classes/pref_feeds.php:1393
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr "<b>提示：</b> 您可以拖拽信息源和类别。"
 
-#: modules/pref-feeds.php:1438
+#: classes/pref_feeds.php:1401
+msgid "Import and export"
+msgstr ""
+
+#: classes/pref_feeds.php:1403
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1440
+#: classes/pref_feeds.php:1405
+#, fuzzy
 msgid ""
-"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+"Using OPML you can export and import your feeds, filters, labels and Tiny "
+"Tiny RSS settings."
 msgstr "您可以用 OPML 进行信息源和 Tiny Tiny RSS 偏好设置的导出导入。"
 
-#: modules/pref-feeds.php:1442
-msgid "Note: Only main settings profile can be migrated using OPML."
+#: classes/pref_feeds.php:1407
+#, fuzzy
+msgid "Only main settings profile can be migrated using OPML."
 msgstr "提醒：OPML 仅可用于默认偏好文件的迁移。"
 
-#: modules/pref-feeds.php:1446 modules/pref-feeds.php:1459
-msgid "Import"
-msgstr "导入"
-
-#: modules/pref-feeds.php:1461 modules/pref-feeds.php:1469
-msgid "Export"
-msgstr "导出"
+#: classes/pref_feeds.php:1420
+#, fuzzy
+msgid "Import my OPML"
+msgstr "导入 OPML ……"
 
-#: modules/pref-feeds.php:1463
+#: classes/pref_feeds.php:1424
 msgid "Filename:"
 msgstr "文件名："
 
-#: modules/pref-feeds.php:1465
+#: classes/pref_feeds.php:1426
 msgid "Include settings"
 msgstr "包含设置"
 
-#: modules/pref-feeds.php:1471
-msgid "Publish"
-msgstr "发布"
+#: classes/pref_feeds.php:1430
+#, fuzzy
+msgid "Export OPML"
+msgstr "导出"
 
-#: modules/pref-feeds.php:1473
+#: classes/pref_feeds.php:1434
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
 
-#: modules/pref-feeds.php:1475
+#: classes/pref_feeds.php:1436
+#, fuzzy
 msgid ""
-"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-"that require authentication or feeds hidden from Popular feeds."
+"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+"require authentication or feeds hidden from Popular feeds."
 msgstr ""
 "提醒：公开发布的 OPML 不会包含您的 Tiny Tiny RSS 配置文件、需要认证才能获取的"
 "信息源、以及从最受欢迎的信息源中隐藏的信息源。"
 
-#: modules/pref-feeds.php:1478 modules/pref-feeds.php:1526
-msgid "Display URL"
-msgstr "显示 URL"
+#: classes/pref_feeds.php:1439
+#, fuzzy
+msgid "Display published OPML URL"
+msgstr "公开的 OPML URL"
+
+#: classes/pref_feeds.php:1442
+#, fuzzy
+msgid "Article archive"
+msgstr "文章发布时间"
+
+#: classes/pref_feeds.php:1444
+msgid ""
+"You can export and import your Starred and Archived articles for safekeeping "
+"or when migrating between tt-rss instances."
+msgstr ""
 
-#: modules/pref-feeds.php:1485
+#: classes/pref_feeds.php:1447
+#, fuzzy
+msgid "Export my data"
+msgstr "导出"
+
+#: classes/pref_feeds.php:1462
+msgid "Import"
+msgstr "导入"
+
+#: classes/pref_feeds.php:1469
 msgid "Firefox integration"
 msgstr "Firefox 集成"
 
-#: modules/pref-feeds.php:1487
+#: classes/pref_feeds.php:1471
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
 
-#: modules/pref-feeds.php:1494
+#: classes/pref_feeds.php:1478
 msgid "Click here to register this site as a feed reader."
 msgstr "点击此处将本站注册为信息源阅读器。"
 
-#: modules/pref-feeds.php:1502
+#: classes/pref_feeds.php:1486
 msgid "Subscribing using bookmarklet"
 msgstr "通过书签订阅"
 
-#: modules/pref-feeds.php:1504
+#: classes/pref_feeds.php:1488
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1488,24 +1658,24 @@ msgstr ""
 "将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接"
 "以订阅。"
 
-#: modules/pref-feeds.php:1508
+#: classes/pref_feeds.php:1492
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
 
-#: modules/pref-feeds.php:1512
+#: classes/pref_feeds.php:1496
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "在 Tiny Tiny RSS 中订阅"
 
-#: modules/pref-feeds.php:1516
+#: classes/pref_feeds.php:1500
 msgid "Published & shared articles and generated feeds"
 msgstr "已发布、已分享的文章和生成的信息源"
 
-#: modules/pref-feeds.php:1518
+#: classes/pref_feeds.php:1502
 msgid "Published articles and generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: modules/pref-feeds.php:1520
+#: classes/pref_feeds.php:1504
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1513,27 +1683,31 @@ msgstr ""
 "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订"
 "阅。"
 
-#: modules/pref-feeds.php:1529
+#: classes/pref_feeds.php:1510
+msgid "Display URL"
+msgstr "显示 URL"
+
+#: classes/pref_feeds.php:1513
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: modules/pref-feeds.php:1531
+#: classes/pref_feeds.php:1515
 msgid "Articles shared by URL"
 msgstr "通过 URL 分享的文章"
 
-#: modules/pref-feeds.php:1533
+#: classes/pref_feeds.php:1517
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有通过 URL 分享的文章。"
 
-#: modules/pref-feeds.php:1536
+#: classes/pref_feeds.php:1520
 msgid "Unshare all articles"
 msgstr "取消所有分享"
 
-#: modules/pref-feeds.php:1542
+#: classes/pref_feeds.php:1526
 msgid "Twitter"
 msgstr "Twitter"
 
-#: modules/pref-feeds.php:1551
+#: classes/pref_feeds.php:1535
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1541,60 +1715,47 @@ msgstr ""
 "更新 Twitter 信息源之前，您必须在 Twitter.com 上注册这个 Tiny Tiny RSS 的实"
 "例。"
 
-#: modules/pref-feeds.php:1553
+#: classes/pref_feeds.php:1537
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr "您已经成功在 Twitter.com 上注册并获取您的 Twitter 信息源的访问权。"
 
-#: modules/pref-feeds.php:1557
+#: classes/pref_feeds.php:1541
 msgid "Register with Twitter.com"
 msgstr "在 Twitter.com 上注册"
 
-#: modules/pref-feeds.php:1563
+#: classes/pref_feeds.php:1547
 msgid "Clear stored credentials"
 msgstr "清空保存的个人信息"
 
-#: modules/pref-feeds.php:1654
-#, php-format
-msgid "%d archived articles"
-msgstr "%d 个存档的文章"
-
-#: modules/pref-feeds.php:1678
-msgid "No feeds found."
-msgstr "未找到信息源。"
-
-#: modules/pref-filters.php:38
+#: classes/pref_filters.php:47
 msgid "Articles matching this filter:"
 msgstr "符合本过滤器条件的文章："
 
-#: modules/pref-filters.php:75
+#: classes/pref_filters.php:84
 msgid "No articles matching this filter has been found."
 msgstr "本过滤器下没有匹配到文章。"
 
-#: modules/pref-filters.php:470
+#: classes/pref_filters.php:523
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: modules/pref-filters.php:531 help/3.php:34 help/4.php:25
-msgid "Create filter"
-msgstr "创建过滤器"
-
-#: modules/pref-filters.php:534 modules/pref-instances.php:143
-#: modules/pref-users.php:393
+#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_users.php:385
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-instances.php:5 modules/pref-users.php:7
+#: classes/pref_instances.php:13 classes/pref_users.php:6
 msgid "Your access level is insufficient to open this tab."
 msgstr "您的访问级别不够，无法打开这个舌签。"
 
-#: modules/pref-instances.php:142
+#: classes/pref_instances.php:147
 msgid "Link instance"
 msgstr "链接实例"
 
-#: modules/pref-instances.php:154
+#: classes/pref_instances.php:159
 msgid ""
 "You can connect other instances of Tiny Tiny RSS to this one to share "
 "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
@@ -1602,1032 +1763,1188 @@ msgstr ""
 "您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这个 "
 "URL 为本实例建立链接："
 
-#: modules/pref-instances.php:164
+#: classes/pref_instances.php:169
 msgid "Last connected"
 msgstr "上次连接"
 
-#: modules/pref-instances.php:165
+#: classes/pref_instances.php:170
 msgid "Stored feeds"
 msgstr "保存的信息源"
 
-#: modules/pref-instances.php:183 modules/pref-users.php:469
+#: classes/pref_instances.php:188 classes/pref_users.php:454
 msgid "Click to edit"
 msgstr "点击进行编辑"
 
-#: modules/pref-labels.php:21
+#: classes/pref_labels.php:22
 msgid "Caption"
 msgstr "标题"
 
-#: modules/pref-labels.php:36
+#: classes/pref_labels.php:37
 msgid "Colors"
 msgstr "颜色"
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Foreground:"
 msgstr "前端："
 
-#: modules/pref-labels.php:41
+#: classes/pref_labels.php:42
 msgid "Background:"
 msgstr "背景："
 
-#: modules/pref-labels.php:231
+#: classes/pref_labels.php:232
 #, php-format
 msgid "Created label <b>%s</b>"
 msgstr "创建预定义标签 <b>%s</b>"
 
-#: modules/pref-labels.php:278 help/3.php:33 help/4.php:26
-msgid "Create label"
-msgstr "创建预定义标签"
-
-#: modules/pref-labels.php:284
+#: classes/pref_labels.php:287
 msgid "Clear colors"
 msgstr "清空颜色"
 
-#: modules/pref-prefs.php:29
+#: classes/pref_prefs.php:17
 msgid "Old password cannot be blank."
 msgstr "请输入之前使用的密码。"
 
-#: modules/pref-prefs.php:34
+#: classes/pref_prefs.php:22
 msgid "New password cannot be blank."
 msgstr "请输入一个新密码。"
 
-#: modules/pref-prefs.php:39
+#: classes/pref_prefs.php:27
 msgid "Entered passwords do not match."
 msgstr "两次输入的密码不一致。"
 
-#: modules/pref-prefs.php:63
+#: classes/pref_prefs.php:51
 msgid "Password has been changed."
 msgstr "密码更改成功。"
 
-#: modules/pref-prefs.php:65
+#: classes/pref_prefs.php:53
 msgid "Old password is incorrect."
 msgstr "原密码输入错误。"
 
-#: modules/pref-prefs.php:93
+#: classes/pref_prefs.php:79
 msgid "The configuration was saved."
 msgstr "设置已保存。"
 
-#: modules/pref-prefs.php:109
+#: classes/pref_prefs.php:94
 #, php-format
 msgid "Unknown option: %s"
 msgstr "未知选项： %s"
 
-#: modules/pref-prefs.php:122
+#: classes/pref_prefs.php:108
 msgid "Your personal data has been saved."
 msgstr "您的个人数据已保存。"
 
-#: modules/pref-prefs.php:154
+#: classes/pref_prefs.php:150
 msgid "Personal data"
 msgstr "个人信息"
 
-#: modules/pref-prefs.php:181
+#: classes/pref_prefs.php:177
 msgid "Full name"
 msgstr "姓名"
 
-#: modules/pref-prefs.php:185
+#: classes/pref_prefs.php:181
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: modules/pref-prefs.php:190
+#: classes/pref_prefs.php:186
 msgid "Access level"
 msgstr "访问级别"
 
-#: modules/pref-prefs.php:200
+#: classes/pref_prefs.php:196
 msgid "Save data"
 msgstr "保存信息"
 
-#: modules/pref-prefs.php:212
+#: classes/pref_prefs.php:208
 msgid "Your password is at default value, please change it."
 msgstr "您还在使用系统默认的密码，请修改。"
 
-#: modules/pref-prefs.php:240
+#: classes/pref_prefs.php:236
 msgid "Old password"
 msgstr "原密码"
 
-#: modules/pref-prefs.php:243
+#: classes/pref_prefs.php:239
 msgid "New password"
 msgstr "新密码"
 
-#: modules/pref-prefs.php:248
+#: classes/pref_prefs.php:244
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: modules/pref-prefs.php:258
+#: classes/pref_prefs.php:254
 msgid "Change password"
 msgstr "更改密码"
 
-#: modules/pref-prefs.php:344
+#: classes/pref_prefs.php:339
 msgid "Select theme"
 msgstr "选择主题"
 
-#: modules/pref-prefs.php:402
+#: classes/pref_prefs.php:391
 msgid "Customize"
 msgstr "自定义"
 
-#: modules/pref-prefs.php:422 modules/pref-prefs.php:429
-#: modules/pref-prefs.php:434
+#: classes/pref_prefs.php:410 classes/pref_prefs.php:417
+#: classes/pref_prefs.php:422
 msgid "Yes"
 msgstr "是"
 
-#: modules/pref-prefs.php:424 modules/pref-prefs.php:434
+#: classes/pref_prefs.php:412 classes/pref_prefs.php:422
 msgid "No"
 msgstr "否"
 
-#: modules/pref-prefs.php:468
+#: classes/pref_prefs.php:456
 msgid "Clear"
 msgstr "清空"
 
-#: modules/pref-prefs.php:494
+#: classes/pref_prefs.php:482
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: modules/pref-prefs.php:497
+#: classes/pref_prefs.php:485
 msgid "Manage profiles"
 msgstr "管理偏好文件"
 
-#: modules/pref-prefs.php:500
+#: classes/pref_prefs.php:488
 msgid "Reset to defaults"
 msgstr "恢复到默认"
 
-#: modules/pref-users.php:20
+#: classes/pref_users.php:27
 msgid "User details"
 msgstr "用户详细资料"
 
-#: modules/pref-users.php:34
+#: classes/pref_users.php:41
 msgid "User not found"
 msgstr "未找到用户"
 
-#: modules/pref-users.php:53 modules/pref-users.php:440
+#: classes/pref_users.php:60 classes/pref_users.php:433
 msgid "Registered"
 msgstr "注册时间"
 
-#: modules/pref-users.php:54
+#: classes/pref_users.php:61
 msgid "Last logged in"
 msgstr "上次登录"
 
-#: modules/pref-users.php:61
+#: classes/pref_users.php:68
 msgid "Subscribed feeds count"
 msgstr "订阅的信息源数量"
 
-#: modules/pref-users.php:65
+#: classes/pref_users.php:72
 msgid "Subscribed feeds"
 msgstr "订阅的信息源"
 
-#: modules/pref-users.php:114
+#: classes/pref_users.php:122
 msgid "User Editor"
 msgstr "编辑用户信息"
 
-#: modules/pref-users.php:150
+#: classes/pref_users.php:158
 msgid "Access level: "
 msgstr "访问级别："
 
-#: modules/pref-users.php:163
+#: classes/pref_users.php:171
 msgid "Change password to"
 msgstr "更改密码为："
 
-#: modules/pref-users.php:172
+#: classes/pref_users.php:180
 msgid "E-mail: "
 msgstr "电子邮件："
 
-#: modules/pref-users.php:206
-#, php-format
-msgid "Changed password of user <b>%s</b>."
-msgstr "用户 <b>%s</b> 的密码已更改。"
-
-#: modules/pref-users.php:254
+#: classes/pref_users.php:255
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
 
-#: modules/pref-users.php:261
+#: classes/pref_users.php:262
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "无法创建用户 <b>%s</b> "
 
-#: modules/pref-users.php:265
+#: classes/pref_users.php:266
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
-#: modules/pref-users.php:285
-#, php-format
+#: classes/pref_users.php:285
+#, fuzzy, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
-"\t\t\t\t\t to <b>%s</b>"
+"\t\t\t\t to <b>%s</b>"
 msgstr ""
 "更改用户 <b>%s</b>\n"
 "\t\t\t\t\t 的密码为 <b>%s</b>"
 
-#: modules/pref-users.php:291
+#: classes/pref_users.php:292
 #, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "提醒 <b>%s</b>。"
 
-#: modules/pref-users.php:328
+#: classes/pref_users.php:329
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
-#: modules/pref-users.php:387 help/4.php:27
-msgid "Create user"
-msgstr "创建用户"
-
-#: modules/pref-users.php:397
+#: classes/pref_users.php:389
 msgid "Reset password"
 msgstr "重置密码"
 
-#: modules/pref-users.php:439
+#: classes/pref_users.php:432
 msgid "Access Level"
 msgstr "访问级别"
 
-#: modules/pref-users.php:441
+#: classes/pref_users.php:434
 msgid "Last login"
 msgstr "最后登陆"
 
-#: modules/pref-users.php:489
+#: classes/pref_users.php:474
 msgid "No users defined."
 msgstr "没有定义用户。"
 
-#: modules/pref-users.php:491
+#: classes/pref_users.php:476
 msgid "No matching users found."
 msgstr "没有匹配的用户。"
 
-#: help/2.php:1
-msgid "Content filtering"
-msgstr "内容过滤"
-
-#: help/2.php:3
-msgid ""
-"Tiny Tiny RSS has support for filtering (or processing) articles. Filtering "
-"is done once, when new article is imported to the database from the "
-"newsfeed, specified field is matched against regular expression and some "
-"action is taken. Regular expression matching is case-insensitive."
+#: classes/readitlater_button.php:7
+msgid "Read it later"
 msgstr ""
-"Tiny Tiny RSS 支持文章过滤。过滤在文章导入数据库的时候完成，指定的内容在与正"
-"则表达式匹配后会执行指定的动作。正则表达式区分大小写。"
 
-#: help/2.php:5
-msgid ""
-"Supported actions are: filter (do not import) article, mark article as read, "
-"set starred, assign tag(s), and set score. Filters can be defined globally "
-"and for some specific feed."
-msgstr ""
-"支持的动作包括：过滤文章（不导入），标记文章为已读，加注星标，加注自定义标"
-"签，进行评分。过滤器可以全局设置，也可以针对指定的信息源设置。"
+#: classes/rpc.php:426 include/functions.php:3265 include/functions.php:4036
+msgid "no tags"
+msgstr "无标签"
 
-#: help/2.php:7
-msgid ""
-"Multiple and inverse matching are supported. All matching filters are "
-"considered when article is being imported and all actions executed in "
-"sequence. Inverse matching reverts matching result, e.g. filter matching "
-"XYZZY in title with inverse flag will match all articles, except those "
-"containing string XYZZY in title."
-msgstr ""
-"支持多项匹配和反向匹配。当文章被导入时，所有的匹配过滤器会被依次执行。反向匹"
-"配会将匹配结果反转，比如反向匹配 XYZZY 这个关键字的情况将会匹配所有标题中不包"
-"含 XYZZY 的文章。"
+#: classes/rpc.php:741
+msgid "Your request could not be completed."
+msgstr "您的请求无法完成。"
 
-#: help/2.php:9
-msgid "See also:"
-msgstr "另请参考："
+#: classes/rpc.php:745
+msgid "Feed update has been scheduled."
+msgstr "信息源更新的任务计划已制定。"
 
-#: help/3.php:1 help/4.php:1
-msgid "Keyboard Shortcuts"
-msgstr "快捷键"
+#: classes/rpc.php:753
+msgid "Category update has been scheduled."
+msgstr "分类更新已列入任务计划。"
 
-#: help/3.php:5
-msgid "Navigation"
-msgstr "导航"
+#: classes/rpc.php:766
+msgid "Can't update this kind of feed."
+msgstr "无法更新这种类型的信息源。"
 
-#: help/3.php:8
-msgid "Move between feeds"
-msgstr "在信息源之间移动"
+#: classes/share_button.php:7
+msgid "Share by URL"
+msgstr "通过 URL 分享"
 
-#: help/3.php:9
-msgid "Move between articles"
-msgstr "在文章之间移动"
+#: classes/share_button.php:29
+msgid "You can share this article by the following unique URL:"
+msgstr "您可以通过以下唯一 URL 分享本文："
 
-#: help/3.php:10
-msgid "Show search dialog"
-msgstr "显示搜索对话框"
+#: classes/tweet_button.php:7
+msgid "Share on Twitter"
+msgstr "在 Twitter 上分享"
 
-#: help/3.php:13
-msgid "Active article actions"
-msgstr "启用文章动作"
+#: include/functions.php:838
+msgid "Session failed to validate (incorrect IP)"
+msgstr "无法验证会话（IP 错误）"
 
-#: help/3.php:16
-msgid "Toggle starred"
-msgstr "锁定加星标的项"
+#: include/functions.php:912
+msgid "Incorrect username or password"
+msgstr "用户名或密码错误"
 
-#: help/3.php:17
-msgid "Toggle published"
-msgstr "锁定发布的项"
+#: include/functions.php:2013
+msgid "Archived articles"
+msgstr "存档的文章"
 
-#: help/3.php:18
-msgid "Toggle unread"
-msgstr "锁定未读项"
+#: include/functions.php:3109 js/viewfeed.js:1945
+msgid "Click to play"
+msgstr "点击播放"
 
-#: help/3.php:19
-msgid "Edit tags"
-msgstr "编辑自定义标签"
+#: include/functions.php:3110 js/viewfeed.js:1944
+msgid "Play"
+msgstr "播放"
 
-#: help/3.php:20
-msgid "Dismiss selected articles"
-msgstr "不再显示所选的文章"
+#: include/functions.php:3236
+msgid " - "
+msgstr " - "
 
-#: help/3.php:21
-msgid "Dismiss read articles"
-msgstr "不再显示已读文章"
+#: include/functions.php:4061
+msgid "(edit note)"
+msgstr "（编辑注记）"
 
-#: help/3.php:22
-msgid "Open article in new window"
-msgstr "在新窗口打开文章"
+#: include/functions.php:4476
+msgid "No feed selected."
+msgstr "没有选中的信息源。"
 
-#: help/3.php:23
-msgid "Mark articles below/above active one as read"
-msgstr "将当前项以下/以上的文章标记为已读"
+#: include/functions.php:4660
+msgid "unknown type"
+msgstr "未知类型"
 
-#: help/3.php:24
-msgid "Scroll article content"
-msgstr "滚动文章内容"
+#: include/functions.php:4700
+msgid "Attachment:"
+msgstr "附件："
 
-#: help/3.php:25
-msgid "Email article"
-msgstr "通过邮件发送文章"
+#: include/functions.php:4702
+msgid "Attachments:"
+msgstr "附件："
 
-#: help/3.php:29 help/4.php:30
-msgid "Other actions"
-msgstr "其他动作"
+#: include/functions.php:5091
+#, php-format
+msgid "%d archived articles"
+msgstr "%d 个存档的文章"
 
-#: help/3.php:32
-msgid "Select article under mouse cursor"
-msgstr "选择鼠标指向的文章"
+#: include/functions.php:5115
+msgid "No feeds found."
+msgstr "未找到信息源。"
 
-#: help/3.php:35
-msgid "Collapse sidebar"
-msgstr "折叠侧边栏"
+#: include/functions.php:5161
+#, fuzzy
+msgid "Could not import: incorrect schema version."
+msgstr "无法找到必要的表结构文件，需要版本："
 
-#: help/3.php:36 help/4.php:34
-msgid "Display this help dialog"
-msgstr "显示本帮助对话框"
+#: include/functions.php:5166
+msgid "Could not import: unrecognized document format."
+msgstr ""
 
-#: help/3.php:41
-msgid "Multiple articles actions"
-msgstr "多文章动作"
+#: include/functions.php:5325
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""
 
-#: help/3.php:44
-msgid "Select all articles"
-msgstr "选择所有文章"
+#: include/functions.php:5331
+msgid "Could not load XML document."
+msgstr ""
 
-#: help/3.php:45
-msgid "Select unread articles"
-msgstr "选择未读文章"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "标题或内容"
 
-#: help/3.php:46
-msgid "Invert article selection"
-msgstr "反选文章"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "链接"
 
-#: help/3.php:47
-msgid "Deselect all articles"
-msgstr "取消选择所有文章"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "文章发布时间"
 
-#: help/3.php:50
-msgid "Feed actions"
-msgstr "信息源动作"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "删除文章"
 
-#: help/3.php:53
-msgid "Refresh active feed"
-msgstr "刷新活动的信息源"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "加星标"
 
-#: help/3.php:56
-msgid "Edit feed"
-msgstr "编辑信息源"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:462
+msgid "Publish article"
+msgstr "发布文章"
 
-#: help/3.php:57
-msgid "Mark feed as read"
-msgstr "标记信息源为已读"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "添加自定义标签"
 
-#: help/3.php:58
-msgid "Reverse headlines order"
-msgstr "反向排序"
+#: include/localized_schema.php:14 js/viewfeed.js:1909
+msgid "Assign label"
+msgstr "添加预定义标签"
 
-#: help/3.php:59
-msgid "Mark all feeds as read"
-msgstr "标记所有信息源为已读"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr ""
 
-#: help/3.php:60
-msgid "If viewing category, (un)collapse it"
-msgstr "查看类别时将其折叠/展开"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr ""
 
-#: help/3.php:63 help/4.php:5
-msgid "Go to..."
-msgstr "跳转至……"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr ""
 
-#: help/3.php:66
-msgid "All articles"
-msgstr "全部文章"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr ""
 
-#: help/3.php:67
-msgid "Fresh articles"
-msgstr "最新更新的文章"
+#: include/localized_schema.php:21
+msgid ""
+"This option is useful when you are reading several planet-type aggregators "
+"with partially colliding userbase. When disabled, it forces same posts from "
+"different feeds to appear only once."
+msgstr ""
+"您可能订阅了一些聚合类型的信息源，这种情况下可能遇到同一用户的文章在不同源多"
+"次出现。当该选项被禁用时，来自不同 RSS 源的同一文章将只会显示一次。"
 
-#: help/3.php:68
-msgid "Starred articles"
-msgstr "加星标文章"
+#: include/localized_schema.php:22
+msgid ""
+"Display expanded list of feed articles, instead of separate displays for "
+"headlines and article content"
+msgstr "将文章列表展开显示，而不是将标题和内容分别显示"
 
-#: help/3.php:69
-msgid "Published articles"
-msgstr "已发布文章"
+#: include/localized_schema.php:23
+msgid ""
+"When \"Mark as read\" button is clicked in toolbar, automatically open next "
+"feed with unread articles."
+msgstr ""
+"当工具栏上 \"标记为已读 \" 按钮被点击时，自动打开下一个信息源中的未读文章。"
 
-#: help/3.php:70
-msgid "Tag cloud"
-msgstr "标签云"
+#: include/localized_schema.php:24
+msgid ""
+"This option enables sending daily digest of new (and unread) headlines on "
+"your configured e-mail address"
+msgstr "每天将更新的和未读的文章标题通过邮件发送摘要到您设置的邮箱中"
 
-#: help/3.php:77
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr "在 Tiny Tiny RSS 的维基上可以找到其他界面技巧。"
+#: include/localized_schema.php:25
+msgid ""
+"This option enables marking articles as read automatically while you scroll "
+"article list."
+msgstr "在滚动页面的同时自动将文章标记为已读。"
 
-#: help/3.php:79 help/4.php:41
-msgid "Press any key to close this window."
-msgstr "按任意键关闭本窗口。"
+#: include/localized_schema.php:26
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "仅加载几个最常用的 HTML 标签"
 
-#: help/4.php:9
-msgid "My Feeds"
-msgstr "我的信息源"
+#: include/localized_schema.php:27
+msgid ""
+"When auto-detecting tags in articles these tags will not be applied (comma-"
+"separated list)."
+msgstr "自动检测文章标签时，这些标签将被忽略（半角逗号隔开的列表）。"
 
-#: help/4.php:10
-msgid "Other Feeds"
-msgstr "其他信息源"
+#: include/localized_schema.php:28
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr "选择本项可让特殊区域和预定义标签中的文章标题以信息源顺序排列"
 
-#: help/4.php:19
-msgid "Panel actions"
-msgstr "版面动作"
+#: include/localized_schema.php:29
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr "使用信息源中定义的时间，而非本地导入的时间来排序。"
 
-#: help/4.php:23
-msgid "Top 25 feeds"
-msgstr "前25位的信息源"
+#: include/localized_schema.php:30
+msgid "Customize CSS stylesheet to your liking"
+msgstr "自定义 CSS 样式"
 
-#: help/4.php:24
-msgid "Edit feed categories"
-msgstr "编辑信息源类别"
+#: include/localized_schema.php:31
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr "在 tt-rss 处注册您的 SSL 证书"
 
-#: help/4.php:33
-msgid "Focus search (if present)"
-msgstr "进入搜索框（页面中存在的情况）"
+#: include/localized_schema.php:32
+msgid "Purge old posts after this number of days (0 - disables)"
+msgstr "清除多少天之前的文章？（0为不启用）"
 
-#: help/4.php:39
-msgid ""
-"<b>Note:</b> not all actions may be available, depending on Tiny Tiny RSS "
-"configuration and your access level."
-msgstr ""
-"<b>提醒：</b>根据 Tiny Tiny RSS 的配置和你的访问级别不同，并非所有的动作都可"
-"以执行。"
+#: include/localized_schema.php:33
+msgid "Default interval between feed updates"
+msgstr "信息源更新的默认时间间隔"
 
-#: mobile/login_form.php:28
-msgid "Log in"
-msgstr "登录"
+#: include/localized_schema.php:34
+msgid "Amount of articles to display at once"
+msgstr "同时显示的文章数量"
 
-#: mobile/login_form.php:38
-msgid "Login:"
-msgstr "登陆："
+#: include/localized_schema.php:35
+msgid "Allow duplicate posts"
+msgstr "允许重复文章"
 
-#: mobile/login_form.php:43
-msgid "Password:"
-msgstr "密码："
+#: include/localized_schema.php:36
+msgid "Enable feed categories"
+msgstr "启用信息源分类"
 
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:382
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr "主页"
+#: include/localized_schema.php:37
+msgid "Show content preview in headlines list"
+msgstr "在标题列表中显示内容预览"
 
-#: mobile/mobile-functions.php:178
-msgid "Special"
-msgstr "特殊区域"
+#: include/localized_schema.php:38
+msgid "Short date format"
+msgstr "短时间格式"
 
-#: mobile/mobile-functions.php:418
-msgid "Nothing found (click to reload feed)."
-msgstr "啥也没找到（点击以重新加载信息源）。"
+#: include/localized_schema.php:39
+msgid "Long date format"
+msgstr "长时间格式"
 
-#: mobile/prefs.php:24
-msgid "Enable categories"
-msgstr "启用类别"
+#: include/localized_schema.php:40
+msgid "Combined feed display"
+msgstr "合并显示模式"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "ON"
-msgstr "ON"
+#: include/localized_schema.php:41
+msgid "Hide feeds with no unread messages"
+msgstr "隐藏没有未读信息的信息源"
 
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46
-msgid "OFF"
-msgstr "OFF"
+#: include/localized_schema.php:42
+msgid "On catchup show next feed"
+msgstr "自动显示下一个信息源"
 
-#: mobile/prefs.php:29
-msgid "Browse categories like folders"
-msgstr "以文件夹方式浏览类别"
+#: include/localized_schema.php:43
+msgid "Sort feeds by unread articles count"
+msgstr "以未读文章数量排序信息源"
 
-#: mobile/prefs.php:35
-msgid "Show images in posts"
-msgstr "在帖子里显示图像"
+#: include/localized_schema.php:44
+msgid "Reverse headline order (oldest first)"
+msgstr "反转标题列表顺序（最旧的在上面）"
 
-#: mobile/prefs.php:40
-msgid "Hide read articles and feeds"
-msgstr "隐藏已读的文章和信息源"
+#: include/localized_schema.php:45
+msgid "Enable e-mail digest"
+msgstr "启用电子邮件摘要"
 
-#: mobile/prefs.php:45
-msgid "Sort feeds by unread count"
-msgstr "以未读文章数量排列信息源"
+#: include/localized_schema.php:46
+msgid "Confirm marking feed as read"
+msgstr "标记信息源为已读之前弹出确认"
 
-#~ msgid "Session failed to validate (incorrect IP)"
-#~ msgstr "无法验证会话（IP 错误）"
+#: include/localized_schema.php:47
+msgid "Automatically mark articles as read"
+msgstr "自动标记文章为已读"
 
-#~ msgid "Incorrect username or password"
-#~ msgstr "用户名或密码错误"
+#: include/localized_schema.php:48
+msgid "Strip unsafe tags from articles"
+msgstr "从文章中剔除不安全的标签"
 
-#~ msgid "Archived articles"
-#~ msgstr "存档的文章"
+#: include/localized_schema.php:49
+msgid "Blacklisted tags"
+msgstr "被列入黑名单的标签"
 
-#~ msgid "Select:"
-#~ msgstr "选择："
+#: include/localized_schema.php:50
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "最新更新文章的保鲜期（以小时为单位）"
 
-#~ msgid "Invert"
-#~ msgstr "反选"
+#: include/localized_schema.php:51
+msgid "Mark articles in e-mail digest as read"
+msgstr "将邮件摘要中的文章标记为已读"
 
-#~ msgid "Selection toggle:"
-#~ msgstr "锁定选择："
+#: include/localized_schema.php:52
+msgid "Automatically expand articles in combined mode"
+msgstr "在组合模式下自动展开文章"
 
-#~ msgid "Selection:"
-#~ msgstr "选择："
+#: include/localized_schema.php:53
+msgid "Purge unread articles"
+msgstr "清除未读文章"
 
-#~ msgid "Archive"
-#~ msgstr "存档"
+#: include/localized_schema.php:54
+msgid "Show special feeds when hiding read feeds"
+msgstr "隐藏已读信息之后显示特殊区域的内容"
 
-#~ msgid "Move back"
-#~ msgstr "移回原位"
+#: include/localized_schema.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "对虚拟源中的文章按源分组"
 
-#~ msgid "Delete"
-#~ msgstr "删除"
+#: include/localized_schema.php:56
+msgid "Do not show images in articles"
+msgstr "不要显示文章中的图片"
 
-#~ msgid "Forward by email"
-#~ msgstr "通过邮件转发"
+#: include/localized_schema.php:57
+msgid "Enable external API"
+msgstr "允许使用外部 API"
 
-#~ msgid "Feed:"
-#~ msgstr "信息源："
+#: include/localized_schema.php:58
+msgid "User timezone"
+msgstr "用户所在时区"
 
-#~ msgid "Visit the website"
-#~ msgstr "访问网站"
+#: include/localized_schema.php:59
+msgid "Sort headlines by feed date"
+msgstr "以信息源的日期排序"
 
-#~ msgid "View as RSS feed"
-#~ msgstr "以RSS信息源方式阅读"
+#: include/localized_schema.php:60 js/prefs.js:1762
+msgid "Customize stylesheet"
+msgstr "自定义样式"
 
-#~ msgid "Click to play"
-#~ msgstr "点击播放"
+#: include/localized_schema.php:61
+msgid "Login with an SSL certificate"
+msgstr "使用 SSL 证书登录"
 
-#~ msgid "Play"
-#~ msgstr "播放"
+#: include/login_form.php:139
+msgid "Language:"
+msgstr "语言："
 
-#~ msgid " - "
-#~ msgstr " - "
+#: include/login_form.php:148
+msgid "Profile:"
+msgstr "偏好："
 
-#~ msgid "Edit tags for this article"
-#~ msgstr "为本文编辑自定义标签"
+#: include/login_form.php:178
+msgid "Use less traffic"
+msgstr "使用较少流量"
 
-#~ msgid "Open article in new tab"
-#~ msgstr "在新标签页中打开文章"
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+msgid "Mark all articles in %s as read?"
+msgstr "将 %s 中的全部文章标记为已读？"
 
-#~ msgid "Edit article note"
-#~ msgstr "编辑文章注记"
+#: js/digest.js:69
+msgid "Mark %d displayed articles as read?"
+msgstr "将显示的 %d 篇文章标记为已读？"
 
-#~ msgid "Share on Twitter"
-#~ msgstr "在 Twitter 上分享"
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:417
+msgid "Unstar article"
+msgstr "取消星标"
 
-#~ msgid "Share by URL"
-#~ msgstr "通过 URL 分享"
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:422
+msgid "Star article"
+msgstr "加星标"
 
-#~ msgid "Close this panel"
-#~ msgstr "关闭本界面"
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:457
+msgid "Unpublish article"
+msgstr "取消发布文章"
 
-#~ msgid "Originally from:"
-#~ msgstr "来源："
+#: js/digest.js:265
+msgid "Original article"
+msgstr "原文"
 
-#~ msgid "mark as read"
-#~ msgstr "标记为已读"
+#: js/digest.js:267
+msgid "Close this panel"
+msgstr "关闭本界面"
 
-#~ msgid "Dismiss article"
-#~ msgstr "不再显示本文章"
+#: js/digest.js:290
+msgid "Error: unable to load article."
+msgstr "错误：无法加载文章。"
 
-#~ msgid "No unread articles found to display."
-#~ msgstr "没有未读文章。"
+#: js/digest.js:444
+msgid "Click to expand article."
+msgstr "点击以展开文章。"
 
-#~ msgid "No updated articles found to display."
-#~ msgstr "没有最新更新的文章。"
+#: js/digest.js:519
+msgid "%d more..."
+msgstr "下面的 %d 篇……"
 
-#~ msgid "No starred articles found to display."
-#~ msgstr "没有加星标的文章。"
+#: js/digest.js:526
+msgid "No unread feeds."
+msgstr "没有未读的信息源。"
 
-#~ msgid ""
-#~ "No articles found to display. You can assign articles to labels manually "
-#~ "(see the Actions menu above) or use a filter."
-#~ msgstr ""
-#~ "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上"
-#~ "方活动菜单）。"
+#: js/digest.js:628
+msgid "Load more..."
+msgstr "加载更多……"
 
-#~ msgid "No articles found to display."
-#~ msgstr "暂时没有文章。"
+#: js/feedlist.js:298
+msgid "New articles available in this feed (click to show)"
+msgstr "本信息源中的最新文章（点击显示）"
 
-#~ msgid "Feeds last updated at %s"
-#~ msgstr "上次信息源更新时间：%s"
+#: js/FeedTree.js:137
+msgid "Update feed"
+msgstr "更新信息源"
 
-#~ msgid "Some feeds have update errors (click for details)"
-#~ msgstr "部分信息源更新错误（点击了解详情）"
+#: js/functions.js:91
+msgid ""
+"Are you sure to report this exception to tt-rss.org? The report will include "
+"your browser information. Your IP would be saved in the database."
+msgstr ""
+"您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览器信息。您的IP将被存入数"
+"据库。"
 
-#~ msgid "Remove:"
-#~ msgstr "移除："
+#: js/functions.js:647
+msgid "Date syntax appears to be correct:"
+msgstr "日期的语法正确："
 
-#~ msgid "Assign:"
-#~ msgstr "应用于："
+#: js/functions.js:650
+msgid "Date syntax is incorrect."
+msgstr "日期的语法错误。"
 
-#~ msgid "(edit note)"
-#~ msgstr "（编辑注记）"
+#: js/functions.js:777
+msgid "Remove stored feed icon?"
+msgstr "移除已保存的信息源图标？"
 
-#~ msgid "No feed selected."
-#~ msgstr "没有选中的信息源。"
+#: js/functions.js:809
+msgid "Please select an image file to upload."
+msgstr "请选择图片文件上传。"
 
-#~ msgid "unknown type"
-#~ msgstr "未知类型"
+#: js/functions.js:811
+msgid "Upload new icon for this feed?"
+msgstr "为本信息源上传一个新的图标？"
 
-#~ msgid "Attachment:"
-#~ msgstr "附件："
+#: js/functions.js:828
+msgid "Please enter label caption:"
+msgstr "请填写预定义标签的说明："
 
-#~ msgid "Attachments:"
-#~ msgstr "附件："
+#: js/functions.js:833
+msgid "Can't create label: missing caption."
+msgstr "创建标签失败：没有标题。"
 
-#~ msgid "Language:"
-#~ msgstr "语言："
+#: js/functions.js:875
+msgid "Subscribe to Feed"
+msgstr "订阅信息源"
 
-#~ msgid "Profile:"
-#~ msgstr "偏好："
+#: js/functions.js:883
+msgid "Subscribing to feed..."
+msgstr "正在订阅信息源……"
 
-#~ msgid "Use less traffic"
-#~ msgstr "使用较少流量"
+#: js/functions.js:901
+msgid "Subscribed to %s"
+msgstr "已订阅至 %s"
 
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "锁定类别重新排序模式"
+#: js/functions.js:906
+msgid "Specified URL seems to be invalid."
+msgstr "指定的 URL 无效。"
 
-#~ msgid "Update all feeds"
-#~ msgstr "更新全部信息源"
+#: js/functions.js:909
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr "指定的 URL 没有包含任何信息源。"
 
-#~ msgid "Sort by name or unread count"
-#~ msgstr "通过名称或未读的数量排序"
+#: js/functions.js:945
+msgid "Couldn't download the specified URL."
+msgstr "无法下载指定的 URL 。"
 
-#~ msgid "Mark all articles in %s as read?"
-#~ msgstr "将 %s 中的全部文章标记为已读？"
+#: js/functions.js:948
+msgid "You are already subscribed to this feed."
+msgstr "您已经订阅过这个信息源啦。"
 
-#~ msgid "Mark %d displayed articles as read?"
-#~ msgstr "将显示的 %d 篇文章标记为已读？"
+#: js/functions.js:977
+msgid "Create Filter"
+msgstr "创建过滤器"
 
-#~ msgid "Unstar article"
-#~ msgstr "取消星标"
+#: js/functions.js:987 js/prefs.js:165
+msgid "Filter Test Results"
+msgstr "过滤器测试结果"
 
-#~ msgid "Star article"
-#~ msgstr "加星标"
+#: js/functions.js:1045
+msgid ""
+"Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
+"hub again on next feed update."
+msgstr ""
+"重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
 
-#~ msgid "Unpublish article"
-#~ msgstr "取消发布文章"
+#: js/functions.js:1066 js/tt-rss.js:395
+msgid "Unsubscribe from %s?"
+msgstr "从 %s 取消订阅？"
 
-#~ msgid "Original article"
-#~ msgstr "原文"
+#: js/functions.js:1173
+msgid "Please enter category title:"
+msgstr "请填写类别名称："
 
-#~ msgid "Error: unable to load article."
-#~ msgstr "错误：无法加载文章。"
+#: js/functions.js:1204
+msgid "Generate new syndication address for this feed?"
+msgstr "为本信息源生成新的群地址？"
 
-#~ msgid "Click to expand article."
-#~ msgstr "点击以展开文章。"
+#: js/functions.js:1388 js/tt-rss.js:374 js/tt-rss.js:885
+msgid "You can't edit this kind of feed."
+msgstr "您无法编辑这种类型的信息源。"
 
-#~ msgid "%d more..."
-#~ msgstr "下面的 %d 篇……"
+#: js/functions.js:1400
+msgid "Edit Feed"
+msgstr "编辑信息源"
 
-#~ msgid "No unread feeds."
-#~ msgstr "没有未读的信息源。"
+#: js/functions.js:1438
+msgid "More Feeds"
+msgstr "更多信息源"
 
-#~ msgid "Load more..."
-#~ msgstr "加载更多……"
+#: js/functions.js:1499 js/functions.js:1609 js/prefs.js:390 js/prefs.js:420
+#: js/prefs.js:452 js/prefs.js:610 js/prefs.js:630 js/prefs.js:1247
+#: js/prefs.js:1392
+msgid "No feeds are selected."
+msgstr "没有选择任何信息源。"
 
-#~ msgid "New articles available in this feed (click to show)"
-#~ msgstr "本信息源中的最新文章（点击显示）"
+#: js/functions.js:1541
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
-#~ msgid "Update feed"
-#~ msgstr "更新信息源"
+#: js/functions.js:1580
+msgid "Feeds with update errors"
+msgstr "更新错误的信息源"
 
-#~ msgid ""
-#~ "Are you sure to report this exception to tt-rss.org? The report will "
-#~ "include your browser information. Your IP would be saved in the database."
-#~ msgstr ""
-#~ "您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览器信息。您的IP将被存入"
-#~ "数据库。"
+#: js/functions.js:1591 js/prefs.js:1229
+msgid "Remove selected feeds?"
+msgstr "移除选中的信息源？"
 
-#~ msgid "Date syntax appears to be correct:"
-#~ msgstr "日期的语法正确："
+#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
+#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
+#: js/viewfeed.js:936 js/viewfeed.js:986
+msgid "No articles are selected."
+msgstr "没有选中任何文章。"
 
-#~ msgid "Date syntax is incorrect."
-#~ msgstr "日期的语法错误。"
+#: js/mail_button.js:21
+msgid "Forward article by email"
+msgstr "用邮件转发文章"
 
-#~ msgid "Remove stored feed icon?"
-#~ msgstr "移除已保存的信息源图标？"
+#: js/PrefFilterTree.js:32
+msgid "Inverse"
+msgstr "反选"
 
-#~ msgid "Please select an image file to upload."
-#~ msgstr "请选择图片文件上传。"
+#: js/prefs.js:64
+msgid "Please enter login:"
+msgstr "请输入登录名："
 
-#~ msgid "Upload new icon for this feed?"
-#~ msgstr "为本信息源上传一个新的图标？"
+#: js/prefs.js:71
+msgid "Can't create user: no login specified."
+msgstr "无法创建用户：没有指定登录名。"
 
-#~ msgid "Please enter label caption:"
-#~ msgstr "请填写预定义标签的说明："
+#: js/prefs.js:134
+msgid "Edit Filter"
+msgstr "编辑过滤器"
 
-#~ msgid "Can't create label: missing caption."
-#~ msgstr "创建标签失败：没有标题。"
+#: js/prefs.js:138
+msgid "Remove filter %s?"
+msgstr "移除这个过滤器： %s ？"
 
-#~ msgid "Subscribe to Feed"
-#~ msgstr "订阅信息源"
+#: js/prefs.js:272
+msgid "Remove selected labels?"
+msgstr "移除选中的预定义标签？"
 
-#~ msgid "Subscribing to feed..."
-#~ msgstr "正在订阅信息源……"
+#: js/prefs.js:288 js/prefs.js:1433
+msgid "No labels are selected."
+msgstr "没有选择任何预定义标签。"
 
-#~ msgid "Subscribed to %s"
-#~ msgstr "已订阅至 %s"
+#: js/prefs.js:302
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr "移除选中的用户？默认管理员和您的帐户不会被移除。"
+
+#: js/prefs.js:319 js/prefs.js:500 js/prefs.js:521 js/prefs.js:560
+msgid "No users are selected."
+msgstr "没有选中任何用户。"
+
+#: js/prefs.js:337
+msgid "Remove selected filters?"
+msgstr "移除选定的过滤器？"
 
-#~ msgid "Specified URL seems to be invalid."
-#~ msgstr "指定的 URL 无效。"
+#: js/prefs.js:352 js/prefs.js:590
+msgid "No filters are selected."
+msgstr "没有选中的过滤器。"
 
-#~ msgid "Specified URL doesn't seem to contain any feeds."
-#~ msgstr "指定的 URL 没有包含任何信息源。"
+#: js/prefs.js:371
+msgid "Unsubscribe from selected feeds?"
+msgstr "从选中的信息源取消订阅？"
 
-#~ msgid "Couldn't download the specified URL."
-#~ msgstr "无法下载指定的 URL 。"
+#: js/prefs.js:405
+msgid "Please select only one feed."
+msgstr "请仅选择一个信息源。"
 
-#~ msgid "You are already subscribed to this feed."
-#~ msgstr "您已经订阅过这个信息源啦。"
+#: js/prefs.js:411
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "清空选中的信息源当中所有未加星标的文章？"
 
-#~ msgid "Create Filter"
-#~ msgstr "创建过滤器"
+#: js/prefs.js:433
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr "文章保存几天？（填写0则采用默认设置）"
 
-#~ msgid "Filter Test Results"
-#~ msgstr "过滤器测试结果"
+#: js/prefs.js:471
+msgid "Login field cannot be blank."
+msgstr "请填写登录信息。"
 
-#~ msgid ""
-#~ "Reset subscription? Tiny Tiny RSS will try to subscribe to the "
-#~ "notification hub again on next feed update."
-#~ msgstr ""
-#~ "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中"
-#~ "心。"
+#: js/prefs.js:505 js/prefs.js:526 js/prefs.js:565
+msgid "Please select only one user."
+msgstr "请仅选择一个用户。"
 
-#~ msgid "Unsubscribe from %s?"
-#~ msgstr "从 %s 取消订阅？"
+#: js/prefs.js:530
+msgid "Reset password of selected user?"
+msgstr "重置选定用户的密码？"
 
-#~ msgid "Please enter category title:"
-#~ msgstr "请填写类别名称："
+#: js/prefs.js:595
+msgid "Please select only one filter."
+msgstr "请仅选择一个过滤器。"
 
-#~ msgid "Generate new syndication address for this feed?"
-#~ msgstr "为本信息源生成新的群地址？"
+#: js/prefs.js:652
+msgid "Edit Multiple Feeds"
+msgstr "编辑多个信息源"
 
-#~ msgid "You can't edit this kind of feed."
-#~ msgstr "您无法编辑这种类型的信息源。"
+#: js/prefs.js:676
+msgid "Save changes to selected feeds?"
+msgstr "保存对信息源的更改？"
 
-#~ msgid "Edit Feed"
-#~ msgstr "编辑信息源"
+#: js/prefs.js:768
+msgid "OPML Import"
+msgstr "OPML 导入"
 
-#~ msgid "More Feeds"
-#~ msgstr "更多信息源"
+#: js/prefs.js:795
+msgid "Please choose an OPML file first."
+msgstr "请先选择一个 OPML 文件。"
 
-#~ msgid "No feeds are selected."
-#~ msgstr "没有选择任何信息源。"
+#: js/prefs.js:811
+#, fuzzy
+msgid "Please choose the file first."
+msgstr "请先选择一个 OPML 文件。"
 
-#~ msgid ""
-#~ "Remove selected feeds from the archive? Feeds with stored articles will "
-#~ "not be removed."
-#~ msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
+#: js/prefs.js:938
+msgid "Reset to defaults?"
+msgstr "重置为默认状态？"
 
-#~ msgid "Feeds with update errors"
-#~ msgstr "更新错误的信息源"
+#: js/prefs.js:1149
+msgid "Feed Categories"
+msgstr "信息源类别"
 
-#~ msgid "Remove selected feeds?"
-#~ msgstr "移除选中的信息源？"
+#: js/prefs.js:1158
+msgid "Remove selected categories?"
+msgstr "移除选中的类别？"
 
-#~ msgid "Inverse"
-#~ msgstr "反选"
+#: js/prefs.js:1177
+msgid "No categories are selected."
+msgstr "没有选中任何类别。"
 
-#~ msgid "Please enter login:"
-#~ msgstr "请输入登录名："
+#: js/prefs.js:1218
+msgid "Feeds without recent updates"
+msgstr "最近没更新的信息源"
 
-#~ msgid "Can't create user: no login specified."
-#~ msgstr "无法创建用户：没有指定登录名。"
+#: js/prefs.js:1267
+msgid "Replace current OPML publishing address with a new one?"
+msgstr "将当前的 OPML 发布地址更改替换为新地址？"
 
-#~ msgid "Edit Filter"
-#~ msgstr "编辑过滤器"
+#: js/prefs.js:1376
+msgid "Rescore articles in selected feeds?"
+msgstr "为选中信息源中的文章重置评分？"
 
-#~ msgid "Remove filter %s?"
-#~ msgstr "移除这个过滤器： %s ？"
+#: js/prefs.js:1399
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr "重置所有文章的评分？这可能将花费很长时间。"
 
-#~ msgid "Remove selected labels?"
-#~ msgstr "移除选中的预定义标签？"
+#: js/prefs.js:1419
+msgid "Reset selected labels to default colors?"
+msgstr "将选中的可选标签重置为默认颜色？"
 
-#~ msgid "No labels are selected."
-#~ msgstr "没有选择任何预定义标签。"
+#: js/prefs.js:1456
+msgid "Settings Profiles"
+msgstr "偏好文件的设置"
 
-#~ msgid ""
-#~ "Remove selected users? Neither default admin nor your account will be "
-#~ "removed."
-#~ msgstr "移除选中的用户？默认管理员和您的帐户不会被移除。"
+#: js/prefs.js:1465
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
 
-#~ msgid "No users are selected."
-#~ msgstr "没有选中任何用户。"
+#: js/prefs.js:1483
+msgid "No profiles are selected."
+msgstr "未选择偏好文件。"
 
-#~ msgid "Remove selected filters?"
-#~ msgstr "移除选定的过滤器？"
+#: js/prefs.js:1491 js/prefs.js:1544
+msgid "Activate selected profile?"
+msgstr "启用选中的偏好文件？"
 
-#~ msgid "No filters are selected."
-#~ msgstr "没有选中的过滤器。"
+#: js/prefs.js:1507 js/prefs.js:1560
+msgid "Please choose a profile to activate."
+msgstr "请选择希望启用的偏好文件。"
 
-#~ msgid "Unsubscribe from selected feeds?"
-#~ msgstr "从选中的信息源取消订阅？"
+#: js/prefs.js:1568
+msgid "This will invalidate all previously generated feed URLs. Continue?"
+msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
 
-#~ msgid "Please select only one feed."
-#~ msgstr "请仅选择一个信息源。"
+#: js/prefs.js:1587
+msgid "This will invalidate all previously shared article URLs. Continue?"
+msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
-#~ msgid "Erase all non-starred articles in selected feed?"
-#~ msgstr "清空选中的信息源当中所有未加星标的文章？"
+#: js/prefs.js:1670
+msgid "Label Editor"
+msgstr "编辑预定义标签"
 
-#~ msgid "How many days of articles to keep (0 - use default)?"
-#~ msgstr "文章保存几天？（填写0则采用默认设置）"
+#: js/prefs.js:1733
+msgid ""
+"This will clear your stored authentication information for Twitter. Continue?"
+msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
 
-#~ msgid "Login field cannot be blank."
-#~ msgstr "请填写登录信息。"
+#: js/prefs.js:1804
+msgid "Link Instance"
+msgstr "链接实例"
 
-#~ msgid "Please select only one user."
-#~ msgstr "请仅选择一个用户。"
+#: js/prefs.js:1855
+msgid "Edit Instance"
+msgstr "编辑实例"
 
-#~ msgid "Reset password of selected user?"
-#~ msgstr "重置选定用户的密码？"
+#: js/prefs.js:1904
+msgid "Remove selected instances?"
+msgstr "移除选中的实例？"
 
-#~ msgid "Please select only one filter."
-#~ msgstr "请仅选择一个过滤器。"
+#: js/prefs.js:1921 js/prefs.js:1933
+msgid "No instances are selected."
+msgstr "未选中任何实例。"
 
-#~ msgid "Edit Multiple Feeds"
-#~ msgstr "编辑多个信息源"
+#: js/prefs.js:1938
+msgid "Please select only one instance."
+msgstr "请仅选择一个实例。"
 
-#~ msgid "Save changes to selected feeds?"
-#~ msgstr "保存对信息源的更改？"
+#: js/prefs.js:1973
+#, fuzzy
+msgid "Export Data"
+msgstr "导出"
 
-#~ msgid "OPML Import"
-#~ msgstr "OPML 导入"
+#: js/prefs.js:2000
+msgid ""
+"Finished, exported %d articles. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgstr ""
 
-#~ msgid "Please choose an OPML file first."
-#~ msgstr "请先选择一个 OPML 文件。"
+#: js/prefs.js:2053
+#, fuzzy
+msgid "Data Import"
+msgstr "导入"
 
-#~ msgid "Reset to defaults?"
-#~ msgstr "重置为默认状态？"
+#: js/share_button.js:10
+msgid "Share article by URL"
+msgstr "通过 URL 分享文章"
 
-#~ msgid "Feed Categories"
-#~ msgstr "信息源类别"
+#: js/tt-rss.js:146
+msgid "Mark all articles as read?"
+msgstr "将所有文章标记为已读？"
 
-#~ msgid "Remove selected categories?"
-#~ msgstr "移除选中的类别？"
+#: js/tt-rss.js:384
+msgid "You can't unsubscribe from the category."
+msgstr "您不能取消订阅一个类别。"
 
-#~ msgid "No categories are selected."
-#~ msgstr "没有选中任何类别。"
+#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+msgid "Please select some feed first."
+msgstr "请先选几个信息源吧。"
 
-#~ msgid "Feeds without recent updates"
-#~ msgstr "最近没更新的信息源"
+#: js/tt-rss.js:592
+msgid "You can't rescore this kind of feed."
+msgstr "无法重置本类信息源的评分。"
 
-#~ msgid "Replace current OPML publishing address with a new one?"
-#~ msgstr "将当前的 OPML 发布地址更改替换为新地址？"
+#: js/tt-rss.js:602
+msgid "Rescore articles in %s?"
+msgstr "重置 %s 中文章的评分？"
 
-#~ msgid "Rescore articles in selected feeds?"
-#~ msgstr "为选中信息源中的文章重置评分？"
+#: js/tt-rss.js:1083
+msgid "New version available!"
+msgstr "有可用的新版本啦！"
 
-#~ msgid "Rescore all articles? This operation may take a lot of time."
-#~ msgstr "重置所有文章的评分？这可能将花费很长时间。"
+#: js/viewfeed.js:873
+msgid "Mark all visible articles in %s as read?"
+msgstr "标记 %s 中所有可见的文章为已读？"
 
-#~ msgid "Reset selected labels to default colors?"
-#~ msgstr "将选中的可选标签重置为默认颜色？"
+#: js/viewfeed.js:901
+msgid "Delete %d selected articles in %s?"
+msgstr "删除 %s 中选择的 %d 篇文章？"
 
-#~ msgid "Settings Profiles"
-#~ msgstr "偏好文件的设置"
+#: js/viewfeed.js:903
+msgid "Delete %d selected articles?"
+msgstr "删除选中的 %d 篇文章？"
 
-#~ msgid ""
-#~ "Remove selected profiles? Active and default profiles will not be removed."
-#~ msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
+#: js/viewfeed.js:945
+msgid "Archive %d selected articles in %s?"
+msgstr "将 %s 中的 %d 篇选中的文章存档？"
 
-#~ msgid "No profiles are selected."
-#~ msgstr "未选择偏好文件。"
+#: js/viewfeed.js:948
+msgid "Move %d archived articles back?"
+msgstr "将存档的 %d 篇文章移回原处？"
 
-#~ msgid "Activate selected profile?"
-#~ msgstr "启用选中的偏好文件？"
+#: js/viewfeed.js:992
+msgid "Mark %d selected articles in %s as read?"
+msgstr "将 %s 中选中的 %d 篇文章标记为已读？"
 
-#~ msgid "Please choose a profile to activate."
-#~ msgstr "请选择希望启用的偏好文件。"
+#: js/viewfeed.js:1016
+msgid "Edit article Tags"
+msgstr "编辑文章的自定义标签"
 
-#~ msgid "This will invalidate all previously generated feed URLs. Continue?"
-#~ msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
+#: js/viewfeed.js:1173
+msgid "No article is selected."
+msgstr "未选中任何文章。"
 
-#~ msgid "This will invalidate all previously shared article URLs. Continue?"
-#~ msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
+#: js/viewfeed.js:1208
+msgid "No articles found to mark"
+msgstr "未找到需要标记的文章"
 
-#~ msgid "Label Editor"
-#~ msgstr "编辑预定义标签"
+#: js/viewfeed.js:1210
+msgid "Mark %d article(s) as read?"
+msgstr "将 %d 篇文章标记为已读？"
 
-#~ msgid ""
-#~ "This will clear your stored authentication information for Twitter. "
-#~ "Continue?"
-#~ msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
+#: js/viewfeed.js:1374
+msgid "Loading..."
+msgstr "加载中……"
 
-#~ msgid "Link Instance"
-#~ msgstr "链接实例"
+#: js/viewfeed.js:1848
+msgid "Open original article"
+msgstr "打开原文"
 
-#~ msgid "Edit Instance"
-#~ msgstr "编辑实例"
+#: js/viewfeed.js:1854
+msgid "View in a tt-rss tab"
+msgstr "在 tt-rss 舌签中查看"
 
-#~ msgid "Remove selected instances?"
-#~ msgstr "移除选中的实例？"
+#: js/viewfeed.js:1862
+#, fuzzy
+msgid "Mark above as read"
+msgstr "标记为已读"
 
-#~ msgid "No instances are selected."
-#~ msgstr "未选中任何实例。"
+#: js/viewfeed.js:1868
+#, fuzzy
+msgid "Mark below as read"
+msgstr "标记为已读"
 
-#~ msgid "Please select only one instance."
-#~ msgstr "请仅选择一个实例。"
+#: js/viewfeed.js:1914
+msgid "Remove label"
+msgstr "移除预定义标签"
 
-#~ msgid "Mark all articles as read?"
-#~ msgstr "将所有文章标记为已读？"
+#: js/viewfeed.js:1938
+msgid "Playing..."
+msgstr "播放中……"
 
-#~ msgid "You can't unsubscribe from the category."
-#~ msgstr "您不能取消订阅一个类别。"
+#: js/viewfeed.js:1939
+msgid "Click to pause"
+msgstr "点击暂停"
 
-#~ msgid "Please select some feed first."
-#~ msgstr "请先选几个信息源吧。"
+#~ msgid "About..."
+#~ msgstr "关于……"
 
-#~ msgid "You can't rescore this kind of feed."
-#~ msgstr "无法重置本类信息源的评分。"
+#~ msgid "Help"
+#~ msgstr "帮助"
 
-#~ msgid "Rescore articles in %s?"
-#~ msgstr "重置 %s 中文章的评分？"
+#~ msgid "Importing using DOMXML."
+#~ msgstr "通过 DOMXML 导入。"
 
-#~ msgid "New version available!"
-#~ msgstr "有可用的新版本啦！"
+#~ msgid "Importing using DOMDocument."
+#~ msgstr "通过 DOMDocument 导入。"
 
-#~ msgid "No articles are selected."
-#~ msgstr "没有选中任何文章。"
+#~ msgid ""
+#~ "DOMXML extension is not found. It is required for PHP versions below 5."
+#~ msgstr "未检测到 DOMXML 扩展。PHP 5以下的版本需要用到本扩展。"
 
-#~ msgid "Mark all visible articles in %s as read?"
-#~ msgstr "标记 %s 中所有可见的文章为已读？"
+#~ msgid "Cache images locally (SimplePie only)"
+#~ msgstr "在本地缓存图片（仅针对SimplePie）"
 
-#~ msgid "Delete %d selected articles in %s?"
-#~ msgstr "删除 %s 中选择的 %d 篇文章？"
+#~ msgid ""
+#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
+#~ "settings."
+#~ msgstr "您可以用 OPML 进行信息源和 Tiny Tiny RSS 偏好设置的导出导入。"
 
-#~ msgid "Delete %d selected articles?"
-#~ msgstr "删除选中的 %d 篇文章？"
+#~ msgid "Note: Only main settings profile can be migrated using OPML."
+#~ msgstr "提醒：OPML 仅可用于默认偏好文件的迁移。"
 
-#~ msgid "Archive %d selected articles in %s?"
-#~ msgstr "将 %s 中的 %d 篇选中的文章存档？"
+#~ msgid "Publish"
+#~ msgstr "发布"
 
-#~ msgid "Move %d archived articles back?"
-#~ msgstr "将存档的 %d 篇文章移回原处？"
+#~ msgid ""
+#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+#~ "that require authentication or feeds hidden from Popular feeds."
+#~ msgstr ""
+#~ "提醒：公开发布的 OPML 不会包含您的 Tiny Tiny RSS 配置文件、需要认证才能获"
+#~ "取的信息源、以及从最受欢迎的信息源中隐藏的信息源。"
 
-#~ msgid "Mark %d selected articles in %s as read?"
-#~ msgstr "将 %s 中选中的 %d 篇文章标记为已读？"
+#~ msgid "Changed password of user <b>%s</b>."
+#~ msgstr "用户 <b>%s</b> 的密码已更改。"
 
-#~ msgid "Edit article Tags"
-#~ msgstr "编辑文章的自定义标签"
+#~ msgid "Content filtering"
+#~ msgstr "内容过滤"
 
-#~ msgid "No article is selected."
-#~ msgstr "未选中任何文章。"
+#~ msgid ""
+#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
+#~ "Filtering is done once, when new article is imported to the database from "
+#~ "the newsfeed, specified field is matched against regular expression and "
+#~ "some action is taken. Regular expression matching is case-insensitive."
+#~ msgstr ""
+#~ "Tiny Tiny RSS 支持文章过滤。过滤在文章导入数据库的时候完成，指定的内容在与"
+#~ "正则表达式匹配后会执行指定的动作。正则表达式区分大小写。"
 
-#~ msgid "No articles found to mark"
-#~ msgstr "未找到需要标记的文章"
+#~ msgid ""
+#~ "Supported actions are: filter (do not import) article, mark article as "
+#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
+#~ "globally and for some specific feed."
+#~ msgstr ""
+#~ "支持的动作包括：过滤文章（不导入），标记文章为已读，加注星标，加注自定义标"
+#~ "签，进行评分。过滤器可以全局设置，也可以针对指定的信息源设置。"
 
-#~ msgid "Mark %d article(s) as read?"
-#~ msgstr "将 %d 篇文章标记为已读？"
+#~ msgid ""
+#~ "Multiple and inverse matching are supported. All matching filters are "
+#~ "considered when article is being imported and all actions executed in "
+#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
+#~ "XYZZY in title with inverse flag will match all articles, except those "
+#~ "containing string XYZZY in title."
+#~ msgstr ""
+#~ "支持多项匹配和反向匹配。当文章被导入时，所有的匹配过滤器会被依次执行。反向"
+#~ "匹配会将匹配结果反转，比如反向匹配 XYZZY 这个关键字的情况将会匹配所有标题"
+#~ "中不包含 XYZZY 的文章。"
 
-#~ msgid "Loading..."
-#~ msgstr "加载中……"
+#~ msgid "See also:"
+#~ msgstr "另请参考："
 
-#~ msgid "Forward article by email"
-#~ msgstr "用邮件转发文章"
+#, fuzzy
+#~ msgid "Add category..."
+#~ msgstr "创建类别"
 
-#~ msgid "Open original article"
-#~ msgstr "打开原文"
+#, fuzzy
+#~ msgid "Add label..."
+#~ msgstr "创建预定义标签……"
 
-#~ msgid "View in a tt-rss tab"
-#~ msgstr "在 tt-rss 舌签中查看"
+#~ msgid "Dismiss article"
+#~ msgstr "不再显示本文章"
 
-#~ msgid "Remove label"
-#~ msgstr "移除预定义标签"
+#~ msgid "Remove:"
+#~ msgstr "移除："
+
+#~ msgid "Assign:"
+#~ msgstr "应用于："
 
-#~ msgid "Playing..."
-#~ msgstr "播放中……"
+#~ msgid "Toggle category reordering mode"
+#~ msgstr "锁定类别重新排序模式"
 
-#~ msgid "Click to pause"
-#~ msgstr "点击暂停"
+#~ msgid "Update all feeds"
+#~ msgstr "更新全部信息源"
 
-#~ msgid "Share article by URL"
-#~ msgstr "通过 URL 分享文章"
+#~ msgid "Sort by name or unread count"
+#~ msgstr "通过名称或未读的数量排序"
diff --git a/utils/localized_schema.txt b/utils/localized_schema.txt
index 43280298..417b690c 100644
--- a/utils/localized_schema.txt
+++ b/utils/localized_schema.txt
@@ -10,3 +10,8 @@ __("Set starred");
 __("Publish article");
 __("Assign tags");
 __("Assign label");
+__("Modify score");
+
+__("General");
+__("Interface");
+__("Advanced");
diff --git a/utils/update-translations.sh b/utils/update-translations.sh
index 7c8841ca..7e81a3ef 100755
--- a/utils/update-translations.sh
+++ b/utils/update-translations.sh
@@ -3,9 +3,9 @@ TEMPLATE=messages.pot
 
 ./utils/update-schema-translations.sh
 
-xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php modules/*.php help/*.php mobile/*.php
+xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php help/*.php mobile/*.php classes/*.php include/*.php
 
-xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE *.js
+xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE js/*.js
 
 update_lang() {
 	if [ -f $1.po ]; then