update translations

diff --git a/include/localized_schema.php b/include/localized_schema.php
index 150d936b95d820f594a460dfcef36a8cf2029490..48c763a74116bc96c04f4cba295875526809d4fb 100644 (file)
--- a/include/localized_schema.php
+++ b/include/localized_schema.php
@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Wed Jun 6 12:33:28 MSK 2012
+<?php # This file has been generated at:  Sun Sep 9 20:16:54 MSK 2012

 
 __("Title");
 __("Title or Content");
 
 __("Title");
 __("Title or Content");


@@ -26,11 +26,11 @@ __('This option enables marking articles as read automatically while you scroll
 __('Strip all but most common HTML tags when reading articles.');
 __('When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 __('When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
 __('Strip all but most common HTML tags when reading articles.');
 __('When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 __('When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');

-__('Use feed-specified date to sort headlines instead of local import date.');

 __('Customize CSS stylesheet to your liking');
 __('Customize CSS stylesheet to your liking');

+__('Use feed-specified date to sort headlines instead of local import date.');

 __('Click to register your SSL client certificate with tt-rss');
 __('Uses UTC timezone');
 __('Click to register your SSL client certificate with tt-rss');
 __('Uses UTC timezone');

-__('Purge old posts after this number of days (0 - disables)');
+__('Purge articles after this number of days (0 - disables)');

 __('Default interval between feed updates');
 __('Amount of articles to display at once');
 __('Allow duplicate posts');
 __('Default interval between feed updates');
 __('Amount of articles to display at once');
 __('Allow duplicate posts');


@@ -57,8 +57,8 @@ __('Group headlines in virtual feeds');
 __('Do not show images in articles');
 __('Enable external API');
 __('User timezone');
 __('Do not show images in articles');
 __('Enable external API');
 __('User timezone');

-__('Sort headlines by feed date');

 __('Customize stylesheet');
 __('Customize stylesheet');

+__('Sort headlines by feed date');

 __('Login with an SSL certificate');
 __('Try to send digests around specified time');
 ?>
 __('Login with an SSL certificate');
 __('Try to send digests around specified time');
 ?>

diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index ce103e402a8cbcecda9ed3650b172a082fd36d44..8b7ee3edda5c98f21fcb9eee6aff169041970591 100644 (file)
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 85a7ed7f9b14e9420b4eddf4347dbdf5a504d061..7107903284d69a28f9c872498c9d0546accb837a 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+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"
 "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,95 +17,91 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Catalan\n"
 
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Catalan\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Valors per defecte"
 
 msgid "Use default"
 msgstr "Valors per defecte"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "No ho purguis mai"
 
 msgid "Never purge"
 msgstr "No ho purguis mai"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "Al cap d'1 setmana"
 
 msgid "1 week old"
 msgstr "Al cap d'1 setmana"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "Al cap de 2 setmanes"
 
 msgid "2 weeks old"
 msgstr "Al cap de 2 setmanes"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "Al cap d'1 mes"
 
 msgid "1 month old"
 msgstr "Al cap d'1 mes"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "Al cap de 2 mesos"
 
 msgid "2 months old"
 msgstr "Al cap de 2 mesos"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "Al cap de 3 mesos"
 
 msgid "3 months old"
 msgstr "Al cap de 3 mesos"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Interval per defecte"
 
 msgid "Default interval"
 msgstr "Interval per defecte"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Deshabilita les actualitzacions"
 
 msgid "Disable updates"
 msgstr "Deshabilita les actualitzacions"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Cada 15 minuts"
 
 msgid "Each 15 minutes"
 msgstr "Cada 15 minuts"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "cada  30 minuts"
 
 msgid "Each 30 minutes"
 msgstr "cada  30 minuts"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "Cada hora"
 
 msgid "Hourly"
 msgstr "Cada hora"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Cada 4 hores"
 
 msgid "Each 4 hours"
 msgstr "Cada 4 hores"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Cada 12 hores"
 
 msgid "Each 12 hours"
 msgstr "Cada 12 hores"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Diàriament"
 
 msgid "Daily"
 msgstr "Diàriament"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Setmanalment"
 
 msgid "Weekly"
 msgstr "Setmanalment"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Per defecte"
 
 msgid "Default"
 msgstr "Per defecte"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Usuari"
 
 msgid "User"
 msgstr "Usuari"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Súper usuari"
 
 msgid "Power User"
 msgstr "Súper usuari"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Administrador"
 
 msgid "Administrator"
 msgstr "Administrador"
 


@@ -136,8 +132,7 @@ msgstr "La base de dades de Tiny Tiny RSS està actualitzada."
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Torna a Tiny Tiny RSS"
 


@@ -214,22 +209,24 @@ msgstr ""
 "reviseu els vostres\n"
 "/t/t paràmetres del navegador."
 
 "reviseu els vostres\n"
 "/t/t paràmetres del navegador."
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 
 msgid "Loading, please wait..."
 msgstr "S'està obrint, preneu paciència..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Hola, "
 
 msgid "Hello,"
 msgstr "Hola, "
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Surt"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Surt"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -303,214 +300,157 @@ msgstr ""
 "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
 "bases de dades i de PHP"
 
 "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
 "bases de dades i de PHP"
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Preferències"
 
 msgid "Preferences"
 msgstr "Preferències"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "Comentaris?"
 
 msgid "Comments?"
 msgstr "Comentaris?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Redueix la llista de canals"
 
 msgid "Collapse feedlist"
 msgstr "Redueix la llista de canals"
 

-#: index.php:148
+#: index.php:165

 #, fuzzy
 msgid "Show articles"
 msgstr "Articles mémorisés"
 
 #, fuzzy
 msgid "Show articles"
 msgstr "Articles mémorisés"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Adaptatiu"
 
 msgid "Adaptive"
 msgstr "Adaptatiu"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Tots els articles"
 
 msgid "All Articles"
 msgstr "Tots els articles"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Marcats"
 
 msgid "Starred"
 msgstr "Marcats"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Publicats"
 
 msgid "Published"
 msgstr "Publicats"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Per llegir"
 
 msgid "Unread"
 msgstr "Per llegir"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "Ignora la puntuació"
 
 msgid "Ignore Scoring"
 msgstr "Ignora la puntuació"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Actualitzat"
 
 msgid "Updated"
 msgstr "Actualitzat"
 

-#: index.php:160
+#: index.php:177

 #, fuzzy
 msgid "Sort articles"
 msgstr "Articles mémorisés"
 
 #, fuzzy
 msgid "Sort articles"
 msgstr "Articles mémorisés"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Data"
 
 msgid "Date"
 msgstr "Data"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Títol"
 
 msgid "Title"
 msgstr "Títol"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "Puntuació"
 
 msgid "Score"
 msgstr "Puntuació"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Edita les categories"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Actualitza"
 
 msgid "Update"
 msgstr "Actualitza"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Accions..."
 
 msgid "Actions..."
 msgstr "Accions..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Cerca..."
 
 msgid "Search..."
 msgstr "Cerca..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 
 msgid "Feed actions:"
 msgstr "Accions sobre els canals:"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 
 msgid "Subscribe to feed..."
 msgstr "Subscriviu-vos al canal"
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Edita aquest canal..."
 
 msgid "Edit this feed..."
 msgstr "Edita aquest canal..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 
 msgid "Rescore feed"
 msgstr "Canvia la puntuació del canal"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 
 msgid "Unsubscribe"
 msgstr "Dóna't de baixa"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Tots els canals"
 
 msgid "All feeds:"
 msgstr "Tots els canals"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 
 msgid "(Un)hide read feeds"
 msgstr "Mostra/amaga els canals llegits"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Altres accions:"
 
 msgid "Other actions:"
 msgstr "Altres accions:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr ""
 
 msgid "Switch to digest..."
 msgstr ""
 

-#: index.php:194
+#: index.php:216

 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Núvol d'etiquetes"
 
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Núvol d'etiquetes"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Crea una etiqueta"
 
 msgid "Create label..."
 msgstr "Crea una etiqueta"
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Crea un filtre..."
 
 msgid "Create filter..."
 msgstr "Crea un filtre..."
 

-#: index.php:198
+#: index.php:220

 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Dreceres de teclat"
 
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Dreceres de teclat"
 

-#: opml.php:81
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "S'està afegint la categoria <b>%s</b>."
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: opml.php:123
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Assigna-li l'etiqueta"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, fuzzy, php-format
-msgid "Adding filter %s"
-msgstr "S'està afegint el canal..."
-
-#: opml.php:196
-#, fuzzy, php-format
-msgid "Duplicate filter %s"
-msgstr "Crea un filtre"
-
-#: opml.php:241
-#, fuzzy
-msgid "is already imported."
-msgstr "Ja s'ha importat"
-
-#: opml.php:271
-#, fuzzy
-msgid "OK"
-msgstr "D'acord!"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Error mentre s'analitza el document."
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Error: si us plau carregueu el fitxer OPML."
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "Eina OPML"
-
-#: opml.php:530
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Torna a les preferències"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"


@@ -519,18 +459,16 @@ msgstr "Dreceres de teclat"
 msgid "Exit preferences"
 msgstr "Surt de les preferències"
 
 msgid "Exit preferences"
 msgstr "Surt de les preferències"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Canals"
 
 msgid "Feeds"
 msgstr "Canals"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Etiquetes"
 
 msgid "Labels"
 msgstr "Etiquetes"
 


@@ -601,23 +539,6 @@ msgstr "S'ha creat el compte."
 msgid "New user registrations are currently closed."
 msgstr "Actualment no es permet el registre de nous usuaris."
 
 msgid "New user registrations are currently closed."
 msgstr "Actualment no es permet el registre de nous usuaris."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-#, fuzzy
-msgid "Register"
-msgstr "Registrat"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Dreceres de teclat"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Dreceres de teclat"


@@ -694,11 +615,11 @@ msgstr "Altres accions"
 msgid "Select article under mouse cursor"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 
 msgid "Select article under mouse cursor"
 msgstr "Seleccioneu un article mitjançant el ratolí."
 

-#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Crea una etiqueta"
 
 msgid "Create label"
 msgstr "Crea una etiqueta"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Crea un filtre"
 
 msgid "Create filter"
 msgstr "Crea un filtre"
 


@@ -744,11 +665,11 @@ msgstr "Accions dels canals"
 msgid "Refresh active feed"
 msgstr "Actualitza els canals actius"
 
 msgid "Refresh active feed"
 msgstr "Actualitza els canals actius"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 
 msgid "Subscribe to feed"
 msgstr "Subscriu-te al canal"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Edita el canal"
 
 msgid "Edit feed"
 msgstr "Edita el canal"
 


@@ -773,19 +694,19 @@ msgstr "Si esteu veient les categories reduir-les/ampliar-les"
 msgid "Go to..."
 msgstr "Vés a..."
 
 msgid "Go to..."
 msgstr "Vés a..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Tots els articles"
 
 msgid "All articles"
 msgstr "Tots els articles"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Articles nous"
 
 msgid "Fresh articles"
 msgstr "Articles nous"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Articles marcats"
 
 msgid "Starred articles"
 msgstr "Articles marcats"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Articles publicats"
 
 msgid "Published articles"
 msgstr "Articles publicats"
 


@@ -821,7 +742,7 @@ msgstr "Els 25 més llegits"
 msgid "Edit feed categories"
 msgstr "Edita les categories dels canals"
 
 msgid "Edit feed categories"
 msgstr "Edita les categories dels canals"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Crea un usuari"
 
 msgid "Create user"
 msgstr "Crea un usuari"
 


@@ -849,6 +770,10 @@ msgstr "Usuari:"
 msgid "Password:"
 msgstr "Contrasenya:"
 
 msgid "Password:"
 msgstr "Contrasenya:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -856,8 +781,8 @@ msgstr "Contrasenya:"
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Especial"
 
 msgid "Special"
 msgstr "Especial"
 


@@ -914,13 +839,11 @@ msgstr "No s'ha trobat el tema a l'ajuda."
 msgid "Prepare data"
 msgstr "Desa"
 
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Tanca la finestra"
 
 msgid "Close this window"
 msgstr "Tanca la finestra"
 


@@ -930,51 +853,65 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+#, fuzzy
+msgid "Select"
+msgstr "Selecciona:"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Tot"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Cap"
+
+#: classes/dlg.php:85

 #, fuzzy
 msgid "Create profile"
 msgstr "Crea un filtre"
 
 #, fuzzy
 msgid "Create profile"
 msgstr "Crea un filtre"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 #, fuzzy
 msgid "(active)"
 msgstr "Adaptatiu"
 
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptatiu"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 #, fuzzy
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
 
 #, fuzzy
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 #, fuzzy
 msgid "Activate profile"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
 #, fuzzy
 msgid "Activate profile"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr ""
 
 msgid "Public OPML URL"
 msgstr ""
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enllaç als articles publicats del canal."
 
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enllaç als articles publicats del canal."
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
 
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Canals generats"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "Avís"
 
 msgid "Notice"
 msgstr "Avís"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -985,11 +922,11 @@ msgstr ""
 "us plau, engegueu el procés del daemon o contacteu amb el responsable "
 "pertinent."
 
 "us plau, engegueu el procés del daemon o contacteu amb el responsable "
 "pertinent."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Última actualització:"
 
 msgid "Last update:"
 msgstr "Última actualització:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -999,260 +936,192 @@ msgstr ""
 "un problema com la caiguda. Si us plau, reviseu dels processos del daemon o "
 "contacteu amb el seu propietari."
 
 "un problema com la caiguda. Si us plau, reviseu dels processos del daemon o "
 "contacteu amb el seu propietari."
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Canal"
 
 msgid "Feed"
 msgstr "Canal"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 
 msgid "Place in category:"
 msgstr "Posa'l a la categoria:"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 #, fuzzy
 msgid "Available feeds"
 msgstr "Tots els canals"
 
 #, fuzzy
 msgid "Available feeds"
 msgstr "Tots els canals"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Autenticació"
 
 msgid "Authentication"
 msgstr "Autenticació"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Entra"
 
 msgid "Login"
 msgstr "Entra"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
 
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 
 msgid "This feed requires authentication."
 msgstr "Aquest canal requereix autenticació."
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "Subscriu-t'hi"
 
 msgid "Subscribe"
 msgstr "Subscriu-t'hi"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 
 #, fuzzy
 msgid "More feeds"
 msgstr "Més canals"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Cancel·la"
 
 msgid "Cancel"
 msgstr "Cancel·la"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Cerca"
 
 msgid "Search"
 msgstr "Cerca"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 
 #, fuzzy
 msgid "Popular feeds"
 msgstr "mostra els canals"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 
 #, fuzzy
 msgid "Feed archive"
 msgstr "Accions dels canals"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 
 #, fuzzy
 msgid "limit:"
 msgstr "Límit:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Suprimeix"
 
 msgid "Remove"
 msgstr "Suprimeix"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr "Mirar-ho per"
 
 msgid "Look for"
 msgstr "Mirar-ho per"
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr "coincideix en"
 
 msgid "match on"
 msgstr "coincideix en"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Contingut"
 
 msgid "Content"
 msgstr "Contingut"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Títol o contingut"
 
 msgid "Title or content"
 msgstr "Títol o contingut"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Limita la cerca a:"
 
 msgid "Limit search to:"
 msgstr "Limita la cerca a:"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Tots els canals"
 
 msgid "All feeds"
 msgstr "Tots els canals"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Aquest canal"
 
 msgid "This feed"
 msgstr "Aquest canal"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Coincidència"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "abans"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "després"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "Revisa-ho"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "al camp"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "a"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Acció a realitzar:"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "amb els paràmetres:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Opcions"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Activat"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "Coincidència inversa"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-#, fuzzy
-msgid "Apply to category"
-msgstr "Posa'l a la categoria:"
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Tester"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Crea"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 #, 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:"
 
 #, 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:"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Feu clic per editar"
 
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Feu clic per editar"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "Aquests canals no s'han actualitzat degut als següents errors:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetes per aquest article (separades per comes):"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Desa"
 
 msgid "Save"
 msgstr "Desa"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvol d'etiquetes"
 
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvol d'etiquetes"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 
 msgid "Match:"
 msgstr "Correspondance&nbsp;:"
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 #, fuzzy
 msgid "Display entries"
 msgstr "mostra els canals"
 
 #, fuzzy
 msgid "Display entries"
 msgstr "mostra els canals"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
 
 #, fuzzy
 msgid "View as RSS"
 msgstr "Visualitza les etiquetes"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 #, fuzzy
 msgid "Details"
 msgstr "Diàriament"
 
 #, fuzzy
 msgid "Details"
 msgstr "Diàriament"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1260,167 +1129,152 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr ""
 
 msgid "Instance"
 msgstr ""
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr ""
 
 msgid "Instance URL"
 msgstr ""
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 #, fuzzy
 msgid "Access key:"
 msgstr "Nivell d'accés:"
 
 #, fuzzy
 msgid "Access key:"
 msgstr "Nivell d'accés:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 #, fuzzy
 msgid "Access key"
 msgstr "Nivell d'accés"
 
 #, fuzzy
 msgid "Access key"
 msgstr "Nivell d'accés"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 #, fuzzy
 msgid "Generate new key"
 msgstr "Canals generats"
 
 #, fuzzy
 msgid "Generate new key"
 msgstr "Canals generats"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 #, fuzzy
 msgid "Create link"
 msgstr "Crea"
 
 #, fuzzy
 msgid "Create link"
 msgstr "Crea"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Aquest canal requereix autenticació."
 
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Aquest canal requereix autenticació."
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 #, fuzzy
 msgid "Visit the website"
 msgstr "Visiteu el web oficial"
 
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visiteu el web oficial"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Visualitza els canals"
 
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Visualitza els canals"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Selecciona:"
 
 msgid "Select:"
 msgstr "Selecciona:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Tot"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Inverteix"
 
 msgid "Invert"
 msgstr "Inverteix"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Cap"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Commuta la selecció"
 
 msgid "Selection toggle:"
 msgstr "Commuta la selecció"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Selecció:"
 
 msgid "Selection:"
 msgstr "Selecció:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 #, fuzzy
 msgid "Archive"
 msgstr "Data de l'article"
 
 #, fuzzy
 msgid "Archive"
 msgstr "Data de l'article"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 #, fuzzy
 msgid "Move back"
 msgstr "Vés enrere"
 
 #, fuzzy
 msgid "Move back"
 msgstr "Vés enrere"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 #, fuzzy
 msgid "Delete"
 msgstr "Per defecte"
 
 #, fuzzy
 msgid "Delete"
 msgstr "Per defecte"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 #, fuzzy
 msgid "Forward by email"
 msgstr "Marca l'article"
 
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marca l'article"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 
 msgid "Feed:"
 msgstr "Flux&nbsp;:"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "No s'ha trobat el canal."
 
 msgid "Feed not found."
 msgstr "No s'ha trobat el canal."
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "Marca'l com a llegit"
 
 msgid "mark as read"
 msgstr "Marca'l com a llegit"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 #, fuzzy
 msgid "Originally from:"
 msgstr "Mostra el contingut original de l'article"
 
 #, fuzzy
 msgid "Originally from:"
 msgstr "Mostra el contingut original de l'article"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Obre l'article en una finestra nova"
 
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Obre l'article en una finestra nova"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 #, fuzzy
 msgid "Close article"
 msgstr "Buida els articles"
 
 #, fuzzy
 msgid "Close article"
 msgstr "Buida els articles"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
 
 msgid "No unread articles found to display."
 msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "No hi ha cap article actualitzat."
 
 msgid "No updated articles found to display."
 msgstr "No hi ha cap article actualitzat."
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "No hi ha articles marcats per mostrar."
 
 msgid "No starred articles found to display."
 msgstr "No hi ha articles marcats per mostrar."
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1428,870 +1282,213 @@ msgstr ""
 "No s'han trobat articles per a mostrar. Podeu assignar articles a etiquetes "
 "manualment (mireu el menú Accions) o utilitzeu un filtre."
 
 "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:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Erreurs de mise à jour"
 
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Erreurs de mise à jour"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 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)"
 
 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:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "Sense categoria"
-
-#: classes/mail_button.php:52 classes/mail_button.php:58
-msgid "[Forwarded]"
-msgstr ""
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Eina OPML"

 
 

-#: classes/mail_button.php:52
+#: classes/opml.php:37

 #, fuzzy
 #, fuzzy

-msgid "Multiple articles"
-msgstr "Tots els articles"
+msgid "Importing OPML..."
+msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."

 
 

-#: classes/mail_button.php:73
-msgid "From:"
-msgstr ""
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Torna a les preferències"

 
 

-#: classes/mail_button.php:82
-#, fuzzy
-msgid "To:"
-msgstr "Dalt"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "S'està afegint el canal..."

 
 

-#: classes/mail_button.php:95
-#, fuzzy
-msgid "Subject:"
-msgstr "Selecciona:"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Crea un filtre"

 
 

-#: classes/mail_button.php:111
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Canvieu l'adreça electrònica"
+#: classes/opml.php:293
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Assigna-li l'etiqueta"
+
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""

 
 

-#: classes/note_button.php:7 js/note_button.js:11
+#: classes/opml.php:337

 #, fuzzy
 #, fuzzy

-msgid "Edit article note"
-msgstr "Edita les etiquetes"
+msgid "Adding filter..."
+msgstr "S'està afegint el canal..."

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "Seleccioneu-ho per activar els camps"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Sense categoria"

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#: classes/opml.php:411

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "(%d feeds)"
-msgstr "Edita el canal"
+msgid "Processing category: %s"
+msgstr "Posa'l a la categoria:"

 
 

-#: classes/pref_feeds.php:306
-#, fuzzy
-msgid "Feed Title"
-msgstr "Títol"
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Error: si us plau carregueu el fitxer OPML."

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "s'està utilitzant"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Error mentre s'analitza el document."
+
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "sense etiqueta"

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Neteja d'articles:"
+#: classes/rpc.php:736
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "La vostra informació de registre és incompleta."

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
+#: classes/rpc.php:748

 #, fuzzy
 #, fuzzy

-msgid "Hide from Popular feeds"
-msgstr "Amaga-ho de la llista de canals"
+msgid "Category update has been scheduled."
+msgstr "S'ha modificat la contrasenya."

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "Contingut escrit de dreta a esquerra"
+#: classes/rpc.php:761
+#, fuzzy
+msgid "Can't update this kind of feed."
+msgstr "No podeu editar aquest tipus de canal."

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "Inclou-lo en el resum diari per correu electrònic"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."
+msgstr ""

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr "Mostra les imatges adjuntes"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "No s'ha pogut validar la sessió (IP incorrecta)"

 
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Emmagatzema les imatges localment"
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "El nom d'usuari o la contrasenya és incorrecte"

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
+#: include/functions.php:2049

 #, fuzzy
 #, fuzzy

-msgid "Mark updated articles as unread"
-msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
+msgid "Archived articles"
+msgstr "Articles mémorisés"

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
+#: include/functions.php:2051
+msgid "Recently read"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:491
+#: include/functions.php:3223 js/viewfeed.js:1996

 #, fuzzy
 #, fuzzy

-msgid "Icon"
-msgstr "Action"
+msgid "Click to play"
+msgstr "Feu clic per editar"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:524
-#, fuzzy
-msgid "Resubscribe to push updates"
-msgstr "Subscrit als canals:"
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#: include/functions.php:3485
+msgid "Related"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Fet!"
-
-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Subscrit a <b>%s</b>."
-
-#: classes/pref_feeds.php:1021
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Ja esteu subscrit a <b>%s</b>."
+#: include/functions.php:4186
+#, fuzzy
+msgid "(edit note)"
+msgstr "edita la nota"

 
 

-#: classes/pref_feeds.php:1024
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "No s'ha trobat cap canal."
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "No heu seleccionat cap canal."

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Ja esteu subscrit a <b>%s</b>."
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "tipus desconegut"

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:4844

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "L'adreça URL del canal ha canviat."
+msgid "Attachments"
+msgstr "Adjuncions:"

 
 

-#: classes/pref_feeds.php:1035
+#: include/functions.php:5286

 #, fuzzy, php-format
 #, 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>."
+msgid "%d archived articles"
+msgstr "Articles marcats"

 
 

-#: classes/pref_feeds.php:1057
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "No s'ha trobat cap canal."
+
+#: include/functions.php:5356

 #, fuzzy
 #, fuzzy

-msgid "Subscribe to selected feed"
-msgstr "Us voleu donar de baixa dels canals seleccionats?"
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "Edita les opcions de les subscripcions"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1161
+#: include/functions.php:5520

 #, php-format
 #, 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."
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Crea una categoria"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "No s'ha definit cap categoria per als canals."
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Títol o contingut"

 
 

-#: classes/pref_feeds.php:1243
-#, fuzzy
-msgid "Remove selected categories"
-msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Enllaç"

 
 

-#: classes/pref_feeds.php:1267
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "Editor de canals"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Data de l'article"

 
 

-#: classes/pref_feeds.php:1287
+#: include/localized_schema.php:9

 #, fuzzy
 #, fuzzy

-msgid "Inactive feeds"
-msgstr "Tots els canals"
+msgid "Delete article"
+msgstr "Buida els articles"

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-#, fuzzy
-msgid "Select"
-msgstr "Selecciona:"
-
-#: classes/pref_feeds.php:1324
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "S'estan purgant els canals seleccionats..."
-
-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Reinicia la contrasenya"
-
-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "Dóna't de baixa"
-
-#: classes/pref_feeds.php:1333
-#, fuzzy
-msgid "Categories"
-msgstr "Catégorie&nbsp;:"
-
-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Edita les categories"
-
-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Edita les categories"
-
-#: classes/pref_feeds.php:1354
-#, fuzzy
-msgid "More actions..."
-msgstr "Accions..."
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Purger manuellement"
-
-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Esborra les dades del canal"
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "Canvia la puntuació dels articles"
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref_feeds.php:1432
-#, fuzzy
-msgid "Import my OPML"
-msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-#, fuzzy
-msgid "Include settings"
-msgstr "Inclou-lo en el resum diari per correu electrònic"
-
-#: classes/pref_feeds.php:1442
-#, fuzzy
-msgid "Export OPML"
-msgstr "Exporta en format OPML"
-
-#: classes/pref_feeds.php:1446
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-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."
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-#, fuzzy
-msgid "Article archive"
-msgstr "Data de l'article"
-
-#: classes/pref_feeds.php:1456
-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:1459
-#, fuzzy
-msgid "Export my data"
-msgstr "Exporta en format OPML"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importeu"
-
-#: classes/pref_feeds.php:1481
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Integració al Firefox"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent "
-"clic en el següent enllaç."
-
-#: classes/pref_feeds.php:1490
-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."
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1508
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1512
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-"Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
-"personalitzades?"
-
-#: classes/pref_feeds.php:1514
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr ""
-"Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
-"personalitzades?"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-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."
-
-#: classes/pref_feeds.php:1522
-#, fuzzy
-msgid "Display URL"
-msgstr "afficher les étiquettes"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Articles mémorisés"
-
-#: classes/pref_feeds.php:1538
-#, fuzzy
-msgid "Twitter"
-msgstr "Títol"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-#, fuzzy
-msgid "Clear stored credentials"
-msgstr "Esborra les dades del canal"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: classes/pref_filters.php:89
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "No s'ha trobat cap fitxer que coincideixi."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "S'ha creat el filtre <b>%s</b>"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Edita"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr ""
-
-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-#, fuzzy
-msgid "Stored feeds"
-msgstr "Més canals"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Feu clic per editar"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "Descriptif"
-
-#: classes/pref_labels.php:37
-#, fuzzy
-msgid "Colors"
-msgstr "Tanca"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Foreground:"
-msgstr "Primer pla"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Background:"
-msgstr "Fons"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "S'ha creat l'etiqueta <b>%s</b> "
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Elimina els colors"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "El camp de contrasenya antiga no pot estar buit."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "El camp de contrasenya nova no pot estar buit."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "Les contrasenyes no coincideixen."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "S'ha modificat la contrasenya."
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "La contrasenya antiga és incorrecta."
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "S'ha desat la configuració"
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Es desconeix l'opció %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-#, fuzzy
-msgid "Personal data / Authentication"
-msgstr "Autenticació"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr ""
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "Adreça electrònica"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Nivell d'accés"
-
-#: classes/pref_prefs.php:213
-#, fuzzy
-msgid "Save data"
-msgstr "Desa"
-
-#: classes/pref_prefs.php:224
-#, 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."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Contrasenya antiga"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Nova contrasenya"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Confirmeu la contrasenya"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Canvia la contrasenya"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Seleccioneu una interfície"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Sí"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "No"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Desa la configuració"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr ""
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Torna als paràmetres per defecte"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Detalls de l'usuari"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "No s'ha trobat l'usuari"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Registrat"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Última connexió el"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Nombre de canals subscrits"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Canals subscrits"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Editor de perfils d'usuari"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Nivell d'accés:"
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Nova contrasenya"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "Adreça electrònica:"
-
-#: classes/pref_users.php:257
-#, 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>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "No s'ha pogut crear l'usuari <b>%s</b>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "L'usuari<b>%s</b> ja existeix."
-
-#: classes/pref_users.php:291
-#, fuzzy, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\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>"
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "S'està notificant <b>%s</b>."
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notificació de canvi de contrasenya"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Reinicia la contrasenya"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Permisos"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Última connexió"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "No s'han definit els usuaris."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "No s'ha trobat cap usuari que coinicideixi. "
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "sense etiqueta"
-
-#: classes/rpc.php:742
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "La vostra informació de registre és incompleta."
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr ""
-
-#: classes/rpc.php:754
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "S'ha modificat la contrasenya."
-
-#: classes/rpc.php:767
-#, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "No podeu editar aquest tipus de canal."
-
-#: classes/share_button.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "Marca l'article"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "Títol"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "El nom d'usuari o la contrasenya és incorrecte"
-
-#: include/functions.php:2099
-#, fuzzy
-msgid "Archived articles"
-msgstr "Articles mémorisés"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-#, fuzzy
-msgid "Click to play"
-msgstr "Feu clic per editar"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-#, fuzzy
-msgid "(edit note)"
-msgstr "edita la nota"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "No heu seleccionat cap canal."
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "tipus desconegut"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Adjunció:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Adjuncions:"
-
-#: include/functions.php:5261
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Articles marcats"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "No s'ha trobat cap canal."
-
-#: include/functions.php:5331
-#, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr ""
-"No s'ha pogut trobar el fitxer d'esquema necessari, es necessita la versió:"
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr ""
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "Títol o contingut"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "Enllaç"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "Data de l'article"
-
-#: include/localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Buida els articles"
-
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "Marca'l com a destacat"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Marca'l com a destacat"

 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730

-#: js/viewfeed.js:466
+#: js/viewfeed.js:475

 msgid "Publish article"
 msgstr "Publica l'article"
 
 msgid "Publish article"
 msgstr "Publica l'article"
 


@@ -2299,7 +1496,7 @@ msgstr "Publica l'article"
 msgid "Assign tags"
 msgstr "Assigna etiquetes"
 
 msgid "Assign tags"
 msgstr "Assigna etiquetes"
 

-#: include/localized_schema.php:14 js/viewfeed.js:1935
+#: include/localized_schema.php:14 js/viewfeed.js:1960

 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 
 msgid "Assign label"
 msgstr "Assigna-li l'etiqueta"
 


@@ -2382,11 +1579,11 @@ msgstr ""
 "per canals."
 
 #: include/localized_schema.php:29
 "per canals."
 
 #: include/localized_schema.php:29

-msgid "Use feed-specified date to sort headlines instead of local import date."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2398,7 +1595,8 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
 msgstr ""
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr ""
 "Purga els articles vells al cap d'aquest nombre de dies (0 - desactiva la "
 "purga)"
 msgstr ""
 "Purga els articles vells al cap d'aquest nombre de dies (0 - desactiva la "
 "purga)"


@@ -2512,16 +1710,16 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
 msgid "User timezone"
 msgstr ""
 

-#: include/localized_schema.php:60
-#, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Ordena els canals per articles no llegits"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la fulla d'estils personalitzada."
 
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la fulla d'estils personalitzada."
 

+#: include/localized_schema.php:61
+#, fuzzy
+msgid "Sort headlines by feed date"
+msgstr "Ordena els canals per articles no llegits"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""


@@ -2543,7 +1741,7 @@ msgstr "Fitxer:"
 msgid "Use less traffic"
 msgstr ""
 
 msgid "Use less traffic"
 msgstr ""
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 


@@ -2552,15 +1750,19 @@ msgstr "Esteu segur que voleu marcar tots els articles de %s com a llegits?"
 msgid "Mark %d displayed articles as read?"
 msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "a"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Treu la marca de l'article"
 
 msgid "Unstar article"
 msgstr "Treu la marca de l'article"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Marca l'article"
 
 msgid "Star article"
 msgstr "Marca l'article"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Deixa de publicar l'article"
 
 msgid "Unpublish article"
 msgstr "Deixa de publicar l'article"
 


@@ -2599,11 +1801,11 @@ msgstr "Mostra/amaga els canals llegits"
 msgid "Load more..."
 msgstr "Ouverture de l'aide..."
 
 msgid "Load more..."
 msgstr "Ouverture de l'aide..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 #, fuzzy
 msgid "Update feed"
 msgstr "Actualitza tots els canals"
 #, fuzzy
 msgid "Update feed"
 msgstr "Actualitza tots els canals"


@@ -2614,136 +1816,147 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "La contrasenya antiga és incorrecta."
 
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "La contrasenya antiga és incorrecta."
 

-#: js/functions.js:650
+#: js/functions.js:621

 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "La contrasenya antiga és incorrecta."
 
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "La contrasenya antiga és incorrecta."
 

-#: js/functions.js:777
+#: js/functions.js:748

 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Elimina les dades emmagatzemades"
 
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Elimina les dades emmagatzemades"
 

-#: js/functions.js:809
+#: js/functions.js:780

 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Si us plau, seleccioneu un canal."
 
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Si us plau, seleccioneu un canal."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
 
 msgid "Please enter label caption:"
 msgstr "Si us plau, escriviu un títol per a l'etiqueta:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
 
 msgid "Can't create label: missing caption."
 msgstr "No s'ha pogut crear l'etiqueta: Títol desconegut."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "Subscriviu-vos al canal"
 
 msgid "Subscribe to Feed"
 msgstr "Subscriviu-vos al canal"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "S'està subscrivint a un canal..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Subscrit als canals:"
 
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Subscrit als canals:"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 msgid "Specified URL seems to be invalid."
 msgstr ""
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 

-#: js/functions.js:945
+#: js/functions.js:917

 #, fuzzy
 #, fuzzy

-msgid "Couldn't download the specified URL."
+msgid "Couldn't download the specified URL: %s"

 msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal."
 
 msgstr "No s'ha pogut subscriure: no s'ha especificat la URL del canal."
 

-#: js/functions.js:948
+#: js/functions.js:921

 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "No esteu subscrit a cap canal."
 
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "No esteu subscrit a cap canal."
 

-#: js/functions.js:980
-msgid "Create Filter"
-msgstr "Crea un filtre"
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Filtres"
+
+#: js/functions.js:1049
+#, fuzzy
+msgid "Add rule"
+msgstr "S'està afegint la categoria..."

 
 

-#: js/functions.js:1008 js/prefs.js:168
+#: js/functions.js:1075

 #, fuzzy
 #, fuzzy

-msgid "Filter Test Results"
-msgstr "Expression du filtre"
+msgid "Edit action"
+msgstr "Accions dels canals"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "Accions dels canals"
+
+#: js/functions.js:1112
+msgid "Create Filter"
+msgstr "Crea un filtre"

 
 

-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
 
 msgid "Unsubscribe from %s?"
 msgstr "Us voleu donar de baixa de %s ?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 
 msgid "You can't edit this kind of feed."
 msgstr "No podeu editar aquest tipus de canal."
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 #, fuzzy
 msgid "Edit Feed"
 msgstr "Edita el canal"
 
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Edita el canal"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 #, fuzzy
 msgid "More Feeds"
 msgstr "Més canals"
 
 #, fuzzy
 msgid "More Feeds"
 msgstr "Més canals"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "No heu seleccionat cap canal."
 
 msgid "No feeds are selected."
 msgstr "No heu seleccionat cap canal."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Erreurs de mise à jour"
 
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Erreurs de mise à jour"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
 
 msgid "No articles are selected."
 msgstr "No hi ha cap article seleccionat."
 


@@ -2752,6 +1965,21 @@ msgstr "No hi ha cap article seleccionat."
 msgid "Forward article by email"
 msgstr "Marca l'article"
 
 msgid "Forward article by email"
 msgstr "Marca l'article"
 

+#: js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Edita les etiquetes"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Edita les categories"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Crea una categoria"
+

 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"


@@ -2770,350 +1998,863 @@ msgstr "No s'ha pogut crear l'usuari: no hi ha cap nom especificat."
 msgid "Edit Filter"
 msgstr "Filtres"
 
 msgid "Edit Filter"
 msgstr "Filtres"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "Esteu segur que voleu suprimir el filtre %s?"
 
 msgstr "Esteu segur que voleu suprimir el filtre %s?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
 msgid "Remove selected labels?"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "No heu seleccionat cap etiqueta."
 
 msgid "No labels are selected."
 msgstr "No heu seleccionat cap etiqueta."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "No heu seleccionat cap usuari."
 
 msgid "No users are selected."
 msgstr "No heu seleccionat cap usuari."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 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:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "No heu seleccionat cap filtre."
 
 msgid "No filters are selected."
 msgstr "No heu seleccionat cap filtre."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "Us voleu donar de baixa dels canals seleccionats?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Si us plau, seleccioneu només un canal."
 
 msgid "Please select only one feed."
 msgstr "Si us plau, seleccioneu només un canal."
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 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?"
 
 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:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Quants dies voleu mantenir els articles (0 - per defecte)?"
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "El nom del camp no es pot deixar en blanc."
 
 msgid "Login field cannot be blank."
 msgstr "El nom del camp no es pot deixar en blanc."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Si us plau, seleccioneu només un usuari."
 
 msgid "Please select only one user."
 msgstr "Si us plau, seleccioneu només un usuari."
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
 
 msgid "Reset password of selected user?"
 msgstr "Voleu reiniciar la contrasenya de l'usuari seleccionat?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Si us plau, seleccioneu només un filtre."
 
 msgid "Please select only one filter."
 msgstr "Si us plau, seleccioneu només un filtre."
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
+
+#: js/prefs.js:704

 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor múltiple de canals"
 
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor múltiple de canals"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
 
 msgid "Save changes to selected feeds?"
 msgstr "Esteu segur que voleu desar els canvis als canals seleccionats?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 #, fuzzy
 msgid "OPML Import"
 msgstr "Importeu"
 
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importeu"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Primerament heu de seleccionar un canal."
 
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Primerament heu de seleccionar un canal."
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Primerament heu de seleccionar un canal."
 
 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Primerament heu de seleccionar un canal."
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "Esteu segur que voleu establir els valors per defecte?"
 
 msgid "Reset to defaults?"
 msgstr "Esteu segur que voleu establir els valors per defecte?"
 

-#: js/prefs.js:1152
-#, fuzzy
-msgid "Feed Categories"
-msgstr "Catégorie&nbsp;:"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 
 msgid "Remove selected categories?"
 msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "No heu seleccionat cap categoria."
 
 msgid "No categories are selected."
 msgstr "No heu seleccionat cap categoria."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Edita les categories"
+
+#: js/prefs.js:1306

 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Erreurs de mise à jour"
 
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Erreurs de mise à jour"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Voleu canviar l'adreça de publicació per una de nova?"
 
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Voleu canviar l'adreça de publicació per una de nova?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
 "personalitzades?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 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."
 
 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:1422
+#: js/prefs.js:1507

 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr ""
 "Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
 "defecte?"
 
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr ""
 "Esteu segur que voleu canviar els colors de les etiquetes pels colors per "
 "defecte?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr ""
 
 msgid "Settings Profiles"
 msgstr ""
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No hi ha cap article seleccionat."
 
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No hi ha cap article seleccionat."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Primerament heu de seleccionar un canal."
 
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Primerament heu de seleccionar un canal."
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 
 msgid "Label Editor"
 msgstr "Éditeur d'intitulé"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 #, fuzzy
 msgid "Link Instance"
 msgstr "Edita les etiquetes"
 
 #, fuzzy
 msgid "Link Instance"
 msgstr "Edita les etiquetes"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 #, fuzzy
 msgid "Edit Instance"
 msgstr "Edita les etiquetes"
 
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Edita les etiquetes"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Esteu segur que voleu suprimir els filtres seleccionats?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 #, fuzzy
 msgid "No instances are selected."
 msgstr "No heu seleccionat cap filtre."
 
 #, fuzzy
 msgid "No instances are selected."
 msgstr "No heu seleccionat cap filtre."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Si us plau, seleccioneu només un filtre."
 
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Si us plau, seleccioneu només un filtre."
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 #, fuzzy
 msgid "Export Data"
 msgstr "Exporta en format OPML"
 
 #, fuzzy
 msgid "Export Data"
 msgstr "Exporta en format OPML"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 #, fuzzy
 msgid "Data Import"
 msgstr "Importeu"
 
 #, fuzzy
 msgid "Data Import"
 msgstr "Importeu"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "Dóna't de baixa"
+
+#: js/prefs.js:2191

 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "S'està subscrivint a un canal..."
 
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "S'està subscrivint a un canal..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Torna a Tiny Tiny RSS"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marca l'article"
 
 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marca l'article"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 
 msgid "Mark all articles as read?"
 msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 
 msgid "You can't unsubscribe from the category."
 msgstr "No us podeu donar de baixa de la categoria."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Primerament heu de seleccionar un canal."
 
 msgid "Please select some feed first."
 msgstr "Primerament heu de seleccionar un canal."
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 
 msgid "You can't rescore this kind of feed."
 msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 #, fuzzy
 msgid "New version available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 
 #, fuzzy
 msgid "New version available!"
 msgstr "Hi ha una nova versió de Tiny Tiny RSS!"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 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 "Mark all visible articles in %s as read?"
 msgstr ""
 "Esteu segur que voleu marcar tots els articles visibles de %s com a llegits ?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
 #, 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:916
+#: js/viewfeed.js:925

 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr ""
 "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr ""
 "Esteu segur que voleu eliminar els articles seleccionats de l'etiqueta?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
 #, fuzzy
 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:961
+#: js/viewfeed.js:970

 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Articles marcats"
 
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Articles marcats"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 "Esteu segur que voleu marcar els %d articles seleccionats de %s com a "
 "llegits?"
 
 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:1029
+#: js/viewfeed.js:1038

 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Edita les etiquetes"
 
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Edita les etiquetes"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "No hi ha cap article seleccionat."
 
 msgid "No article is selected."
 msgstr "No hi ha cap article seleccionat."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "No s'han trobat articles per a marcar."
 
 msgid "No articles found to mark"
 msgstr "No s'han trobat articles per a marcar."
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 #, fuzzy
 msgid "Loading..."
 msgstr "S'està carregant la llista de canals..."
 
 #, fuzzy
 msgid "Loading..."
 msgstr "S'està carregant la llista de canals..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 
 #, fuzzy
 msgid "Open original article"
 msgstr "Mostra el contingut original de l'article"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Obre l'article en una finestra nova"
 
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Obre l'article en una finestra nova"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marca'l com a llegit"
 
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marca'l com a llegit"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marca'l com a llegit"
 
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marca'l com a llegit"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 
 #, fuzzy
 msgid "Remove label"
 msgstr "Esteu segur que voleu suprimir les etiquetes seleccionades?"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 #, fuzzy
 msgid "Playing..."
 msgstr "S'està carregant la llista de canals..."
 
 #, fuzzy
 msgid "Playing..."
 msgstr "S'està carregant la llista de canals..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 #, fuzzy
 msgid "Click to pause"
 msgstr "Feu clic per editar"
 
 #, fuzzy
 msgid "Click to pause"
 msgstr "Feu clic per editar"
 

+#, fuzzy
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "S'està afegint la categoria <b>%s</b>."
+
+#, fuzzy
+#~ msgid "is already imported."
+#~ msgstr "Ja s'ha importat"
+
+#, fuzzy
+#~ msgid "OK"
+#~ msgstr "D'acord!"
+
+#, fuzzy
+#~ msgid "Register"
+#~ msgstr "Registrat"
+
+#~ msgid "Match"
+#~ msgstr "Coincidència"
+
+#~ msgid "before"
+#~ msgstr "abans"
+
+#~ msgid "after"
+#~ msgstr "després"
+
+#~ msgid "Check it"
+#~ msgstr "Revisa-ho"
+
+#~ msgid "on field"
+#~ msgstr "al camp"
+
+#~ msgid "Perform Action"
+#~ msgstr "Acció a realitzar:"
+
+#~ msgid "with parameters:"
+#~ msgstr "amb els paràmetres:"
+
+#~ msgid "Options"
+#~ msgstr "Opcions"
+
+#~ msgid "Enabled"
+#~ msgstr "Activat"
+
+#~ msgid "Inverse match"
+#~ msgstr "Coincidència inversa"
+
+#, fuzzy
+#~ msgid "Apply to category"
+#~ msgstr "Posa'l a la categoria:"
+
+#~ msgid "Test"
+#~ msgstr "Tester"
+
+#~ msgid "Create"
+#~ msgstr "Crea"
+
+#, fuzzy
+#~ msgid "Multiple articles"
+#~ msgstr "Tots els articles"
+
+#, fuzzy
+#~ msgid "To:"
+#~ msgstr "Dalt"
+
+#, fuzzy
+#~ msgid "Subject:"
+#~ msgstr "Selecciona:"
+
+#, fuzzy
+#~ msgid "Send e-mail"
+#~ msgstr "Canvieu l'adreça electrònica"
+
+#~ msgid "Check to enable field"
+#~ msgstr "Seleccioneu-ho per activar els camps"
+
+#, fuzzy
+#~ msgid "(%d feeds)"
+#~ msgstr "Edita el canal"
+
+#, fuzzy
+#~ msgid "Feed Title"
+#~ msgstr "Títol"
+
+#~ msgid "using"
+#~ msgstr "s'està utilitzant"
+
+#~ msgid "Article purging:"
+#~ msgstr "Neteja d'articles:"
+
+#, fuzzy
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Amaga-ho de la llista de canals"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contingut escrit de dreta a esquerra"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "Inclou-lo en el resum diari per correu electrònic"
+
+#~ msgid "Always display image attachments"
+#~ msgstr "Mostra les imatges adjuntes"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Emmagatzema les imatges localment"
+
+#, fuzzy
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Esteu segur que voleu marcar tots els articles com a llegits?"
+
+#, fuzzy
+#~ msgid "Icon"
+#~ msgstr "Action"
+
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Subscrit als canals:"
+
+#~ msgid "All done."
+#~ msgstr "Fet!"
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "Subscrit a <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Ja esteu subscrit a <b>%s</b>."
+
+#, fuzzy
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "No s'ha trobat cap canal."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "Ja esteu subscrit a <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "L'adreça URL del canal ha canviat."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#~ msgstr "Ja esteu subscrit a <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "Us voleu donar de baixa dels canals seleccionats?"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Edita les opcions de les subscripcions"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "La categoria <b>%s</b> ja existeix a la base de dades."
+
+#~ msgid "No feed categories defined."
+#~ msgstr "No s'ha definit cap categoria per als canals."
+
+#, fuzzy
+#~ msgid "Remove selected categories"
+#~ msgstr "Esteu segur que voleu suprimir les categories seleccionades?"
+
+#, fuzzy
+#~ msgid "Feeds with errors"
+#~ msgstr "Editor de canals"
+
+#, fuzzy
+#~ msgid "Inactive feeds"
+#~ msgstr "Tots els canals"
+
+#, fuzzy
+#~ msgid "Edit selected feeds"
+#~ msgstr "S'estan purgant els canals seleccionats..."
+
+#, fuzzy
+#~ msgid "Reset sort order"
+#~ msgstr "Reinicia la contrasenya"
+
+#, fuzzy
+#~ msgid "Categories"
+#~ msgstr "Catégorie&nbsp;:"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Edita les categories"
+
+#, fuzzy
+#~ msgid "More actions..."
+#~ msgstr "Accions..."
+
+#~ msgid "Manual purge"
+#~ msgstr "Purger manuellement"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Esborra les dades del canal"
+
+#~ msgid "Rescore articles"
+#~ msgstr "Canvia la puntuació dels articles"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#, fuzzy
+#~ msgid "Import my OPML"
+#~ msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
+
+#, fuzzy
+#~ msgid "Include settings"
+#~ msgstr "Inclou-lo en el resum diari per correu electrònic"
+
+#, fuzzy
+#~ msgid "Export OPML"
+#~ msgstr "Exporta en format OPML"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ 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."
+
+#, fuzzy
+#~ msgid "Article archive"
+#~ msgstr "Data de l'article"
+
+#, fuzzy
+#~ msgid "Export my data"
+#~ msgstr "Exporta en format OPML"
+
+#~ msgid "Import"
+#~ msgstr "Importeu"
+
+#, fuzzy
+#~ msgid "Firefox integration"
+#~ msgstr "Integració al Firefox"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent "
+#~ "clic en el següent enllaç."
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Torna a Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Torna a Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr ""
+#~ "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
+#~ "personalitzades?"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr ""
+#~ "Esteu segur que voleu canviar la puntuació dels articles en les etiquetes "
+#~ "personalitzades?"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ 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."
+
+#, fuzzy
+#~ msgid "Display URL"
+#~ msgstr "afficher les étiquettes"
+
+#, fuzzy
+#~ msgid "Unshare all articles"
+#~ msgstr "Articles mémorisés"
+
+#, fuzzy
+#~ msgid "Twitter"
+#~ msgstr "Títol"
+
+#, fuzzy
+#~ msgid "Clear stored credentials"
+#~ msgstr "Esborra les dades del canal"
+
+#, fuzzy
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "No s'ha trobat cap fitxer que coincideixi."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "S'ha creat el filtre <b>%s</b>"
+
+#~ msgid "Edit"
+#~ msgstr "Edita"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "No teniu  permisos per a obrir aquesta pestanya."
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Més canals"
+
+#~ msgid "Click to edit"
+#~ msgstr "Feu clic per editar"
+
+#~ msgid "Caption"
+#~ msgstr "Descriptif"
+
+#, fuzzy
+#~ msgid "Colors"
+#~ msgstr "Tanca"
+
+#, fuzzy
+#~ msgid "Foreground:"
+#~ msgstr "Primer pla"
+
+#, fuzzy
+#~ msgid "Background:"
+#~ msgstr "Fons"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "S'ha creat l'etiqueta <b>%s</b> "
+
+#~ msgid "Clear colors"
+#~ msgstr "Elimina els colors"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "El camp de contrasenya antiga no pot estar buit."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "El camp de contrasenya nova no pot estar buit."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "Les contrasenyes no coincideixen."
+
+#~ msgid "Password has been changed."
+#~ msgstr "S'ha modificat la contrasenya."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "La contrasenya antiga és incorrecta."
+
+#~ msgid "The configuration was saved."
+#~ msgstr "S'ha desat la configuració"
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Es desconeix l'opció %s"
+
+#, fuzzy
+#~ msgid "Personal data / Authentication"
+#~ msgstr "Autenticació"
+
+#~ msgid "E-mail"
+#~ msgstr "Adreça electrònica"
+
+#~ msgid "Access level"
+#~ msgstr "Nivell d'accés"
+
+#, fuzzy
+#~ msgid "Save data"
+#~ msgstr "Desa"
+
+#, 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."
+
+#~ msgid "Old password"
+#~ msgstr "Contrasenya antiga"
+
+#~ msgid "New password"
+#~ msgstr "Nova contrasenya"
+
+#~ msgid "Confirm password"
+#~ msgstr "Confirmeu la contrasenya"
+
+#~ msgid "Change password"
+#~ msgstr "Canvia la contrasenya"
+
+#~ msgid "Select theme"
+#~ msgstr "Seleccioneu una interfície"
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Save configuration"
+#~ msgstr "Desa la configuració"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Torna als paràmetres per defecte"
+
+#~ msgid "User details"
+#~ msgstr "Detalls de l'usuari"
+
+#~ msgid "User not found"
+#~ msgstr "No s'ha trobat l'usuari"
+
+#~ msgid "Registered"
+#~ msgstr "Registrat"
+
+#~ msgid "Last logged in"
+#~ msgstr "Última connexió el"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Nombre de canals subscrits"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Canals subscrits"
+
+#~ msgid "User Editor"
+#~ msgstr "Editor de perfils d'usuari"
+
+#~ msgid "Access level: "
+#~ msgstr "Nivell d'accés:"
+
+#~ msgid "Change password to"
+#~ msgstr "Nova contrasenya"
+
+#~ msgid "E-mail: "
+#~ msgstr "Adreça electrònica:"
+
+#~ 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>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "No s'ha pogut crear l'usuari <b>%s</b>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "L'usuari<b>%s</b> ja existeix."
+
+#, fuzzy
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\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>"
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "S'està notificant <b>%s</b>."
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Notificació de canvi de contrasenya"
+
+#~ msgid "Reset password"
+#~ msgstr "Reinicia la contrasenya"
+
+#~ msgid "Access Level"
+#~ msgstr "Permisos"
+
+#~ msgid "Last login"
+#~ msgstr "Última connexió"
+
+#~ msgid "No users defined."
+#~ msgstr "No s'han definit els usuaris."
+
+#~ msgid "No matching users found."
+#~ msgstr "No s'ha trobat cap usuari que coinicideixi. "
+
+#, fuzzy
+#~ msgid "Share by URL"
+#~ msgstr "Marca l'article"
+
+#, fuzzy
+#~ msgid "Share on Twitter"
+#~ msgstr "Títol"
+
+#~ msgid "Attachment:"
+#~ msgstr "Adjunció:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "S'està subscrivint a un canal..."
+
+#, fuzzy
+#~ msgid "Filter Test Results"
+#~ msgstr "Expression du filtre"
+
+#, fuzzy
+#~ msgid "Feed Categories"
+#~ msgstr "Catégorie&nbsp;:"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."


@@ -3185,10 +2926,6 @@ msgstr "Feu clic per editar"
 #~ msgid "Add category..."
 #~ msgstr "S'està afegint la categoria..."
 
 #~ msgid "Add category..."
 #~ msgstr "S'està afegint la categoria..."
 

-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "S'està afegint la categoria..."
-

 #~ msgid "description"
 #~ msgstr "description"
 
 #~ msgid "description"
 #~ msgstr "description"
 


@@ -3391,9 +3128,6 @@ msgstr "Feu clic per editar"
 #~ msgid "Update Errors"
 #~ msgstr "Actualitza els errors"
 
 #~ msgid "Update Errors"
 #~ msgstr "Actualitza els errors"
 

-#~ msgid "Category editor"
-#~ msgstr "Edita les categories"
-

 #~ msgid "Show last article times"
 #~ msgstr "Mostra l'hora de l'últim article"
 
 #~ msgid "Show last article times"
 #~ msgstr "Mostra l'hora de l'últim article"
 


@@ -3467,10 +3201,6 @@ msgstr "Feu clic per editar"
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "S'ha desat el filtre <b>%s</b>"
 
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "S'ha desat el filtre <b>%s</b>"
 

-#, fuzzy
-#~ msgid "Tiny Tiny RSS"
-#~ msgstr "Torna a Tiny Tiny RSS"
-

 #~ msgid "Click to collapse category"
 #~ msgstr "Clica-hi per a reduir la categoria"
 
 #~ msgid "Click to collapse category"
 #~ msgstr "Clica-hi per a reduir la categoria"
 

diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 25f8eca2f1da07200dd24620ad33202a1410de85..0f345b0da8ea378b538218c31a536701cca2e728 100644 (file)
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 976c575f3c7d35ef9c5a61dcb3732de44db661a4..c229cac84f189534176bef5f9b686a707c17bb9b 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+0400\n"

 "PO-Revision-Date: 2012-04-21 09:02+0000\n"
 "Last-Translator: poitzorg <ailbone@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/tt-rss/language/"
 "PO-Revision-Date: 2012-04-21 09:02+0000\n"
 "Last-Translator: poitzorg <ailbone@gmail.com>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/tt-rss/language/"


@@ -21,95 +21,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Standard verwenden"
 
 msgid "Use default"
 msgstr "Standard verwenden"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Niemals löschen"
 
 msgid "Never purge"
 msgstr "Niemals löschen"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "Nach 1 Woche"
 
 msgid "1 week old"
 msgstr "Nach 1 Woche"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "Nach 2 Wochen"
 
 msgid "2 weeks old"
 msgstr "Nach 2 Wochen"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "Nach 1 Monat"
 
 msgid "1 month old"
 msgstr "Nach 1 Monat"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "Nach 2 Monaten"
 
 msgid "2 months old"
 msgstr "Nach 2 Monaten"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "Nach 3 Monaten"
 
 msgid "3 months old"
 msgstr "Nach 3 Monaten"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Standard Intervall"
 
 msgid "Default interval"
 msgstr "Standard Intervall"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Aktualisierungen deaktivieren"
 
 msgid "Disable updates"
 msgstr "Aktualisierungen deaktivieren"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Alle 15 Minuten"
 
 msgid "Each 15 minutes"
 msgstr "Alle 15 Minuten"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Alle 30 Minuten"
 
 msgid "Each 30 minutes"
 msgstr "Alle 30 Minuten"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "Stündlich"
 
 msgid "Hourly"
 msgstr "Stündlich"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Alle 4 Stunden"
 
 msgid "Each 4 hours"
 msgstr "Alle 4 Stunden"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Alle 12 Stunden"
 
 msgid "Each 12 hours"
 msgstr "Alle 12 Stunden"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Täglich"
 
 msgid "Daily"
 msgstr "Täglich"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Wöchentlich"
 
 msgid "Weekly"
 msgstr "Wöchentlich"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Standard"
 
 msgid "Default"
 msgstr "Standard"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr "Twitter OAuth "
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Benutzer"
 
 msgid "User"
 msgstr "Benutzer"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Erfahrener Benutzer"
 
 msgid "Power User"
 msgstr "Erfahrener Benutzer"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Administrator"
 
 msgid "Administrator"
 msgstr "Administrator"
 


@@ -139,8 +135,7 @@ msgstr "Tiny Tiny RSS Datenbank ist auf dem neusten Stand."
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Zu Tiny Tiny RSS zurückkehren"
 


@@ -218,22 +213,25 @@ msgstr ""
 "\t\tfunktionieren, welches von Ihrem Browser nicht unterstützt wird.\t"
 "\tBitte überprüfen Sie Ihre Browser Einstellungen."
 
 "\t\tfunktionieren, welches von Ihrem Browser nicht unterstützt wird.\t"
 "\tBitte überprüfen Sie Ihre Browser Einstellungen."
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 
 msgid "Loading, please wait..."
 msgstr "Ladevorgang, bitte warten..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Hallo,"
 
 msgid "Hello,"
 msgstr "Hallo,"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Abmelden"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Abmelden"
 

+#: digest.php:78
+#, fuzzy
+msgid "Regular version"
+msgstr "Ungültiger Regulärerausdruck"
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -306,207 +304,153 @@ msgstr ""
 "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
 "Konfiguration"
 
 "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
 "Konfiguration"
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Einstellungen"
 
 msgid "Preferences"
 msgstr "Einstellungen"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "Kommentare?"
 
 msgid "Comments?"
 msgstr "Kommentare?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Neue Version von Tiny Tiny RSS verfügbar!"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr "Neuigkeiten"
 
 msgid "News"
 msgstr "Neuigkeiten"
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Feedliste verbergen"
 
 msgid "Collapse feedlist"
 msgstr "Feedliste verbergen"
 

-#: index.php:148
+#: index.php:165

 msgid "Show articles"
 msgstr "Neue Artikel"
 
 msgid "Show articles"
 msgstr "Neue Artikel"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Adaptiv"
 
 msgid "Adaptive"
 msgstr "Adaptiv"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Alle Artikel"
 
 msgid "All Articles"
 msgstr "Alle Artikel"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Bewertet"
 
 msgid "Starred"
 msgstr "Bewertet"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Veröffentlicht"
 
 msgid "Published"
 msgstr "Veröffentlicht"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Ungelesen"
 
 msgid "Unread"
 msgstr "Ungelesen"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "Bewertung ignorieren"
 
 msgid "Ignore Scoring"
 msgstr "Bewertung ignorieren"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Aktualisiert"
 
 msgid "Updated"
 msgstr "Aktualisiert"
 

-#: index.php:160
+#: index.php:177

 msgid "Sort articles"
 msgstr "Artikel sortieren"
 
 msgid "Sort articles"
 msgstr "Artikel sortieren"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Datum"
 
 msgid "Date"
 msgstr "Datum"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Titel"
 
 msgid "Title"
 msgstr "Titel"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "Bewertung"
 
 msgid "Score"
 msgstr "Bewertung"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Kategorien bearbeiten"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Aktualisieren"
 
 msgid "Update"
 msgstr "Aktualisieren"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Aktionen..."
 
 msgid "Actions..."
 msgstr "Aktionen..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Suchen..."
 
 msgid "Search..."
 msgstr "Suchen..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 
 msgid "Feed actions:"
 msgstr "Feed-Aktionen:"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 
 msgid "Subscribe to feed..."
 msgstr "Feed abonnieren..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Diesen Feed bearbeiten..."
 
 msgid "Edit this feed..."
 msgstr "Diesen Feed bearbeiten..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 
 msgid "Rescore feed"
 msgstr "Feed neu bewerten"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Alle Feeds:"
 
 msgid "All feeds:"
 msgstr "Alle Feeds:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "Gelesene ein-/ausblenden"
 
 msgid "(Un)hide read feeds"
 msgstr "Gelesene ein-/ausblenden"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 
 msgid "Other actions:"
 msgstr "Andere Aktionen:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr "Zur Zusammenfassung wechseln..."
 
 msgid "Switch to digest..."
 msgstr "Zur Zusammenfassung wechseln..."
 

-#: index.php:194
+#: index.php:216

 msgid "Show tag cloud..."
 msgstr "Tagwolke anzeigen..."
 
 msgid "Show tag cloud..."
 msgstr "Tagwolke anzeigen..."
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr "Artikel nach Tag filtern.."
 
 msgid "Select by tags..."
 msgstr "Artikel nach Tag filtern.."
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Label erstellen..."
 
 msgid "Create label..."
 msgstr "Label erstellen..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Filter erstellen..."
 
 msgid "Create filter..."
 msgstr "Filter erstellen..."
 

-#: index.php:198
+#: index.php:220

 msgid "Keyboard shortcuts help"
 msgstr "Hilfe zu Tastaturbefehlen"
 
 msgid "Keyboard shortcuts help"
 msgstr "Hilfe zu Tastaturbefehlen"
 

-#: opml.php:81
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>Füge Kategorie <b>%s</b> hinzu.</li>"
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Setze Konfigurationsoption %s auf %s"
-
-#: opml.php:123
-#, php-format
-msgid "Adding label %s"
-msgstr "Füge Label %s hinzu"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Label %s kopieren."
-
-#: opml.php:180
-#, php-format
-msgid "Adding filter %s"
-msgstr "Füge Filter %s hinzu"
-
-#: opml.php:196
-#, php-format
-msgid "Duplicate filter %s"
-msgstr "Doppelter Filter %s"
-
-#: opml.php:241
-msgid "is already imported."
-msgstr "wurde bereits importiert."
-
-#: opml.php:271
-msgid "OK"
-msgstr "OK"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Fehler beim Parsen des Dokuments."
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Fehler: bitte eine OPML-Datei hochladen."
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "OPML Werkzeug"
-
-#: opml.php:530
-msgid "Importing OPML..."
-msgstr "Importiere OPML..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Zu den Einstellungen zurückkehren"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"


@@ -515,18 +459,16 @@ msgstr "Tastaturbefehle"
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Feeds"
 
 msgid "Feeds"
 msgstr "Feeds"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Filter"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Label"
 
 msgid "Labels"
 msgstr "Label"
 


@@ -596,24 +538,6 @@ msgstr "Konto erfolgreich erstellt."
 msgid "New user registrations are currently closed."
 msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 
 msgid "New user registrations are currently closed."
 msgstr "Registrierung für neue Benutzer ist momentan geschlossen."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr "Mit Twitter verbinden"
-
-#: 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:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr "Glückwunsch! Sie haben sich erfolgreich mit Twitter verbunden."
-
-#: twitter.php:118 classes/pref_prefs.php:469
-msgid "Register"
-msgstr "Registrieren"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturbefehle"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturbefehle"


@@ -686,11 +610,11 @@ msgstr "Andere Aktionen"
 msgid "Select article under mouse cursor"
 msgstr "Artikel unter Mauszeiger auswählen"
 
 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
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Label erstellen"
 
 msgid "Create label"
 msgstr "Label erstellen"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Filter erstellen"
 
 msgid "Create filter"
 msgstr "Filter erstellen"
 


@@ -730,11 +654,11 @@ msgstr "Feed-Aktionen"
 msgid "Refresh active feed"
 msgstr "Aktiven Feed aktualisieren"
 
 msgid "Refresh active feed"
 msgstr "Aktiven Feed aktualisieren"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 
 msgid "Subscribe to feed"
 msgstr "Feed abonnieren"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 
 msgid "Edit feed"
 msgstr "Feed bearbeiten"
 


@@ -758,19 +682,19 @@ msgstr "Gewählte Kategorie auf-/zuklappen"
 msgid "Go to..."
 msgstr "Gehe zu..."
 
 msgid "Go to..."
 msgstr "Gehe zu..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Alle Artikel"
 
 msgid "All articles"
 msgstr "Alle Artikel"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Bewertete Artikel"
 
 msgid "Starred articles"
 msgstr "Bewertete Artikel"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 


@@ -807,7 +731,7 @@ msgstr "Top 25 Feeds"
 msgid "Edit feed categories"
 msgstr "Feedkategorien bearbeiten"
 
 msgid "Edit feed categories"
 msgstr "Feedkategorien bearbeiten"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Benutzer anlegen"
 
 msgid "Create user"
 msgstr "Benutzer anlegen"
 


@@ -835,6 +759,11 @@ msgstr "Benutzername:"
 msgid "Password:"
 msgstr "Passwort:"
 
 msgid "Password:"
 msgstr "Passwort:"
 

+#: mobile/login_form.php:50
+#, fuzzy
+msgid "Open regular version"
+msgstr "Ungültiger Regulärerausdruck"
+

 #: 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/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


@@ -842,8 +771,8 @@ msgstr "Passwort:"
 msgid "Home"
 msgstr "Startseite"
 
 msgid "Home"
 msgstr "Startseite"
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Sonderfeeds"
 
 msgid "Special"
 msgstr "Sonderfeeds"
 


@@ -893,13 +822,11 @@ msgstr "Hilfe Thema nicht gefunden."
 msgid "Prepare data"
 msgstr "Bereite Daten vor"
 
 msgid "Prepare data"
 msgstr "Bereite Daten vor"
 

-#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
-#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 


@@ -911,44 +838,57 @@ msgstr ""
 "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen "
 "erneut geladen werden um alle neuen Einstellungen zu sehen."
 
 "Wenn Label und/oder Filter importiert wurden, müssen die Einstellungen "
 "erneut geladen werden um alle neuen Einstellungen zu sehen."
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+msgid "Select"
+msgstr "Auswahl"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Alle"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Keine"
+
+#: classes/dlg.php:85

 msgid "Create profile"
 msgstr "Profil erstellen"
 
 msgid "Create profile"
 msgstr "Profil erstellen"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 msgid "(active)"
 msgstr "(aktiv)"
 
 msgid "(active)"
 msgstr "(aktiv)"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 msgid "Default profile"
 msgstr "Standard Profil"
 
 msgid "Default profile"
 msgstr "Standard Profil"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 msgid "Remove selected profiles"
 msgstr "Ausgewählte Profile entfernen"
 
 msgid "Remove selected profiles"
 msgstr "Ausgewählte Profile entfernen"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 msgid "Activate profile"
 msgstr "Aktives Profil"
 
 msgid "Activate profile"
 msgstr "Aktives Profil"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 
 msgid "Public OPML URL"
 msgstr "Öffentliche OPML-URL"
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 
 msgid "Your Public OPML URL is:"
 msgstr "Ihre öffentliche OPML-URL lautet:"
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 
 msgid "Generate new URL"
 msgstr "Erzeuge neue URL"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "Anmerkung"
 
 msgid "Notice"
 msgstr "Anmerkung"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -959,11 +899,11 @@ msgstr ""
 "Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den "
 "Besitzer der Instanz."
 
 "Bitte starten Sie den Prozess des Daemons oder benachrichtigen Sie den "
 "Besitzer der Instanz."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -974,175 +914,105 @@ msgstr ""
 "Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
 "benachrichtigen Sie den Besitzer des Instanz."
 
 "Blockierung hinweisen. Bitte überprüfen Sie den Prozess des Daemons oder "
 "benachrichtigen Sie den Besitzer des Instanz."
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Feed"
 
 msgid "Feed"
 msgstr "Feed"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 msgid "Feed URL"
 msgstr "Feed URL"
 
 msgid "Feed URL"
 msgstr "Feed URL"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 
 msgid "Place in category:"
 msgstr "In Kategorie einordnen:"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 
 msgid "Available feeds"
 msgstr "Verfügbare Feeds"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Authentifizierung"
 
 msgid "Authentication"
 msgstr "Authentifizierung"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Anmelden"
 
 msgid "Login"
 msgstr "Anmelden"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 msgid "Password"
 msgstr "Passwort"
 
 msgid "Password"
 msgstr "Passwort"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr "OAuth wird automatisch für Twitter Feeds verwendet"
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr "OAuth wird automatisch für Twitter Feeds verwendet"
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Dieser Feed benötigt eine Authentifizierung."
 
 msgid "This feed requires authentication."
 msgstr "Dieser Feed benötigt eine Authentifizierung."
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "Abonnieren"
 
 msgid "Subscribe"
 msgstr "Abonnieren"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 msgid "More feeds"
 msgstr "Weitere Feeds"
 
 msgid "More feeds"
 msgstr "Weitere Feeds"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Abbrechen"
 
 msgid "Cancel"
 msgstr "Abbrechen"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Suchen"
 
 msgid "Search"
 msgstr "Suchen"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 
 msgid "Popular feeds"
 msgstr "Beliebte Feeds"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 msgid "Feed archive"
 msgstr "Feed-Archiv"
 
 msgid "Feed archive"
 msgstr "Feed-Archiv"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 msgid "limit:"
 msgstr "Grenzwert:"
 
 msgid "limit:"
 msgstr "Grenzwert:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Entfernen"
 
 msgid "Remove"
 msgstr "Entfernen"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr "Suche nach"
 
 msgid "Look for"
 msgstr "Suche nach"
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr "suchen in:"
 
 msgid "match on"
 msgstr "suchen in:"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Inhalt"
 
 msgid "Content"
 msgstr "Inhalt"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Titel oder Inhalt"
 
 msgid "Title or content"
 msgstr "Titel oder Inhalt"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Suche begrenzen auf:"
 
 msgid "Limit search to:"
 msgstr "Suche begrenzen auf:"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Alle Feeds"
 
 msgid "All feeds"
 msgstr "Alle Feeds"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Diesen Feed"
 
 msgid "This feed"
 msgstr "Diesen Feed"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Übereinstimmung"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "vorher"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "nacher"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "Überprüfen"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "in Feld"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "in"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Aktion ausführen"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "mit Parametern:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Optionen"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Aktiviert"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "Invertierte Übereinstimmung"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-msgid "Apply to category"
-msgstr "Auf Kategorie anwenden"
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Test"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Erstellen"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"


@@ -1150,71 +1020,74 @@ msgstr ""
 "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste "
 "zuerst):"
 
 "Folgende Feeds konnten seit 3 Monaten nicht aktualisiert werden (älteste "
 "zuerst):"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 
 msgid "Click to edit feed"
 msgstr "Zum Bearbeiten klicken"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 
 msgid "Unsubscribe from selected feeds"
 msgstr "Ausgewählte Feeds abbestellen"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "Folgende Feeds konnten aufgrund von Fehlern nicht aktualisiert werden:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (komma-getrennt)"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags für diesen Artikel (komma-getrennt)"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Speichern"
 
 msgid "Save"
 msgstr "Speichern"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 msgid "Tag Cloud"
 msgstr "Tagwolke"
 
 msgid "Tag Cloud"
 msgstr "Tagwolke"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr "Artikel nach Tag auswählen"
 
 msgid "Select item(s) by tags"
 msgstr "Artikel nach Tag auswählen"
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr "Suche: "
 
 msgid "Match:"
 msgstr "Suche: "
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr "Welche Tags?"
 
 msgid "Which Tags?"
 msgstr "Welche Tags?"
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 msgid "Display entries"
 msgstr "Einträge anzeigen"
 
 msgid "Display entries"
 msgstr "Einträge anzeigen"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 msgid "View as RSS"
 msgstr "Als RSS anzeigen"
 
 msgid "View as RSS"
 msgstr "Als RSS anzeigen"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "Sie finden diesen Feed als RSS unter der folgenden URL:"
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
 
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Neue Version von Tiny Tiny RSS verfügbar (%s)."
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 msgid "Details"
 msgstr "Details"
 
 msgid "Details"
 msgstr "Details"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr "Download"
 
 msgid "Download"
 msgstr "Download"
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1226,43 +1099,40 @@ msgstr ""
 "class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Basis benutzt "
 "werden."
 
 "class=\"visibleLink\" href=\"%s\">Diese Datei</a> kann als Basis benutzt "
 "werden."
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr "Instanz"
 
 msgid "Instance"
 msgstr "Instanz"
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr "Instanz-URL"
 
 msgid "Instance URL"
 msgstr "Instanz-URL"
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 msgid "Access key:"
 msgstr "Zugriffsberechtigung:"
 
 msgid "Access key:"
 msgstr "Zugriffsberechtigung:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 msgid "Access key"
 msgstr "Zugriffsberechtigung"
 
 msgid "Access key"
 msgstr "Zugriffsberechtigung"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 "Benutzen Sie eine Zugriffsberechtigung für beide verbundenen Instanzen."
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 "Benutzen Sie eine Zugriffsberechtigung für beide verbundenen Instanzen."
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 msgid "Generate new key"
 msgstr "Neue Zugriffsberechtigung erstellen"
 
 msgid "Generate new key"
 msgstr "Neue Zugriffsberechtigung erstellen"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 msgid "Create link"
 msgstr "Verbindung herstellen"
 
 msgid "Create link"
 msgstr "Verbindung herstellen"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"


@@ -1271,111 +1141,99 @@ msgstr ""
 "Datei konnte nicht hochgeladen werden. Bitte upload_max_filesize \n"
 "in PHP.ini anpassen. (Aktueller Wert = %s)"
 
 "Datei konnte nicht hochgeladen werden. Bitte upload_max_filesize \n"
 "in PHP.ini anpassen. (Aktueller Wert = %s)"
 

-#: classes/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Keine Feederkennung)"
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Einen gültigen RSS Feed pro Zeile hinzufügen (Keine Feederkennung)"
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr "Zu abonierende Feeds, Einen pro Zeile"
 
 msgid "Feeds to subscribe, One per line"
 msgstr "Zu abonierende Feeds, Einen pro Zeile"
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 msgid "Feeds require authentication."
 msgstr "Feeds benötigen Anmeldung."
 
 msgid "Feeds require authentication."
 msgstr "Feeds benötigen Anmeldung."
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 msgid "Visit the website"
 msgstr "Offizielle Website besuchen"
 
 msgid "Visit the website"
 msgstr "Offizielle Website besuchen"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 msgid "View as RSS feed"
 msgstr "Als RSS-Feed anzeigen"
 
 msgid "View as RSS feed"
 msgstr "Als RSS-Feed anzeigen"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Auswahl:"
 
 msgid "Select:"
 msgstr "Auswahl:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Alle"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Invertieren"
 
 msgid "Invert"
 msgstr "Invertieren"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Keine"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Auswahl umschalten:"
 
 msgid "Selection toggle:"
 msgstr "Auswahl umschalten:"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Auswahl:"
 
 msgid "Selection:"
 msgstr "Auswahl:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 msgid "Archive"
 msgstr "Archiv"
 
 msgid "Archive"
 msgstr "Archiv"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 msgid "Move back"
 msgstr "Zurückgehen"
 
 msgid "Move back"
 msgstr "Zurückgehen"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 msgid "Delete"
 msgstr "Löschen"
 
 msgid "Delete"
 msgstr "Löschen"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 msgid "Forward by email"
 msgstr "Per E-Mail weiterleiten"
 
 msgid "Forward by email"
 msgstr "Per E-Mail weiterleiten"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "Feed:"
 
 msgid "Feed:"
 msgstr "Feed:"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "als gelesen markieren"
 
 msgid "mark as read"
 msgstr "als gelesen markieren"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 msgid "Originally from:"
 msgstr "Original von:"
 
 msgid "Originally from:"
 msgstr "Original von:"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 msgid "Open article in new tab"
 msgstr "Artikel in neuem Reiter öffnen"
 
 msgid "Open article in new tab"
 msgstr "Artikel in neuem Reiter öffnen"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 msgid "Close article"
 msgstr "Artikel schließen"
 
 msgid "Close article"
 msgstr "Artikel schließen"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 
 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 
 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "Keine bewerteten Artikel zum Anzeigen gefunden."
 
 msgid "No starred articles found to display."
 msgstr "Keine bewerteten Artikel zum Anzeigen gefunden."
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1383,861 +1241,237 @@ msgstr ""
 "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
 "hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
 
 "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
 "hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Feeds zuletzt aktualisiert am %s"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr "Einige Feeds haben Aktualisierungsfehler (klicken für Details)"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-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/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML Werkzeug"

 
 

-#: classes/mail_button.php:95
-msgid "Subject:"
-msgstr "Betreff:"
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importiere OPML..."

 
 

-#: classes/mail_button.php:111
-msgid "Send e-mail"
-msgstr "E-Mail versenden"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Zu den Einstellungen zurückkehren"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-msgid "Edit article note"
-msgstr "Artikelnotizen bearbeiten"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Füge Filter %s hinzu"

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "Ankreuzen um das Feld zu aktivieren"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Label %s kopieren."

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#: classes/opml.php:293

 #, php-format
 #, php-format

-msgid "(%d feeds)"
-msgstr "(%d) Feeds"
-
-#: classes/pref_feeds.php:306
-msgid "Feed Title"
-msgstr "Feed-Titel"
+msgid "Adding label %s"
+msgstr "Füge Label %s hinzu"

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "verwende"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Label %s kopieren."

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Artikel löschen:"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Setze Konfigurationsoption %s auf %s"

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
-"<b>Hinweise:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr Feed "
-"eine Authentifizierung erfordert (außer Twitter-Feeds)."
+#: classes/opml.php:337
+#, fuzzy
+msgid "Adding filter..."
+msgstr "Füge Filter %s hinzu"

 
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-msgid "Hide from Popular feeds"
-msgstr "Auf meiner Feedliste verbergen"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Unkategorisiert"

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "Rechts-nach-links Inhalt"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "In Kategorie einordnen:"

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "In E-Mail-Zusammenfassung aufnehmen"
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Fehler: bitte eine OPML-Datei hochladen."

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr "Angehängte Bilder immer anzeigen"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Fehler beim Parsen des Dokuments."

 
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Bilder lokal zwischenspeichern"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "Keine Tags"

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
-msgid "Mark updated articles as unread"
-msgstr "Alle Artikel als ungelesen markieren"
+#: classes/rpc.php:736
+msgid "Your request could not be completed."
+msgstr "Ihre Anfrage konnte nicht bearbeitet werden."

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
-msgstr "Artikel als aktualisiert markieren bei Inhaltsänderung"
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."
+msgstr "Feed-Aktualisierung wurde eingeplant."

 
 

-#: classes/pref_feeds.php:491
-msgid "Icon"
-msgstr "Icon"
+#: classes/rpc.php:748
+msgid "Category update has been scheduled."
+msgstr "Kategorieaktualisierung wurde eingeplant."

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
-msgstr "Ersetze"
+#: classes/rpc.php:761
+msgid "Can't update this kind of feed."
+msgstr "Sie können diese Art von Feed nicht aktualisieren."

 
 

-#: classes/pref_feeds.php:524
-msgid "Resubscribe to push updates"
-msgstr "Abonnierte Feeds:"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."
+msgstr ""

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "PubSubHubbub-Abonnementstatus für push-enabled Feeds zurücksetzen"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Session konnte nicht validiert werden (falsche IP)"

 
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Alle fertig."
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "Falscher Benutzername oder Passwort"

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "<b>%s</b> abonniert."
+#: include/functions.php:2049
+msgid "Archived articles"
+msgstr "Archivierte Artikel"

 
 

-#: classes/pref_feeds.php:1021
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "<b>%s</b> bereits abonniert."
+#: include/functions.php:2051
+msgid "Recently read"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1024
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Keine Feeds in <b>%s</b> gefunden."
+#: include/functions.php:3223 js/viewfeed.js:1996
+msgid "Click to play"
+msgstr "Zum Abspielen klicken"

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "<b>%s</b> bereits abonniert."
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"
+msgstr "Abspielen"

 
 

-#: classes/pref_feeds.php:1030
-msgid "Multiple feed URLs found."
-msgstr "Mehrere Feed URLs gefunden."
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:1035
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#: include/functions.php:3485
+msgid "Related"

 msgstr ""
 msgstr ""

-"Konnte <b>%s</b> nicht abonnieren.<br>Kann die Feed-URL nicht herunterladen."

 
 

-#: classes/pref_feeds.php:1057
-msgid "Subscribe to selected feed"
-msgstr "Ausgewählte Feeds abonnieren"
+#: include/functions.php:4186
+msgid "(edit note)"
+msgstr "(Notiz bearbeiten)"

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "Abonnementoptionen bearbeiten"
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "Kein Feed ausgewählt."

 
 

-#: classes/pref_feeds.php:1161
-#, php-format
-msgid "Category <b>$%s</b> already exists in the database."
-msgstr "Kategorie <b>$%s</b> existiert bereits in der Datenbank."
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "unbekannter Typ"

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Kategorie erstellen"
+#: include/functions.php:4844
+#, fuzzy
+msgid "Attachments"
+msgstr "Anhänge:"

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "Keine Feedkategorien definiert."
+#: include/functions.php:5286
+#, php-format
+msgid "%d archived articles"
+msgstr "%d archivierte Artikel"

 
 

-#: classes/pref_feeds.php:1243
-msgid "Remove selected categories"
-msgstr "Ausgewählte Kategorien entfernen?"
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "Keine Feeds gefunden."

 
 

-#: classes/pref_feeds.php:1267
-msgid "Feeds with errors"
-msgstr "Feeds mit Fehlern"
+#: include/functions.php:5356
+msgid "Could not import: incorrect schema version."
+msgstr "Import fehlgeschlagen: Falsche Schemaversion"

 
 

-#: classes/pref_feeds.php:1287
-msgid "Inactive feeds"
-msgstr "Inaktive Feed"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr "Import fehlgeschlagen: Unbekanntes Format"

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-msgid "Select"
-msgstr "Auswahl"
+#: include/functions.php:5520
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr "Fertig: %d Artikel bearbeitet, %d importiert, %d Feeds erstellt."

 
 

-#: classes/pref_feeds.php:1324
-msgid "Edit selected feeds"
-msgstr "Bearbeite gewählten Feed..."
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr "Konnte XML-Datei nicht laden."

 
 

-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-msgid "Reset sort order"
-msgstr "Sortierreihenfolge zurücksetzen"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Titel oder Inhalt"

 
 

-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-msgid "Batch subscribe"
-msgstr "Mehrere Feeds abonnieren"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Link"

 
 

-#: classes/pref_feeds.php:1333
-msgid "Categories"
-msgstr "Kategorien"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Artikeldatum"

 
 

-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Kategorien bearbeiten"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "Artikel löschen"

 
 

-#: classes/pref_feeds.php:1338
-msgid "(Un)hide empty categories"
-msgstr "Zeige / Verstecke leere Kategorien"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Bewertung setzen"

 
 

-#: classes/pref_feeds.php:1354
-msgid "More actions..."
-msgstr "Mehr Aktionen..."
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:475
+msgid "Publish article"
+msgstr "Artikel veröffentlichen"

 
 

-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Manuelle Säuberung"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Tags zuweisen"

 
 

-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Feed-Daten löschen"
+#: include/localized_schema.php:14 js/viewfeed.js:1960
+msgid "Assign label"
+msgstr "Label zuweisen"

 
 

-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "Artikel neu bewerten"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr "Bewertung ändern"

 
 

-#: classes/pref_feeds.php:1405
-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."
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Allgemeines"

 
 

-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr "Import und Export"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Oberfläche"

 
 

-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Erweiterte Einstellungen"

 
 

-#: classes/pref_feeds.php:1417
+#: include/localized_schema.php:21

 msgid ""
 msgid ""

-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
+"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 ""
 msgstr ""

-"Über OPML können Feeds, Filter, Label und Tiny Tiny RSS Einstellungen "
-"importiert und export werden."
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
-
-#: classes/pref_feeds.php:1432
-msgid "Import my OPML"
-msgstr "OPML importieren"
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr "Dateiname"
-
-#: classes/pref_feeds.php:1438
-msgid "Include settings"
-msgstr "Einstellungen hinzufügen"
-
-#: classes/pref_feeds.php:1442
-msgid "Export OPML"
-msgstr "OPML exportieren"
-
-#: classes/pref_feeds.php:1446
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
-"können von jedem abonniert werden, der die folgende URL kennt."
-
-#: classes/pref_feeds.php:1448
-msgid ""
-"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
-"require authentication or feeds hidden from Popular feeds."
-msgstr ""
-"Eine öffentliche OPMl enthält keine Tiny Tiny RSS Einstellungen, Feeds die "
-"eine Anmeldung benötigen oder Feeds die nicht in den Favoriten enthalten "
-"sind."
-
-#: classes/pref_feeds.php:1451
-msgid "Display published OPML URL"
-msgstr "Zeige öffentliche OPML URL an."
-
-#: classes/pref_feeds.php:1454
-msgid "Article archive"
-msgstr "Artikelarchiv"
-
-#: classes/pref_feeds.php:1456
-msgid ""
-"You can export and import your Starred and Archived articles for safekeeping "
-"or when migrating between tt-rss instances."
-msgstr "Die bewerteten und archivierten Artikel können exportiert werden. "
-
-#: classes/pref_feeds.php:1459
-msgid "Export my data"
-msgstr "Meine Daten exportieren"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importieren"
-
-#: classes/pref_feeds.php:1481
-msgid "Firefox integration"
-msgstr "Firefox Integration"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox "
-"verwendet werden."
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "Diese Website als Feedreader registrieren."
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr "Mit Bookmarklet abonnieren"
-
-#: classes/pref_feeds.php:1500
-msgid ""
-"Drag the link below to your browser toolbar, open the feed you're interested "
-"in in your browser and click on the link to subscribe to it."
-msgstr ""
-"Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen den Feed, an "
-"dem Sie interessiert sind in Ihren Browser und klicken auf den Link, um ihn "
-"zu abonnieren."
-
-#: classes/pref_feeds.php:1504
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "%s in Tiny Tiny RSS abonnieren?"
-
-#: classes/pref_feeds.php:1508
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Abonnieren in Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1512
-msgid "Published & shared articles / Generated feeds"
-msgstr "Veröffentlichte & gesendete Artikel / erzeugte Feeds"
-
-#: classes/pref_feeds.php:1514
-msgid "Published articles and generated feeds"
-msgstr "Veröffentlichte Artikel und erzeugte Feeds"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-"Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
-"können von jedem abonniert werden, der die nachstehende URL kennt."
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr "Zeige URL an"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr "Alle generierten URLs löschen"
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr "Per URL geteilte Artikel"
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "Du kannst alle über URL geteilten Artikel hier deaktivieren."
-
-#: classes/pref_feeds.php:1532
-msgid "Unshare all articles"
-msgstr "Alle veröffentlichten Artikel zurückziehen"
-
-#: classes/pref_feeds.php:1538
-msgid "Twitter"
-msgstr "Twitter"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-"Bevor Sie Ihre Twitter-Feeds aktualisieren können, müssen Sie diese Instanz "
-"von Tiny Tiny RSS bei Twitter registrieren."
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-"Sie haben diese Instanz erfolgreich mit Twitter verbunden und sollten nun "
-"auf Ihre Twitter-Feeds zugreifen können."
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr "Mit Twitter registrieren"
-
-#: classes/pref_feeds.php:1559
-msgid "Clear stored credentials"
-msgstr "Gespeicherte Zugangsdaten löschen"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr "Artikel, die auf diesen Filter passen: "
-
-#: classes/pref_filters.php:89
-msgid "No articles matching this filter has been found."
-msgstr "Keine übereinstimmenden Artikel für diesen Filter gefunden."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr "Ungültiger Regulärerausdruck"
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "Filter <b>%s</b> erstellt"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr "Instanz verbinden"
-
-#: 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 ""
-"Sie können andere Instanzen von Tiny Tiny RSS mit dieser verbinden um "
-"beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS mit "
-"folgender URL:"
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr "Zuletzt verbunden"
-
-#: classes/pref_instances.php:170
-msgid "Stored feeds"
-msgstr "Gespeicherte Feeds"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Zum Bearbeiten klicken"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "Titel"
-
-#: classes/pref_labels.php:37
-msgid "Colors"
-msgstr "Farben"
-
-#: classes/pref_labels.php:42
-msgid "Foreground:"
-msgstr "Vordergrund"
-
-#: classes/pref_labels.php:42
-msgid "Background:"
-msgstr "Hintergrund"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Label <b>%s</b> erstellt"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Farben löschen"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "Altes Passwort darf nicht leer sein."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "Neues Passwort darf nicht leer sein."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "Die eingegebenen Passwörter stimmen nicht überein."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "Passwort wurde geändert."
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "Altes Passwort ist falsch."
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "Die Einstellungen wurden gespeichert."
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Unbekannte Option: %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr "Ihre persönlichen Daten wurden gespeichert."
-
-#: classes/pref_prefs.php:166
-msgid "Personal data / Authentication"
-msgstr "Persönliche Daten / Anmeldung"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr "Vollständiger Name"
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Zugriffsberechtigung"
-
-#: classes/pref_prefs.php:213
-msgid "Save data"
-msgstr "Speichern"
-
-#: classes/pref_prefs.php:224
-msgid "Your password is at default value, please change it."
-msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Altes Passwort"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Neues Passwort"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Passwort bestätigen"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Passwort ändern"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Thema auswählen"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr "Personalisieren"
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Ja"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "Nein"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr "Löschen"
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr "Aktuelle Serverzeit: %s (UTC)"
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Einstellungen speichern"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr "Profile verwalten"
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Auf Standardwerte zurücksetzen"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Benutzerdetails"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "Benutzer nicht gefunden"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Registriert"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Zuletzt angemeldet"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Anzahl abonnierter Feeds"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Abonnierte Feeds"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Benutzereditor"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Zugriffsberechtigung: "
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Passwort ändern in"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "E-Mail: "
-
-#: classes/pref_users.php:257
-#, 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"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Konnte den Benutzer <b>%s</b> nicht anlegen"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Benutzer <b>%s</b> existiert bereits."
-
-#: classes/pref_users.php:291
-#, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
-msgstr "Passwort für Benutzer <b>%s</b> auf <b>%s</b> geändert."
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "Benachrichtige <b>%s</b>."
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Passwort zurücksetzen"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Zugriffsberechtigung"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Zuletzt angemeldet"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "Keine Benutzer definiert."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "Keine zugehörigen Benutzer gefunden."
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "Keine Tags"
-
-#: classes/rpc.php:742
-msgid "Your request could not be completed."
-msgstr "Ihre Anfrage konnte nicht bearbeitet werden."
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr "Feed-Aktualisierung wurde eingeplant."
-
-#: classes/rpc.php:754
-msgid "Category update has been scheduled."
-msgstr "Kategorieaktualisierung wurde eingeplant."
-
-#: classes/rpc.php:767
-msgid "Can't update this kind of feed."
-msgstr "Sie können diese Art von Feed nicht aktualisieren."
-
-#: classes/share_button.php:7
-msgid "Share by URL"
-msgstr "Per URL teilen"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr "Du kannst diesen Artikel über folgende URL teilen"
-
-#: classes/tweet_button.php:7
-msgid "Share on Twitter"
-msgstr "Auf Twitter teilen"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Session konnte nicht validiert werden (falsche IP)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "Falscher Benutzername oder Passwort"
-
-#: include/functions.php:2099
-msgid "Archived articles"
-msgstr "Archivierte Artikel"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-msgid "Click to play"
-msgstr "Zum Abspielen klicken"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr "Abspielen"
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-msgid "(edit note)"
-msgstr "(Notiz bearbeiten)"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "Kein Feed ausgewählt."
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "unbekannter Typ"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Anhang:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Anhänge:"
-
-#: include/functions.php:5261
-#, php-format
-msgid "%d archived articles"
-msgstr "%d archivierte Artikel"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "Keine Feeds gefunden."
-
-#: include/functions.php:5331
-msgid "Could not import: incorrect schema version."
-msgstr "Import fehlgeschlagen: Falsche Schemaversion"
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr "Import fehlgeschlagen: Unbekanntes Format"
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr "Fertig: %d Artikel bearbeitet, %d importiert, %d Feeds erstellt."
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr "Konnte XML-Datei nicht laden."
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "Titel oder Inhalt"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "Link"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "Artikeldatum"
-
-#: include/localized_schema.php:9
-msgid "Delete article"
-msgstr "Artikel löschen"
-
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "Bewertung setzen"
-
-#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
-#: js/viewfeed.js:466
-msgid "Publish article"
-msgstr "Artikel veröffentlichen"
-
-#: include/localized_schema.php:13
-msgid "Assign tags"
-msgstr "Tags zuweisen"
-
-#: include/localized_schema.php:14 js/viewfeed.js:1935
-msgid "Assign label"
-msgstr "Label zuweisen"
-
-#: include/localized_schema.php:15
-msgid "Modify score"
-msgstr "Bewertung ändern"
-
-#: include/localized_schema.php:17
-msgid "General"
-msgstr "Allgemeines"
-
-#: include/localized_schema.php:18
-msgid "Interface"
-msgstr "Oberfläche"
-
-#: include/localized_schema.php:19
-msgid "Advanced"
-msgstr "Erweiterte Einstellungen"
-
-#: 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 ähnlicher Feeds mit teilweise gleichen "
-"Artikeln. Ist diese Option deaktiviert, werden die selben Artikel von "
-"unterschiedlichen Feeds nur einmal erscheinen."
+"Diese Option dient zum Lesen mehrerer ähnlicher Feeds mit teilweise gleichen "
+"Artikeln. Ist diese Option deaktiviert, werden die selben Artikel von "
+"unterschiedlichen Feeds nur einmal erscheinen."

 
 #: include/localized_schema.php:22
 msgid ""
 
 #: include/localized_schema.php:22
 msgid ""


@@ -2290,15 +1524,15 @@ msgstr ""
 "Labels nach Feeds gruppiert"
 
 #: include/localized_schema.php:29
 "Labels nach Feeds gruppiert"
 
 #: include/localized_schema.php:29

+msgid "Customize CSS stylesheet to your liking"
+msgstr "CSS Stylesheet nach Ihren Vorlieben anpassen"
+
+#: include/localized_schema.php:30

 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."
 
 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."
 

-#: include/localized_schema.php:30
-msgid "Customize CSS stylesheet to your liking"
-msgstr "CSS Stylesheet nach Ihren Vorlieben anpassen"
-

 #: 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"
 #: 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"


@@ -2308,7 +1542,8 @@ msgid "Uses UTC timezone"
 msgstr "Benutzt UTC Zeitzone"
 
 #: include/localized_schema.php:33
 msgstr "Benutzt UTC Zeitzone"
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr "Alte Nachrichten nach dieser Anzahl an Tagen löschen (0 - deaktivert)"
 
 #: include/localized_schema.php:34
 msgstr "Alte Nachrichten nach dieser Anzahl an Tagen löschen (0 - deaktivert)"
 
 #: include/localized_schema.php:34


@@ -2415,14 +1650,14 @@ msgstr "Externe API aktivieren"
 msgid "User timezone"
 msgstr "Zeitzone des Benutzers"
 
 msgid "User timezone"
 msgstr "Zeitzone des Benutzers"
 

-#: include/localized_schema.php:60
-msgid "Sort headlines by feed date"
-msgstr "Feeds nach Feed-Datum sortieren"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 msgid "Customize stylesheet"
 msgstr "Benutzer Stylesheet"
 
 msgid "Customize stylesheet"
 msgstr "Benutzer Stylesheet"
 

+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"
+msgstr "Feeds nach Feed-Datum sortieren"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Mit SSL-Zertifikat anmelden"
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Mit SSL-Zertifikat anmelden"


@@ -2443,7 +1678,7 @@ msgstr "Profil:"
 msgid "Use less traffic"
 msgstr "Weniger Datenverkehr nutzen"
 
 msgid "Use less traffic"
 msgstr "Weniger Datenverkehr nutzen"
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "Alle Artikel in %s als gelesen markieren?"
 


@@ -2451,15 +1686,19 @@ msgstr "Alle Artikel in %s als gelesen markieren?"
 msgid "Mark %d displayed articles as read?"
 msgstr "%d Artikel als gelesen markieren?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "%d Artikel als gelesen markieren?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "in"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Artikelbewertung zurücknehmen"
 
 msgid "Unstar article"
 msgstr "Artikelbewertung zurücknehmen"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Artikel bewerten"
 
 msgid "Star article"
 msgstr "Artikel bewerten"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Artikelveröffentlichung widerrufen"
 
 msgid "Unpublish article"
 msgstr "Artikelveröffentlichung widerrufen"
 


@@ -2491,11 +1730,11 @@ msgstr "Gelesene ein-/ausblenden"
 msgid "Load more..."
 msgstr "Gehe zu..."
 
 msgid "Load more..."
 msgstr "Gehe zu..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr "Neue Artikel verfügbar (klicken zum anzeigen)"
 
 msgid "New articles available in this feed (click to show)"
 msgstr "Neue Artikel verfügbar (klicken zum anzeigen)"
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 msgid "Update feed"
 msgstr "Alle Feeds aktualisieren"
 
 msgid "Update feed"
 msgstr "Alle Feeds aktualisieren"
 


@@ -2508,71 +1747,83 @@ msgstr ""
 "Bericht enthält Ihre Browser-Informationen. Ihre IP-Adresse würde in der "
 "Datenbank gespeichert werden."
 
 "Bericht enthält Ihre Browser-Informationen. Ihre IP-Adresse würde in der "
 "Datenbank gespeichert werden."
 

-#: js/functions.js:647
+#: js/functions.js:618

 msgid "Date syntax appears to be correct:"
 msgstr "Die Datumssyntax scheint korrekt zu sein:"
 
 msgid "Date syntax appears to be correct:"
 msgstr "Die Datumssyntax scheint korrekt zu sein:"
 

-#: js/functions.js:650
+#: js/functions.js:621

 msgid "Date syntax is incorrect."
 msgstr "Die Datumssyntax ist falsch."
 
 msgid "Date syntax is incorrect."
 msgstr "Die Datumssyntax ist falsch."
 

-#: js/functions.js:777
+#: js/functions.js:748

 msgid "Remove stored feed icon?"
 msgstr "Gespeicherte Feed-Icons entfernen"
 
 msgid "Remove stored feed icon?"
 msgstr "Gespeicherte Feed-Icons entfernen"
 

-#: js/functions.js:809
+#: js/functions.js:780

 msgid "Please select an image file to upload."
 msgstr "Bitte eine Bilddatei zum Hochladen auswählen."
 
 msgid "Please select an image file to upload."
 msgstr "Bitte eine Bilddatei zum Hochladen auswählen."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr "Neues Icon für diesen Feed hochladen"
 
 msgid "Upload new icon for this feed?"
 msgstr "Neues Icon für diesen Feed hochladen"
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Bitte einen Label-Titel eingeben:"
 
 msgid "Please enter label caption:"
 msgstr "Bitte einen Label-Titel eingeben:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
 
 msgid "Can't create label: missing caption."
 msgstr "Kann das Label nicht hinzufügen: fehlender Titel."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "Feed abonnieren"
 
 msgid "Subscribe to Feed"
 msgstr "Feed abonnieren"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "Abonniere Feed..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 msgid "Subscribed to %s"
 msgstr "%s abonniert"
 
 msgid "Subscribed to %s"
 msgstr "%s abonniert"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr "Die angegebene URL scheint ungültig zu sein"
 
 msgid "Specified URL seems to be invalid."
 msgstr "Die angegebene URL scheint ungültig zu sein"
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Die angegebene URL scheint keine Feeds zu enthalten."
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "Die angegebene URL scheint keine Feeds zu enthalten."
 

-#: js/functions.js:945
-msgid "Couldn't download the specified URL."
+#: js/functions.js:917
+#, fuzzy
+msgid "Couldn't download the specified URL: %s"

 msgstr "Konnte die angegebene Feed-URL nicht herunterladen."
 
 msgstr "Konnte die angegebene Feed-URL nicht herunterladen."
 

-#: js/functions.js:948
+#: js/functions.js:921

 msgid "You are already subscribed to this feed."
 msgstr "Sie haben diesen Feed bereits abonniert."
 
 msgid "You are already subscribed to this feed."
 msgstr "Sie haben diesen Feed bereits abonniert."
 

-#: js/functions.js:980
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Filter bearbeiten"
+
+#: js/functions.js:1049
+msgid "Add rule"
+msgstr ""
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Edit action"
+msgstr "Feed-Aktionen"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "Feed-Aktionen"
+
+#: js/functions.js:1112

 msgid "Create Filter"
 msgstr "Filter erstellen"
 
 msgid "Create Filter"
 msgstr "Filter erstellen"
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
-msgstr "Filtertestergebnis"
-
-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."


@@ -2580,37 +1831,37 @@ msgstr ""
 "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten "
 "Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
 
 "Abonnement zurücksetzen? Tiny Tiny RSS wird versuchen, sich bei der nächsten "
 "Feed-Aktualisierung erneut beim Benachrichtigungs-Hub anzumelden."
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
 
 msgid "Unsubscribe from %s?"
 msgstr "%s abbestellen?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 msgid "Please enter category title:"
 msgstr "Bitte geben Sie den Kategorietitel ein:"
 
 msgid "Please enter category title:"
 msgstr "Bitte geben Sie den Kategorietitel ein:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 
 msgid "Generate new syndication address for this feed?"
 msgstr "Neue Veröffentlichungsadresse für diesen Feed erzeugen?"
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 
 msgid "You can't edit this kind of feed."
 msgstr "Sie können diese Art von Feed nicht bearbeiten."
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 msgid "Edit Feed"
 msgstr "Feed bearbeiten"
 
 msgid "Edit Feed"
 msgstr "Feed bearbeiten"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 msgid "More Feeds"
 msgstr "Weitere Feeds"
 
 msgid "More Feeds"
 msgstr "Weitere Feeds"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
 
 msgid "No feeds are selected."
 msgstr "Keine Feeds ausgewählt."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."


@@ -2618,17 +1869,17 @@ msgstr ""
 "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten "
 "Artikeln werden nicht gelöscht"
 
 "Die ausgewählten Feeds aus dem Archiv löschen? Feeds mit gespeicherten "
 "Artikeln werden nicht gelöscht"
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 
 msgid "Feeds with update errors"
 msgstr "Feeds mit Aktualisierungsfehlern"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 
 msgid "Remove selected feeds?"
 msgstr "Ausgewählte Feeds entfernen?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
 
 msgid "No articles are selected."
 msgstr "Keine Artikel ausgewählt."
 


@@ -2636,6 +1887,20 @@ msgstr "Keine Artikel ausgewählt."
 msgid "Forward article by email"
 msgstr "Artikel via E-Mail weiterleiten"
 
 msgid "Forward article by email"
 msgstr "Artikel via E-Mail weiterleiten"
 

+#: js/note_button.js:11
+msgid "Edit article note"
+msgstr "Artikelnotizen bearbeiten"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Kategorien bearbeiten"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Kategorie erstellen"
+

 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "(Invertiert)"
 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "(Invertiert)"


@@ -2652,19 +1917,20 @@ msgstr "Kann den Benutzer nicht hinzufügen: kein Login angegeben."
 msgid "Edit Filter"
 msgstr "Filter bearbeiten"
 
 msgid "Edit Filter"
 msgstr "Filter bearbeiten"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "Filter entfernen %s?"
 
 msgstr "Filter entfernen %s?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "Ausgewählte Labels entfernen?"
 
 msgid "Remove selected labels?"
 msgstr "Ausgewählte Labels entfernen?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "Keine Labels ausgewählt."
 
 msgid "No labels are selected."
 msgstr "Keine Labels ausgewählt."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."


@@ -2672,174 +1938,185 @@ msgstr ""
 "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes Konto "
 "werden gelöscht."
 
 "Ausgewählte Benutzer löschen? Weder der Administrator noch Ihr eigenes Konto "
 "werden gelöscht."
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "Keine Benutzer ausgewählt."
 
 msgid "No users are selected."
 msgstr "Keine Benutzer ausgewählt."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "Ausgewählte Filter entfernen?"
 
 msgid "Remove selected filters?"
 msgstr "Ausgewählte Filter entfernen?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "Keine Filter ausgewählt."
 
 msgid "No filters are selected."
 msgstr "Keine Filter ausgewählt."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "Ausgewählte Feeds abbestellen?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "Ausgewählte Feeds abbestellen?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Bitte nur einen Feed auswählen."
 
 msgid "Please select only one feed."
 msgstr "Bitte nur einen Feed auswählen."
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Alle nicht bewerteten Artikel im ausgewählten Feed löschen?"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Alle nicht bewerteten Artikel im ausgewählten Feed löschen?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Artikel für wieviele Tage aufbewahren (0 - Standardwert nutzen)?"
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "Feld für Benutzername darf nicht leer sein."
 
 msgid "Login field cannot be blank."
 msgstr "Feld für Benutzername darf nicht leer sein."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Bitte nur einen Benutzer auswählen."
 
 msgid "Please select only one user."
 msgstr "Bitte nur einen Benutzer auswählen."
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
 
 msgid "Reset password of selected user?"
 msgstr "Passwort des ausgewählten Benutzers zurücksetzen?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Bitte nur einen Filter auswählen."
 
 msgid "Please select only one filter."
 msgstr "Bitte nur einen Filter auswählen."
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Ausgewählte Filter entfernen?"
+
+#: js/prefs.js:704

 msgid "Edit Multiple Feeds"
 msgstr "Mehrere Feeds bearbeiten"
 
 msgid "Edit Multiple Feeds"
 msgstr "Mehrere Feeds bearbeiten"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "Änderungen an den gewählten Feeds speichern?"
 
 msgid "Save changes to selected feeds?"
 msgstr "Änderungen an den gewählten Feeds speichern?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 msgid "OPML Import"
 msgstr "OPML Import"
 
 msgid "OPML Import"
 msgstr "OPML Import"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 
 msgid "Please choose an OPML file first."
 msgstr "Bitte zuerst eine OPML-Datei auswählen."
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 msgid "Please choose the file first."
 msgstr "Bitte zuerst die Datei auswählen."
 
 msgid "Please choose the file first."
 msgstr "Bitte zuerst die Datei auswählen."
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "Auf Standardwerte zurücksetzen?"
 
 msgid "Reset to defaults?"
 msgstr "Auf Standardwerte zurücksetzen?"
 

-#: js/prefs.js:1152
-msgid "Feed Categories"
-msgstr "Feed-Kategorien"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Ausgewählte Kategorien entfernen?"
 
 msgid "Remove selected categories?"
 msgstr "Ausgewählte Kategorien entfernen?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "Keine Kategorien ausgewählt."
 
 msgid "No categories are selected."
 msgstr "Keine Kategorien ausgewählt."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Kategorien"
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr "Feeds ohne kürzliche Aktualisierungen"
 
 msgid "Feeds without recent updates"
 msgstr "Feeds ohne kürzliche Aktualisierungen"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
 
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Aktuelle Veröffentlichungsadresse durch eine Neue ersetzen?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr "Artikel in gewählten Feeds neu bewerten?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr "Artikel in gewählten Feeds neu bewerten?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 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 "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/prefs.js:1422
+#: js/prefs.js:1507

 msgid "Reset selected labels to default colors?"
 msgstr "Label-Farben auf Standardwerte zurücksetzen?"
 
 msgid "Reset selected labels to default colors?"
 msgstr "Label-Farben auf Standardwerte zurücksetzen?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr "Einstellungsprofile"
 
 msgid "Settings Profiles"
 msgstr "Einstellungsprofile"
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 "Ausgewählte Profile löschen? Das aktive und das Standardprofil werden nicht "
 "gelöscht"
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 "Ausgewählte Profile löschen? Das aktive und das Standardprofil werden nicht "
 "gelöscht"
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 msgid "No profiles are selected."
 msgstr "Keine Profile ausgewählt."
 
 msgid "No profiles are selected."
 msgstr "Keine Profile ausgewählt."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 msgid "Activate selected profile?"
 msgstr "Ausgewählte Profile entfernen?"
 
 msgid "Activate selected profile?"
 msgstr "Ausgewählte Profile entfernen?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 msgid "Please choose a profile to activate."
 msgstr "Bitte ein Profil zum aktivieren auswählen"
 
 msgid "Please choose a profile to activate."
 msgstr "Bitte ein Profil zum aktivieren auswählen"
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "Dies wird alle zuvor erstellten Feed-URLs ungültig machen. Fortfahren?"
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Alle bisher geteilten Artikel URLs werden ungültig Weiter?"
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Alle bisher geteilten Artikel URLs werden ungültig Weiter?"
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "Label-Editor"
 
 msgid "Label Editor"
 msgstr "Label-Editor"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter "
 "löschen. Fortfahren?"
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Dies wird Ihre gespeicherten Authentifizierungsinformationen für Twitter "
 "löschen. Fortfahren?"
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 msgid "Link Instance"
 msgstr "Instanz verbinden"
 
 msgid "Link Instance"
 msgstr "Instanz verbinden"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 msgid "Edit Instance"
 msgstr "Instanz bearbeiten"
 
 msgid "Edit Instance"
 msgstr "Instanz bearbeiten"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 msgid "Remove selected instances?"
 msgstr "Ausgewählte Instanzen entfernen?"
 
 msgid "Remove selected instances?"
 msgstr "Ausgewählte Instanzen entfernen?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 msgid "No instances are selected."
 msgstr "Keine Instanzen ausgewählt."
 
 msgid "No instances are selected."
 msgstr "Keine Instanzen ausgewählt."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 msgid "Please select only one instance."
 msgstr "Bitte nur eine Instanz auswählen."
 
 msgid "Please select only one instance."
 msgstr "Bitte nur eine Instanz auswählen."
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 msgid "Export Data"
 msgstr "Daten exportieren"
 
 msgid "Export Data"
 msgstr "Daten exportieren"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."


@@ -2847,114 +2124,701 @@ msgstr ""
 "Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> "
 "herunterladen."
 
 "Fertig, %d Artikel exportiert. <a class='visibleLink' href='%u'>Hier</a> "
 "herunterladen."
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 msgid "Data Import"
 msgstr "Daten importieren"
 
 msgid "Data Import"
 msgstr "Daten importieren"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+msgid "Batch subscribe"
+msgstr "Mehrere Feeds abonnieren"
+
+#: js/prefs.js:2191

 msgid "Subscribing to feeds..."
 msgstr "Abonniere Feeds..."
 
 msgid "Subscribing to feeds..."
 msgstr "Abonniere Feeds..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Zu Tiny Tiny RSS zurückkehren"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "Artikel über URL teilen"
 
 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "Artikel über URL teilen"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "Alle Artikel als gelesen markieren?"
 
 msgid "Mark all articles as read?"
 msgstr "Alle Artikel als gelesen markieren?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 
 msgid "You can't unsubscribe from the category."
 msgstr "Sie können die Kategorie nicht abbestellen."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 
 msgid "Please select some feed first."
 msgstr "Bitte erst einen Feed auswählen."
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 
 msgid "You can't rescore this kind of feed."
 msgstr "Sie können diese Art von Feed nicht neu bewerten."
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 msgid "New version available!"
 msgstr "Neue Version verfügbar!"
 
 msgid "New version available!"
 msgstr "Neue Version verfügbar!"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "Alle sichtbaren Artikel in %s als gelesen markieren?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "Alle sichtbaren Artikel in %s als gelesen markieren?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 msgid "Delete %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s löschen?"
 
 msgid "Delete %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s löschen?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 msgid "Delete %d selected articles?"
 msgstr "%d ausgewählte Artikel löschen?"
 
 msgid "Delete %d selected articles?"
 msgstr "%d ausgewählte Artikel löschen?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 msgid "Archive %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s archivieren?"
 
 msgid "Archive %d selected articles in %s?"
 msgstr "%d ausgewählte Artikel in %s archivieren?"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 msgid "Move %d archived articles back?"
 msgstr "%d archivierte Artikel zurück verschieben"
 
 msgid "Move %d archived articles back?"
 msgstr "%d archivierte Artikel zurück verschieben"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "%d ausgewählte Artikel in %s als gelesen markieren?"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "%d ausgewählte Artikel in %s als gelesen markieren?"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 msgid "Edit article Tags"
 msgstr "Artikel-Tags bearbeiten"
 
 msgid "Edit article Tags"
 msgstr "Artikel-Tags bearbeiten"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "Kein Artikel ausgewählt."
 
 msgid "No article is selected."
 msgstr "Kein Artikel ausgewählt."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "Keine Artikel zum markieren gefunden."
 
 msgid "No articles found to mark"
 msgstr "Keine Artikel zum markieren gefunden."
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "%d Artikel als gelesen markieren?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "%d Artikel als gelesen markieren?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 msgid "Loading..."
 msgstr "Lade..."
 
 msgid "Loading..."
 msgstr "Lade..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 msgid "Open original article"
 msgstr "Originalartikel öffnen"
 
 msgid "Open original article"
 msgstr "Originalartikel öffnen"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 msgid "View in a tt-rss tab"
 msgstr "Artikel in neuem Reiter öffnen"
 
 msgid "View in a tt-rss tab"
 msgstr "Artikel in neuem Reiter öffnen"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 
 msgid "Mark above as read"
 msgstr "Obige als gelesen markieren"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 
 msgid "Mark below as read"
 msgstr "Untere als gelesen markieren"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 msgid "Remove label"
 msgstr "Ausgewähltes Label entfernen?"
 
 msgid "Remove label"
 msgstr "Ausgewähltes Label entfernen?"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 msgid "Playing..."
 msgstr "Abspielen..."
 
 msgid "Playing..."
 msgstr "Abspielen..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 msgid "Click to pause"
 msgstr "Zum Pausieren klicken"
 
 msgid "Click to pause"
 msgstr "Zum Pausieren klicken"
 

+#~ msgid "Twitter OAuth"
+#~ msgstr "Twitter OAuth "
+
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "<li>Füge Kategorie <b>%s</b> hinzu.</li>"
+
+#~ msgid "Duplicate filter %s"
+#~ msgstr "Doppelter Filter %s"
+
+#~ msgid "is already imported."
+#~ msgstr "wurde bereits importiert."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Register with Twitter"
+#~ msgstr "Mit Twitter verbinden"
+
+#~ msgid "Could not connect to Twitter. Refresh the page or try again later."
+#~ msgstr ""
+#~ "Konnte nicht zu Twitter verbinden. Aktualisieren Sie die Seite oder "
+#~ "versuchen es später erneut."
+
+#~ msgid "Congratulations! You have successfully registered with Twitter."
+#~ msgstr "Glückwunsch! Sie haben sich erfolgreich mit Twitter verbunden."
+
+#~ msgid "Register"
+#~ msgstr "Registrieren"
+
+#~ msgid "Match"
+#~ msgstr "Übereinstimmung"
+
+#~ msgid "before"
+#~ msgstr "vorher"
+
+#~ msgid "after"
+#~ msgstr "nacher"
+
+#~ msgid "Check it"
+#~ msgstr "Überprüfen"
+
+#~ msgid "on field"
+#~ msgstr "in Feld"
+
+#~ msgid "Perform Action"
+#~ msgstr "Aktion ausführen"
+
+#~ msgid "with parameters:"
+#~ msgstr "mit Parametern:"
+
+#~ msgid "Options"
+#~ msgstr "Optionen"
+
+#~ msgid "Enabled"
+#~ msgstr "Aktiviert"
+
+#~ msgid "Inverse match"
+#~ msgstr "Invertierte Übereinstimmung"
+
+#~ msgid "Apply to category"
+#~ msgstr "Auf Kategorie anwenden"
+
+#~ msgid "Test"
+#~ msgstr "Test"
+
+#~ msgid "Create"
+#~ msgstr "Erstellen"
+
+#~ msgid "[Forwarded]"
+#~ msgstr "[Weitergeleitet]"
+
+#~ msgid "Multiple articles"
+#~ msgstr "Mehrere Artikel"
+
+#~ msgid "From:"
+#~ msgstr "Absender:"
+
+#~ msgid "To:"
+#~ msgstr "Empfänger:"
+
+#~ msgid "Subject:"
+#~ msgstr "Betreff:"
+
+#~ msgid "Send e-mail"
+#~ msgstr "E-Mail versenden"
+
+#~ msgid "Check to enable field"
+#~ msgstr "Ankreuzen um das Feld zu aktivieren"
+
+#~ msgid "(%d feeds)"
+#~ msgstr "(%d) Feeds"
+
+#~ msgid "Feed Title"
+#~ msgstr "Feed-Titel"
+
+#~ msgid "using"
+#~ msgstr "verwende"
+
+#~ msgid "Article purging:"
+#~ msgstr "Artikel löschen:"
+
+#~ msgid ""
+#~ "<b>Hint:</b> you need to fill in your login information if your feed "
+#~ "requires authentication, except for Twitter feeds."
+#~ msgstr ""
+#~ "<b>Hinweise:</b> Sie müssen Ihre Login-Informationen eingeben, wenn Ihr "
+#~ "Feed eine Authentifizierung erfordert (außer Twitter-Feeds)."
+
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Auf meiner Feedliste verbergen"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Rechts-nach-links Inhalt"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "In E-Mail-Zusammenfassung aufnehmen"
+
+#~ msgid "Always display image attachments"
+#~ msgstr "Angehängte Bilder immer anzeigen"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Bilder lokal zwischenspeichern"
+
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Alle Artikel als ungelesen markieren"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Artikel als aktualisiert markieren bei Inhaltsänderung"
+
+#~ msgid "Icon"
+#~ msgstr "Icon"
+
+#~ msgid "Replace"
+#~ msgstr "Ersetze"
+
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Abonnierte Feeds:"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "PubSubHubbub-Abonnementstatus für push-enabled Feeds zurücksetzen"
+
+#~ msgid "All done."
+#~ msgstr "Alle fertig."
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "<b>%s</b> abonniert."
+
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "<b>%s</b> bereits abonniert."
+
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "Keine Feeds in <b>%s</b> gefunden."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "<b>%s</b> bereits abonniert."
+
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "Mehrere Feed URLs gefunden."
+
+#~ 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."
+
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "Ausgewählte Feeds abonnieren"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Abonnementoptionen bearbeiten"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "Kategorie <b>$%s</b> existiert bereits in der Datenbank."
+
+#~ msgid "No feed categories defined."
+#~ msgstr "Keine Feedkategorien definiert."
+
+#~ msgid "Remove selected categories"
+#~ msgstr "Ausgewählte Kategorien entfernen?"
+
+#~ msgid "Feeds with errors"
+#~ msgstr "Feeds mit Fehlern"
+
+#~ msgid "Inactive feeds"
+#~ msgstr "Inaktive Feed"
+
+#~ msgid "Edit selected feeds"
+#~ msgstr "Bearbeite gewählten Feed..."
+
+#~ msgid "Reset sort order"
+#~ msgstr "Sortierreihenfolge zurücksetzen"
+
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Zeige / Verstecke leere Kategorien"
+
+#~ msgid "More actions..."
+#~ msgstr "Mehr Aktionen..."
+
+#~ msgid "Manual purge"
+#~ msgstr "Manuelle Säuberung"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Feed-Daten löschen"
+
+#~ msgid "Rescore articles"
+#~ msgstr "Artikel neu bewerten"
+
+#~ 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."
+
+#~ msgid "Import and export"
+#~ msgstr "Import und Export"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#~ msgid ""
+#~ "Using OPML you can export and import your feeds, filters, labels and Tiny "
+#~ "Tiny RSS settings."
+#~ msgstr ""
+#~ "Über OPML können Feeds, Filter, Label und Tiny Tiny RSS Einstellungen "
+#~ "importiert und export werden."
+
+#~ msgid "Only main settings profile can be migrated using OPML."
+#~ msgstr "Nur das Hauptprofil kann mit OPML gesichert werden."
+
+#~ msgid "Import my OPML"
+#~ msgstr "OPML importieren"
+
+#~ msgid "Filename:"
+#~ msgstr "Dateiname"
+
+#~ msgid "Include settings"
+#~ msgstr "Einstellungen hinzufügen"
+
+#~ msgid "Export OPML"
+#~ msgstr "OPML exportieren"
+
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ msgstr ""
+#~ "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
+#~ "können von jedem abonniert werden, der die folgende URL kennt."
+
+#~ msgid ""
+#~ "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+#~ "require authentication or feeds hidden from Popular feeds."
+#~ msgstr ""
+#~ "Eine öffentliche OPMl enthält keine Tiny Tiny RSS Einstellungen, Feeds "
+#~ "die eine Anmeldung benötigen oder Feeds die nicht in den Favoriten "
+#~ "enthalten sind."
+
+#~ msgid "Display published OPML URL"
+#~ msgstr "Zeige öffentliche OPML URL an."
+
+#~ msgid "Article archive"
+#~ msgstr "Artikelarchiv"
+
+#~ msgid ""
+#~ "You can export and import your Starred and Archived articles for "
+#~ "safekeeping or when migrating between tt-rss instances."
+#~ msgstr "Die bewerteten und archivierten Artikel können exportiert werden. "
+
+#~ msgid "Export my data"
+#~ msgstr "Meine Daten exportieren"
+
+#~ msgid "Import"
+#~ msgstr "Importieren"
+
+#~ msgid "Firefox integration"
+#~ msgstr "Firefox Integration"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "Tiny Tiny RSS kann durch den folgenden Link als Feedreader für Firefox "
+#~ "verwendet werden."
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "Diese Website als Feedreader registrieren."
+
+#~ msgid "Subscribing using bookmarklet"
+#~ msgstr "Mit Bookmarklet abonnieren"
+
+#~ msgid ""
+#~ "Drag the link below to your browser toolbar, open the feed you're "
+#~ "interested in in your browser and click on the link to subscribe to it."
+#~ msgstr ""
+#~ "Ziehen Sie den folgenden Link in Ihre Browser-Toolbar, öffnen den Feed, "
+#~ "an dem Sie interessiert sind in Ihren Browser und klicken auf den Link, "
+#~ "um ihn zu abonnieren."
+
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "%s in Tiny Tiny RSS abonnieren?"
+
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Abonnieren in Tiny Tiny RSS"
+
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr "Veröffentlichte & gesendete Artikel / erzeugte Feeds"
+
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "Veröffentlichte Artikel und erzeugte Feeds"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ msgstr ""
+#~ "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
+#~ "können von jedem abonniert werden, der die nachstehende URL kennt."
+
+#~ msgid "Display URL"
+#~ msgstr "Zeige URL an"
+
+#~ msgid "Clear all generated URLs"
+#~ msgstr "Alle generierten URLs löschen"
+
+#~ msgid "Articles shared by URL"
+#~ msgstr "Per URL geteilte Artikel"
+
+#~ msgid "You can disable all articles shared by unique URLs here."
+#~ msgstr "Du kannst alle über URL geteilten Artikel hier deaktivieren."
+
+#~ msgid "Unshare all articles"
+#~ msgstr "Alle veröffentlichten Artikel zurückziehen"
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "Before you can update your Twitter feeds, you must register this instance "
+#~ "of Tiny Tiny RSS with Twitter.com."
+#~ msgstr ""
+#~ "Bevor Sie Ihre Twitter-Feeds aktualisieren können, müssen Sie diese "
+#~ "Instanz von Tiny Tiny RSS bei Twitter registrieren."
+
+#~ msgid ""
+#~ "You have been successfully registered with Twitter.com and should be able "
+#~ "to access your Twitter feeds."
+#~ msgstr ""
+#~ "Sie haben diese Instanz erfolgreich mit Twitter verbunden und sollten nun "
+#~ "auf Ihre Twitter-Feeds zugreifen können."
+
+#~ msgid "Register with Twitter.com"
+#~ msgstr "Mit Twitter registrieren"
+
+#~ msgid "Clear stored credentials"
+#~ msgstr "Gespeicherte Zugangsdaten löschen"
+
+#~ msgid "Articles matching this filter:"
+#~ msgstr "Artikel, die auf diesen Filter passen: "
+
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "Keine übereinstimmenden Artikel für diesen Filter gefunden."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "Filter <b>%s</b> erstellt"
+
+#~ msgid "Edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr ""
+#~ "Sie haben nicht die benötigten Rechte um diese Registerkarte zu öffnen."
+
+#~ msgid "Link instance"
+#~ msgstr "Instanz verbinden"
+
+#~ msgid ""
+#~ "You can connect other instances of Tiny Tiny RSS to this one to share "
+#~ "Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr ""
+#~ "Sie können andere Instanzen von Tiny Tiny RSS mit dieser verbinden um "
+#~ "beliebte Feeds zu teilen. Verbinden Sie diese Instanz von Tiny Tiny RSS "
+#~ "mit folgender URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Zuletzt verbunden"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Gespeicherte Feeds"
+
+#~ msgid "Click to edit"
+#~ msgstr "Zum Bearbeiten klicken"
+
+#~ msgid "Caption"
+#~ msgstr "Titel"
+
+#~ msgid "Colors"
+#~ msgstr "Farben"
+
+#~ msgid "Foreground:"
+#~ msgstr "Vordergrund"
+
+#~ msgid "Background:"
+#~ msgstr "Hintergrund"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "Label <b>%s</b> erstellt"
+
+#~ msgid "Clear colors"
+#~ msgstr "Farben löschen"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "Altes Passwort darf nicht leer sein."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "Neues Passwort darf nicht leer sein."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "Die eingegebenen Passwörter stimmen nicht überein."
+
+#~ msgid "Password has been changed."
+#~ msgstr "Passwort wurde geändert."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "Altes Passwort ist falsch."
+
+#~ msgid "The configuration was saved."
+#~ msgstr "Die Einstellungen wurden gespeichert."
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Unbekannte Option: %s"
+
+#~ msgid "Your personal data has been saved."
+#~ msgstr "Ihre persönlichen Daten wurden gespeichert."
+
+#~ msgid "Personal data / Authentication"
+#~ msgstr "Persönliche Daten / Anmeldung"
+
+#~ msgid "Full name"
+#~ msgstr "Vollständiger Name"
+
+#~ msgid "E-mail"
+#~ msgstr "E-Mail"
+
+#~ msgid "Access level"
+#~ msgstr "Zugriffsberechtigung"
+
+#~ msgid "Save data"
+#~ msgstr "Speichern"
+
+#~ msgid "Your password is at default value, please change it."
+#~ msgstr "Sie nutzen das Standard Passwort, bitte ändern Sie es."
+
+#~ msgid "Old password"
+#~ msgstr "Altes Passwort"
+
+#~ msgid "New password"
+#~ msgstr "Neues Passwort"
+
+#~ msgid "Confirm password"
+#~ msgstr "Passwort bestätigen"
+
+#~ msgid "Change password"
+#~ msgstr "Passwort ändern"
+
+#~ msgid "Select theme"
+#~ msgstr "Thema auswählen"
+
+#~ msgid "Customize"
+#~ msgstr "Personalisieren"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nein"
+
+#~ msgid "Clear"
+#~ msgstr "Löschen"
+
+#~ msgid "Current server time: %s (UTC)"
+#~ msgstr "Aktuelle Serverzeit: %s (UTC)"
+
+#~ msgid "Save configuration"
+#~ msgstr "Einstellungen speichern"
+
+#~ msgid "Manage profiles"
+#~ msgstr "Profile verwalten"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Auf Standardwerte zurücksetzen"
+
+#~ msgid "User details"
+#~ msgstr "Benutzerdetails"
+
+#~ msgid "User not found"
+#~ msgstr "Benutzer nicht gefunden"
+
+#~ msgid "Registered"
+#~ msgstr "Registriert"
+
+#~ msgid "Last logged in"
+#~ msgstr "Zuletzt angemeldet"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Anzahl abonnierter Feeds"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Abonnierte Feeds"
+
+#~ msgid "User Editor"
+#~ msgstr "Benutzereditor"
+
+#~ msgid "Access level: "
+#~ msgstr "Zugriffsberechtigung: "
+
+#~ msgid "Change password to"
+#~ msgstr "Passwort ändern in"
+
+#~ msgid "E-mail: "
+#~ msgstr "E-Mail: "
+
+#~ msgid "Added user <b>%s</b> with password <b>%s</b>"
+#~ msgstr "Benutzer <b>%s</b> mit Passwort <b>%s</b> hinzugefügt"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "Konnte den Benutzer <b>%s</b> nicht anlegen"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "Benutzer <b>%s</b> existiert bereits."
+
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\t\t\t\t to <b>%s</b>"
+#~ msgstr "Passwort für Benutzer <b>%s</b> auf <b>%s</b> geändert."
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "Benachrichtige <b>%s</b>."
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Benachrichtigung: Passwort geändert"
+
+#~ msgid "Reset password"
+#~ msgstr "Passwort zurücksetzen"
+
+#~ msgid "Access Level"
+#~ msgstr "Zugriffsberechtigung"
+
+#~ msgid "Last login"
+#~ msgstr "Zuletzt angemeldet"
+
+#~ msgid "No users defined."
+#~ msgstr "Keine Benutzer definiert."
+
+#~ msgid "No matching users found."
+#~ msgstr "Keine zugehörigen Benutzer gefunden."
+
+#~ msgid "Share by URL"
+#~ msgstr "Per URL teilen"
+
+#~ msgid "You can share this article by the following unique URL:"
+#~ msgstr "Du kannst diesen Artikel über folgende URL teilen"
+
+#~ msgid "Share on Twitter"
+#~ msgstr "Auf Twitter teilen"
+
+#~ msgid "Attachment:"
+#~ msgstr "Anhang:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Abonniere Feed..."
+
+#~ msgid "Filter Test Results"
+#~ msgstr "Filtertestergebnis"
+
+#~ msgid "Feed Categories"
+#~ msgstr "Feed-Kategorien"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."

diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 3d52de23571de88b05dcf718598815a34da7ca27..5f2638d67009f996c4e37de3c27d9b24d13e41cc 100644 (file)
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 6c853d22956d3791340887d0f8a27d72131cda1d..20483c1974d4346cdff785f36845880d02fbb4af 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+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"
 "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,95 +14,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Usar configuración por defecto"
 
 msgid "Use default"
 msgstr "Usar configuración por defecto"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Nunca purgar"
 
 msgid "Never purge"
 msgstr "Nunca purgar"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "1 semana de antigüedad"
 
 msgid "1 week old"
 msgstr "1 semana de antigüedad"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "2 semanas de antigüedad"
 
 msgid "2 weeks old"
 msgstr "2 semanas de antigüedad"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "1 mes de antigüedad"
 
 msgid "1 month old"
 msgstr "1 mes de antigüedad"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "2 meses de antigüedad"
 
 msgid "2 months old"
 msgstr "2 meses de antigüedad"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "3 meses de antigüedad"
 
 msgid "3 months old"
 msgstr "3 meses de antigüedad"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Intervalo por defecto"
 
 msgid "Default interval"
 msgstr "Intervalo por defecto"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Desactivar actualizaciones"
 
 msgid "Disable updates"
 msgstr "Desactivar actualizaciones"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "Cada hora"
 
 msgid "Hourly"
 msgstr "Cada hora"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Diariamente"
 
 msgid "Daily"
 msgstr "Diariamente"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Semanalmente"
 
 msgid "Weekly"
 msgstr "Semanalmente"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Por defecto"
 
 msgid "Default"
 msgstr "Por defecto"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Usuario"
 
 msgid "User"
 msgstr "Usuario"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Usuario con poder"
 
 msgid "Power User"
 msgstr "Usuario con poder"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Administrador"
 
 msgid "Administrator"
 msgstr "Administrador"
 


@@ -133,8 +129,7 @@ msgstr "La base de datos de Tiny Tiny RSS está actualizada."
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Volver a Tiny Tiny RSS"
 


@@ -213,22 +208,24 @@ msgstr ""
 "navegador no lo soporta actualmente. Por favor, revise las opciones de "
 "configuración de su navegador."
 
 "navegador no lo soporta actualmente. Por favor, revise las opciones de "
 "configuración de su navegador."
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 
 msgid "Loading, please wait..."
 msgstr "Cargando. Por favor, espere..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Hola,"
 
 msgid "Hello,"
 msgstr "Hola,"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Cerrar sesión"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Cerrar sesión"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -302,214 +299,157 @@ msgstr ""
 "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
 "base de datos y PHP."
 
 "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
 "base de datos y PHP."
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Preferencias"
 
 msgid "Preferences"
 msgstr "Preferencias"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "¿Comentarios?"
 
 msgid "Comments?"
 msgstr "¿Comentarios?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Plegar la lista de fuentes"
 
 msgid "Collapse feedlist"
 msgstr "Plegar la lista de fuentes"
 

-#: index.php:148
+#: index.php:165

 #, fuzzy
 msgid "Show articles"
 msgstr "Recientes"
 
 #, fuzzy
 msgid "Show articles"
 msgstr "Recientes"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Adaptable"
 
 msgid "Adaptive"
 msgstr "Adaptable"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Todos"
 
 msgid "All Articles"
 msgstr "Todos"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Favoritos"
 
 msgid "Starred"
 msgstr "Favoritos"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Publicado"
 
 msgid "Published"
 msgstr "Publicado"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Sin leer"
 
 msgid "Unread"
 msgstr "Sin leer"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "Ignorar la puntuación"
 
 msgid "Ignore Scoring"
 msgstr "Ignorar la puntuación"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Actualizados"
 
 msgid "Updated"
 msgstr "Actualizados"
 

-#: index.php:160
+#: index.php:177

 #, fuzzy
 msgid "Sort articles"
 msgstr "Marcar el artículo como favorito"
 
 #, fuzzy
 msgid "Sort articles"
 msgstr "Marcar el artículo como favorito"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Fecha"
 
 msgid "Date"
 msgstr "Fecha"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Título"
 
 msgid "Title"
 msgstr "Título"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "Puntos"
 
 msgid "Score"
 msgstr "Puntos"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Editar categorías"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Actualizar"
 
 msgid "Update"
 msgstr "Actualizar"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Marcar como leído"
 
 msgid "Mark as read"
 msgstr "Marcar como leído"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Acciones..."
 
 msgid "Actions..."
 msgstr "Acciones..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Buscar..."
 
 msgid "Search..."
 msgstr "Buscar..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 
 msgid "Feed actions:"
 msgstr "Acciones de la fuente:"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "Suscribir a la fuente..."
 
 msgid "Subscribe to feed..."
 msgstr "Suscribir a la fuente..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 
 msgid "Edit this feed..."
 msgstr "Editar esta fuente..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 
 msgid "Rescore feed"
 msgstr "Reiniciar la puntuación"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 
 msgid "Unsubscribe"
 msgstr "Cancelar la suscripción"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 
 msgid "All feeds:"
 msgstr "Todas las fuentes:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "Ocultar/Mostrar las leídas"
 
 msgid "(Un)hide read feeds"
 msgstr "Ocultar/Mostrar las leídas"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Otras acciones:"
 
 msgid "Other actions:"
 msgstr "Otras acciones:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr ""
 
 msgid "Switch to digest..."
 msgstr ""
 

-#: index.php:194
+#: index.php:216

 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "nube de etiquetas"
 
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "nube de etiquetas"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Crear etiqueta..."
 
 msgid "Create label..."
 msgstr "Crear etiqueta..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Crear filtro..."
 
 msgid "Create filter..."
 msgstr "Crear filtro..."
 

-#: index.php:198
+#: index.php:220

 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Atajos de teclado"
 
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Atajos de teclado"
 

-#: opml.php:81
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Añadiendo categoría <b>%s</b>."
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: opml.php:123
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Asignar etiqueta"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, fuzzy, php-format
-msgid "Adding filter %s"
-msgstr "Añadiendo fuente..."
-
-#: opml.php:196
-#, fuzzy, php-format
-msgid "Duplicate filter %s"
-msgstr "Crear filtro"
-
-#: opml.php:241
-#, fuzzy
-msgid "is already imported."
-msgstr "Ya importado."
-
-#: opml.php:271
-#, fuzzy
-msgid "OK"
-msgstr "¡TODO CORRECTO!"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Error mientras se analizaba el documento."
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Error: por favor, suba un fichero OPML."
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "Utilidad OPML"
-
-#: opml.php:530
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "Importando OPML (usando la extensión DOMXML)..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Volver a las preferencias"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"


@@ -518,18 +458,16 @@ msgstr "Atajos de teclado"
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Fuentes"
 
 msgid "Feeds"
 msgstr "Fuentes"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Filtros"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Etiquetas"
 
 msgid "Labels"
 msgstr "Etiquetas"
 


@@ -601,23 +539,6 @@ msgstr "Cuenta creada correctamente."
 msgid "New user registrations are currently closed."
 msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
 
 msgid "New user registrations are currently closed."
 msgstr "El registro de nuevos usuarios está cerrado en estos momentos."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-#, fuzzy
-msgid "Register"
-msgstr "Registrado"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"


@@ -693,11 +614,11 @@ msgstr "Otras acciones"
 msgid "Select article under mouse cursor"
 msgstr "Seleccionar el artículo que esté detrás del cursor del ratón"
 
 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
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Crear etiqueta"
 
 msgid "Create label"
 msgstr "Crear etiqueta"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Crear filtro"
 
 msgid "Create filter"
 msgstr "Crear filtro"
 


@@ -743,11 +664,11 @@ msgstr "Acciones de las fuentes"
 msgid "Refresh active feed"
 msgstr "Actualizar las fuentes activas"
 
 msgid "Refresh active feed"
 msgstr "Actualizar las fuentes activas"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "Suscribir a la fuente"
 
 msgid "Subscribe to feed"
 msgstr "Suscribir a la fuente"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Editar la fuente"
 
 msgid "Edit feed"
 msgstr "Editar la fuente"
 


@@ -772,19 +693,19 @@ msgstr "si se está viendo la categoría, (des)pliéguela"
 msgid "Go to..."
 msgstr "Ir a..."
 
 msgid "Go to..."
 msgstr "Ir a..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Todos"
 
 msgid "All articles"
 msgstr "Todos"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Recientes"
 
 msgid "Fresh articles"
 msgstr "Recientes"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Favoritos"
 
 msgid "Starred articles"
 msgstr "Favoritos"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Publicados"
 
 msgid "Published articles"
 msgstr "Publicados"
 


@@ -820,7 +741,7 @@ msgstr "Primeros 25 puestos de las fuentes"
 msgid "Edit feed categories"
 msgstr "Editar las categorías de fuentes"
 
 msgid "Edit feed categories"
 msgstr "Editar las categorías de fuentes"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Crear usuario"
 
 msgid "Create user"
 msgstr "Crear usuario"
 


@@ -848,6 +769,10 @@ msgstr "Nombre de usuario:"
 msgid "Password:"
 msgstr "Contraseña:"
 
 msgid "Password:"
 msgstr "Contraseña:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -855,8 +780,8 @@ msgstr "Contraseña:"
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Especial"
 
 msgid "Special"
 msgstr "Especial"
 


@@ -913,13 +838,11 @@ msgstr "Tema de ayuda no encontrado."
 msgid "Prepare data"
 msgstr "Guardar"
 
 msgid "Prepare data"
 msgstr "Guardar"
 

-#: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
-#: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 


@@ -929,51 +852,65 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+#, fuzzy
+msgid "Select"
+msgstr "Seleccione:"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "No"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Ninguno"
+
+#: classes/dlg.php:85

 #, fuzzy
 msgid "Create profile"
 msgstr "Crear filtro"
 
 #, fuzzy
 msgid "Create profile"
 msgstr "Crear filtro"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 #, fuzzy
 msgid "(active)"
 msgstr "Adaptable"
 
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptable"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 #, fuzzy
 msgid "Default profile"
 msgstr "Límite de artículos por defecto"
 
 #, fuzzy
 msgid "Default profile"
 msgstr "Límite de artículos por defecto"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "¿Eliminar los filtros seleccionados?"
 
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "¿Eliminar los filtros seleccionados?"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 #, fuzzy
 msgid "Activate profile"
 msgstr "¿Eliminar los filtros seleccionados?"
 
 #, fuzzy
 msgid "Activate profile"
 msgstr "¿Eliminar los filtros seleccionados?"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr ""
 
 msgid "Public OPML URL"
 msgstr ""
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enlace a la fuente de artículos publicados."
 
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Enlace a la fuente de artículos publicados."
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 #, fuzzy
 msgid "Generate new URL"
 msgstr "Fuente generada"
 
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Fuente generada"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "Aviso"
 
 msgid "Notice"
 msgstr "Aviso"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -984,11 +921,11 @@ msgstr ""
 "actualización de todas las fuentes. Por favor, inicie el proceso del demonio "
 "o solicítelo al propietario de la instancia."
 
 "actualización de todas las fuentes. Por favor, inicie el proceso del demonio "
 "o solicítelo al propietario de la instancia."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Última actualización:"
 
 msgid "Last update:"
 msgstr "Última actualización:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -999,183 +936,112 @@ msgstr ""
 "(rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise "
 "al propietario de la instancia."
 
 "(rotura, cuelgue,...). Por favor, compruebe el proceso del demonio o avise "
 "al propietario de la instancia."
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Fuente"
 
 msgid "Feed"
 msgstr "Fuente"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 #, fuzzy
 msgid "Feed URL"
 msgstr "Fuente"
 
 #, fuzzy
 msgid "Feed URL"
 msgstr "Fuente"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "Colocar en la categoría:"
 
 msgid "Place in category:"
 msgstr "Colocar en la categoría:"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 #, fuzzy
 msgid "Available feeds"
 msgstr "Todas las fuentes"
 
 #, fuzzy
 msgid "Available feeds"
 msgstr "Todas las fuentes"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Autenticación"
 
 msgid "Authentication"
 msgstr "Autenticación"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Iniciar sesión"
 
 msgid "Login"
 msgstr "Iniciar sesión"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 #, fuzzy
 msgid "Password"
 msgstr "Contraseña:"
 
 #, fuzzy
 msgid "Password"
 msgstr "Contraseña:"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 
 msgid "This feed requires authentication."
 msgstr "Esta fuente requiere autenticación."
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "Suscribir"
 
 msgid "Subscribe"
 msgstr "Suscribir"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 #, fuzzy
 msgid "More feeds"
 msgstr "Más fuentes"
 
 #, fuzzy
 msgid "More feeds"
 msgstr "Más fuentes"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Cancelar"
 
 msgid "Cancel"
 msgstr "Cancelar"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Buscar"
 
 msgid "Search"
 msgstr "Buscar"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 #, fuzzy
 msgid "Popular feeds"
 msgstr "desplegar fuentes"
 
 #, fuzzy
 msgid "Popular feeds"
 msgstr "desplegar fuentes"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 #, fuzzy
 msgid "Feed archive"
 msgstr "Acciones de las fuentes"
 
 #, fuzzy
 msgid "Feed archive"
 msgstr "Acciones de las fuentes"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 #, fuzzy
 msgid "limit:"
 msgstr "Límite:"
 
 #, fuzzy
 msgid "limit:"
 msgstr "Límite:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Eliminar"
 
 msgid "Remove"
 msgstr "Eliminar"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr "Buscar"
 
 msgid "Look for"
 msgstr "Buscar"
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr "coincidencia con"
 
 msgid "match on"
 msgstr "coincidencia con"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Contenido"
 
 msgid "Content"
 msgstr "Contenido"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Título o contenido"
 
 msgid "Title or content"
 msgstr "Título o contenido"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Limitar la búsqueda a:"
 
 msgid "Limit search to:"
 msgstr "Limitar la búsqueda a:"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Todas las fuentes"
 
 msgid "All feeds"
 msgstr "Todas las fuentes"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Esta fuente"
 
 msgid "This feed"
 msgstr "Esta fuente"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Coincidir"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "antes"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "después"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "Comprobarlo"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "en el campo"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "en"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Realizar la acción"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "con los parámetros:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Opciones"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "coincidencia inversa"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-#, fuzzy
-msgid "Apply to category"
-msgstr "Colocar en la categoría:"
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr ""
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Crear"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "


@@ -1183,79 +1049,82 @@ msgid ""
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Pulse aquí para editar"
 
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Pulse aquí para editar"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 "Estas fuentes no han sido actualizadas debido a los siguientes errores:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "Etiquetas para este artículo (separadas por comas):"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Guardar"
 
 msgid "Save"
 msgstr "Guardar"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 #, fuzzy
 msgid "Match:"
 msgstr "Coincidir"
 
 #, fuzzy
 msgid "Match:"
 msgstr "Coincidir"
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 #, fuzzy
 msgid "Display entries"
 msgstr "desplegar fuentes"
 
 #, fuzzy
 msgid "Display entries"
 msgstr "desplegar fuentes"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 #, fuzzy
 msgid "View as RSS"
 msgstr "Ver etiquetas"
 
 #, fuzzy
 msgid "View as RSS"
 msgstr "Ver etiquetas"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 
 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1263,168 +1132,153 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr ""
 
 msgid "Instance"
 msgstr ""
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr ""
 
 msgid "Instance URL"
 msgstr ""
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 #, fuzzy
 msgid "Access key:"
 msgstr "Nivel de acceso:"
 
 #, fuzzy
 msgid "Access key:"
 msgstr "Nivel de acceso:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 #, fuzzy
 msgid "Access key"
 msgstr "Nivel de acceso"
 
 #, fuzzy
 msgid "Access key"
 msgstr "Nivel de acceso"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 #, fuzzy
 msgid "Generate new key"
 msgstr "Fuente generada"
 
 #, fuzzy
 msgid "Generate new key"
 msgstr "Fuente generada"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 #, fuzzy
 msgid "Create link"
 msgstr "Crear"
 
 #, fuzzy
 msgid "Create link"
 msgstr "Crear"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Esta fuente requiere autenticación."
 
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Esta fuente requiere autenticación."
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 #, fuzzy
 msgid "Visit the website"
 msgstr "Visitar el sitio oficial"
 
 #, fuzzy
 msgid "Visit the website"
 msgstr "Visitar el sitio oficial"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Ver fuentes"
 
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Ver fuentes"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Seleccione:"
 
 msgid "Select:"
 msgstr "Seleccione:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "No"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Invertir"
 
 msgid "Invert"
 msgstr "Invertir"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Ninguno"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Cambiar la selección:"
 
 msgid "Selection toggle:"
 msgstr "Cambiar la selección:"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Selección:"
 
 msgid "Selection:"
 msgstr "Selección:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 #, fuzzy
 msgid "Archive"
 msgstr "Fecha del artículo"
 
 #, fuzzy
 msgid "Archive"
 msgstr "Fecha del artículo"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 #, fuzzy
 msgid "Move back"
 msgstr "Volver atrás"
 
 #, fuzzy
 msgid "Move back"
 msgstr "Volver atrás"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 #, fuzzy
 msgid "Delete"
 msgstr "Por defecto"
 
 #, fuzzy
 msgid "Delete"
 msgstr "Por defecto"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 #, fuzzy
 msgid "Forward by email"
 msgstr "Marcar el artículo como favorito"
 
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marcar el artículo como favorito"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 #, fuzzy
 msgid "Feed:"
 msgstr "Fuente"
 
 #, fuzzy
 msgid "Feed:"
 msgstr "Fuente"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 
 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "marcar como leído"
 
 msgid "mark as read"
 msgstr "marcar como leído"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 #, fuzzy
 msgid "Originally from:"
 msgstr "Desplegar el contenido original del artículo"
 
 #, fuzzy
 msgid "Originally from:"
 msgstr "Desplegar el contenido original del artículo"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 #, fuzzy
 msgid "Close article"
 msgstr "Limpiar los artículos"
 
 #, fuzzy
 msgid "Close article"
 msgstr "Limpiar los artículos"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "No se han encontrado artículos sin leer."
 
 msgid "No unread articles found to display."
 msgstr "No se han encontrado artículos sin leer."
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "No se han encontrado artículos actualizados."
 
 msgid "No updated articles found to display."
 msgstr "No se han encontrado artículos actualizados."
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "No se han encontrado artículos favoritos."
 
 msgid "No starred articles found to display."
 msgstr "No se han encontrado artículos favoritos."
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1433,868 +1287,212 @@ msgstr ""
 "artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o usar "
 "un filtro."
 
 "artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o usar "
 "un filtro."
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que desplegar."
 
 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que desplegar."
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Error al actualizar algunas fuentes (pulse aquí para obtener los detalles)"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "Sin clasificar"
-
-#: classes/mail_button.php:52 classes/mail_button.php:58
-msgid "[Forwarded]"
-msgstr ""
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utilidad OPML"

 
 

-#: classes/mail_button.php:52
+#: classes/opml.php:37

 #, fuzzy
 #, fuzzy

-msgid "Multiple articles"
-msgstr "Todos"
+msgid "Importing OPML..."
+msgstr "Importando OPML (usando la extensión DOMXML)..."

 
 

-#: classes/mail_button.php:73
-msgid "From:"
-msgstr ""
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Volver a las preferencias"

 
 

-#: classes/mail_button.php:82
-#, fuzzy
-msgid "To:"
-msgstr "Arriba"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Añadiendo fuente..."

 
 

-#: classes/mail_button.php:95
-#, fuzzy
-msgid "Subject:"
-msgstr "Seleccione:"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Crear filtro"

 
 

-#: classes/mail_button.php:111
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Cambiar el correo electrónico"
+#: classes/opml.php:293
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Asignar etiqueta"
+
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""
+
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""

 
 

-#: classes/note_button.php:7 js/note_button.js:11
+#: classes/opml.php:337

 #, fuzzy
 #, fuzzy

-msgid "Edit article note"
-msgstr "Editar etiquetas"
+msgid "Adding filter..."
+msgstr "Añadiendo fuente..."

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "Marcar para habilitar el campo"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Sin clasificar"

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#: classes/opml.php:411

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "(%d feeds)"
-msgstr "Editar la fuente"
+msgid "Processing category: %s"
+msgstr "Colocar en la categoría:"

 
 

-#: classes/pref_feeds.php:306
-#, fuzzy
-msgid "Feed Title"
-msgstr "Título"
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Error: por favor, suba un fichero OPML."
+
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Error mientras se analizaba el documento."

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "usando"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "sin etiquetas"

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Purgando el artículo"
+#: classes/rpc.php:736
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Su información de registro está incompleta"

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
+#: classes/rpc.php:748

 #, fuzzy
 #, fuzzy

-msgid "Hide from Popular feeds"
-msgstr "Ocultar en mi lista de fuentes"
+msgid "Category update has been scheduled."
+msgstr "La contraseña ha sido cambiada."

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "Contenido de derecha a izquierda"
+#: classes/rpc.php:761
+#, fuzzy
+msgid "Can't update this kind of feed."
+msgstr "No puede editar esta clase de fuente."

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "Incluir en el correo recopilatorio"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."
+msgstr ""

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr "Desplegar siempre las imágenes adjuntas"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "No se pudo validar la sesión (IP incorrecta)"

 
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Guardar las imágenes en la memoria caché local"
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "Nombre de usuario o contraseña incorrecta"

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
+#: include/functions.php:2049

 #, fuzzy
 #, fuzzy

-msgid "Mark updated articles as unread"
-msgstr "¿Marcar todos los artículos como leídos?"
-
-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref_feeds.php:491
-msgid "Icon"
-msgstr ""
+msgid "Archived articles"
+msgstr "Favoritos"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
+#: include/functions.php:2051
+msgid "Recently read"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:524
+#: include/functions.php:3223 js/viewfeed.js:1996

 #, fuzzy
 #, fuzzy

-msgid "Resubscribe to push updates"
-msgstr "Suscrito a las fuentes:"
+msgid "Click to play"
+msgstr "Pulse aquí para editar"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Hecho."
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Suscrito a <strong>%s</strong>."
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1021
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Ya está suscrito a <strong>%s</strong>."
+#: include/functions.php:4186
+#, fuzzy
+msgid "(edit note)"
+msgstr "editar nota"

 
 

-#: classes/pref_feeds.php:1024
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "No se han encontrado fuentes."
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "No se ha seleccionado ninguna fuente."

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Ya está suscrito a <strong>%s</strong>."
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "tipo desconocido"

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:4844

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "La URL de la fuente publicada ha sido cambiada."
+msgid "Attachments"
+msgstr "Adjuntos:"

 
 

-#: classes/pref_feeds.php:1035
+#: include/functions.php:5286

 #, fuzzy, php-format
 #, 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>."
+msgid "%d archived articles"
+msgstr "Favoritos"

 
 

-#: classes/pref_feeds.php:1057
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "No se han encontrado fuentes."
+
+#: include/functions.php:5356

 #, fuzzy
 #, fuzzy

-msgid "Subscribe to selected feed"
-msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"No se puede encontrar el fichero de esquema necesario. Versión necesaria:"

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "Editar las opciones de suscripción"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1161
+#: include/functions.php:5520

 #, php-format
 #, 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."
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Crear categoría"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "No se han definido categorías de fuentes."
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Título o contenido"

 
 

-#: classes/pref_feeds.php:1243
-#, fuzzy
-msgid "Remove selected categories"
-msgstr "¿Eliminar las categorías seleccionadas?"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Enlace"

 
 

-#: classes/pref_feeds.php:1267
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "Editor de fuente"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Fecha del artículo"

 
 

-#: classes/pref_feeds.php:1287
+#: include/localized_schema.php:9

 #, fuzzy
 #, fuzzy

-msgid "Inactive feeds"
-msgstr "Fuente completa"
-
-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-#, fuzzy
-msgid "Select"
-msgstr "Seleccione:"
-
-#: classes/pref_feeds.php:1324
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "Purgando la fuente seleccionada..."
-
-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Redefinir contraseña"
-
-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "Cancelar la suscripción"
-
-#: classes/pref_feeds.php:1333
-#, fuzzy
-msgid "Categories"
-msgstr "Volver a categorizar"
-
-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Editar categorías"
-
-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Editar categorías"
-
-#: classes/pref_feeds.php:1354
-#, fuzzy
-msgid "More actions..."
-msgstr "Acciones..."
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Purga manual"
-
-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Limpiar los datos de la fuente"
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "Reiniciar la puntuación de los artículos"
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref_feeds.php:1432
-#, fuzzy
-msgid "Import my OPML"
-msgstr "Importando OPML (usando la extensión DOMXML)..."
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-#, fuzzy
-msgid "Include settings"
-msgstr "Incluir en el correo recopilatorio"
-
-#: classes/pref_feeds.php:1442
-#, fuzzy
-msgid "Export OPML"
-msgstr "Exportar OPML"
-
-#: classes/pref_feeds.php:1446
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Los artículos publicados son exportados como una fuente RSS pública a la "
-"cual podrá suscribirse cualquiera que conozca la URL especificada a "
-"continuación."
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-#, fuzzy
-msgid "Article archive"
-msgstr "Fecha del artículo"
-
-#: classes/pref_feeds.php:1456
-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:1459
-#, fuzzy
-msgid "Export my data"
-msgstr "Exportar OPML"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importar"
-
-#: classes/pref_feeds.php:1481
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Integración con Firefox"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Este sitio Tiny tiny RSS puede ser usado como un lector de fuentes de "
-"Firefox si pulsa en el enlace de abajo."
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Volver a Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1508
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Volver a Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1512
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-"¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
-
-#: classes/pref_feeds.php:1514
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr ""
-"¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-"Los artículos publicados son exportados como una fuente RSS pública a la "
-"cual podrá suscribirse cualquiera que conozca la URL especificada a "
-"continuación."
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Quitar el artículo de los favoritos"
-
-#: classes/pref_feeds.php:1538
-#, fuzzy
-msgid "Twitter"
-msgstr "Título"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-#, fuzzy
-msgid "Clear stored credentials"
-msgstr "Limpiar los datos de la fuente"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: classes/pref_filters.php:89
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "No se han encontrado filtros coincidentes."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "Se ha creado el filtro <strong>%s</strong>"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Editar"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr ""
-
-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-#, fuzzy
-msgid "Stored feeds"
-msgstr "Más fuentes"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Pulse aquí para editar"
-
-#: classes/pref_labels.php:22
-#, fuzzy
-msgid "Caption"
-msgstr "Opciones"
-
-#: classes/pref_labels.php:37
-#, fuzzy
-msgid "Colors"
-msgstr "Cerrar"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Foreground:"
-msgstr "primer plano"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Background:"
-msgstr "fondo"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Se ha creado la etiqueta <strong>%s</strong>"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Limpiar los colores"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "La antigua contraseña no puede dejarse en blanco."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "La nueva contraseña no puede dejarse en blanco."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "Las contraseñas introducidas no coinciden."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "La contraseña ha sido cambiada."
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "La contraseña antigua es incorrecta."
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "La configuración ha sido guardada."
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Opción desconocida: %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-#, fuzzy
-msgid "Personal data / Authentication"
-msgstr "Autenticación"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr ""
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "Correo electrónico"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Nivel de acceso"
-
-#: classes/pref_prefs.php:213
-#, fuzzy
-msgid "Save data"
-msgstr "Guardar"
-
-#: classes/pref_prefs.php:224
-#, fuzzy
-msgid "Your password is at default value, please change it."
-msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Antigua contraseña"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Nueva contraseña"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Confirme la nueva contraseña"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Cambiar contraseña"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Seleccionar plantilla"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Sí"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "No"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Guardar la configuración"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr ""
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Opciones por defecto"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Detalles del usuario"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "Usuario no encontrado"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Registrado"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Última sesión el"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Contador de fuentes suscritas"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Fuentes suscritas"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Editor de usuario"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Nivel de acceso:"
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Cambiar la contraseña a"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "Correo electrónico:"
-
-#: classes/pref_users.php:257
-#, 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>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "No se puede crear el usuario <strong>%s</strong>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "El usuario <strong>%s</strong> ya existe."
-
-#: classes/pref_users.php:291
-#, fuzzy, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
-msgstr ""
-"Se ha cambiado la contraseña del usuario <strong>%s</strong> a <strong>%s</"
-"strong>"
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "Notificando a <strong>%s</strong>."
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notificación de cambio de contraseña"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Redefinir contraseña"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Nivel de acceso"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Última sesión"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "No se han definido usuarios."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "No se han encontrado usuarios coincidentes."
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "sin etiquetas"
-
-#: classes/rpc.php:742
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "Su información de registro está incompleta"
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr ""
-
-#: classes/rpc.php:754
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "La contraseña ha sido cambiada."
-
-#: classes/rpc.php:767
-#, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "No puede editar esta clase de fuente."
-
-#: classes/share_button.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "Marcar el artículo como favorito"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "Título"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "No se pudo validar la sesión (IP incorrecta)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "Nombre de usuario o contraseña incorrecta"
-
-#: include/functions.php:2099
-#, fuzzy
-msgid "Archived articles"
-msgstr "Favoritos"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-#, fuzzy
-msgid "Click to play"
-msgstr "Pulse aquí para editar"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-#, fuzzy
-msgid "(edit note)"
-msgstr "editar nota"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "No se ha seleccionado ninguna fuente."
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "tipo desconocido"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Adjunto:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Adjuntos:"
-
-#: include/functions.php:5261
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Favoritos"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "No se han encontrado fuentes."
-
-#: include/functions.php:5331
-#, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr ""
-"No se puede encontrar el fichero de esquema necesario. Versión necesaria:"
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr ""
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "Título o contenido"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "Enlace"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "Fecha del artículo"
-
-#: include/localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Limpiar los artículos"
+msgid "Delete article"
+msgstr "Limpiar los artículos"

 
 #: include/localized_schema.php:11
 msgid "Set starred"
 msgstr "Fijar como favorito"
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
 
 #: include/localized_schema.php:11
 msgid "Set starred"
 msgstr "Fijar como favorito"
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730

-#: js/viewfeed.js:466
+#: js/viewfeed.js:475

 msgid "Publish article"
 msgstr "Publicar artículo"
 
 msgid "Publish article"
 msgstr "Publicar artículo"
 


@@ -2302,7 +1500,7 @@ msgstr "Publicar artículo"
 msgid "Assign tags"
 msgstr "Asignar etiquetas"
 
 msgid "Assign tags"
 msgstr "Asignar etiquetas"
 

-#: include/localized_schema.php:14 js/viewfeed.js:1935
+#: include/localized_schema.php:14 js/viewfeed.js:1960

 msgid "Assign label"
 msgstr "Asignar etiqueta"
 
 msgid "Assign label"
 msgstr "Asignar etiqueta"
 


@@ -2389,11 +1587,11 @@ msgstr ""
 "etiquetas son agrupados por fuentes"
 
 #: include/localized_schema.php:29
 "etiquetas son agrupados por fuentes"
 
 #: include/localized_schema.php:29

-msgid "Use feed-specified date to sort headlines instead of local import date."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2405,7 +1603,8 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
 msgstr ""
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr ""
 "Purgar los envíos antiguos después de este número de días (0 = desactivado)"
 
 msgstr ""
 "Purgar los envíos antiguos después de este número de días (0 = desactivado)"
 


@@ -2517,16 +1716,16 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
 msgid "User timezone"
 msgstr ""
 

-#: include/localized_schema.php:60
-#, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Ordenar las fuentes en función del número de artículos sin leer"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la hoja de estilo del usuario"
 
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL de la hoja de estilo del usuario"
 

+#: include/localized_schema.php:61
+#, fuzzy
+msgid "Sort headlines by feed date"
+msgstr "Ordenar las fuentes en función del número de artículos sin leer"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""


@@ -2548,7 +1747,7 @@ msgstr "Fichero:"
 msgid "Use less traffic"
 msgstr ""
 
 msgid "Use less traffic"
 msgstr ""
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "¿Marcar todos los artículos de %s como leídos?"
 


@@ -2557,15 +1756,19 @@ msgstr "¿Marcar todos los artículos de %s como leídos?"
 msgid "Mark %d displayed articles as read?"
 msgstr "¿Marcar %d artículo(s) como leído(s)?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "¿Marcar %d artículo(s) como leído(s)?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "en"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Quitar el artículo de los favoritos"
 
 msgid "Unstar article"
 msgstr "Quitar el artículo de los favoritos"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Marcar el artículo como favorito"
 
 msgid "Star article"
 msgstr "Marcar el artículo como favorito"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Anular la publicación del artículo"
 
 msgid "Unpublish article"
 msgstr "Anular la publicación del artículo"
 


@@ -2604,11 +1807,11 @@ msgstr "Ocultar/Mostrar las leídas"
 msgid "Load more..."
 msgstr "Ir a..."
 
 msgid "Load more..."
 msgstr "Ir a..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 #, fuzzy
 msgid "Update feed"
 msgstr "Actualizar todas las fuentes"
 #, fuzzy
 msgid "Update feed"
 msgstr "Actualizar todas las fuentes"


@@ -2619,135 +1822,147 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "La contraseña antigua es incorrecta."
 
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "La contraseña antigua es incorrecta."
 

-#: js/functions.js:650
+#: js/functions.js:621

 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "La contraseña antigua es incorrecta."
 
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "La contraseña antigua es incorrecta."
 

-#: js/functions.js:777
+#: js/functions.js:748

 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Eliminar los datos almacenados"
 
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Eliminar los datos almacenados"
 

-#: js/functions.js:809
+#: js/functions.js:780

 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Por favor, seleccione una fuente."
 
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Por favor, seleccione una fuente."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Por favor, introduzca el título de la etiqueta:"
 
 msgid "Please enter label caption:"
 msgstr "Por favor, introduzca el título de la etiqueta:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "No se puede crear la etiqueta: falta el título."
 
 msgid "Can't create label: missing caption."
 msgstr "No se puede crear la etiqueta: falta el título."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "Suscribir a la fuente"
 
 msgid "Subscribe to Feed"
 msgstr "Suscribir a la fuente"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "Suscribiéndose a la fuente..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Suscrito a las fuentes:"
 
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Suscrito a las fuentes:"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 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:881
+msgid "Specified URL doesn't seem to contain any feeds."
+msgstr ""
+
+#: js/functions.js:917
+#, fuzzy
+msgid "Couldn't download the specified URL: %s"
+msgstr "Suscripción imposible: no se ha indicado la URL de la fuente."
+
+#: js/functions.js:921
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "No está suscrito a ninguna fuente."
+
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Filtros"
+
+#: js/functions.js:1049
+#, fuzzy
+msgid "Add rule"
+msgstr "Añadiendo categoría de fuentes..."

 
 

-#: js/functions.js:945
+#: js/functions.js:1075

 #, fuzzy
 #, fuzzy

-msgid "Couldn't download the specified URL."
-msgstr "Suscripción imposible: no se ha indicado la URL de la fuente."
+msgid "Edit action"
+msgstr "Acciones de las fuentes"

 
 

-#: js/functions.js:948
+#: js/functions.js:1075

 #, fuzzy
 #, fuzzy

-msgid "You are already subscribed to this feed."
-msgstr "No está suscrito a ninguna fuente."
+msgid "Add action"
+msgstr "Acciones de las fuentes"

 
 

-#: js/functions.js:980
+#: js/functions.js:1112

 msgid "Create Filter"
 msgstr "Crear filtro"
 
 msgid "Create Filter"
 msgstr "Crear filtro"
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
-msgstr ""
-
-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 
 msgid "Unsubscribe from %s?"
 msgstr "¿Cancelar la suscripción a %s?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 
 msgid "You can't edit this kind of feed."
 msgstr "No puede editar esta clase de fuente."
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar la fuente"
 
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar la fuente"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 #, fuzzy
 msgid "More Feeds"
 msgstr "Más fuentes"
 
 #, fuzzy
 msgid "More Feeds"
 msgstr "Más fuentes"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 
 msgid "No feeds are selected."
 msgstr "No se han seleccionado fuentes."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Editor de fuente"
 
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Editor de fuente"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "¿Eliminar los filtros seleccionados?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 
 msgid "No articles are selected."
 msgstr "No se han seleccionado artículos."
 


@@ -2756,6 +1971,21 @@ msgstr "No se han seleccionado artículos."
 msgid "Forward article by email"
 msgstr "Marcar el artículo como favorito"
 
 msgid "Forward article by email"
 msgstr "Marcar el artículo como favorito"
 

+#: js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Editar etiquetas"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Editar categorías"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Crear categoría"
+

 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"


@@ -2775,338 +2005,837 @@ msgstr ""
 msgid "Edit Filter"
 msgstr "Filtros"
 
 msgid "Edit Filter"
 msgstr "Filtros"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "¿Eliminar el filtro %s?"
 
 msgstr "¿Eliminar el filtro %s?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "¿Eliminar las etiquetas seleccionadas?"
 
 msgid "Remove selected labels?"
 msgstr "¿Eliminar las etiquetas seleccionadas?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "No se han seleccionado etiquetas."
 
 msgid "No labels are selected."
 msgstr "No se han seleccionado etiquetas."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "No se han seleccionado usuarios."
 
 msgid "No users are selected."
 msgstr "No se han seleccionado usuarios."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
 msgid "Remove selected filters?"
 msgstr "¿Eliminar los filtros seleccionados?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "No se han seleccionado filtros."
 
 msgid "No filters are selected."
 msgstr "No se han seleccionado filtros."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Por favor, seleccione una única fuente."
 
 msgid "Please select only one feed."
 msgstr "Por favor, seleccione una única fuente."
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "¿Borrar todos los artículos no favoritos de la fuente seleccionada?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 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)"
 
 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:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "El campo de nombre de usuario no puede dejarse en blanco."
 
 msgid "Login field cannot be blank."
 msgstr "El campo de nombre de usuario no puede dejarse en blanco."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Por favor, seleccione un único usuario."
 
 msgid "Please select only one user."
 msgstr "Por favor, seleccione un único usuario."
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "¿Reajustar la contraseña del usuario seleccionado?"
 
 msgid "Reset password of selected user?"
 msgstr "¿Reajustar la contraseña del usuario seleccionado?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Por favor, seleccione un único filtro."
 
 msgid "Please select only one filter."
 msgstr "Por favor, seleccione un único filtro."
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "¿Eliminar los filtros seleccionados?"
+
+#: js/prefs.js:704

 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor de múltiples fuentes"
 
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor de múltiples fuentes"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
 
 msgid "Save changes to selected feeds?"
 msgstr "¿Guardar los cambios de las fuentes seleccionadas?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 #, fuzzy
 msgid "OPML Import"
 msgstr "Importar"
 
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importar"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Por favor, seleccione alguna fuente primero."
 
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Por favor, seleccione alguna fuente primero."
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Por favor, seleccione alguna fuente primero."
 
 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Por favor, seleccione alguna fuente primero."
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "¿Reajustar a las opciones por defecto?"
 
 msgid "Reset to defaults?"
 msgstr "¿Reajustar a las opciones por defecto?"
 

-#: js/prefs.js:1152
-#, fuzzy
-msgid "Feed Categories"
-msgstr "Volver a categorizar"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "¿Eliminar las categorías seleccionadas?"
 
 msgid "Remove selected categories?"
 msgstr "¿Eliminar las categorías seleccionadas?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "No se han seleccionado categorías."
 
 msgid "No categories are selected."
 msgstr "No se han seleccionado categorías."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Editor de categorías"
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr ""
 
 msgid "Feeds without recent updates"
 msgstr ""
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
 
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "¿Reemplazar la actual dirección de publicación por una nueva?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 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 "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/prefs.js:1422
+#: js/prefs.js:1507

 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "¿Reajustar los colores de la etiqueta a las opciones por defecto?"
 
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "¿Reajustar los colores de la etiqueta a las opciones por defecto?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr ""
 
 msgid "Settings Profiles"
 msgstr ""
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No se ha seleccionado ningún artículo."
 
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "No se ha seleccionado ningún artículo."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "¿Eliminar los filtros seleccionados?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Por favor, seleccione alguna fuente primero."
 
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Por favor, seleccione alguna fuente primero."
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de fuente"
 
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de fuente"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 #, fuzzy
 msgid "Link Instance"
 msgstr "Editar etiquetas"
 
 #, fuzzy
 msgid "Link Instance"
 msgstr "Editar etiquetas"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 #, fuzzy
 msgid "Edit Instance"
 msgstr "Editar etiquetas"
 
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Editar etiquetas"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "¿Eliminar los filtros seleccionados?"
 
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "¿Eliminar los filtros seleccionados?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 #, fuzzy
 msgid "No instances are selected."
 msgstr "No se han seleccionado filtros."
 
 #, fuzzy
 msgid "No instances are selected."
 msgstr "No se han seleccionado filtros."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Por favor, seleccione un único filtro."
 
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Por favor, seleccione un único filtro."
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 #, fuzzy
 msgid "Export Data"
 msgstr "Exportar OPML"
 
 #, fuzzy
 msgid "Export Data"
 msgstr "Exportar OPML"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 #, fuzzy
 msgid "Data Import"
 msgstr "Importar"
 
 #, fuzzy
 msgid "Data Import"
 msgstr "Importar"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "Cancelar la suscripción"
+
+#: js/prefs.js:2191

 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Suscribiéndose a la fuente..."
 
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Suscribiéndose a la fuente..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Volver a Tiny Tiny RSS"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marcar el artículo como favorito"
 
 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marcar el artículo como favorito"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "¿Marcar todos los artículos como leídos?"
 
 msgid "Mark all articles as read?"
 msgstr "¿Marcar todos los artículos como leídos?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 
 msgid "You can't unsubscribe from the category."
 msgstr "No puede cancelar la suscripción a la categoría."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Por favor, seleccione alguna fuente primero."
 
 msgid "Please select some feed first."
 msgstr "Por favor, seleccione alguna fuente primero."
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 
 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:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 #, fuzzy
 msgid "New version available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 
 #, fuzzy
 msgid "New version available!"
 msgstr "¡Nueva versión de Tiny Tiny RSS disponible!"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "¿Marcar todos los artículos visibles de %s como leídos?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "¿Marcar todos los artículos visibles de %s como leídos?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "¿Eliminar de la etiqueta los artículos seleccionados?"
 
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "¿Eliminar de la etiqueta los artículos seleccionados?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favoritos"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "¿Marcar %d artículos seleccionados de %s como leídos?"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Editar etiquetas"
 
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Editar etiquetas"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "No se ha seleccionado ningún artículo."
 
 msgid "No article is selected."
 msgstr "No se ha seleccionado ningún artículo."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "No se han encontrado artículos que marcar"
 
 msgid "No articles found to mark"
 msgstr "No se han encontrado artículos que marcar"
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "¿Marcar %d artículo(s) como leído(s)?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "¿Marcar %d artículo(s) como leído(s)?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 #, fuzzy
 msgid "Loading..."
 msgstr "Cargando la lista de la fuente..."
 
 #, fuzzy
 msgid "Loading..."
 msgstr "Cargando la lista de la fuente..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 #, fuzzy
 msgid "Open original article"
 msgstr "Desplegar el contenido original del artículo"
 
 #, fuzzy
 msgid "Open original article"
 msgstr "Desplegar el contenido original del artículo"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Abrir el artículo en una nueva pestaña o ventana"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como leído"
 
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como leído"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como leído"
 
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como leído"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 #, fuzzy
 msgid "Remove label"
 msgstr "¿Eliminar las etiquetas seleccionadas?"
 
 #, fuzzy
 msgid "Remove label"
 msgstr "¿Eliminar las etiquetas seleccionadas?"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 #, fuzzy
 msgid "Playing..."
 msgstr "Cargando la lista de la fuente..."
 
 #, fuzzy
 msgid "Playing..."
 msgstr "Cargando la lista de la fuente..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 #, fuzzy
 msgid "Click to pause"
 msgstr "Pulse aquí para editar"
 
 #, fuzzy
 msgid "Click to pause"
 msgstr "Pulse aquí para editar"
 

+#, fuzzy
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "Añadiendo categoría <b>%s</b>."
+
+#, fuzzy
+#~ msgid "is already imported."
+#~ msgstr "Ya importado."
+
+#, fuzzy
+#~ msgid "OK"
+#~ msgstr "¡TODO CORRECTO!"
+
+#, fuzzy
+#~ msgid "Register"
+#~ msgstr "Registrado"
+
+#~ msgid "Match"
+#~ msgstr "Coincidir"
+
+#~ msgid "before"
+#~ msgstr "antes"
+
+#~ msgid "after"
+#~ msgstr "después"
+
+#~ msgid "Check it"
+#~ msgstr "Comprobarlo"
+
+#~ msgid "on field"
+#~ msgstr "en el campo"
+
+#~ msgid "Perform Action"
+#~ msgstr "Realizar la acción"
+
+#~ msgid "with parameters:"
+#~ msgstr "con los parámetros:"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#~ msgid "Enabled"
+#~ msgstr "Habilitado"
+
+#~ msgid "Inverse match"
+#~ msgstr "coincidencia inversa"
+
+#, fuzzy
+#~ msgid "Apply to category"
+#~ msgstr "Colocar en la categoría:"
+
+#~ msgid "Create"
+#~ msgstr "Crear"
+
+#, fuzzy
+#~ msgid "Multiple articles"
+#~ msgstr "Todos"
+
+#, fuzzy
+#~ msgid "To:"
+#~ msgstr "Arriba"
+
+#, fuzzy
+#~ msgid "Subject:"
+#~ msgstr "Seleccione:"
+
+#, fuzzy
+#~ msgid "Send e-mail"
+#~ msgstr "Cambiar el correo electrónico"
+
+#~ msgid "Check to enable field"
+#~ msgstr "Marcar para habilitar el campo"
+
+#, fuzzy
+#~ msgid "(%d feeds)"
+#~ msgstr "Editar la fuente"
+
+#, fuzzy
+#~ msgid "Feed Title"
+#~ msgstr "Título"
+
+#~ msgid "using"
+#~ msgstr "usando"
+
+#~ msgid "Article purging:"
+#~ msgstr "Purgando el artículo"
+
+#, fuzzy
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Ocultar en mi lista de fuentes"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contenido de derecha a izquierda"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "Incluir en el correo recopilatorio"
+
+#~ msgid "Always display image attachments"
+#~ msgstr "Desplegar siempre las imágenes adjuntas"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Guardar las imágenes en la memoria caché local"
+
+#, fuzzy
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "¿Marcar todos los artículos como leídos?"
+
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Suscrito a las fuentes:"
+
+#~ msgid "All done."
+#~ msgstr "Hecho."
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "Suscrito a <strong>%s</strong>."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Ya está suscrito a <strong>%s</strong>."
+
+#, fuzzy
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "No se han encontrado fuentes."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "Ya está suscrito a <strong>%s</strong>."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "La URL de la fuente publicada ha sido cambiada."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#~ msgstr "Ya está suscrito a <strong>%s</strong>."
+
+#, fuzzy
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "¿Cancelar la suscripción a las fuentes seleccionadas?"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Editar las opciones de suscripción"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "La categoría <strong>$%s</strong> ya existe en la base de datos."
+
+#~ msgid "No feed categories defined."
+#~ msgstr "No se han definido categorías de fuentes."
+
+#, fuzzy
+#~ msgid "Remove selected categories"
+#~ msgstr "¿Eliminar las categorías seleccionadas?"
+
+#, fuzzy
+#~ msgid "Feeds with errors"
+#~ msgstr "Editor de fuente"
+
+#, fuzzy
+#~ msgid "Inactive feeds"
+#~ msgstr "Fuente completa"
+
+#, fuzzy
+#~ msgid "Edit selected feeds"
+#~ msgstr "Purgando la fuente seleccionada..."
+
+#, fuzzy
+#~ msgid "Reset sort order"
+#~ msgstr "Redefinir contraseña"
+
+#, fuzzy
+#~ msgid "Categories"
+#~ msgstr "Volver a categorizar"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Editar categorías"
+
+#, fuzzy
+#~ msgid "More actions..."
+#~ msgstr "Acciones..."
+
+#~ msgid "Manual purge"
+#~ msgstr "Purga manual"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Limpiar los datos de la fuente"
+
+#~ msgid "Rescore articles"
+#~ msgstr "Reiniciar la puntuación de los artículos"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#, fuzzy
+#~ msgid "Import my OPML"
+#~ msgstr "Importando OPML (usando la extensión DOMXML)..."
+
+#, fuzzy
+#~ msgid "Include settings"
+#~ msgstr "Incluir en el correo recopilatorio"
+
+#, fuzzy
+#~ msgid "Export OPML"
+#~ msgstr "Exportar OPML"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ msgstr ""
+#~ "Los artículos publicados son exportados como una fuente RSS pública a la "
+#~ "cual podrá suscribirse cualquiera que conozca la URL especificada a "
+#~ "continuación."
+
+#, fuzzy
+#~ msgid "Article archive"
+#~ msgstr "Fecha del artículo"
+
+#, fuzzy
+#~ msgid "Export my data"
+#~ msgstr "Exportar OPML"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#, fuzzy
+#~ msgid "Firefox integration"
+#~ msgstr "Integración con Firefox"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "Este sitio Tiny tiny RSS puede ser usado como un lector de fuentes de "
+#~ "Firefox si pulsa en el enlace de abajo."
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
+
+#, fuzzy
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Volver a Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Volver a Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr ""
+#~ "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr ""
+#~ "¿Reiniciar la puntuación de los artículos de las fuentes seleccionadas?"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ msgstr ""
+#~ "Los artículos publicados son exportados como una fuente RSS pública a la "
+#~ "cual podrá suscribirse cualquiera que conozca la URL especificada a "
+#~ "continuación."
+
+#, fuzzy
+#~ msgid "Unshare all articles"
+#~ msgstr "Quitar el artículo de los favoritos"
+
+#, fuzzy
+#~ msgid "Twitter"
+#~ msgstr "Título"
+
+#, fuzzy
+#~ msgid "Clear stored credentials"
+#~ msgstr "Limpiar los datos de la fuente"
+
+#, fuzzy
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "No se han encontrado filtros coincidentes."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "Se ha creado el filtro <strong>%s</strong>"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "Su nivel de acceso es insuficiente para abrir esta pestaña."
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Más fuentes"
+
+#~ msgid "Click to edit"
+#~ msgstr "Pulse aquí para editar"
+
+#, fuzzy
+#~ msgid "Caption"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Colors"
+#~ msgstr "Cerrar"
+
+#, fuzzy
+#~ msgid "Foreground:"
+#~ msgstr "primer plano"
+
+#, fuzzy
+#~ msgid "Background:"
+#~ msgstr "fondo"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "Se ha creado la etiqueta <strong>%s</strong>"
+
+#~ msgid "Clear colors"
+#~ msgstr "Limpiar los colores"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "La antigua contraseña no puede dejarse en blanco."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "La nueva contraseña no puede dejarse en blanco."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "Las contraseñas introducidas no coinciden."
+
+#~ msgid "Password has been changed."
+#~ msgstr "La contraseña ha sido cambiada."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "La contraseña antigua es incorrecta."
+
+#~ msgid "The configuration was saved."
+#~ msgstr "La configuración ha sido guardada."
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Opción desconocida: %s"
+
+#, fuzzy
+#~ msgid "Personal data / Authentication"
+#~ msgstr "Autenticación"
+
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
+
+#~ msgid "Access level"
+#~ msgstr "Nivel de acceso"
+
+#, fuzzy
+#~ msgid "Save data"
+#~ msgstr "Guardar"
+
+#, fuzzy
+#~ msgid "Your password is at default value, please change it."
+#~ msgstr "Su contraseña tiene el valor por defecto. Por favor, modifíquela."
+
+#~ msgid "Old password"
+#~ msgstr "Antigua contraseña"
+
+#~ msgid "New password"
+#~ msgstr "Nueva contraseña"
+
+#~ msgid "Confirm password"
+#~ msgstr "Confirme la nueva contraseña"
+
+#~ msgid "Change password"
+#~ msgstr "Cambiar contraseña"
+
+#~ msgid "Select theme"
+#~ msgstr "Seleccionar plantilla"
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Save configuration"
+#~ msgstr "Guardar la configuración"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Opciones por defecto"
+
+#~ msgid "User details"
+#~ msgstr "Detalles del usuario"
+
+#~ msgid "User not found"
+#~ msgstr "Usuario no encontrado"
+
+#~ msgid "Registered"
+#~ msgstr "Registrado"
+
+#~ msgid "Last logged in"
+#~ msgstr "Última sesión el"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Contador de fuentes suscritas"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Fuentes suscritas"
+
+#~ msgid "User Editor"
+#~ msgstr "Editor de usuario"
+
+#~ msgid "Access level: "
+#~ msgstr "Nivel de acceso:"
+
+#~ msgid "Change password to"
+#~ msgstr "Cambiar la contraseña a"
+
+#~ msgid "E-mail: "
+#~ msgstr "Correo electrónico:"
+
+#~ 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>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "No se puede crear el usuario <strong>%s</strong>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "El usuario <strong>%s</strong> ya existe."
+
+#, fuzzy
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\t\t\t\t to <b>%s</b>"
+#~ msgstr ""
+#~ "Se ha cambiado la contraseña del usuario <strong>%s</strong> a <strong>"
+#~ "%s</strong>"
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "Notificando a <strong>%s</strong>."
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Notificación de cambio de contraseña"
+
+#~ msgid "Reset password"
+#~ msgstr "Redefinir contraseña"
+
+#~ msgid "Access Level"
+#~ msgstr "Nivel de acceso"
+
+#~ msgid "Last login"
+#~ msgstr "Última sesión"
+
+#~ msgid "No users defined."
+#~ msgstr "No se han definido usuarios."
+
+#~ msgid "No matching users found."
+#~ msgstr "No se han encontrado usuarios coincidentes."
+
+#, fuzzy
+#~ msgid "Share by URL"
+#~ msgstr "Marcar el artículo como favorito"
+
+#, fuzzy
+#~ msgid "Share on Twitter"
+#~ msgstr "Título"
+
+#~ msgid "Attachment:"
+#~ msgstr "Adjunto:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Suscribiéndose a la fuente..."
+
+#, fuzzy
+#~ msgid "Feed Categories"
+#~ msgstr "Volver a categorizar"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."


@@ -3194,10 +2923,6 @@ msgstr "Pulse aquí para editar"
 #~ msgid "Add category..."
 #~ msgstr "Añadiendo categoría de fuentes..."
 
 #~ msgid "Add category..."
 #~ msgstr "Añadiendo categoría de fuentes..."
 

-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Añadiendo categoría de fuentes..."
-

 #, fuzzy
 #~ msgid "description"
 #~ msgstr "Selección"
 #, fuzzy
 #~ msgid "description"
 #~ msgstr "Selección"


@@ -3391,9 +3116,6 @@ msgstr "Pulse aquí para editar"
 #~ msgid "Update Errors"
 #~ msgstr "Errores de actualización"
 
 #~ msgid "Update Errors"
 #~ msgstr "Errores de actualización"
 

-#~ msgid "Category editor"
-#~ msgstr "Editor de categorías"
-

 #~ msgid "Show last article times"
 #~ msgstr "Mostrar el horario de los últimos artículos"
 
 #~ msgid "Show last article times"
 #~ msgstr "Mostrar el horario de los últimos artículos"
 


@@ -3469,10 +3191,6 @@ msgstr "Pulse aquí para editar"
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Se ha guardado el filtro <strong>%s</strong>"
 
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Se ha guardado el filtro <strong>%s</strong>"
 

-#, fuzzy
-#~ msgid "Tiny Tiny RSS"
-#~ msgstr "Volver a Tiny Tiny RSS"
-

 #~ msgid "Click to collapse category"
 #~ msgstr "Plegar la categoría"
 
 #~ msgid "Click to collapse category"
 #~ msgstr "Plegar la categoría"
 

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 1e702cd6a10ce0cc85e6da6b3158d28dcd7edbc2..c931060de4df6302016462aa28f03d8a873608f6 100644 (file)
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 e127bfc70845aa7d9accc542f1c4f85b920cd12e..140cd8b876960b78a6062302936b45a723c7f170 100644 (file)
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+0400\n"

 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Thomas Jost <schnouki@schnouki.net>\n"
 "Language-Team: French (France) (http://www.transifex.net/projects/p/tt-rss/"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Thomas Jost <schnouki@schnouki.net>\n"
 "Language-Team: French (France) (http://www.transifex.net/projects/p/tt-rss/"


@@ -21,95 +21,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Utiliser la valeur par défaut"
 
 msgid "Use default"
 msgstr "Utiliser la valeur par défaut"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Ne jamais purger"
 
 msgid "Never purge"
 msgstr "Ne jamais purger"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "Au bout d'une semaine"
 
 msgid "1 week old"
 msgstr "Au bout d'une semaine"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "Au bout de 2 semaines"
 
 msgid "2 weeks old"
 msgstr "Au bout de 2 semaines"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "Au bout d'un mois"
 
 msgid "1 month old"
 msgstr "Au bout d'un mois"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "Au bout de 2 mois"
 
 msgid "2 months old"
 msgstr "Au bout de 2 mois"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "Au bout de 3 mois"
 
 msgid "3 months old"
 msgstr "Au bout de 3 mois"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 
 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Toutes les 15 minutes"
 
 msgid "Each 15 minutes"
 msgstr "Toutes les 15 minutes"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Toutes les 30 minutes"
 
 msgid "Each 30 minutes"
 msgstr "Toutes les 30 minutes"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "Toutes les heures"
 
 msgid "Hourly"
 msgstr "Toutes les heures"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Toutes les 4 heures"
 
 msgid "Each 4 hours"
 msgstr "Toutes les 4 heures"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Toutes les 12 heures"
 
 msgid "Each 12 hours"
 msgstr "Toutes les 12 heures"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Une fois par jour"
 
 msgid "Daily"
 msgstr "Une fois par jour"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Une fois par semaine"
 
 msgid "Weekly"
 msgstr "Une fois par semaine"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 
 msgid "Default"
 msgstr "Utiliser la valeur par défaut"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr "Twitter OAuth"
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Utilisateur"
 
 msgid "User"
 msgstr "Utilisateur"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Utilisateur avancé"
 
 msgid "Power User"
 msgstr "Utilisateur avancé"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Administrateur"
 
 msgid "Administrator"
 msgstr "Administrateur"
 


@@ -139,8 +135,7 @@ msgstr "La base de données de Tiny Tiny RSS est à jour."
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
 


@@ -218,22 +213,24 @@ msgstr ""
 "\t\t\tpour le bon fonctionnement de ce logiciel. Veuillez modifier la\n"
 "\t\t\tconfiguration de votre navigateur."
 
 "\t\t\tpour le bon fonctionnement de ce logiciel. Veuillez modifier la\n"
 "\t\t\tconfiguration de votre navigateur."
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Bonjour,"
 
 msgid "Hello,"
 msgstr "Bonjour,"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Déconnexion"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Déconnexion"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -308,207 +305,153 @@ msgstr ""
 "Le test d'échappement SQL a échoué, vérifiez votre base de donnée et votre "
 "configuration de PHP."
 
 "Le test d'échappement SQL a échoué, vérifiez votre base de donnée et votre "
 "configuration de PHP."
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Configuration"
 
 msgid "Preferences"
 msgstr "Configuration"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "Commentaires ?"
 
 msgid "Comments?"
 msgstr "Commentaires ?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible !"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr "Actualités"
 
 msgid "News"
 msgstr "Actualités"
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Contracter la liste des flux"
 
 msgid "Collapse feedlist"
 msgstr "Contracter la liste des flux"
 

-#: index.php:148
+#: index.php:165

 msgid "Show articles"
 msgstr "Afficher les articles"
 
 msgid "Show articles"
 msgstr "Afficher les articles"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Adaptatif"
 
 msgid "Adaptive"
 msgstr "Adaptatif"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Tous les articles"
 
 msgid "All Articles"
 msgstr "Tous les articles"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Remarquables"
 
 msgid "Starred"
 msgstr "Remarquables"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Publiés"
 
 msgid "Published"
 msgstr "Publiés"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Non lus"
 
 msgid "Unread"
 msgstr "Non lus"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "Ignorer le score"
 
 msgid "Ignore Scoring"
 msgstr "Ignorer le score"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Mis à jour"
 
 msgid "Updated"
 msgstr "Mis à jour"
 

-#: index.php:160
+#: index.php:177

 msgid "Sort articles"
 msgstr "Classer les articles"
 
 msgid "Sort articles"
 msgstr "Classer les articles"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Date"
 
 msgid "Date"
 msgstr "Date"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Titre"
 
 msgid "Title"
 msgstr "Titre"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "Score"
 
 msgid "Score"
 msgstr "Score"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Modifier les catégories"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Mettre à jour"
 
 msgid "Update"
 msgstr "Mettre à jour"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Actions..."
 
 msgid "Actions..."
 msgstr "Actions..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Rechercher..."
 
 msgid "Search..."
 msgstr "Rechercher..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Modifier ce flux..."
 
 msgid "Edit this feed..."
 msgstr "Modifier ce flux..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Tous les flux :"
 
 msgid "All feeds:"
 msgstr "Tous les flux :"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 
 msgid "(Un)hide read feeds"
 msgstr "(Dé)Masquer les flux lus"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Autres actions :"
 
 msgid "Other actions:"
 msgstr "Autres actions :"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr "Basculer en mode résumé..."
 
 msgid "Switch to digest..."
 msgstr "Basculer en mode résumé..."
 

-#: index.php:194
+#: index.php:216

 msgid "Show tag cloud..."
 msgstr "Afficher le nuage d'étiquettes"
 
 msgid "Show tag cloud..."
 msgstr "Afficher le nuage d'étiquettes"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr "Sélectionner par tags..."
 
 msgid "Select by tags..."
 msgstr "Sélectionner par tags..."
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Créer une étiquette..."
 
 msgid "Create label..."
 msgstr "Créer une étiquette..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Créer un filtre..."
 
 msgid "Create filter..."
 msgstr "Créer un filtre..."
 

-#: index.php:198
+#: index.php:220

 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 
 msgid "Keyboard shortcuts help"
 msgstr "Aide sur les raccourcis clavier"
 

-#: opml.php:81
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Paramétrage de la préférence %s à %s"
-
-#: opml.php:123
-#, php-format
-msgid "Adding label %s"
-msgstr "Ajout de l'étiquette %s"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Etiquette identique : %s"
-
-#: opml.php:180
-#, php-format
-msgid "Adding filter %s"
-msgstr "Ajout du filtre %s"
-
-#: opml.php:196
-#, php-format
-msgid "Duplicate filter %s"
-msgstr "Filtre identique : %s"
-
-#: opml.php:241
-msgid "is already imported."
-msgstr "est déjà importé."
-
-#: opml.php:271
-msgid "OK"
-msgstr "OK"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Erreur lors de l'analyse du document."
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Erreur : veuillez envoyer un document OPML."
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "Outil OPML"
-
-#: opml.php:530
-msgid "Importing OPML..."
-msgstr "Import OPML en cours..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Revenir à la configuration"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"


@@ -517,18 +460,16 @@ msgstr "Raccourcis clavier"
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Flux"
 
 msgid "Feeds"
 msgstr "Flux"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Etiquettes"
 
 msgid "Labels"
 msgstr "Etiquettes"
 


@@ -599,24 +540,6 @@ msgstr "Compte créé avec succès."
 msgid "New user registrations are currently closed."
 msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 
 msgid "New user registrations are currently closed."
 msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr "S'inscrire via Twitter"
-
-#: 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:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr "Félicitation ! Vous vous êtes inscrit via Twitter avec succès."
-
-#: twitter.php:118 classes/pref_prefs.php:469
-msgid "Register"
-msgstr "S'inscrire"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"


@@ -689,11 +612,11 @@ msgstr "Autres actions"
 msgid "Select article under mouse cursor"
 msgstr "Selectionner l'article sous le curseur de la souris"
 
 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
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Créer une étiquette"
 
 msgid "Create label"
 msgstr "Créer une étiquette"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Créer un filtre"
 
 msgid "Create filter"
 msgstr "Créer un filtre"
 


@@ -733,11 +656,11 @@ msgstr "Actions sur ce flux"
 msgid "Refresh active feed"
 msgstr "Mettre à jour le flux actif"
 
 msgid "Refresh active feed"
 msgstr "Mettre à jour le flux actif"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Modifier le flux"
 
 msgid "Edit feed"
 msgstr "Modifier le flux"
 


@@ -761,19 +684,19 @@ msgstr "Déployer/Contracter lors de la consultation des catégories"
 msgid "Go to..."
 msgstr "Aller à..."
 
 msgid "Go to..."
 msgstr "Aller à..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Tous les articles"
 
 msgid "All articles"
 msgstr "Tous les articles"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Articles remarquables"
 
 msgid "Starred articles"
 msgstr "Articles remarquables"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Articles publiés"
 
 msgid "Published articles"
 msgstr "Articles publiés"
 


@@ -811,7 +734,7 @@ msgstr "Top 25 des flux"
 msgid "Edit feed categories"
 msgstr "Modifier les catégories des flux"
 
 msgid "Edit feed categories"
 msgstr "Modifier les catégories des flux"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Créer l'utilisateur"
 
 msgid "Create user"
 msgstr "Créer l'utilisateur"
 


@@ -839,6 +762,10 @@ msgstr "Login :"
 msgid "Password:"
 msgstr "Mot de passe :"
 
 msgid "Password:"
 msgstr "Mot de passe :"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -846,8 +773,8 @@ msgstr "Mot de passe :"
 msgid "Home"
 msgstr "Accueil"
 
 msgid "Home"
 msgstr "Accueil"
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Spécial"
 
 msgid "Special"
 msgstr "Spécial"
 


@@ -897,13 +824,11 @@ msgstr "Sujet non trouvé dans l'aide."
 msgid "Prepare data"
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 


@@ -915,44 +840,57 @@ msgstr ""
 "Si vous avez importé des étiquettes et/ou des filtres, vous devrez peut-être "
 "recharger les préférences pour voir les nouvelles données."
 
 "Si vous avez importé des étiquettes et/ou des filtres, vous devrez peut-être "
 "recharger les préférences pour voir les nouvelles données."
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+msgid "Select"
+msgstr "Sélectionner"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Tout"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Aucun"
+
+#: classes/dlg.php:85

 msgid "Create profile"
 msgstr "Création d'un profil"
 
 msgid "Create profile"
 msgstr "Création d'un profil"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 msgid "(active)"
 msgstr "(actif)"
 
 msgid "(active)"
 msgstr "(actif)"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 msgid "Default profile"
 msgstr "Profil par défaut"
 
 msgid "Default profile"
 msgstr "Profil par défaut"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 msgid "Remove selected profiles"
 msgstr "Supprimer les filtres sélectionnés"
 
 msgid "Remove selected profiles"
 msgstr "Supprimer les filtres sélectionnés"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 msgid "Activate profile"
 msgstr "Activer le profil"
 
 msgid "Activate profile"
 msgstr "Activer le profil"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 
 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "Avertissement"
 
 msgid "Notice"
 msgstr "Avertissement"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -962,11 +900,11 @@ msgstr ""
 "n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le "
 "démarrer ou contacter l'administrateur."
 
 "n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le "
 "démarrer ou contacter l'administrateur."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 
 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -976,175 +914,105 @@ 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."
 
 "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."
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Flux"
 
 msgid "Feed"
 msgstr "Flux"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 msgid "Feed URL"
 msgstr "URL du flux"
 
 msgid "Feed URL"
 msgstr "URL du flux"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 msgid "Available feeds"
 msgstr "Flux disponibles"
 
 msgid "Available feeds"
 msgstr "Flux disponibles"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Identification"
 
 msgid "Authentication"
 msgstr "Identification"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Se connecter"
 
 msgid "Login"
 msgstr "Se connecter"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 msgid "Password"
 msgstr "Mot de passe"
 
 msgid "Password"
 msgstr "Mot de passe"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr "OAuth sera utilisé automatiquement pour les flux Twitter."
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr "OAuth sera utilisé automatiquement pour les flux Twitter."
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "S'abonner"
 
 msgid "Subscribe"
 msgstr "S'abonner"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 msgid "More feeds"
 msgstr "D'autres flux"
 
 msgid "More feeds"
 msgstr "D'autres flux"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Annuler"
 
 msgid "Cancel"
 msgstr "Annuler"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Rechercher"
 
 msgid "Search"
 msgstr "Rechercher"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 msgid "Popular feeds"
 msgstr "Flux populaires"
 
 msgid "Popular feeds"
 msgstr "Flux populaires"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 msgid "Feed archive"
 msgstr "Archive du flux"
 
 msgid "Feed archive"
 msgstr "Archive du flux"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 msgid "limit:"
 msgstr "limite :"
 
 msgid "limit:"
 msgstr "limite :"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Supprimer"
 
 msgid "Remove"
 msgstr "Supprimer"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr "Rechercher"
 
 msgid "Look for"
 msgstr "Rechercher"
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr "correspond à"
 
 msgid "match on"
 msgstr "correspond à"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Contenu"
 
 msgid "Content"
 msgstr "Contenu"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Titre ou contenu"
 
 msgid "Title or content"
 msgstr "Titre ou contenu"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Restreindre la recherche à :"
 
 msgid "Limit search to:"
 msgstr "Restreindre la recherche à :"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Tous les flux"
 
 msgid "All feeds"
 msgstr "Tous les flux"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Ce flux"
 
 msgid "This feed"
 msgstr "Ce flux"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Correspondance"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "avant"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "après"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "Vérifier"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "sur le champ"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "dans"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Exécuter l'action"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "avec les paramètres :"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Options"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Activé"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "Correspondance inverse"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-msgid "Apply to category"
-msgstr "Appliquer à une catégorie"
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Test"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Créer"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"


@@ -1152,71 +1020,74 @@ msgstr ""
 "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge "
 "décroissant) :"
 
 "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge "
 "décroissant) :"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 
 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Enregistrer"
 
 msgid "Save"
 msgstr "Enregistrer"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 msgid "Tag Cloud"
 msgstr "Nuage d'étiquettes"
 
 msgid "Tag Cloud"
 msgstr "Nuage d'étiquettes"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr "Sélectionner des éléments par tags"
 
 msgid "Select item(s) by tags"
 msgstr "Sélectionner des éléments par tags"
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr "Correspondance :"
 
 msgid "Match:"
 msgstr "Correspondance :"
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr "Quels tags ?"
 
 msgid "Which Tags?"
 msgstr "Quels tags ?"
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 msgid "Display entries"
 msgstr "Afficher les entrées"
 
 msgid "Display entries"
 msgstr "Afficher les entrées"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 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 :"
 
 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 :"
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
 
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Une nouvelle version de Tiny Tiny RSS est disponible (%s)."
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 msgid "Details"
 msgstr "Détails"
 
 msgid "Details"
 msgstr "Détails"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr "Télécharger"
 
 msgid "Download"
 msgstr "Télécharger"
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1228,42 +1099,39 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être "
 "utilisé comme base de départ."
 
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Ce fichier</a> peut être "
 "utilisé comme base de départ."
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr "Instance"
 
 msgid "Instance"
 msgstr "Instance"
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL du flux :"
 
 msgid "URL:"
 msgstr "URL du flux :"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr "URL de l'instance"
 
 msgid "Instance URL"
 msgstr "URL de l'instance"
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 msgid "Access key:"
 msgstr "Clef d'accès :"
 
 msgid "Access key:"
 msgstr "Clef d'accès :"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 msgid "Access key"
 msgstr "Clef d'accès"
 
 msgid "Access key"
 msgstr "Clef d'accès"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr "Utilisez une clef d'accès pour les deux instances liées."
 
 msgid "Use one access key for both linked instances."
 msgstr "Utilisez une clef d'accès pour les deux instances liées."
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 msgid "Generate new key"
 msgstr "Générer une nouvelle clef"
 
 msgid "Generate new key"
 msgstr "Générer une nouvelle clef"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 msgid "Create link"
 msgstr "Créer un lien"
 
 msgid "Create link"
 msgstr "Créer un lien"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"


@@ -1272,113 +1140,101 @@ msgstr ""
 "Envoi du fichier impossible. Vous devriez peut-être modifier la valeur de "
 "upload_max_filesize dans PHP.ini (valeur courante : %s)"
 
 "Envoi du fichier impossible. Vous devriez peut-être modifier la valeur de "
 "upload_max_filesize dans PHP.ini (valeur courante : %s)"
 

-#: classes/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 "Ajoutez un flux RSS valide par ligne (aucune détection de flux n'est "
 "réalisée)"
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 "Ajoutez un flux RSS valide par ligne (aucune détection de flux n'est "
 "réalisée)"
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr "Flux auxquels s'abonner, un par ligne"
 
 msgid "Feeds to subscribe, One per line"
 msgstr "Flux auxquels s'abonner, un par ligne"
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 msgid "Feeds require authentication."
 msgstr ""
 
 msgid "Feeds require authentication."
 msgstr ""
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 msgid "Visit the website"
 msgstr "Visiter le site web"
 
 msgid "Visit the website"
 msgstr "Visiter le site web"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 msgid "View as RSS feed"
 msgstr "Voir comme flux RSS"
 
 msgid "View as RSS feed"
 msgstr "Voir comme flux RSS"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Sélectionner :"
 
 msgid "Select:"
 msgstr "Sélectionner :"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Tout"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Inverse"
 
 msgid "Invert"
 msgstr "Inverse"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Aucun"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Sélectionner :"
 
 msgid "Selection toggle:"
 msgstr "Sélectionner :"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Sélection :"
 
 msgid "Selection:"
 msgstr "Sélection :"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 msgid "Archive"
 msgstr "Archive"
 
 msgid "Archive"
 msgstr "Archive"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 msgid "Move back"
 msgstr "Revenir"
 
 msgid "Move back"
 msgstr "Revenir"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 msgid "Delete"
 msgstr "Supprimer"
 
 msgid "Delete"
 msgstr "Supprimer"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 msgid "Forward by email"
 msgstr "Transférer par email"
 
 msgid "Forward by email"
 msgstr "Transférer par email"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "Flux :"
 
 msgid "Feed:"
 msgstr "Flux :"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "marquer comme lu"
 
 msgid "mark as read"
 msgstr "marquer comme lu"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 msgid "Originally from:"
 msgstr "Origine :"
 
 msgid "Originally from:"
 msgstr "Origine :"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 
 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 msgid "Open article in new tab"
 msgstr "Ouvrir les articles dans un nouvel onglet"
 
 msgid "Open article in new tab"
 msgstr "Ouvrir les articles dans un nouvel onglet"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 msgid "Close article"
 msgstr "Fermer l'article"
 
 msgid "Close article"
 msgstr "Fermer l'article"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "Aucun article non-lu à afficher"
 
 msgid "No unread articles found to display."
 msgstr "Aucun article non-lu à afficher"
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "Aucun article mis à jour à afficher"
 
 msgid "No updated articles found to display."
 msgstr "Aucun article mis à jour à afficher"
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher"
 
 msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher"
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1386,857 +1242,232 @@ msgstr ""
 "Aucun article à afficher. Vous pouvez assigner des étiquettes aux articles "
 "manuellement (voir les actions du menu ci-dessus) ou utiliser un filtre."
 
 "Aucun article à afficher. Vous pouvez assigner des étiquettes aux articles "
 "manuellement (voir les actions du menu ci-dessus) ou utiliser un filtre."
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "Aucun article à afficher"
 
 msgid "No articles found to display."
 msgstr "Aucun article à afficher"
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 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)"
 
 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:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-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/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Outil OPML"

 
 

-#: classes/mail_button.php:73
-msgid "From:"
-msgstr "De :"
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Import OPML en cours..."

 
 

-#: classes/mail_button.php:82
-msgid "To:"
-msgstr "A :"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Revenir à la configuration"

 
 

-#: classes/mail_button.php:95
-msgid "Subject:"
-msgstr "Sujet :"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Ajout du filtre %s"

 
 

-#: classes/mail_button.php:111
-msgid "Send e-mail"
-msgstr "Envoyer l'email"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Etiquette identique : %s"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-msgid "Edit article note"
-msgstr "Modifier l'annotation de l'article"
+#: classes/opml.php:293
+#, php-format
+msgid "Adding label %s"
+msgstr "Ajout de l'étiquette %s"

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "Cocher pour activer le champ"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Etiquette identique : %s"

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#: classes/opml.php:308

 #, php-format
 #, php-format

-msgid "(%d feeds)"
-msgstr "(%d flux)"
+msgid "Setting preference key %s to %s"
+msgstr "Paramétrage de la préférence %s à %s"

 
 

-#: classes/pref_feeds.php:306
-msgid "Feed Title"
-msgstr "Titre du flux"
+#: classes/opml.php:337
+#, fuzzy
+msgid "Adding filter..."
+msgstr "Ajout du filtre %s"

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "en utilisant"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Sans catégorie"

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Purge des articles :"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Placer dans la catégorie :"

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
-"<b>Astuce :</b> vous devez renseigner vos informations d'identification si "
-"le flux nécessite une authentification, sauf pour les flux Twitter."
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Erreur : veuillez envoyer un document OPML."

 
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-msgid "Hide from Popular feeds"
-msgstr "Masquer dans la liste des flux populaires"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Erreur lors de l'analyse du document."

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "Contenu écrit de droite à gauche"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "aucun tag"

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
+#: classes/rpc.php:736
+msgid "Your request could not be completed."
+msgstr "Votre requête ne peut être traitée."

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr "Toujours afficher les images jointes"
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."
+msgstr "La mise à jour des flux a été planifiée."

 
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Enregistrer localement les images"
+#: classes/rpc.php:748
+msgid "Category update has been scheduled."
+msgstr "La mise à jour des catégories a été planifiée."

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
-msgid "Mark updated articles as unread"
-msgstr "Marquer les article mis à jour comme non lus"
+#: classes/rpc.php:761
+msgid "Can't update this kind of feed."
+msgstr "Impossible de mettre à jour ce type de flux."

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
-msgstr "Marquer les articles comme mis à jour quand leur contenu change"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."
+msgstr ""

 
 

-#: classes/pref_feeds.php:491
-msgid "Icon"
-msgstr "Icône"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Echec de la validation de la session (adresse ip incorrecte)"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
-msgstr "Remplacer"
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "Login ou mot de passe incorrect"

 
 

-#: classes/pref_feeds.php:524
-msgid "Resubscribe to push updates"
-msgstr "Réinscription aux mises à jour en push"
+#: include/functions.php:2049
+msgid "Archived articles"
+msgstr "Articles archivés"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#: include/functions.php:2051
+msgid "Recently read"

 msgstr ""
 msgstr ""

-"Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise à "
-"jour push."
-
-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Tout est terminé."

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Abonné à <b>%s</b>."
-
-#: classes/pref_feeds.php:1021
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Impossible de s'abonner à <b>%s</b>."
+#: include/functions.php:3223 js/viewfeed.js:1996
+msgid "Click to play"
+msgstr "Cliquez pour lancer la lecture"

 
 

-#: classes/pref_feeds.php:1024
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Aucun flux trouvé dans <b>%s</b>."
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"
+msgstr "Lecture"

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Déjà abonné à <b>%s</b>."
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:3485

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "Aucun flux trouvé."
+msgid "Related"
+msgstr "Lire plus tard"

 
 

-#: classes/pref_feeds.php:1035
-#, 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>.<br>Impossible de télécharger l'URL du "
-"flux."
-
-#: classes/pref_feeds.php:1057
-msgid "Subscribe to selected feed"
-msgstr "S'abonner au flux sélectionné"
+#: include/functions.php:4186
+msgid "(edit note)"
+msgstr "(modifier l'annotation)"

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "Modifier les options d'abonnement"
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "Aucun flux sélectionné."

 
 

-#: classes/pref_feeds.php:1161
-#, 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."
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "type inconnu"

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Créer la catégorie"
+#: include/functions.php:4844
+#, fuzzy
+msgid "Attachments"
+msgstr "Fichiers attachés :"

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "Aucune catégorie de flux définie."
+#: include/functions.php:5286
+#, php-format
+msgid "%d archived articles"
+msgstr "%d articles archivés"

 
 

-#: classes/pref_feeds.php:1243
-msgid "Remove selected categories"
-msgstr "Supprimer les catégories sélectionnées"
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "Aucun flux trouvé."

 
 

-#: classes/pref_feeds.php:1267
-msgid "Feeds with errors"
-msgstr "Flux avec des erreurs"
+#: include/functions.php:5356
+msgid "Could not import: incorrect schema version."
+msgstr "Importation impossible : version du schéma incorrecte."

 
 

-#: classes/pref_feeds.php:1287
-msgid "Inactive feeds"
-msgstr "Flux inactifs"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr "Importation impossible : format de document non reconnu."

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-msgid "Select"
-msgstr "Sélectionner"
+#: include/functions.php:5520
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr "Terminé : %d articles traités, %d importés, %d flux créés."

 
 

-#: classes/pref_feeds.php:1324
-msgid "Edit selected feeds"
-msgstr "Modifier les flux sélectionnés"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr "Impossible de charger le document XML."

 
 

-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-msgid "Reset sort order"
-msgstr "Réinitialiser le critère de tri"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Titre ou contenu"

 
 

-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-msgid "Batch subscribe"
-msgstr "Abonnement par lots"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Lien"

 
 

-#: classes/pref_feeds.php:1333
-msgid "Categories"
-msgstr "Catégories"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Date de l'article"

 
 

-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Modifier les catégories"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "Supprimer l'article"

 
 

-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Modifier les catégories"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Marquer comme remarquable"

 
 

-#: classes/pref_feeds.php:1354
-msgid "More actions..."
-msgstr "Autres actions..."
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:475
+msgid "Publish article"
+msgstr "Publier l'article"

 
 

-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Purger manuellement"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Assigner des tags"

 
 

-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Purger les données de flux"
+#: include/localized_schema.php:14 js/viewfeed.js:1960
+msgid "Assign label"
+msgstr "Assigner l'étiquette"

 
 

-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "Recalculer le score des articles"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr "Modifier le score"

 
 

-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr "<b>Astuce :</b> vous pouvez faire glisser les flux et les catagories."
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Général"

 
 

-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr "Importer et exporter"
+#: include/localized_schema.php:18
+msgid "Interface"
+msgstr "Interface"

 
 

-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
+#: include/localized_schema.php:19
+msgid "Advanced"
+msgstr "Avancé"

 
 

-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-"Avec OPML, vous pouvez exporter et importer vos flux, filtrer, étiquettes et "
-"réglages de Tiny Tiny RSS."
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-"Seul le profil de réglages principal peut être migré en utilisant OPML."
-
-#: classes/pref_feeds.php:1432
-msgid "Import my OPML"
-msgstr "Importer mon OPML"
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr "Nom du fichier :"
-
-#: classes/pref_feeds.php:1438
-msgid "Include settings"
-msgstr "Inclure les paramètres"
-
-#: classes/pref_feeds.php:1442
-msgid "Export OPML"
-msgstr "Exporter en OPML"
-
-#: classes/pref_feeds.php:1446
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-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."
-
-#: classes/pref_feeds.php:1448
-msgid ""
-"Published OPML does not include your Tiny Tiny RSS settings, feeds that "
-"require authentication or feeds hidden from Popular feeds."
-msgstr ""
-"Les OPML publiés n'incluent pas vos réglages de Tiny Tiny RSS, les flux qui "
-"nécessitent une authentification, ou les flux cachés des Flux Populaires."
-
-#: classes/pref_feeds.php:1451
-msgid "Display published OPML URL"
-msgstr "Afficher l'URL de l'OPML public"
-
-#: classes/pref_feeds.php:1454
-msgid "Article archive"
-msgstr ""
-
-#: classes/pref_feeds.php:1456
-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:1459
-msgid "Export my data"
-msgstr "Exporter mes données"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importer"
-
-#: classes/pref_feeds.php:1481
-msgid "Firefox integration"
-msgstr "Intégration à Firefox"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
-"en cliquant sur le lien ci-dessous."
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr "S'abonner via bookmarklet"
-
-#: classes/pref_feeds.php:1500
-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 ""
-"Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, ouvrez "
-"le flux qui vous intéresse et cliquez sur le lien pour vous abonner à ce "
-"flux."
-
-#: classes/pref_feeds.php:1504
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
-
-#: classes/pref_feeds.php:1508
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "S'abonner dans Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1512
-msgid "Published & shared articles / Generated feeds"
-msgstr "Articles publiés et partagés / Flux générés"
-
-#: classes/pref_feeds.php:1514
-msgid "Published articles and generated feeds"
-msgstr "Articles publiés et flux générés"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-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."
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr "Afficher l'URL"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr "Supprimer toutes les URL générées"
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr "Articles publiés par URL"
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "Vous pouvez désactiver tous les articles partagés par URL unique ici."
-
-#: classes/pref_feeds.php:1532
-msgid "Unshare all articles"
-msgstr "Départager tous les articles"
-
-#: classes/pref_feeds.php:1538
-msgid "Twitter"
-msgstr "Twitter"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-"Avant de mettre à jour vos flux Twitter, vous devez enregistrer cette "
-"instance de Tiny Tiny RSS avec Twitter.com."
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-"Vous vous êtes inscrit avec succès sur Twitter.com et vous devriez être en "
-"mesure d'accéder à vos flux Twitter."
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr "S'inscrire sur Twitter.com"
-
-#: classes/pref_feeds.php:1559
-msgid "Clear stored credentials"
-msgstr "Effacer les données d'authentification stockées"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr "Articles correspondant à ce filtre :"
-
-#: classes/pref_filters.php:89
-msgid "No articles matching this filter has been found."
-msgstr "Aucun article correspondant à ce filtre n'a été trouvé."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "Filtre <b>%s</b> créé"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Modifier"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr "Lier une instance"
-
-#: 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 ""
-"Vous pouvez connecter d'autres instances de Tiny Tiny RSS à celle-ci pour "
-"partager les Flux Populaires. Pour cela utilisez l'URL suivante :"
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr "Dernière connexion"
-
-#: classes/pref_instances.php:170
-msgid "Stored feeds"
-msgstr "Flux stockés"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Cliquer pour modifier"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "Légende"
-
-#: classes/pref_labels.php:37
-msgid "Colors"
-msgstr "Couleurs"
-
-#: classes/pref_labels.php:42
-msgid "Foreground:"
-msgstr "Premier plan :"
-
-#: classes/pref_labels.php:42
-msgid "Background:"
-msgstr "Arrière-plan :"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Etiquette <b>%s</b> créé"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Ré-initialiser les couleurs"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "L'ancien mot de passe ne peut pas être vide."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "Le nouveau mot de passe ne peut pas être vide."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "Les mots de passe saisie ne sont pas identiques."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "Le mot de passe a été modifié."
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "L'ancien mot de passe n'est pas correct."
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "La configuration a été enregistrée."
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Option inconnue : %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr "Vos données personnelles ont été sauvegardées."
-
-#: classes/pref_prefs.php:166
-msgid "Personal data / Authentication"
-msgstr "Données personnelles / Authentification"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr "Nom"
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "Adresse électronique"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Permissions"
-
-#: classes/pref_prefs.php:213
-msgid "Save data"
-msgstr "Enregistrer les données"
-
-#: classes/pref_prefs.php:224
-msgid "Your password is at default value, please change it."
-msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Ancien mot de passe"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Confirmation du mot de passe"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Modifier le mot de passe"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Sélectionner un thème"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr "Personnaliser"
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Oui"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "Non"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr "Effacer"
-
-#: classes/pref_prefs.php:479
-#, fuzzy, php-format
-msgid "Current server time: %s (UTC)"
-msgstr "Heure actuelle du serveur : %s"
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Enregistrer la configuration"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr "Gérer les profils"
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Revenir aux valeurs par défaut"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Détails de l'utilisateur"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "Utilisateur non trouvé"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Inscrit"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Dernière connexion"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Nombre d'abonnements à des flux"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Flux abonnés"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Éditeur d'utilisateur"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Permissions :"
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Nouveau mot de passe"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "Adresse email :"
-
-#: classes/pref_users.php:257
-#, 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>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Impossible de créer l'utilisateur <b>%s</b>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "L'utilisateur <b>%s</b> existe déjà."
-
-#: classes/pref_users.php:291
-#, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
-msgstr ""
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "Notification <b>%s</b>."
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notification de changement de mot passe"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Réinitialiser le mot de passe"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Permissions"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Dernière connexion"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "Aucun utilisateur défini."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "Aucun utilisateur correspondant trouvé."
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "aucun tag"
-
-#: classes/rpc.php:742
-msgid "Your request could not be completed."
-msgstr "Votre requête ne peut être traitée."
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr "La mise à jour des flux a été planifiée."
-
-#: classes/rpc.php:754
-msgid "Category update has been scheduled."
-msgstr "La mise à jour des catégories a été planifiée."
-
-#: classes/rpc.php:767
-msgid "Can't update this kind of feed."
-msgstr "Impossible de mettre à jour ce type de flux."
-
-#: classes/share_button.php:7
-msgid "Share by URL"
-msgstr "Partager par URL"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr "Vous pouvez partager cet article avec l'URL unique suivante :"
-
-#: classes/tweet_button.php:7
-msgid "Share on Twitter"
-msgstr "Partager sur Twitter"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Echec de la validation de la session (adresse ip incorrecte)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "Login ou mot de passe incorrect"
-
-#: include/functions.php:2099
-msgid "Archived articles"
-msgstr "Articles archivés"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-msgid "Click to play"
-msgstr "Cliquez pour lancer la lecture"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr "Lecture"
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-msgid "(edit note)"
-msgstr "(modifier l'annotation)"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "Aucun flux sélectionné."
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "type inconnu"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Fichier attaché :"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Fichiers attachés :"
-
-#: include/functions.php:5261
-#, php-format
-msgid "%d archived articles"
-msgstr "%d articles archivés"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "Aucun flux trouvé."
-
-#: include/functions.php:5331
-msgid "Could not import: incorrect schema version."
-msgstr "Importation impossible : version du schéma incorrecte."
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr "Importation impossible : format de document non reconnu."
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr "Terminé : %d articles traités, %d importés, %d flux créés."
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr "Impossible de charger le document XML."
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "Titre ou contenu"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "Lien"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "Date de l'article"
-
-#: include/localized_schema.php:9
-msgid "Delete article"
-msgstr "Supprimer l'article"
-
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "Marquer comme remarquable"
-
-#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
-#: js/viewfeed.js:466
-msgid "Publish article"
-msgstr "Publier l'article"
-
-#: include/localized_schema.php:13
-msgid "Assign tags"
-msgstr "Assigner des tags"
-
-#: include/localized_schema.php:14 js/viewfeed.js:1935
-msgid "Assign label"
-msgstr "Assigner l'étiquette"
-
-#: include/localized_schema.php:15
-msgid "Modify score"
-msgstr "Modifier le score"
-
-#: include/localized_schema.php:17
-msgid "General"
-msgstr "Général"
-
-#: include/localized_schema.php:18
-msgid "Interface"
-msgstr "Interface"
-
-#: include/localized_schema.php:19
-msgid "Advanced"
-msgstr "Avancé"
-
-#: include/localized_schema.php:21
+#: 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 "
 msgid ""
 "This option is useful when you are reading several planet-type aggregators "
 "with partially colliding userbase. When disabled, it forces same posts from "


@@ -2299,15 +1530,15 @@ msgstr ""
 "étiquettes sont regroupés par flux"
 
 #: include/localized_schema.php:29
 "étiquettes sont regroupés par flux"
 
 #: include/localized_schema.php:29

+msgid "Customize CSS stylesheet to your liking"
+msgstr "Personnaliser les feuilles de style CSS"
+
+#: include/localized_schema.php:30

 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."
 
 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."
 

-#: include/localized_schema.php:30
-msgid "Customize CSS stylesheet to your liking"
-msgstr "Personnaliser les feuilles de style CSS"
-

 #: include/localized_schema.php:31
 msgid "Click to register your SSL client certificate with tt-rss"
 msgstr "Cliquez pour enregistrer votre certificat client SSL dans tt-rss"
 #: include/localized_schema.php:31
 msgid "Click to register your SSL client certificate with tt-rss"
 msgstr "Cliquez pour enregistrer votre certificat client SSL dans tt-rss"


@@ -2318,7 +1549,8 @@ msgid "Uses UTC timezone"
 msgstr "Fuseau horaire de l'utilisateur"
 
 #: include/localized_schema.php:33
 msgstr "Fuseau horaire de l'utilisateur"
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr ""
 "Purger les articles plus vieux que le nombre de jours donné (0 pour ne "
 "jamais purger)"
 msgstr ""
 "Purger les articles plus vieux que le nombre de jours donné (0 pour ne "
 "jamais purger)"


@@ -2427,14 +1659,14 @@ msgstr "Activer les API externes"
 msgid "User timezone"
 msgstr "Fuseau horaire de l'utilisateur"
 
 msgid "User timezone"
 msgstr "Fuseau horaire de l'utilisateur"
 

-#: include/localized_schema.php:60
-msgid "Sort headlines by feed date"
-msgstr "Trier les en-têtes par date de flux"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 

+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"
+msgstr "Trier les en-têtes par date de flux"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Connexion avec un certificat SSL"
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Connexion avec un certificat SSL"


@@ -2455,7 +1687,7 @@ msgstr "Profil :"
 msgid "Use less traffic"
 msgstr "Minimiser l'usage du trafic"
 
 msgid "Use less traffic"
 msgstr "Minimiser l'usage du trafic"
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 


@@ -2463,15 +1695,19 @@ msgstr "Marquer tous les articles de %s comme lus ?"
 msgid "Mark %d displayed articles as read?"
 msgstr "Marquer les %d articles affichés comme lus ?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "Marquer les %d articles affichés comme lus ?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "dans"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 
 msgid "Unstar article"
 msgstr "Ne plus marquer comme remarquable"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Marquer comme remarquable"
 
 msgid "Star article"
 msgstr "Marquer comme remarquable"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 
 msgid "Unpublish article"
 msgstr "Ne plus publier l'article"
 


@@ -2503,11 +1739,11 @@ msgstr "Aucun flux non lu."
 msgid "Load more..."
 msgstr "Charger plus..."
 
 msgid "Load more..."
 msgstr "Charger plus..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)"
 
 msgid "New articles available in this feed (click to show)"
 msgstr "Nouveaux articles disponible dans ce flux (cliquer pour les afficher)"
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 msgid "Update feed"
 msgstr "Mettre à jour le flux"
 
 msgid "Update feed"
 msgstr "Mettre à jour le flux"
 


@@ -2520,71 +1756,83 @@ msgstr ""
 "incluera des informations sur votre navigateur. Votre adresse IP sera "
 "sauvegardée dans la base de données."
 
 "incluera des informations sur votre navigateur. Votre adresse IP sera "
 "sauvegardée dans la base de données."
 

-#: js/functions.js:647
+#: js/functions.js:618

 msgid "Date syntax appears to be correct:"
 msgstr "La syntaxe des dates semble être correcte :"
 
 msgid "Date syntax appears to be correct:"
 msgstr "La syntaxe des dates semble être correcte :"
 

-#: js/functions.js:650
+#: js/functions.js:621

 msgid "Date syntax is incorrect."
 msgstr "La syntaxe des dates est incorrecte."
 
 msgid "Date syntax is incorrect."
 msgstr "La syntaxe des dates est incorrecte."
 

-#: js/functions.js:777
+#: js/functions.js:748

 msgid "Remove stored feed icon?"
 msgstr "Supprimer les données stockées ?"
 
 msgid "Remove stored feed icon?"
 msgstr "Supprimer les données stockées ?"
 

-#: js/functions.js:809
+#: js/functions.js:780

 msgid "Please select an image file to upload."
 msgstr "Veuillez sélectionner une image à envoyer."
 
 msgid "Please select an image file to upload."
 msgstr "Veuillez sélectionner une image à envoyer."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr "Envoyer une nouvelle icône pour ce flux ?"
 
 msgid "Upload new icon for this feed?"
 msgstr "Envoyer une nouvelle icône pour ce flux ?"
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Veuillez saisir le libellé de l'étiquette :"
 
 msgid "Please enter label caption:"
 msgstr "Veuillez saisir le libellé de l'étiquette :"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "Impossible de créer une étiquette : libellé manquant."
 
 msgid "Can't create label: missing caption."
 msgstr "Impossible de créer une étiquette : libellé manquant."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "S'abonner au flux"
 
 msgid "Subscribe to Feed"
 msgstr "S'abonner au flux"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "Abonnement au flux..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 msgid "Subscribed to %s"
 msgstr "Abonné à %s"
 
 msgid "Subscribed to %s"
 msgstr "Abonné à %s"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr "L'URL spécifiée semble invalide."
 
 msgid "Specified URL seems to be invalid."
 msgstr "L'URL spécifiée semble invalide."
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL spécifiée ne semble pas correspondre à un flux."
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL spécifiée ne semble pas correspondre à un flux."
 

-#: js/functions.js:945
-msgid "Couldn't download the specified URL."
+#: js/functions.js:917
+#, fuzzy
+msgid "Couldn't download the specified URL: %s"

 msgstr "Impossible de télécharger l'URL spécifiée."
 
 msgstr "Impossible de télécharger l'URL spécifiée."
 

-#: js/functions.js:948
+#: js/functions.js:921

 msgid "You are already subscribed to this feed."
 msgstr "Vous êtes déjà abonné à ce flux."
 
 msgid "You are already subscribed to this feed."
 msgstr "Vous êtes déjà abonné à ce flux."
 

-#: js/functions.js:980
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Modifier le filtre"
+
+#: js/functions.js:1049
+msgid "Add rule"
+msgstr ""
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Edit action"
+msgstr "Actions sur ce flux"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "Actions sur ce flux"
+
+#: js/functions.js:1112

 msgid "Create Filter"
 msgstr "Créer un filtre"
 
 msgid "Create Filter"
 msgstr "Créer un filtre"
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
-msgstr "Résultats du test du filtre"
-
-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."


@@ -2592,37 +1840,37 @@ msgstr ""
 "Réinitialiser l'inscription ? Tiny Tiny RSS essayera de se réinscrire au hub "
 "de notification lors de la prochaine mise à jour du flux."
 
 "Réinitialiser l'inscription ? Tiny Tiny RSS essayera de se réinscrire au hub "
 "de notification lors de la prochaine mise à jour du flux."
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 msgid "Please enter category title:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
 
 msgid "Please enter category title:"
 msgstr "Veuillez saisir un titre pour cette catégorie :"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 msgid "Edit Feed"
 msgstr "Modifier le flux"
 
 msgid "Edit Feed"
 msgstr "Modifier le flux"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 msgid "More Feeds"
 msgstr "D'autres flux"
 
 msgid "More Feeds"
 msgstr "D'autres flux"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."


@@ -2630,17 +1878,17 @@ msgstr ""
 "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
 "articles stockés ne seront pas supprimés."
 
 "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des "
 "articles stockés ne seront pas supprimés."
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 
 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 msgid "Remove selected feeds?"
 msgstr "Supprimer les flux sélectionnés ?"
 
 msgid "Remove selected feeds?"
 msgstr "Supprimer les flux sélectionnés ?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
 


@@ -2648,6 +1896,20 @@ msgstr "Aucun article sélectionné."
 msgid "Forward article by email"
 msgstr "Transférer l'article par email"
 
 msgid "Forward article by email"
 msgstr "Transférer l'article par email"
 

+#: js/note_button.js:11
+msgid "Edit article note"
+msgstr "Modifier l'annotation de l'article"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Modifier les catégories"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Créer la catégorie"
+

 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "Inverse"
 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "Inverse"


@@ -2664,19 +1926,20 @@ msgstr "Impossible de créer l'utilisateur : aucun login spécifié."
 msgid "Edit Filter"
 msgstr "Modifier le filtre"
 
 msgid "Edit Filter"
 msgstr "Modifier le filtre"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "Supprimer le filtre %s ?"
 
 msgstr "Supprimer le filtre %s ?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "Supprimer les étiquettes sélectionnées ?"
 
 msgid "Remove selected labels?"
 msgstr "Supprimer les étiquettes sélectionnées ?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."


@@ -2684,182 +1947,193 @@ msgstr ""
 "Supprimer les utilisateurs sélectionnés ? l'administrateur par défaut et "
 "votre compte utilisateur ne seront pas supprimés."
 
 "Supprimer les utilisateurs sélectionnés ? l'administrateur par défaut et "
 "votre compte utilisateur ne seront pas supprimés."
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 
 msgid "Remove selected filters?"
 msgstr "Supprimer les filtres sélectionnés ?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "Se désabonner des flux sélectionnés ?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "Se désabonner des flux sélectionnés ?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Veuillez sélectionner un seul flux."
 
 msgid "Please select only one feed."
 msgstr "Veuillez sélectionner un seul flux."
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Supprimer tous les articles non-remarquables dans le flux sélectionné ?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 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 "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:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "Le nom ne peut pas être vide."
 
 msgid "Login field cannot be blank."
 msgstr "Le nom ne peut pas être vide."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
 
 msgid "Reset password of selected user?"
 msgstr "Ré-initialiser le mot de passe de l'utilisateur sélectionné ?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Veuillez sélectionner un seul filtre."
 
 msgid "Please select only one filter."
 msgstr "Veuillez sélectionner un seul filtre."
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Supprimer les filtres sélectionnés ?"
+
+#: js/prefs.js:704

 msgid "Edit Multiple Feeds"
 msgstr "Modifier plusieurs flux"
 
 msgid "Edit Multiple Feeds"
 msgstr "Modifier plusieurs flux"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "Enregistrer les modifications aux flux sélectionnés ?"
 
 msgid "Save changes to selected feeds?"
 msgstr "Enregistrer les modifications aux flux sélectionnés ?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 msgid "OPML Import"
 msgstr "Import OPML"
 
 msgid "OPML Import"
 msgstr "Import OPML"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 msgid "Please choose the file first."
 msgstr "Veuillez d'abord choisir le fichier."
 
 msgid "Please choose the file first."
 msgstr "Veuillez d'abord choisir le fichier."
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 
 msgid "Reset to defaults?"
 msgstr "Revenir aux valeurs par défaut ?"
 

-#: js/prefs.js:1152
-msgid "Feed Categories"
-msgstr "Catégories de flux"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Supprimer les catégories sélectionnées ?"
 
 msgid "Remove selected categories?"
 msgstr "Supprimer les catégories sélectionnées ?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 
 msgid "No categories are selected."
 msgstr "Aucune catégorie sélectionnée."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Catégories"
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr "Flux sans mise à jour récente"
 
 msgid "Feeds without recent updates"
 msgstr "Flux sans mise à jour récente"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
 
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Remplacer l'adresse de publication OPML actuelle par une nouvelle ?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr "Recalculer le score des articles des flux sélectionnés ?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr "Recalculer le score des articles des flux sélectionnés ?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 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 "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/prefs.js:1422
+#: js/prefs.js:1507

 msgid "Reset selected labels to default colors?"
 msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
 
 msgid "Reset selected labels to default colors?"
 msgstr "Ré-initialiser les couleurs des étiquettes aux couleurs par défaut ?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr "Paramètres des profils"
 
 msgid "Settings Profiles"
 msgstr "Paramètres des profils"
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 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 ""
 "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/prefs.js:1486
+#: js/prefs.js:1571

 msgid "No profiles are selected."
 msgstr "Aucun profil sélectionné."
 
 msgid "No profiles are selected."
 msgstr "Aucun profil sélectionné."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 msgid "Activate selected profile?"
 msgstr "Activer le profil selectionné ?"
 
 msgid "Activate selected profile?"
 msgstr "Activer le profil selectionné ?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 msgid "Please choose a profile to activate."
 msgstr "Veuillez sélectionner un profil à activer"
 
 msgid "Please choose a profile to activate."
 msgstr "Veuillez sélectionner un profil à activer"
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Ceci va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
 "continuer ?"
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Ceci va invalider toutes les URL de flux générées auparavant. Souhaitez-vous "
 "continuer ?"
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 "Ceci va invalider tous les articles partagés par URL. Souhaitez-vous "
 "continuer ?"
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 "Ceci va invalider tous les articles partagés par URL. Souhaitez-vous "
 "continuer ?"
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "Editeur d'étiquette"
 
 msgid "Label Editor"
 msgstr "Editeur d'étiquette"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Cela va effacer les informations d'authentification pour Twitter. Voulez-"
 "vous continuer ?"
 
 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:1822
+#: js/prefs.js:1907

 msgid "Link Instance"
 msgstr "Lier l'instance"
 
 msgid "Link Instance"
 msgstr "Lier l'instance"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 msgid "Edit Instance"
 msgstr "Modifier l'instance"
 
 msgid "Edit Instance"
 msgstr "Modifier l'instance"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 msgid "Remove selected instances?"
 msgstr "Supprimer les instances sélectionnées ?"
 
 msgid "Remove selected instances?"
 msgstr "Supprimer les instances sélectionnées ?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 msgid "No instances are selected."
 msgstr "Aucune instance sélectionnée."
 
 msgid "No instances are selected."
 msgstr "Aucune instance sélectionnée."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 msgid "Please select only one instance."
 msgstr "Veuillez ne sélectionner qu'une instance."
 
 msgid "Please select only one instance."
 msgstr "Veuillez ne sélectionner qu'une instance."
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 msgid "Export Data"
 msgstr "Exporer les données"
 
 msgid "Export Data"
 msgstr "Exporer les données"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."


@@ -2867,114 +2141,693 @@ msgstr ""
 "Terminé, %d articles exportés. Vous pouvez télécharger les données <a class="
 "\"visibleLink\" href=\"%u\">ici</a>."
 
 "Terminé, %d articles exportés. Vous pouvez télécharger les données <a class="
 "\"visibleLink\" href=\"%u\">ici</a>."
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 msgid "Data Import"
 msgstr ""
 
 msgid "Data Import"
 msgstr ""
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+msgid "Batch subscribe"
+msgstr "Abonnement par lots"
+
+#: js/prefs.js:2191

 msgid "Subscribing to feeds..."
 msgstr "Abonnement aux flux..."
 
 msgid "Subscribing to feeds..."
 msgstr "Abonnement aux flux..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Revenir à Tiny Tiny RSS"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "Partager l'article par URL"
 
 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "Partager l'article par URL"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "Marquer tous les articles comme lus ?"
 
 msgid "Mark all articles as read?"
 msgstr "Marquer tous les articles comme lus ?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 
 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 msgid "New version available!"
 msgstr "Une nouvelle version est disponible !"
 
 msgid "New version available!"
 msgstr "Une nouvelle version est disponible !"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marquer tous les articles visibles de %s comme lus ?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 msgid "Delete %d selected articles in %s?"
 msgstr "Supprimer les %d articles sélectionnés de %s ?"
 
 msgid "Delete %d selected articles in %s?"
 msgstr "Supprimer les %d articles sélectionnés de %s ?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 msgid "Delete %d selected articles?"
 msgstr "Supprimer les %d articles sélectionnés ?"
 
 msgid "Delete %d selected articles?"
 msgstr "Supprimer les %d articles sélectionnés ?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 msgid "Archive %d selected articles in %s?"
 msgstr "Archiver les %d articles sélectionnés de %s ?"
 
 msgid "Archive %d selected articles in %s?"
 msgstr "Archiver les %d articles sélectionnés de %s ?"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 msgid "Move %d archived articles back?"
 msgstr "Restaurer les articles archivés ?"
 
 msgid "Move %d archived articles back?"
 msgstr "Restaurer les articles archivés ?"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marquer %d articles sélectionnés de %s comme lus ?"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 msgid "Edit article Tags"
 msgstr "Modifier les étiquettes de l'article"
 
 msgid "Edit article Tags"
 msgstr "Modifier les étiquettes de l'article"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 
 msgid "No article is selected."
 msgstr "Aucun article sélectionné."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 
 msgid "No articles found to mark"
 msgstr "Aucun article à marquer"
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "Marquer %d article(s) comme lu(s) ?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 msgid "Loading..."
 msgstr "Chargement en cours..."
 
 msgid "Loading..."
 msgstr "Chargement en cours..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 
 msgid "Open original article"
 msgstr "Ouvrir l'article original"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 msgid "View in a tt-rss tab"
 msgstr "Voir dans un onglet de tt-rss"
 
 msgid "View in a tt-rss tab"
 msgstr "Voir dans un onglet de tt-rss"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 
 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 
 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 msgid "Remove label"
 msgstr "Supprimer l'étiquette"
 
 msgid "Remove label"
 msgstr "Supprimer l'étiquette"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 msgid "Playing..."
 msgstr "Lecture..."
 
 msgid "Playing..."
 msgstr "Lecture..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 msgid "Click to pause"
 msgstr "Cliquez pour mettre en pause"
 
 msgid "Click to pause"
 msgstr "Cliquez pour mettre en pause"
 

+#~ msgid "Twitter OAuth"
+#~ msgstr "Twitter OAuth"
+
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
+
+#~ msgid "Duplicate filter %s"
+#~ msgstr "Filtre identique : %s"
+
+#~ msgid "is already imported."
+#~ msgstr "est déjà importé."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Register with Twitter"
+#~ msgstr "S'inscrire via Twitter"
+
+#~ 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."
+
+#~ msgid "Congratulations! You have successfully registered with Twitter."
+#~ msgstr "Félicitation ! Vous vous êtes inscrit via Twitter avec succès."
+
+#~ msgid "Register"
+#~ msgstr "S'inscrire"
+
+#~ msgid "Match"
+#~ msgstr "Correspondance"
+
+#~ msgid "before"
+#~ msgstr "avant"
+
+#~ msgid "after"
+#~ msgstr "après"
+
+#~ msgid "Check it"
+#~ msgstr "Vérifier"
+
+#~ msgid "on field"
+#~ msgstr "sur le champ"
+
+#~ msgid "Perform Action"
+#~ msgstr "Exécuter l'action"
+
+#~ msgid "with parameters:"
+#~ msgstr "avec les paramètres :"
+
+#~ msgid "Options"
+#~ msgstr "Options"
+
+#~ msgid "Enabled"
+#~ msgstr "Activé"
+
+#~ msgid "Inverse match"
+#~ msgstr "Correspondance inverse"
+
+#~ msgid "Apply to category"
+#~ msgstr "Appliquer à une catégorie"
+
+#~ msgid "Test"
+#~ msgstr "Test"
+
+#~ msgid "Create"
+#~ msgstr "Créer"
+
+#~ msgid "[Forwarded]"
+#~ msgstr "[Transféré]"
+
+#~ msgid "Multiple articles"
+#~ msgstr "Articles multiples"
+
+#~ msgid "From:"
+#~ msgstr "De :"
+
+#~ msgid "To:"
+#~ msgstr "A :"
+
+#~ msgid "Subject:"
+#~ msgstr "Sujet :"
+
+#~ msgid "Send e-mail"
+#~ msgstr "Envoyer l'email"
+
+#~ msgid "Check to enable field"
+#~ msgstr "Cocher pour activer le champ"
+
+#~ msgid "(%d feeds)"
+#~ msgstr "(%d flux)"
+
+#~ msgid "Feed Title"
+#~ msgstr "Titre du flux"
+
+#~ msgid "using"
+#~ msgstr "en utilisant"
+
+#~ msgid "Article purging:"
+#~ msgstr "Purge des articles :"
+
+#~ msgid ""
+#~ "<b>Hint:</b> you need to fill in your login information if your feed "
+#~ "requires authentication, except for Twitter feeds."
+#~ msgstr ""
+#~ "<b>Astuce :</b> vous devez renseigner vos informations d'identification "
+#~ "si le flux nécessite une authentification, sauf pour les flux Twitter."
+
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Masquer dans la liste des flux populaires"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contenu écrit de droite à gauche"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
+
+#~ msgid "Always display image attachments"
+#~ msgstr "Toujours afficher les images jointes"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Enregistrer localement les images"
+
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Marquer les article mis à jour comme non lus"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Marquer les articles comme mis à jour quand leur contenu change"
+
+#~ msgid "Icon"
+#~ msgstr "Icône"
+
+#~ msgid "Replace"
+#~ msgstr "Remplacer"
+
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Réinscription aux mises à jour en push"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr ""
+#~ "Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise "
+#~ "à jour push."
+
+#~ msgid "All done."
+#~ msgstr "Tout est terminé."
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "Abonné à <b>%s</b>."
+
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Impossible de s'abonner à <b>%s</b>."
+
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "Aucun flux trouvé dans <b>%s</b>."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "Déjà abonné à <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "Aucun flux trouvé."
+
+#~ msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#~ msgstr ""
+#~ "Impossible de s'abonner à <b>%s</b>.<br>Impossible de télécharger l'URL "
+#~ "du flux."
+
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "S'abonner au flux sélectionné"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Modifier les options d'abonnement"
+
+#~ 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."
+
+#~ msgid "No feed categories defined."
+#~ msgstr "Aucune catégorie de flux définie."
+
+#~ msgid "Remove selected categories"
+#~ msgstr "Supprimer les catégories sélectionnées"
+
+#~ msgid "Feeds with errors"
+#~ msgstr "Flux avec des erreurs"
+
+#~ msgid "Inactive feeds"
+#~ msgstr "Flux inactifs"
+
+#~ msgid "Edit selected feeds"
+#~ msgstr "Modifier les flux sélectionnés"
+
+#~ msgid "Reset sort order"
+#~ msgstr "Réinitialiser le critère de tri"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Modifier les catégories"
+
+#~ msgid "More actions..."
+#~ msgstr "Autres actions..."
+
+#~ msgid "Manual purge"
+#~ msgstr "Purger manuellement"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Purger les données de flux"
+
+#~ msgid "Rescore articles"
+#~ msgstr "Recalculer le score des articles"
+
+#~ msgid "<b>Hint:</b> you can drag feeds and categories around."
+#~ msgstr ""
+#~ "<b>Astuce :</b> vous pouvez faire glisser les flux et les catagories."
+
+#~ msgid "Import and export"
+#~ msgstr "Importer et exporter"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#~ msgid ""
+#~ "Using OPML you can export and import your feeds, filters, labels and Tiny "
+#~ "Tiny RSS settings."
+#~ msgstr ""
+#~ "Avec OPML, vous pouvez exporter et importer vos flux, filtrer, étiquettes "
+#~ "et réglages de Tiny Tiny RSS."
+
+#~ msgid "Only main settings profile can be migrated using OPML."
+#~ msgstr ""
+#~ "Seul le profil de réglages principal peut être migré en utilisant OPML."
+
+#~ msgid "Import my OPML"
+#~ msgstr "Importer mon OPML"
+
+#~ msgid "Filename:"
+#~ msgstr "Nom du fichier :"
+
+#~ msgid "Include settings"
+#~ msgstr "Inclure les paramètres"
+
+#~ msgid "Export OPML"
+#~ msgstr "Exporter en OPML"
+
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ 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."
+
+#~ msgid ""
+#~ "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
+#~ "require authentication or feeds hidden from Popular feeds."
+#~ msgstr ""
+#~ "Les OPML publiés n'incluent pas vos réglages de Tiny Tiny RSS, les flux "
+#~ "qui nécessitent une authentification, ou les flux cachés des Flux "
+#~ "Populaires."
+
+#~ msgid "Display published OPML URL"
+#~ msgstr "Afficher l'URL de l'OPML public"
+
+#~ msgid "Export my data"
+#~ msgstr "Exporter mes données"
+
+#~ msgid "Import"
+#~ msgstr "Importer"
+
+#~ msgid "Firefox integration"
+#~ msgstr "Intégration à Firefox"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans "
+#~ "Firefox en cliquant sur le lien ci-dessous."
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
+
+#~ msgid "Subscribing using bookmarklet"
+#~ msgstr "S'abonner via bookmarklet"
+
+#~ 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 ""
+#~ "Glissez le lien ci-dessous dans la barre d'outil de votre navigateur, "
+#~ "ouvrez le flux qui vous intéresse et cliquez sur le lien pour vous "
+#~ "abonner à ce flux."
+
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "S'abonner à %s dans Tiny Tiny RSS ?"
+
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "S'abonner dans Tiny Tiny RSS"
+
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr "Articles publiés et partagés / Flux générés"
+
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "Articles publiés et flux générés"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ 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."
+
+#~ msgid "Display URL"
+#~ msgstr "Afficher l'URL"
+
+#~ msgid "Clear all generated URLs"
+#~ msgstr "Supprimer toutes les URL générées"
+
+#~ msgid "Articles shared by URL"
+#~ msgstr "Articles publiés par URL"
+
+#~ msgid "You can disable all articles shared by unique URLs here."
+#~ msgstr ""
+#~ "Vous pouvez désactiver tous les articles partagés par URL unique ici."
+
+#~ msgid "Unshare all articles"
+#~ msgstr "Départager tous les articles"
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "Before you can update your Twitter feeds, you must register this instance "
+#~ "of Tiny Tiny RSS with Twitter.com."
+#~ msgstr ""
+#~ "Avant de mettre à jour vos flux Twitter, vous devez enregistrer cette "
+#~ "instance de Tiny Tiny RSS avec Twitter.com."
+
+#~ msgid ""
+#~ "You have been successfully registered with Twitter.com and should be able "
+#~ "to access your Twitter feeds."
+#~ msgstr ""
+#~ "Vous vous êtes inscrit avec succès sur Twitter.com et vous devriez être "
+#~ "en mesure d'accéder à vos flux Twitter."
+
+#~ msgid "Register with Twitter.com"
+#~ msgstr "S'inscrire sur Twitter.com"
+
+#~ msgid "Clear stored credentials"
+#~ msgstr "Effacer les données d'authentification stockées"
+
+#~ msgid "Articles matching this filter:"
+#~ msgstr "Articles correspondant à ce filtre :"
+
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "Aucun article correspondant à ce filtre n'a été trouvé."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "Filtre <b>%s</b> créé"
+
+#~ msgid "Edit"
+#~ msgstr "Modifier"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
+
+#~ msgid "Link instance"
+#~ msgstr "Lier une instance"
+
+#~ 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 ""
+#~ "Vous pouvez connecter d'autres instances de Tiny Tiny RSS à celle-ci pour "
+#~ "partager les Flux Populaires. Pour cela utilisez l'URL suivante :"
+
+#~ msgid "Last connected"
+#~ msgstr "Dernière connexion"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Flux stockés"
+
+#~ msgid "Click to edit"
+#~ msgstr "Cliquer pour modifier"
+
+#~ msgid "Caption"
+#~ msgstr "Légende"
+
+#~ msgid "Colors"
+#~ msgstr "Couleurs"
+
+#~ msgid "Foreground:"
+#~ msgstr "Premier plan :"
+
+#~ msgid "Background:"
+#~ msgstr "Arrière-plan :"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "Etiquette <b>%s</b> créé"
+
+#~ msgid "Clear colors"
+#~ msgstr "Ré-initialiser les couleurs"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "L'ancien mot de passe ne peut pas être vide."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "Le nouveau mot de passe ne peut pas être vide."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "Les mots de passe saisie ne sont pas identiques."
+
+#~ msgid "Password has been changed."
+#~ msgstr "Le mot de passe a été modifié."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "L'ancien mot de passe n'est pas correct."
+
+#~ msgid "The configuration was saved."
+#~ msgstr "La configuration a été enregistrée."
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Option inconnue : %s"
+
+#~ msgid "Your personal data has been saved."
+#~ msgstr "Vos données personnelles ont été sauvegardées."
+
+#~ msgid "Personal data / Authentication"
+#~ msgstr "Données personnelles / Authentification"
+
+#~ msgid "Full name"
+#~ msgstr "Nom"
+
+#~ msgid "E-mail"
+#~ msgstr "Adresse électronique"
+
+#~ msgid "Access level"
+#~ msgstr "Permissions"
+
+#~ msgid "Save data"
+#~ msgstr "Enregistrer les données"
+
+#~ msgid "Your password is at default value, please change it."
+#~ msgstr "Votre mot de passe est celui par défaut, veuillez le modifier."
+
+#~ msgid "Old password"
+#~ msgstr "Ancien mot de passe"
+
+#~ msgid "New password"
+#~ msgstr "Nouveau mot de passe"
+
+#~ msgid "Confirm password"
+#~ msgstr "Confirmation du mot de passe"
+
+#~ msgid "Change password"
+#~ msgstr "Modifier le mot de passe"
+
+#~ msgid "Select theme"
+#~ msgstr "Sélectionner un thème"
+
+#~ msgid "Customize"
+#~ msgstr "Personnaliser"
+
+#~ msgid "Yes"
+#~ msgstr "Oui"
+
+#~ msgid "No"
+#~ msgstr "Non"
+
+#~ msgid "Clear"
+#~ msgstr "Effacer"
+
+#, fuzzy
+#~ msgid "Current server time: %s (UTC)"
+#~ msgstr "Heure actuelle du serveur : %s"
+
+#~ msgid "Save configuration"
+#~ msgstr "Enregistrer la configuration"
+
+#~ msgid "Manage profiles"
+#~ msgstr "Gérer les profils"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Revenir aux valeurs par défaut"
+
+#~ msgid "User details"
+#~ msgstr "Détails de l'utilisateur"
+
+#~ msgid "User not found"
+#~ msgstr "Utilisateur non trouvé"
+
+#~ msgid "Registered"
+#~ msgstr "Inscrit"
+
+#~ msgid "Last logged in"
+#~ msgstr "Dernière connexion"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Nombre d'abonnements à des flux"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Flux abonnés"
+
+#~ msgid "User Editor"
+#~ msgstr "Éditeur d'utilisateur"
+
+#~ msgid "Access level: "
+#~ msgstr "Permissions :"
+
+#~ msgid "Change password to"
+#~ msgstr "Nouveau mot de passe"
+
+#~ msgid "E-mail: "
+#~ msgstr "Adresse email :"
+
+#~ 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>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "Impossible de créer l'utilisateur <b>%s</b>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "L'utilisateur <b>%s</b> existe déjà."
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "Notification <b>%s</b>."
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Notification de changement de mot passe"
+
+#~ msgid "Reset password"
+#~ msgstr "Réinitialiser le mot de passe"
+
+#~ msgid "Access Level"
+#~ msgstr "Permissions"
+
+#~ msgid "Last login"
+#~ msgstr "Dernière connexion"
+
+#~ msgid "No users defined."
+#~ msgstr "Aucun utilisateur défini."
+
+#~ msgid "No matching users found."
+#~ msgstr "Aucun utilisateur correspondant trouvé."
+
+#~ msgid "Share by URL"
+#~ msgstr "Partager par URL"
+
+#~ msgid "You can share this article by the following unique URL:"
+#~ msgstr "Vous pouvez partager cet article avec l'URL unique suivante :"
+
+#~ msgid "Share on Twitter"
+#~ msgstr "Partager sur Twitter"
+
+#~ msgid "Attachment:"
+#~ msgstr "Fichier attaché :"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Abonnement au flux..."
+
+#~ msgid "Filter Test Results"
+#~ msgstr "Résultats du test du filtre"
+
+#~ msgid "Feed Categories"
+#~ msgstr "Catégories de flux"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."


@@ -2982,8 +2835,5 @@ msgstr "Cliquez pour mettre en pause"
 #~ "Lorsque vous cliquez sur « Marquer comme lus », le prochain flux "
 #~ "contenant des articles non lus est automatiquement affiché"
 
 #~ "Lorsque vous cliquez sur « Marquer comme lus », le prochain flux "
 #~ "contenant des articles non lus est automatiquement affiché"
 

-#~ msgid "Read it later"
-#~ msgstr "Lire plus tard"
-

 #~ msgid "Uses server timezone"
 #~ msgstr "Utilise le fuseau horaire du serveur"
 #~ msgid "Uses server timezone"
 #~ msgstr "Utilise le fuseau horaire du serveur"

diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index ffe98364db47a9a2130309e00c1d222e5181a080..a7ea701fdc8aa8617a6682bf400737fe3a830567 100644 (file)
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 ca4307b5eaedbc693761d8d86d9962b223961cbe..07231e588f0dc29b59c22f2952e0e8c7e1a7bcf7 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+0400\n"

 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"
 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"


@@ -18,95 +18,91 @@ msgstr ""
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Alapértelmezett beállítás"
 
 msgid "Use default"
 msgstr "Alapértelmezett beállítás"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Sose töröld a régi híreket"
 
 msgid "Never purge"
 msgstr "Sose töröld a régi híreket"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "1 hetes"
 
 msgid "1 week old"
 msgstr "1 hetes"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "2 hetes"
 
 msgid "2 weeks old"
 msgstr "2 hetes"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "1 hónapos"
 
 msgid "1 month old"
 msgstr "1 hónapos"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "2 hónapos"
 
 msgid "2 months old"
 msgstr "2 hónapos"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "3 hónapos"
 
 msgid "3 months old"
 msgstr "3 hónapos"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Frissítési intervallum:"
 
 msgid "Default interval"
 msgstr "Frissítési intervallum:"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Frissítések kikapcsolása"
 
 msgid "Disable updates"
 msgstr "Frissítések kikapcsolása"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Minden 15 percben"
 
 msgid "Each 15 minutes"
 msgstr "Minden 15 percben"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Minden 30 percben"
 
 msgid "Each 30 minutes"
 msgstr "Minden 30 percben"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "Óránként"
 
 msgid "Hourly"
 msgstr "Óránként"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Minden 4 órában"
 
 msgid "Each 4 hours"
 msgstr "Minden 4 órában"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Minden 12 órában"
 
 msgid "Each 12 hours"
 msgstr "Minden 12 órában"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Napi"
 
 msgid "Daily"
 msgstr "Napi"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Heti"
 
 msgid "Weekly"
 msgstr "Heti"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Alapértelmezett"
 
 msgid "Default"
 msgstr "Alapértelmezett"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Felhasználó"
 
 msgid "User"
 msgstr "Felhasználó"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Kiemelt felhasználó"
 
 msgid "Power User"
 msgstr "Kiemelt felhasználó"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Adminisztrátor"
 
 msgid "Administrator"
 msgstr "Adminisztrátor"
 


@@ -136,8 +132,7 @@ msgstr "A Tiny Tiny RSS adatbázis friss."
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Vissza az RSS-olvasóhoz"
 


@@ -212,22 +207,24 @@ 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!"
 
 "\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:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "Töltés, kérem várjon..."
 
 msgid "Loading, please wait..."
 msgstr "Töltés, kérem várjon..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Üdv,"
 
 msgid "Hello,"
 msgstr "Üdv,"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Kijelentkezés"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Kijelentkezés"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -294,214 +291,157 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Beállítások"
 
 msgid "Preferences"
 msgstr "Beállítások"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "Hozzászólások?"
 
 msgid "Comments?"
 msgstr "Hozzászólások?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Hírcsatornalista összecsukása"
 
 msgid "Collapse feedlist"
 msgstr "Hírcsatornalista összecsukása"
 

-#: index.php:148
+#: index.php:165

 #, fuzzy
 msgid "Show articles"
 msgstr "Tárolt hírek"
 
 #, fuzzy
 msgid "Show articles"
 msgstr "Tárolt hírek"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Adaptív"
 
 msgid "Adaptive"
 msgstr "Adaptív"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Minden hír"
 
 msgid "All Articles"
 msgstr "Minden hír"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Csillagos"
 
 msgid "Starred"
 msgstr "Csillagos"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Publikált"
 
 msgid "Published"
 msgstr "Publikált"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Olvasatlan"
 
 msgid "Unread"
 msgstr "Olvasatlan"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr ""
 
 msgid "Ignore Scoring"
 msgstr ""
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Frissített"
 
 msgid "Updated"
 msgstr "Frissített"
 

-#: index.php:160
+#: index.php:177

 #, fuzzy
 msgid "Sort articles"
 msgstr "Tárolt hírek"
 
 #, fuzzy
 msgid "Sort articles"
 msgstr "Tárolt hírek"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Dátum"
 
 msgid "Date"
 msgstr "Dátum"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Cím"
 
 msgid "Title"
 msgstr "Cím"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr ""
 
 msgid "Score"
 msgstr ""
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Kategóriák szerkesztése"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Frissítés"
 
 msgid "Update"
 msgstr "Frissítés"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Műveletek"
 
 msgid "Actions..."
 msgstr "Műveletek"
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Keresés..."
 
 msgid "Search..."
 msgstr "Keresés..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 
 msgid "Feed actions:"
 msgstr "Műveletek hírcsatornákkal:"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 
 msgid "Subscribe to feed..."
 msgstr "Feliratkozás hírcsatornára..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Hírcsatorna szerkesztése..."
 
 msgid "Edit this feed..."
 msgstr "Hírcsatorna szerkesztése..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr ""
 
 msgid "Rescore feed"
 msgstr ""
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Az összes hírcsatorna:"
 
 msgid "All feeds:"
 msgstr "Az összes hírcsatorna:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 
 msgid "(Un)hide read feeds"
 msgstr "Olvasottak rejtése/mutatása"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 
 msgid "Other actions:"
 msgstr "Egyéb műveletek:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr ""
 
 msgid "Switch to digest..."
 msgstr ""
 

-#: index.php:194
+#: index.php:216

 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "címkefelhő"
 
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "címkefelhő"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Új címke létrehozása..."
 
 msgid "Create label..."
 msgstr "Új címke létrehozása..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Szűrő létrehozása..."
 
 msgid "Create filter..."
 msgstr "Szűrő létrehozása..."
 

-#: index.php:198
+#: index.php:220

 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Billentyűparancsok"
 
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Billentyűparancsok"
 

-#: opml.php:81
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Kategória hozzáadása <b>%s</b>...<br>"
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: opml.php:123
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Címke hozzáadása"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, fuzzy, php-format
-msgid "Adding filter %s"
-msgstr "Hírcsatorna hozzáadása..."
-
-#: opml.php:196
-#, fuzzy, php-format
-msgid "Duplicate filter %s"
-msgstr "Szűrő létrehozása"
-
-#: opml.php:241
-#, fuzzy
-msgid "is already imported."
-msgstr "Már importálva."
-
-#: opml.php:271
-#, fuzzy
-msgid "OK"
-msgstr "OK!"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Hiba történt a dokuementum feldoglozása közben"
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Hiba: kérem töltse fel az OPML fájlt!"
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "OMPL-segédprogram"
-
-#: opml.php:530
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Vissza a beállításokhoz"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"


@@ -510,18 +450,16 @@ msgstr "Billentyűparancsok"
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Hírcsatornák"
 
 msgid "Feeds"
 msgstr "Hírcsatornák"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Szűrők"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Szűrők"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Címkék"
 
 msgid "Labels"
 msgstr "Címkék"
 


@@ -592,23 +530,6 @@ msgstr "Felhasználói fiók sikeresen létrehozva"
 msgid "New user registrations are currently closed."
 msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
 
 msgid "New user registrations are currently closed."
 msgstr "Új felhasználók regisztrációja jelenleg nem engedélyezett."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-#, fuzzy
-msgid "Register"
-msgstr "Regisztrált"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Billentyűparancsok"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Billentyűparancsok"


@@ -684,11 +605,11 @@ msgstr "Egyéb műveletek"
 msgid "Select article under mouse cursor"
 msgstr "Az egérkurzor alatti hír kiválasztása"
 
 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
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Címke létrehozása"
 
 msgid "Create label"
 msgstr "Címke létrehozása"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 
 msgid "Create filter"
 msgstr "Szűrő létrehozása"
 


@@ -734,11 +655,11 @@ msgstr "Hírcsatorna-műveletek"
 msgid "Refresh active feed"
 msgstr "Aktív hírcsatorna frissítése"
 
 msgid "Refresh active feed"
 msgstr "Aktív hírcsatorna frissítése"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 
 msgid "Subscribe to feed"
 msgstr "Feliratkozás hírcsatornára"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Hírcsatorna szerkesztése"
 
 msgid "Edit feed"
 msgstr "Hírcsatorna szerkesztése"
 


@@ -763,19 +684,19 @@ msgstr "Ha kategóriát böngész, csukja össze/nyissa szét"
 msgid "Go to..."
 msgstr "Ugrás ide..."
 
 msgid "Go to..."
 msgstr "Ugrás ide..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Az összes hír"
 
 msgid "All articles"
 msgstr "Az összes hír"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Friss hírek"
 
 msgid "Fresh articles"
 msgstr "Friss hírek"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Csillagos hírek"
 
 msgid "Starred articles"
 msgstr "Csillagos hírek"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Publikált hírek"
 
 msgid "Published articles"
 msgstr "Publikált hírek"
 


@@ -811,7 +732,7 @@ msgstr "A legfelső 25 hírcsatorna"
 msgid "Edit feed categories"
 msgstr "Kategóriák szerkesztése"
 
 msgid "Edit feed categories"
 msgstr "Kategóriák szerkesztése"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Felhasználó létrehozása"
 
 msgid "Create user"
 msgstr "Felhasználó létrehozása"
 


@@ -837,6 +758,10 @@ msgstr "Felhasználó:"
 msgid "Password:"
 msgstr "Jelszó:"
 
 msgid "Password:"
 msgstr "Jelszó:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -844,8 +769,8 @@ msgstr "Jelszó:"
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Kiemelt"
 
 msgid "Special"
 msgstr "Kiemelt"
 


@@ -902,13 +827,11 @@ msgstr "Súgótéma nem tlálható."
 msgid "Prepare data"
 msgstr "Mentés"
 
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Ablak bezárása"
 
 msgid "Close this window"
 msgstr "Ablak bezárása"
 


@@ -918,51 +841,65 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+#, fuzzy
+msgid "Select"
+msgstr "Kiválaszt:"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Mind"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Kijelölés törlése"
+
+#: classes/dlg.php:85

 #, fuzzy
 msgid "Create profile"
 msgstr "Szűrő létrehozása"
 
 #, fuzzy
 msgid "Create profile"
 msgstr "Szűrő létrehozása"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 #, fuzzy
 msgid "(active)"
 msgstr "Adaptív"
 
 #, fuzzy
 msgid "(active)"
 msgstr "Adaptív"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 #, fuzzy
 msgid "Default profile"
 msgstr "Hírek maximális száma"
 
 #, fuzzy
 msgid "Default profile"
 msgstr "Hírek maximális száma"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 #, fuzzy
 msgid "Activate profile"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
 #, fuzzy
 msgid "Activate profile"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr ""
 
 msgid "Public OPML URL"
 msgstr ""
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Link a publikált hírek hírcsatornájához"
 
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Link a publikált hírek hírcsatornájához"
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generált hírcsatorna"
 
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generált hírcsatorna"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr ""
 
 msgid "Notice"
 msgstr ""
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -972,11 +909,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."
 
 "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."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Legutóbbi frissítés:"
 
 msgid "Last update:"
 msgstr "Legutóbbi frissítés:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -986,261 +923,193 @@ msgstr ""
 "összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/"
 "szerver tulajdonosával!"
 
 "összeomlás vagy hiba jele is lehet, kérem lépjen kapcsolatba az oldal/"
 "szerver tulajdonosával!"
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Hírcsatorna"
 
 msgid "Feed"
 msgstr "Hírcsatorna"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 #, fuzzy
 msgid "Feed URL"
 msgstr "Hírcsatorna"
 
 #, fuzzy
 msgid "Feed URL"
 msgstr "Hírcsatorna"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 
 msgid "Place in category:"
 msgstr "Hozzáadás a következő kategóriához:"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 #, fuzzy
 msgid "Available feeds"
 msgstr "Összes hírcsatorna"
 
 #, fuzzy
 msgid "Available feeds"
 msgstr "Összes hírcsatorna"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Azonosítás"
 
 msgid "Authentication"
 msgstr "Azonosítás"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Belépés"
 
 msgid "Login"
 msgstr "Belépés"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
 
 #, fuzzy
 msgid "Password"
 msgstr "Jelszó:"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
 msgid "This feed requires authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "Feliratkozás"
 
 msgid "Subscribe"
 msgstr "Feliratkozás"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 #, fuzzy
 msgid "More feeds"
 msgstr "Hírcsatornák..."
 
 #, fuzzy
 msgid "More feeds"
 msgstr "Hírcsatornák..."
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Mégse"
 
 msgid "Cancel"
 msgstr "Mégse"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Keresés"
 
 msgid "Search"
 msgstr "Keresés"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 #, fuzzy
 msgid "Popular feeds"
 msgstr "hírcsatornák megjelenítése"
 
 #, fuzzy
 msgid "Popular feeds"
 msgstr "hírcsatornák megjelenítése"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 #, fuzzy
 msgid "Feed archive"
 msgstr "Hírcsatorna-műveletek"
 
 #, fuzzy
 msgid "Feed archive"
 msgstr "Hírcsatorna-műveletek"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 #, fuzzy
 msgid "limit:"
 msgstr "Határ:"
 
 #, fuzzy
 msgid "limit:"
 msgstr "Határ:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Eltávolít"
 
 msgid "Remove"
 msgstr "Eltávolít"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr ""
 
 msgid "Look for"
 msgstr ""
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 #, fuzzy
 msgid "match on"
 msgstr "ha egyezik ezzel:"
 
 #, fuzzy
 msgid "match on"
 msgstr "ha egyezik ezzel:"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Tartalom"
 
 msgid "Content"
 msgstr "Tartalom"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Cím vagy tartalom"
 
 msgid "Title or content"
 msgstr "Cím vagy tartalom"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Keresés korlátozása ezekre:"
 
 msgid "Limit search to:"
 msgstr "Keresés korlátozása ezekre:"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 
 msgid "This feed"
 msgstr "Ez a hírcsatorna"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Egyezés"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr ""
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "elteltével"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr ""
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "...szerepeljen ebben a mezőben: "
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "itt"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Műveletek"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "Beállítás:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Beállítások"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Engedélyezve"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "Fordított egyezés"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-#, fuzzy
-msgid "Apply to category"
-msgstr "Hozzáadás a következő kategóriához:"
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Teszt"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Létrehoz"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 #, 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:"
 
 #, 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:"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Kattintson ide a szerkesztéshez"
 
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Kattintson ide a szerkesztéshez"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "Váratlan hibák miatt ezek a hírcsatornák nem frissültek:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "A hír címkéi (vesszőkkel elválasztva):"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Mentés"
 
 msgid "Save"
 msgstr "Mentés"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Címkefelhő"
 
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Címkefelhő"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr "Egyezés"
 
 msgid "Match:"
 msgstr "Egyezés"
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 #, fuzzy
 msgid "Display entries"
 msgstr "hírcsatornák megjelenítése"
 
 #, fuzzy
 msgid "Display entries"
 msgstr "hírcsatornák megjelenítése"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 #, fuzzy
 msgid "View as RSS"
 msgstr "Címkék megtekintése"
 
 #, fuzzy
 msgid "View as RSS"
 msgstr "Címkék megtekintése"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, 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!"
 
 #, 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!"
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 #, fuzzy
 msgid "Details"
 msgstr "Napi"
 
 #, fuzzy
 msgid "Details"
 msgstr "Napi"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1248,168 +1117,153 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr ""
 
 msgid "Instance"
 msgstr ""
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "Hírcsatorna URL:"
 
 msgid "URL:"
 msgstr "Hírcsatorna URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr ""
 
 msgid "Instance URL"
 msgstr ""
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 #, fuzzy
 msgid "Access key:"
 msgstr "Hozzáférési szint:"
 
 #, fuzzy
 msgid "Access key:"
 msgstr "Hozzáférési szint:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 #, fuzzy
 msgid "Access key"
 msgstr "Hozzáférési szint"
 
 #, fuzzy
 msgid "Access key"
 msgstr "Hozzáférési szint"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 #, fuzzy
 msgid "Generate new key"
 msgstr "Generált hírcsatorna"
 
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generált hírcsatorna"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 #, fuzzy
 msgid "Create link"
 msgstr "Létrehoz"
 
 #, fuzzy
 msgid "Create link"
 msgstr "Létrehoz"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Ez a hírcsatorna azonosítást igényel."
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 #, fuzzy
 msgid "Visit the website"
 msgstr "Hivatalos weboldal megtekintése"
 
 #, fuzzy
 msgid "Visit the website"
 msgstr "Hivatalos weboldal megtekintése"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Hírcsatornák megtekintése"
 
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Hírcsatornák megtekintése"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Kiválaszt:"
 
 msgid "Select:"
 msgstr "Kiválaszt:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Mind"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Fordított"
 
 msgid "Invert"
 msgstr "Fordított"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Kijelölés törlése"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Kiválasztott legyen:"
 
 msgid "Selection toggle:"
 msgstr "Kiválasztott legyen:"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Kiválasztott hírcsatornák:"
 
 msgid "Selection:"
 msgstr "Kiválasztott hírcsatornák:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 #, fuzzy
 msgid "Archive"
 msgstr "Hír dátuma"
 
 #, fuzzy
 msgid "Archive"
 msgstr "Hír dátuma"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 #, fuzzy
 msgid "Move back"
 msgstr "Vissza"
 
 #, fuzzy
 msgid "Move back"
 msgstr "Vissza"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 #, fuzzy
 msgid "Delete"
 msgstr "Alapértelmezett"
 
 #, fuzzy
 msgid "Delete"
 msgstr "Alapértelmezett"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 #, fuzzy
 msgid "Forward by email"
 msgstr "Hír csillagozása"
 
 #, fuzzy
 msgid "Forward by email"
 msgstr "Hír csillagozása"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 #, fuzzy
 msgid "Feed:"
 msgstr "Hírcsatorna"
 
 #, fuzzy
 msgid "Feed:"
 msgstr "Hírcsatorna"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Hírcsatorna nem található"
 
 msgid "Feed not found."
 msgstr "Hírcsatorna nem található"
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "olvasottként jelöl"
 
 msgid "mark as read"
 msgstr "olvasottként jelöl"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 #, fuzzy
 msgid "Originally from:"
 msgstr "Eredeti hír tartalmának megjelenítése"
 
 #, fuzzy
 msgid "Originally from:"
 msgstr "Eredeti hír tartalmának megjelenítése"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Hír megnyitása új ablakban"
 
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Hír megnyitása új ablakban"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 #, fuzzy
 msgid "Close article"
 msgstr "Hírek törlése"
 
 #, fuzzy
 msgid "Close article"
 msgstr "Hírek törlése"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető olvasatlan hír."
 
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető olvasatlan hír."
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető friss hír."
 
 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető friss hír."
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető csillagos hír."
 
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető csillagos hír."
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1418,863 +1272,210 @@ msgstr ""
 "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."
 
 "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."
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Frissítési hiba"
 
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Frissítési hiba"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 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!)"
 
 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:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "Kategorizálatlan"
-
-#: classes/mail_button.php:52 classes/mail_button.php:58
-msgid "[Forwarded]"
-msgstr ""
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OMPL-segédprogram"

 
 

-#: classes/mail_button.php:52
+#: classes/opml.php:37

 #, fuzzy
 #, fuzzy

-msgid "Multiple articles"
-msgstr "Az összes hír"
-
-#: classes/mail_button.php:73
-msgid "From:"
-msgstr ""
+msgid "Importing OPML..."
+msgstr "OPML importálása (DOMXML kiterjesztés használatával)"

 
 

-#: classes/mail_button.php:82
-#, fuzzy
-msgid "To:"
-msgstr "Legfelső"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Vissza a beállításokhoz"

 
 

-#: classes/mail_button.php:95
-#, fuzzy
-msgid "Subject:"
-msgstr "Kiválaszt:"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Hírcsatorna hozzáadása..."

 
 

-#: classes/mail_button.php:111
-#, fuzzy
-msgid "Send e-mail"
-msgstr "E-mail megváltoztatása"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Szűrő létrehozása"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Címkék szerkesztése"
+#: classes/opml.php:293
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Címke hozzáadása"

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
-#, fuzzy, php-format
-msgid "(%d feeds)"
-msgstr "Hírcsatornák"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:306
+#: classes/opml.php:337

 #, fuzzy
 #, fuzzy

-msgid "Feed Title"
-msgstr "Cím"
+msgid "Adding filter..."
+msgstr "Hírcsatorna hozzáadása..."

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr ""
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Kategorizálatlan"

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Régi hírek törlése:"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Hozzáadás a következő kategóriához:"

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Hiba: kérem töltse fel az OPML fájlt!"

 
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-#, fuzzy
-msgid "Hide from Popular feeds"
-msgstr "Elrejtés a hírcsatornalistámról"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Hiba történt a dokuementum feldoglozása közben"

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "Jobbról balra tartó tartalom"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "nincs címke"

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "Hozzáadás az e-mail összefoglalóhou"
+#: classes/rpc.php:736
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Regisztrációs adatai hiányosak"

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Képek helyi tárolása"
+#: classes/rpc.php:748
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "A jelszó megváltoztatva."

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
+#: classes/rpc.php:761

 #, fuzzy
 #, fuzzy

-msgid "Mark updated articles as unread"
-msgstr "Minden hírt olvasottá tesz?"
+msgid "Can't update this kind of feed."
+msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
+
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."
+msgstr ""

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:491
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "Hibás felhasználói név vagy jelszó"
+
+#: include/functions.php:2049

 #, fuzzy
 #, fuzzy

-msgid "Icon"
-msgstr "Művelet"
+msgid "Archived articles"
+msgstr "Tárolt hírek"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
+#: include/functions.php:2051
+msgid "Recently read"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:524
+#: include/functions.php:3223 js/viewfeed.js:1996

 #, fuzzy
 #, fuzzy

-msgid "Resubscribe to push updates"
-msgstr "Feliratkozva a következő hírcsatornákra:"
+msgid "Click to play"
+msgstr "Kattintson ide a szerkesztéshez"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Kész."
+#: include/functions.php:3356
+msgid " - "
+msgstr "-"

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1021
-#, 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>."
+#: include/functions.php:4186
+#, fuzzy
+msgid "(edit note)"
+msgstr "jegyzet szerkesztése"

 
 

-#: classes/pref_feeds.php:1024
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Nem található hírcsatorna."
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "Nincs kiválasztott hírcsatorna."

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "ismeretlen hírcsatornatípus"

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:4844

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "A publikált hírek hírcsatornájának címe megváltozott."
+msgid "Attachments"
+msgstr "Csatolmányok:"

 
 

-#: classes/pref_feeds.php:1035
+#: include/functions.php:5286

 #, fuzzy, php-format
 #, 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>."
+msgid "%d archived articles"
+msgstr "Csillagos hírek"

 
 

-#: classes/pref_feeds.php:1057
-#, fuzzy
-msgid "Subscribe to selected feed"
-msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "Nem található hírcsatorna."
+
+#: include/functions.php:5356
+msgid "Could not import: incorrect schema version."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "Feliratkozási beállítások szerkesztése"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1161
+#: include/functions.php:5520

 #, php-format
 #, 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."
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Kategória létrehozása"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "Nincs megadva hírcsatorna-kategória."
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Cím vagy tartalom"

 
 

-#: classes/pref_feeds.php:1243
-#, fuzzy
-msgid "Remove selected categories"
-msgstr "Kiválasztott kategóriák eltávolítása?"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Link"

 
 

-#: classes/pref_feeds.php:1267
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "Hírcsatornaszerkesztő"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Hír dátuma"

 
 

-#: classes/pref_feeds.php:1287
+#: include/localized_schema.php:9

 #, fuzzy
 #, fuzzy

-msgid "Inactive feeds"
-msgstr "Egész hírcsatornát"
-
-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-#, fuzzy
-msgid "Select"
-msgstr "Kiválaszt:"
-
-#: classes/pref_feeds.php:1324
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "Kijelölt hírcsatorna takarítása..."
-
-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Jelszó reset"
-
-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "Leiratkozás"
-
-#: classes/pref_feeds.php:1333
-#, fuzzy
-msgid "Categories"
-msgstr "Kategória:"
-
-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Kategóriák szerkesztése"
-
-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Kategóriák szerkesztése"
-
-#: classes/pref_feeds.php:1354
-#, fuzzy
-msgid "More actions..."
-msgstr "Műveletek"
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Kézi takarítás (régi hírek törlése)"
-
-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Hírcsatorna-adatok törlése"
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr ""
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref_feeds.php:1432
-#, fuzzy
-msgid "Import my OPML"
-msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-#, fuzzy
-msgid "Include settings"
-msgstr "Hozzáadás az e-mail összefoglalóhou"
-
-#: classes/pref_feeds.php:1442
-#, fuzzy
-msgid "Export OPML"
-msgstr "Exportálás OPML-be"
-
-#: classes/pref_feeds.php:1446
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-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."
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-#, fuzzy
-msgid "Article archive"
-msgstr "Hír dátuma"
-
-#: classes/pref_feeds.php:1456
-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:1459
-#, fuzzy
-msgid "Export my data"
-msgstr "Exportálás OPML-be"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importálás"
-
-#: classes/pref_feeds.php:1481
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Firefox-integráció"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-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!"
-
-#: classes/pref_feeds.php:1490
-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!"
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Vissza az RSS-olvasóhoz"
-
-#: classes/pref_feeds.php:1508
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Vissza az RSS-olvasóhoz"
-
-#: classes/pref_feeds.php:1512
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "Link a publikált hírek hírcsatornájához"
-
-#: classes/pref_feeds.php:1514
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr "Link a publikált hírek hírcsatornájához"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-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."
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Tárolt hírek"
-
-#: classes/pref_feeds.php:1538
-#, fuzzy
-msgid "Twitter"
-msgstr "Cím"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-#, fuzzy
-msgid "Clear stored credentials"
-msgstr "Hírcsatorna-adatok törlése"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: classes/pref_filters.php:89
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "Nem található a feltételeknek megfelelő szűrő."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "Szűrő létrehozva: <b>%s</b>"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Szerkesztése"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr ""
-
-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-#, fuzzy
-msgid "Stored feeds"
-msgstr "Hírcsatornák..."
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Kattintson ide a szerkesztéshez"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "Aláírás"
-
-#: classes/pref_labels.php:37
-#, fuzzy
-msgid "Colors"
-msgstr "Bezár"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Foreground:"
-msgstr "előtér"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Background:"
-msgstr "háttér"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Címke létrehozva: <b>%s</b>"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Színek visszaállítása"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "A régi jelszó mező nem maradhat üresen."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "Az új jelszó mező nem maradhat üresen."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "A megadott jelszavak nem egyeznek."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "A jelszó megváltoztatva."
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "A régi jelszó helytelen."
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "Beállítások elmentve."
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Ismeretlen beállítás: %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-#, fuzzy
-msgid "Personal data / Authentication"
-msgstr "Azonosítás"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr ""
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "E-mail"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Hozzáférési szint"
-
-#: classes/pref_prefs.php:213
-#, fuzzy
-msgid "Save data"
-msgstr "Mentés"
-
-#: classes/pref_prefs.php:224
-#, 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!"
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Régi jelszó"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Új jelszó"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Jelszó még egyszer"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Jelszó megváltoztatása"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Stílusválasztó"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Igen"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "Nem"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Beállítások mentése"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr ""
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Alapértelmezett beállítások"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Felhasználói adatok"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "Felhasználó nem találhat"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Regisztrált"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Utolsó belépés"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Olvasott hírcsatornák száma"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Feliratkozott a következő hírcsatornákra:"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Felhasználó-szerkesztő"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Hozzáférési szint:"
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Jelszó megváltoztatása"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "E-mail:"
-
-#: classes/pref_users.php:257
-#, 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>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "A következő felhasználó létrehozása sikertelen <b>%s</b>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "A következő felhasználó már létezik <b>%s</b>."
-
-#: classes/pref_users.php:291
-#, fuzzy, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\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>"
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr ""
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Jelszó reset"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Hozzáférési szint"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Utolsó belépés"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "Nincs megadva felhasználó."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "Nem található a feltételeknek megfelelő felhasználó."
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "nincs címke"
-
-#: classes/rpc.php:742
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "Regisztrációs adatai hiányosak"
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr ""
-
-#: classes/rpc.php:754
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "A jelszó megváltoztatva."
-
-#: classes/rpc.php:767
-#, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
-
-#: classes/share_button.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "Hír csillagozása"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "Cím"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr ""
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "Hibás felhasználói név vagy jelszó"
-
-#: include/functions.php:2099
-#, fuzzy
-msgid "Archived articles"
-msgstr "Tárolt hírek"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-#, fuzzy
-msgid "Click to play"
-msgstr "Kattintson ide a szerkesztéshez"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3359
-msgid " - "
-msgstr "-"
-
-#: include/functions.php:4178
-#, fuzzy
-msgid "(edit note)"
-msgstr "jegyzet szerkesztése"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "Nincs kiválasztott hírcsatorna."
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "ismeretlen hírcsatornatípus"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Csatolmány:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Csatolmányok:"
-
-#: include/functions.php:5261
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Csillagos hírek"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "Nem található hírcsatorna."
-
-#: include/functions.php:5331
-msgid "Could not import: incorrect schema version."
-msgstr ""
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr ""
-
-#: 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 "Delete article"
-msgstr "Hírek törlése"
+msgid "Delete article"
+msgstr "Hírek törlése"

 
 #: include/localized_schema.php:11
 msgid "Set starred"
 msgstr "Csillagoz"
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
 
 #: 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:466
+#: js/viewfeed.js:475

 msgid "Publish article"
 msgstr "Hír publikálása"
 
 msgid "Publish article"
 msgstr "Hír publikálása"
 


@@ -2282,7 +1483,7 @@ msgstr "Hír publikálása"
 msgid "Assign tags"
 msgstr "Címke hozzáadása"
 
 msgid "Assign tags"
 msgstr "Címke hozzáadása"
 

-#: include/localized_schema.php:14 js/viewfeed.js:1935
+#: include/localized_schema.php:14 js/viewfeed.js:1960

 msgid "Assign label"
 msgstr "Címke hozzáadása"
 
 msgid "Assign label"
 msgstr "Címke hozzáadása"
 


@@ -2363,11 +1564,11 @@ msgstr ""
 "szereplő címeket a program hírcsatornák alapján csoportosítja."
 
 #: include/localized_schema.php:29
 "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."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2379,7 +1580,8 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
 msgstr ""
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr "Régi postok törlése ennyi nap után: (0 - kikapcsol)"
 
 #: include/localized_schema.php:34
 msgstr "Régi postok törlése ennyi nap után: (0 - kikapcsol)"
 
 #: include/localized_schema.php:34


@@ -2489,16 +1691,16 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
 msgid "User timezone"
 msgstr ""
 

-#: include/localized_schema.php:60
-#, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "Felhasználói stíluslap URL-je"
 
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "Felhasználói stíluslap URL-je"
 

+#: include/localized_schema.php:61
+#, fuzzy
+msgid "Sort headlines by feed date"
+msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""


@@ -2520,7 +1722,7 @@ msgstr "Fájl:"
 msgid "Use less traffic"
 msgstr ""
 
 msgid "Use less traffic"
 msgstr ""
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt olvasottá tesz itt: %s?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "Minden hírt olvasottá tesz itt: %s?"
 


@@ -2529,15 +1731,19 @@ msgstr "Minden hírt olvasottá tesz itt: %s?"
 msgid "Mark %d displayed articles as read?"
 msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "itt"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Csillagot levesz a hírről"
 
 msgid "Unstar article"
 msgstr "Csillagot levesz a hírről"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Hír csillagozása"
 
 msgid "Star article"
 msgstr "Hír csillagozása"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Publikálás visszavonása"
 
 msgid "Unpublish article"
 msgstr "Publikálás visszavonása"
 


@@ -2576,11 +1782,11 @@ msgstr "Olvasottak rejtése/mutatása"
 msgid "Load more..."
 msgstr "Segítség betöltése..."
 
 msgid "Load more..."
 msgstr "Segítség betöltése..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 #, fuzzy
 msgid "Update feed"
 msgstr "Összes hírcsatorna frissítése"
 #, fuzzy
 msgid "Update feed"
 msgstr "Összes hírcsatorna frissítése"


@@ -2591,136 +1797,148 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "A régi jelszó helytelen."
 
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "A régi jelszó helytelen."
 

-#: js/functions.js:650
+#: js/functions.js:621

 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "A régi jelszó helytelen."
 
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "A régi jelszó helytelen."
 

-#: js/functions.js:777
+#: js/functions.js:748

 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Tárolt adatok eltávolítása."
 
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Tárolt adatok eltávolítása."
 

-#: js/functions.js:809
+#: js/functions.js:780

 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Válasszon egy hírcsatornát."
 
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Válasszon egy hírcsatornát."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Adja meg  címke nevét:"
 
 msgid "Please enter label caption:"
 msgstr "Adja meg  címke nevét:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "Címke létrehozása sikertelen: nincs megadva név."
 
 msgid "Can't create label: missing caption."
 msgstr "Címke létrehozása sikertelen: nincs megadva név."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "Feliratkozás hírcsatornára"
 
 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
+#: js/functions.js:873

 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Feliratkozva a következő hírcsatornákra:"
 
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Feliratkozva a következő hírcsatornákra:"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 msgid "Specified URL seems to be invalid."
 msgstr ""
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 

-#: js/functions.js:945
+#: js/functions.js:917
+#, fuzzy
+msgid "Couldn't download the specified URL: %s"
+msgstr ""
+"Feliratkozás hírcsatornára sikertelen: nincs megadva a hírcsatorna URL címe."
+
+#: js/functions.js:921
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "Ebből a kategóriából nem ."
+
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Szűrők"
+
+#: js/functions.js:1049

 #, fuzzy
 #, fuzzy

-msgid "Couldn't download the specified URL."
-msgstr ""
-"Feliratkozás hírcsatornára sikertelen: nincs megadva a hírcsatorna URL címe."
+msgid "Add rule"
+msgstr "Hírcsatorna-kategória hozzáadása..."

 
 

-#: js/functions.js:948
+#: js/functions.js:1075

 #, fuzzy
 #, fuzzy

-msgid "You are already subscribed to this feed."
-msgstr "Ebből a kategóriából nem ."
+msgid "Edit action"
+msgstr "Hírcsatorna-műveletek"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "Hírcsatorna-műveletek"

 
 

-#: js/functions.js:980
+#: js/functions.js:1112

 msgid "Create Filter"
 msgstr "Szárő létrehozása"
 
 msgid "Create Filter"
 msgstr "Szárő létrehozása"
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
-msgstr ""
-
-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
 
 msgid "Unsubscribe from %s?"
 msgstr "Leiratkozik innen: %s?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Megyjegyzés csatolása ehhez a hírhez:"
 
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Megyjegyzés csatolása ehhez a hírhez:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
 msgid "You can't edit this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 #, fuzzy
 msgid "Edit Feed"
 msgstr "Hírcsatorna szerkesztése"
 
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Hírcsatorna szerkesztése"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 #, fuzzy
 msgid "More Feeds"
 msgstr "Hírcsatornák..."
 
 #, fuzzy
 msgid "More Feeds"
 msgstr "Hírcsatornák..."
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 
 msgid "No feeds are selected."
 msgstr "Nincs kiválasztott hírcsatorna."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Frissítési hiba"
 
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Frissítési hiba"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
 
 msgid "No articles are selected."
 msgstr "Nincsen kiválasztott hír."
 


@@ -2729,6 +1947,21 @@ msgstr "Nincsen kiválasztott hír."
 msgid "Forward article by email"
 msgstr "Hír csillagozása"
 
 msgid "Forward article by email"
 msgstr "Hír csillagozása"
 

+#: js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Címkék szerkesztése"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Kategóriák szerkesztése"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Kategória létrehozása"
+

 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"


@@ -2747,340 +1980,821 @@ msgstr "Felhasználó létrehozása sikertelen, nincs megadva felhasználói né
 msgid "Edit Filter"
 msgstr "Szűrők"
 
 msgid "Edit Filter"
 msgstr "Szűrők"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "Eltávolítja a következő szűrőt: %s?"
 
 msgstr "Eltávolítja a következő szűrőt: %s?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 
 msgid "Remove selected labels?"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "Nincs kiválasztott címke."
 
 msgid "No labels are selected."
 msgstr "Nincs kiválasztott címke."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "Nincs kijelölt felhasználó."
 
 msgid "No users are selected."
 msgstr "Nincs kijelölt felhasználó."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
 msgid "Remove selected filters?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "Nincs kiválasztott szűrő."
 
 msgid "No filters are selected."
 msgstr "Nincs kiválasztott szűrő."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
 
 msgid "Please select only one feed."
 msgstr "Kérem csak egy hírcsatornát jelöljön meg!"
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 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?"
 
 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/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "Milyen régi híreket szeretne megtartani  (napokban; 0 - alapértelmezett)?"
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 "Milyen régi híreket szeretne megtartani  (napokban; 0 - alapértelmezett)?"
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "A felhasználói név nem maradhat üresen."
 
 msgid "Login field cannot be blank."
 msgstr "A felhasználói név nem maradhat üresen."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Kérem csak egy felhasználót jelöljön meg!"
 
 msgid "Please select only one user."
 msgstr "Kérem csak egy felhasználót jelöljön meg!"
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "Visszaállítja  akiválasztott felhasználók jelszavakit?"
 
 msgid "Reset password of selected user?"
 msgstr "Visszaállítja  akiválasztott felhasználók jelszavakit?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
 msgid "Please select only one filter."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Eltávolítja a kiválasztott szűrőket?"
+
+#: js/prefs.js:704

 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Hírcsatorna szerkesztése"
 
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Hírcsatorna szerkesztése"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 
 msgid "Save changes to selected feeds?"
 msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 #, fuzzy
 msgid "OPML Import"
 msgstr "Importálás"
 
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importálás"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "Visszaállítja a gyári beállításokat?"
 
 msgid "Reset to defaults?"
 msgstr "Visszaállítja a gyári beállításokat?"
 

-#: js/prefs.js:1152
-#, fuzzy
-msgid "Feed Categories"
-msgstr "Kategória:"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 
 msgid "Remove selected categories?"
 msgstr "Kiválasztott kategóriák eltávolítása?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "Nincs kategória kiválaszta."
 
 msgid "No categories are selected."
 msgstr "Nincs kategória kiválaszta."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Kategória-szerkesztő"
+
+#: js/prefs.js:1306

 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Frissítési hiba"
 
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Frissítési hiba"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 #, 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?"
 
 #, 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?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 #, fuzzy
 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?"
 
 #, fuzzy
 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?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 

-#: js/prefs.js:1422
+#: js/prefs.js:1507

 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Visszaállítja a címkeszíneket az alapértelmezettre?"
 
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Visszaállítja a címkeszíneket az alapértelmezettre?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr ""
 
 msgid "Settings Profiles"
 msgstr ""
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nincs kiválasztott hír."
 
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nincs kiválasztott hír."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Válasszon hírcsatorná(ka)t!"
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 
 msgid "Label Editor"
 msgstr "Címke Szerkesztő"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 #, fuzzy
 msgid "Link Instance"
 msgstr "Címkék szerkesztése"
 
 #, fuzzy
 msgid "Link Instance"
 msgstr "Címkék szerkesztése"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 #, fuzzy
 msgid "Edit Instance"
 msgstr "Címkék szerkesztése"
 
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Címkék szerkesztése"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Eltávolítja a kiválasztott szűrőket?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 #, fuzzy
 msgid "No instances are selected."
 msgstr "Nincs kiválasztott szűrő."
 
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Nincs kiválasztott szűrő."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Kérem csak egy szűrőt jelöljön meg!"
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 #, fuzzy
 msgid "Export Data"
 msgstr "Exportálás OPML-be"
 
 #, fuzzy
 msgid "Export Data"
 msgstr "Exportálás OPML-be"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 #, fuzzy
 msgid "Data Import"
 msgstr "Importálás"
 
 #, fuzzy
 msgid "Data Import"
 msgstr "Importálás"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "Leiratkozás"
+
+#: js/prefs.js:2191

 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Feliratkozás a hírcsatornára..."
 
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Feliratkozás a hírcsatornára..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Vissza az RSS-olvasóhoz"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Hír csillagozása"
 
 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Hír csillagozása"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "Minden hírt olvasottá tesz?"
 
 msgid "Mark all articles as read?"
 msgstr "Minden hírt olvasottá tesz?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 
 msgid "You can't unsubscribe from the category."
 msgstr "Ebből a kategóriából nem ."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 
 msgid "Please select some feed first."
 msgstr "Válasszon hírcsatorná(ka)t!"
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "Ezt a hírcsatornatípust nem szerkesztheted."
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 #, fuzzy
 msgid "New version available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 
 #, fuzzy
 msgid "New version available!"
 msgstr "A Tiny Tiny RSS-nek elérhető egy újabb verziója!"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "Olvasottá teszi az összes látható hírt itt: %s?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "Olvasottá teszi az összes látható hírt itt: %s?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Eltávolítja a kijelölt híreket a címke alól?"
 
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Eltávolítja a kijelölt híreket a címke alól?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Olvasottá teszi a következő kijelölt hír(eke)t: %d itt: %s?"
 
 #, fuzzy
 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:961
+#: js/viewfeed.js:970

 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Csillagos hírek"
 
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Csillagos hírek"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 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 "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:1029
+#: js/viewfeed.js:1038

 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Címkék szerkesztése"
 
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Címkék szerkesztése"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "Nincs kiválasztott hír."
 
 msgid "No article is selected."
 msgstr "Nincs kiválasztott hír."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "Nincs megjelölendő hír."
 
 msgid "No articles found to mark"
 msgstr "Nincs megjelölendő hír."
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 #, fuzzy
 msgid "Loading..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 
 #, fuzzy
 msgid "Loading..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 #, fuzzy
 msgid "Open original article"
 msgstr "Eredeti hír tartalmának megjelenítése"
 
 #, fuzzy
 msgid "Open original article"
 msgstr "Eredeti hír tartalmának megjelenítése"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Hír megnyitása új ablakban"
 
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Hír megnyitása új ablakban"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 #, fuzzy
 msgid "Mark above as read"
 msgstr "Olvasottá tesz"
 
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Olvasottá tesz"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 #, fuzzy
 msgid "Mark below as read"
 msgstr "Olvasottá tesz"
 
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Olvasottá tesz"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 #, fuzzy
 msgid "Remove label"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 
 #, fuzzy
 msgid "Remove label"
 msgstr "Eltávolítja a kiválasztott címkéket?"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 #, fuzzy
 msgid "Playing..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 
 #, fuzzy
 msgid "Playing..."
 msgstr "Hírcsatornák töltése, kérem várjon..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 #, fuzzy
 msgid "Click to pause"
 msgstr "Kattintson ide a szerkesztéshez"
 
 #, fuzzy
 msgid "Click to pause"
 msgstr "Kattintson ide a szerkesztéshez"
 

+#, fuzzy
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "Kategória hozzáadása <b>%s</b>...<br>"
+
+#, fuzzy
+#~ msgid "is already imported."
+#~ msgstr "Már importálva."
+
+#, fuzzy
+#~ msgid "OK"
+#~ msgstr "OK!"
+
+#, fuzzy
+#~ msgid "Register"
+#~ msgstr "Regisztrált"
+
+#~ msgid "Match"
+#~ msgstr "Egyezés"
+
+#~ msgid "after"
+#~ msgstr "elteltével"
+
+#~ msgid "on field"
+#~ msgstr "...szerepeljen ebben a mezőben: "
+
+#~ msgid "Perform Action"
+#~ msgstr "Műveletek"
+
+#~ msgid "with parameters:"
+#~ msgstr "Beállítás:"
+
+#~ msgid "Options"
+#~ msgstr "Beállítások"
+
+#~ msgid "Enabled"
+#~ msgstr "Engedélyezve"
+
+#~ msgid "Inverse match"
+#~ msgstr "Fordított egyezés"
+
+#, fuzzy
+#~ msgid "Apply to category"
+#~ msgstr "Hozzáadás a következő kategóriához:"
+
+#~ msgid "Test"
+#~ msgstr "Teszt"
+
+#~ msgid "Create"
+#~ msgstr "Létrehoz"
+
+#, fuzzy
+#~ msgid "Multiple articles"
+#~ msgstr "Az összes hír"
+
+#, fuzzy
+#~ msgid "To:"
+#~ msgstr "Legfelső"
+
+#, fuzzy
+#~ msgid "Subject:"
+#~ msgstr "Kiválaszt:"
+
+#, fuzzy
+#~ msgid "Send e-mail"
+#~ msgstr "E-mail megváltoztatása"
+
+#, fuzzy
+#~ msgid "(%d feeds)"
+#~ msgstr "Hírcsatornák"
+
+#, fuzzy
+#~ msgid "Feed Title"
+#~ msgstr "Cím"
+
+#~ msgid "Article purging:"
+#~ msgstr "Régi hírek törlése:"
+
+#, fuzzy
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Elrejtés a hírcsatornalistámról"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Jobbról balra tartó tartalom"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "Hozzáadás az e-mail összefoglalóhou"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Képek helyi tárolása"
+
+#, fuzzy
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Minden hírt olvasottá tesz?"
+
+#, fuzzy
+#~ msgid "Icon"
+#~ msgstr "Művelet"
+
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Feliratkozva a következő hírcsatornákra:"
+
+#~ msgid "All done."
+#~ msgstr "Kész."
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "Feliratkozva erre a hírcsatornára: <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
+
+#, fuzzy
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "Nem található hírcsatorna."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "Már fel van iratkozva erre a hírcsatornára: <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "A publikált hírek hírcsatornájának címe megváltozott."
+
+#, fuzzy
+#~ 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>."
+
+#, fuzzy
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "Leiratkozik a kiválasztott hírcsatornákról?"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Feliratkozási beállítások szerkesztése"
+
+#~ 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."
+
+#~ msgid "No feed categories defined."
+#~ msgstr "Nincs megadva hírcsatorna-kategória."
+
+#, fuzzy
+#~ msgid "Remove selected categories"
+#~ msgstr "Kiválasztott kategóriák eltávolítása?"
+
+#, fuzzy
+#~ msgid "Feeds with errors"
+#~ msgstr "Hírcsatornaszerkesztő"
+
+#, fuzzy
+#~ msgid "Inactive feeds"
+#~ msgstr "Egész hírcsatornát"
+
+#, fuzzy
+#~ msgid "Edit selected feeds"
+#~ msgstr "Kijelölt hírcsatorna takarítása..."
+
+#, fuzzy
+#~ msgid "Reset sort order"
+#~ msgstr "Jelszó reset"
+
+#, fuzzy
+#~ msgid "Categories"
+#~ msgstr "Kategória:"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Kategóriák szerkesztése"
+
+#, fuzzy
+#~ msgid "More actions..."
+#~ msgstr "Műveletek"
+
+#~ msgid "Manual purge"
+#~ msgstr "Kézi takarítás (régi hírek törlése)"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Hírcsatorna-adatok törlése"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#, fuzzy
+#~ msgid "Import my OPML"
+#~ msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
+
+#, fuzzy
+#~ msgid "Include settings"
+#~ msgstr "Hozzáadás az e-mail összefoglalóhou"
+
+#, fuzzy
+#~ msgid "Export OPML"
+#~ msgstr "Exportálás OPML-be"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ 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."
+
+#, fuzzy
+#~ msgid "Article archive"
+#~ msgstr "Hír dátuma"
+
+#, fuzzy
+#~ msgid "Export my data"
+#~ msgstr "Exportálás OPML-be"
+
+#~ msgid "Import"
+#~ msgstr "Importálás"
+
+#, fuzzy
+#~ msgid "Firefox integration"
+#~ msgstr "Firefox-integráció"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ 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!"
+
+#~ 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!"
+
+#, fuzzy
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Vissza az RSS-olvasóhoz"
+
+#, fuzzy
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Vissza az RSS-olvasóhoz"
+
+#, fuzzy
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr "Link a publikált hírek hírcsatornájához"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "Link a publikált hírek hírcsatornájához"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ 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."
+
+#, fuzzy
+#~ msgid "Unshare all articles"
+#~ msgstr "Tárolt hírek"
+
+#, fuzzy
+#~ msgid "Twitter"
+#~ msgstr "Cím"
+
+#, fuzzy
+#~ msgid "Clear stored credentials"
+#~ msgstr "Hírcsatorna-adatok törlése"
+
+#, fuzzy
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "Nem található a feltételeknek megfelelő szűrő."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "Szűrő létrehozva: <b>%s</b>"
+
+#~ msgid "Edit"
+#~ msgstr "Szerkesztése"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "Hozzáférési szintje elégtelen ehhez a művelethez."
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Hírcsatornák..."
+
+#~ msgid "Click to edit"
+#~ msgstr "Kattintson ide a szerkesztéshez"
+
+#~ msgid "Caption"
+#~ msgstr "Aláírás"
+
+#, fuzzy
+#~ msgid "Colors"
+#~ msgstr "Bezár"
+
+#, fuzzy
+#~ msgid "Foreground:"
+#~ msgstr "előtér"
+
+#, fuzzy
+#~ msgid "Background:"
+#~ msgstr "háttér"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "Címke létrehozva: <b>%s</b>"
+
+#~ msgid "Clear colors"
+#~ msgstr "Színek visszaállítása"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "A régi jelszó mező nem maradhat üresen."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "Az új jelszó mező nem maradhat üresen."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "A megadott jelszavak nem egyeznek."
+
+#~ msgid "Password has been changed."
+#~ msgstr "A jelszó megváltoztatva."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "A régi jelszó helytelen."
+
+#~ msgid "The configuration was saved."
+#~ msgstr "Beállítások elmentve."
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Ismeretlen beállítás: %s"
+
+#, fuzzy
+#~ msgid "Personal data / Authentication"
+#~ msgstr "Azonosítás"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "Access level"
+#~ msgstr "Hozzáférési szint"
+
+#, fuzzy
+#~ msgid "Save data"
+#~ msgstr "Mentés"
+
+#, 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!"
+
+#~ msgid "Old password"
+#~ msgstr "Régi jelszó"
+
+#~ msgid "New password"
+#~ msgstr "Új jelszó"
+
+#~ msgid "Confirm password"
+#~ msgstr "Jelszó még egyszer"
+
+#~ msgid "Change password"
+#~ msgstr "Jelszó megváltoztatása"
+
+#~ msgid "Select theme"
+#~ msgstr "Stílusválasztó"
+
+#~ msgid "Yes"
+#~ msgstr "Igen"
+
+#~ msgid "No"
+#~ msgstr "Nem"
+
+#~ msgid "Save configuration"
+#~ msgstr "Beállítások mentése"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Alapértelmezett beállítások"
+
+#~ msgid "User details"
+#~ msgstr "Felhasználói adatok"
+
+#~ msgid "User not found"
+#~ msgstr "Felhasználó nem találhat"
+
+#~ msgid "Registered"
+#~ msgstr "Regisztrált"
+
+#~ msgid "Last logged in"
+#~ msgstr "Utolsó belépés"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Olvasott hírcsatornák száma"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Feliratkozott a következő hírcsatornákra:"
+
+#~ msgid "User Editor"
+#~ msgstr "Felhasználó-szerkesztő"
+
+#~ msgid "Access level: "
+#~ msgstr "Hozzáférési szint:"
+
+#~ msgid "Change password to"
+#~ msgstr "Jelszó megváltoztatása"
+
+#~ msgid "E-mail: "
+#~ msgstr "E-mail:"
+
+#~ 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>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "A következő felhasználó létrehozása sikertelen <b>%s</b>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "A következő felhasználó már létezik <b>%s</b>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\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>"
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Értesítés jelszó megváltoztatásáról."
+
+#~ msgid "Reset password"
+#~ msgstr "Jelszó reset"
+
+#~ msgid "Access Level"
+#~ msgstr "Hozzáférési szint"
+
+#~ msgid "Last login"
+#~ msgstr "Utolsó belépés"
+
+#~ msgid "No users defined."
+#~ msgstr "Nincs megadva felhasználó."
+
+#~ msgid "No matching users found."
+#~ msgstr "Nem található a feltételeknek megfelelő felhasználó."
+
+#, fuzzy
+#~ msgid "Share by URL"
+#~ msgstr "Hír csillagozása"
+
+#, fuzzy
+#~ msgid "Share on Twitter"
+#~ msgstr "Cím"
+
+#~ msgid "Attachment:"
+#~ msgstr "Csatolmány:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Feliratkozás a hírcsatornára..."
+
+#, fuzzy
+#~ msgid "Feed Categories"
+#~ msgstr "Kategória:"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."


@@ -3129,10 +2843,6 @@ msgstr "Kattintson ide a szerkesztéshez"
 #~ msgid "Add category..."
 #~ msgstr "Hírcsatorna-kategória hozzáadása..."
 
 #~ msgid "Add category..."
 #~ msgstr "Hírcsatorna-kategória hozzáadása..."
 

-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Hírcsatorna-kategória hozzáadása..."
-

 #, fuzzy
 #~ msgid "description"
 #~ msgstr "Kiválasztottakat"
 #, fuzzy
 #~ msgid "description"
 #~ msgstr "Kiválasztottakat"


@@ -3310,9 +3020,6 @@ msgstr "Kattintson ide a szerkesztéshez"
 #~ msgid "Update Errors"
 #~ msgstr "Frissítési hiba"
 
 #~ msgid "Update Errors"
 #~ msgstr "Frissítési hiba"
 

-#~ msgid "Category editor"
-#~ msgstr "Kategória-szerkesztő"
-

 #~ msgid "Show last article times"
 #~ msgstr "Mutasd az utolsó hírek időpontjait"
 
 #~ msgid "Show last article times"
 #~ msgstr "Mutasd az utolsó hírek időpontjait"
 


@@ -3390,10 +3097,6 @@ msgstr "Kattintson ide a szerkesztéshez"
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Szűrő elmentve: <b>%s</b>"
 
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Szűrő elmentve: <b>%s</b>"
 

-#, fuzzy
-#~ msgid "Tiny Tiny RSS"
-#~ msgstr "Vissza az RSS-olvasóhoz"
-

 #~ msgid "Click to collapse category"
 #~ msgstr "Kattintson ide a kategória összecsukásához"
 
 #~ msgid "Click to collapse category"
 #~ msgstr "Kattintson ide a kategória összecsukásához"
 

diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 73df4af10ac634d0fdd7e6d00ff4136160431941..28c37d392d52ec73d3ef0ce01112a552121d18f5 100644 (file)
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 adefcfa20a7384b5f0b89477265eae5c8811bdc3..f46709869695a3d8d65cd5ba585767d17954d36a 100644 (file)
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+0400\n"

 "PO-Revision-Date: 2012-02-14 08:31+0000\n"
 "Last-Translator: gothfox <cthulhoo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: 2012-02-14 08:31+0000\n"
 "Last-Translator: gothfox <cthulhoo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -18,95 +18,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Utilizza predefiniti"
 
 msgid "Use default"
 msgstr "Utilizza predefiniti"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Non pulire mai"
 
 msgid "Never purge"
 msgstr "Non pulire mai"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "Vecchi di 1 settimana"
 
 msgid "1 week old"
 msgstr "Vecchi di 1 settimana"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "Vecchi di 2 settimane"
 
 msgid "2 weeks old"
 msgstr "Vecchi di 2 settimane"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "Vecchi di 1 mese"
 
 msgid "1 month old"
 msgstr "Vecchi di 1 mese"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "Vecchi di 2 mesi"
 
 msgid "2 months old"
 msgstr "Vecchi di 2 mesi"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "Vecchi di 3 mesi"
 
 msgid "3 months old"
 msgstr "Vecchi di 3 mesi"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Intervallo predefinito"
 
 msgid "Default interval"
 msgstr "Intervallo predefinito"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Disabilitare aggiornamenti"
 
 msgid "Disable updates"
 msgstr "Disabilitare aggiornamenti"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Ogni 15 minuti"
 
 msgid "Each 15 minutes"
 msgstr "Ogni 15 minuti"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Ogni 30 minuti"
 
 msgid "Each 30 minutes"
 msgstr "Ogni 30 minuti"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "A ogni ora"
 
 msgid "Hourly"
 msgstr "A ogni ora"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Ogni 4 ore"
 
 msgid "Each 4 hours"
 msgstr "Ogni 4 ore"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Ogni 12 ore"
 
 msgid "Each 12 hours"
 msgstr "Ogni 12 ore"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Giornalmente"
 
 msgid "Daily"
 msgstr "Giornalmente"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Settimanalmente"
 
 msgid "Weekly"
 msgstr "Settimanalmente"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Predefinito"
 
 msgid "Default"
 msgstr "Predefinito"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr "Twitter OAuth"
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Utente"
 
 msgid "User"
 msgstr "Utente"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Utente con più autorizzazioni"
 
 msgid "Power User"
 msgstr "Utente con più autorizzazioni"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Amministratore"
 
 msgid "Administrator"
 msgstr "Amministratore"
 


@@ -136,8 +132,7 @@ msgstr "Il database di Tiny Tiny RSS è aggiornato."
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
 


@@ -215,22 +210,24 @@ msgstr ""
 "\t\t\tda questa applicazione per funzionare correttamente. Controllare\n"
 "\t\t\tle impostazioni del browser."
 
 "\t\t\tda questa applicazione per funzionare correttamente. Controllare\n"
 "\t\t\tle impostazioni del browser."
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Salve,"
 
 msgid "Hello,"
 msgstr "Salve,"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Esci"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Esci"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -302,207 +299,153 @@ msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Preferenze"
 
 msgid "Preferences"
 msgstr "Preferenze"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "Commenti?"
 
 msgid "Comments?"
 msgstr "Commenti?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "È disponibile la nuova versione di Tiny Tiny RSS."
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr "Notizie"
 
 msgid "News"
 msgstr "Notizie"
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Contrai elenco notiziari"
 
 msgid "Collapse feedlist"
 msgstr "Contrai elenco notiziari"
 

-#: index.php:148
+#: index.php:165

 msgid "Show articles"
 msgstr "Mostra articoli"
 
 msgid "Show articles"
 msgstr "Mostra articoli"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Adattivo"
 
 msgid "Adaptive"
 msgstr "Adattivo"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Con stella"
 
 msgid "Starred"
 msgstr "Con stella"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Pubblicati"
 
 msgid "Published"
 msgstr "Pubblicati"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Non letti"
 
 msgid "Unread"
 msgstr "Non letti"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 
 msgid "Ignore Scoring"
 msgstr "Ignora punteggio"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Aggiornato"
 
 msgid "Updated"
 msgstr "Aggiornato"
 

-#: index.php:160
+#: index.php:177

 msgid "Sort articles"
 msgstr "Ordina articoli"
 
 msgid "Sort articles"
 msgstr "Ordina articoli"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Data"
 
 msgid "Date"
 msgstr "Data"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Titolo"
 
 msgid "Title"
 msgstr "Titolo"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "Punteggio"
 
 msgid "Score"
 msgstr "Punteggio"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Modifica categorie"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Aggiorna"
 
 msgid "Update"
 msgstr "Aggiorna"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Segna come letto"
 
 msgid "Mark as read"
 msgstr "Segna come letto"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Azioni..."
 
 msgid "Actions..."
 msgstr "Azioni..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Cerca..."
 
 msgid "Search..."
 msgstr "Cerca..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Azioni notiziari:"
 
 msgid "Feed actions:"
 msgstr "Azioni notiziari:"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Modifica questo notiziario..."
 
 msgid "Edit this feed..."
 msgstr "Modifica questo notiziario..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 
 msgid "All feeds:"
 msgstr "Tutti i notiziari:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
 msgid "(Un)hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Altre azioni:"
 
 msgid "Other actions:"
 msgstr "Altre azioni:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr "Passa al sommario..."
 
 msgid "Switch to digest..."
 msgstr "Passa al sommario..."
 

-#: index.php:194
+#: index.php:216

 msgid "Show tag cloud..."
 msgstr "Mostra nuvola etichette..."
 
 msgid "Show tag cloud..."
 msgstr "Mostra nuvola etichette..."
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Crea etichetta..."
 
 msgid "Create label..."
 msgstr "Crea etichetta..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Crea filtro..."
 
 msgid "Create filter..."
 msgstr "Crea filtro..."
 

-#: index.php:198
+#: index.php:220

 msgid "Keyboard shortcuts help"
 msgstr "Aiuto scorciatoie da tastiera"
 
 msgid "Keyboard shortcuts help"
 msgstr "Aiuto scorciatoie da tastiera"
 

-#: opml.php:81
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>Aggiunta della categoria <b>%s</b>.</li>"
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Impostazione della voce delle preferenze %s a %s"
-
-#: opml.php:123
-#, php-format
-msgid "Adding label %s"
-msgstr ""
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, php-format
-msgid "Adding filter %s"
-msgstr ""
-
-#: opml.php:196
-#, php-format
-msgid "Duplicate filter %s"
-msgstr ""
-
-#: opml.php:241
-msgid "is already imported."
-msgstr "già importato."
-
-#: opml.php:271
-msgid "OK"
-msgstr "OK"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Errore durante l&apos;analisi del documento."
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Errore: caricare il file OPML."
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "Utilità OPML"
-
-#: opml.php:530
-msgid "Importing OPML..."
-msgstr "Importazione OPML..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Ritorna alle preferenze"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"


@@ -511,18 +454,16 @@ msgstr "Scorciatoie da tastiera"
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Notiziari"
 
 msgid "Feeds"
 msgstr "Notiziari"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Filtri"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Filtri"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Etichette"
 
 msgid "Labels"
 msgstr "Etichette"
 


@@ -593,23 +534,6 @@ msgstr "Utente creato con successo."
 msgid "New user registrations are currently closed."
 msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 
 msgid "New user registrations are currently closed."
 msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr "Registra su Twitter"
-
-#: 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:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr "Registrazione su Twitter effettuata con successo."
-
-#: twitter.php:118 classes/pref_prefs.php:469
-msgid "Register"
-msgstr "Registro"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"


@@ -682,11 +606,11 @@ msgstr "Altre azioni"
 msgid "Select article under mouse cursor"
 msgstr "Seleziona l&apos;articolo sotto il cursore del mouse"
 
 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
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Crea etichetta"
 
 msgid "Create label"
 msgstr "Crea etichetta"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Crea filtro"
 
 msgid "Create filter"
 msgstr "Crea filtro"
 


@@ -726,11 +650,11 @@ msgstr "Azioni notiziari"
 msgid "Refresh active feed"
 msgstr "Aggiorna notiziario attivo"
 
 msgid "Refresh active feed"
 msgstr "Aggiorna notiziario attivo"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Modifica notiziario"
 
 msgid "Edit feed"
 msgstr "Modifica notiziario"
 


@@ -754,19 +678,19 @@ msgstr "Se in visualizzazione categoria, contraila/espandila"
 msgid "Go to..."
 msgstr "Vai a..."
 
 msgid "Go to..."
 msgstr "Vai a..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Tutti gli articoli"
 
 msgid "All articles"
 msgstr "Tutti gli articoli"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Articoli con stella"
 
 msgid "Starred articles"
 msgstr "Articoli con stella"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 


@@ -804,7 +728,7 @@ msgstr "Primi 25 notiziari"
 msgid "Edit feed categories"
 msgstr "Modifica categorie notiziari"
 
 msgid "Edit feed categories"
 msgstr "Modifica categorie notiziari"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Crea utente"
 
 msgid "Create user"
 msgstr "Crea utente"
 


@@ -832,6 +756,10 @@ msgstr "Accesso:"
 msgid "Password:"
 msgstr "Password:"
 
 msgid "Password:"
 msgstr "Password:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -839,8 +767,8 @@ msgstr "Password:"
 msgid "Home"
 msgstr "Casa"
 
 msgid "Home"
 msgstr "Casa"
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Speciale"
 
 msgid "Special"
 msgstr "Speciale"
 


@@ -890,13 +818,11 @@ msgstr "Argomento dell&apos;aiuto non trovato."
 msgid "Prepare data"
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 


@@ -906,44 +832,57 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+msgid "Select"
+msgstr "Seleziona"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Tutti"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Nessuno"
+
+#: classes/dlg.php:85

 msgid "Create profile"
 msgstr "Crea profilo"
 
 msgid "Create profile"
 msgstr "Crea profilo"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 msgid "(active)"
 msgstr "(attivo)"
 
 msgid "(active)"
 msgstr "(attivo)"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 msgid "Default profile"
 msgstr "Profilo predefinito"
 
 msgid "Default profile"
 msgstr "Profilo predefinito"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 msgid "Remove selected profiles"
 msgstr "Rimuovi i profili selezionati"
 
 msgid "Remove selected profiles"
 msgstr "Rimuovi i profili selezionati"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 msgid "Activate profile"
 msgstr "Attiva profilo"
 
 msgid "Activate profile"
 msgstr "Attiva profilo"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 
 msgid "Public OPML URL"
 msgstr "URL OPML pubblico"
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "Notifica"
 
 msgid "Notice"
 msgstr "Notifica"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 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 +893,11 @@ msgstr ""
 "aggiornameto di tutti i notiziari. Avviare il processo del demone o "
 "contattare il proprietario dell&apos;istanza."
 
 "aggiornameto di tutti i notiziari. Avviare il processo del demone o "
 "contattare il proprietario dell&apos;istanza."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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,175 +908,105 @@ msgstr ""
 "crash o uno stallo. Controllare il processo del demone o contattare il "
 "proprietario dell&apos;istanza."
 
 "crash o uno stallo. Controllare il processo del demone o contattare il "
 "proprietario dell&apos;istanza."
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Notiziario"
 
 msgid "Feed"
 msgstr "Notiziario"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 msgid "Feed URL"
 msgstr "URL del notiziario"
 
 msgid "Feed URL"
 msgstr "URL del notiziario"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Autenticazione"
 
 msgid "Authentication"
 msgstr "Autenticazione"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Accesso"
 
 msgid "Login"
 msgstr "Accesso"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 msgid "Password"
 msgstr "Password"
 
 msgid "Password"
 msgstr "Password"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l&apos;autenticazione"
 
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l&apos;autenticazione"
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 msgid "More feeds"
 msgstr "Altri notiziari"
 
 msgid "More feeds"
 msgstr "Altri notiziari"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Annulla"
 
 msgid "Cancel"
 msgstr "Annulla"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Cerca"
 
 msgid "Search"
 msgstr "Cerca"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 
 msgid "Popular feeds"
 msgstr "Notiziari popolari"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 msgid "Feed archive"
 msgstr "Archivio notiziari"
 
 msgid "Feed archive"
 msgstr "Archivio notiziari"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 msgid "limit:"
 msgstr "limite:"
 
 msgid "limit:"
 msgstr "limite:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Rimuovi"
 
 msgid "Remove"
 msgstr "Rimuovi"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr "Cerca"
 
 msgid "Look for"
 msgstr "Cerca"
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr "corrisponde a"
 
 msgid "match on"
 msgstr "corrisponde a"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Contenuto"
 
 msgid "Content"
 msgstr "Contenuto"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Titolo o contenuto"
 
 msgid "Title or content"
 msgstr "Titolo o contenuto"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Limitare la ricerca a:"
 
 msgid "Limit search to:"
 msgstr "Limitare la ricerca a:"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Questo notiziario"
 
 msgid "This feed"
 msgstr "Questo notiziario"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Corrisponde"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "prima"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "dopo"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "Controllalo"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "al campo"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "in"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Esegui azione"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "con parametri:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Opzioni"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Abilitato"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "Corrispondenza inversa"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-msgid "Apply to category"
-msgstr ""
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Prova"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Crea"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"


@@ -1145,72 +1014,75 @@ msgstr ""
 "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi "
 "(più vecchi prima):"
 
 "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi "
 "(più vecchi prima):"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 
 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 
 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "Questi notiziari non sono stati aggiornati a causa di errori:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Salva"
 
 msgid "Save"
 msgstr "Salva"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 msgid "Tag Cloud"
 msgstr "Nuvola etichette"
 
 msgid "Tag Cloud"
 msgstr "Nuvola etichette"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr ""
 
 msgid "Match:"
 msgstr ""
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 msgid "Display entries"
 msgstr ""
 
 msgid "Display entries"
 msgstr ""
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 
 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 "È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 "È possibile vedere questo notiziario come RSS utilizzando il seguente URL:"
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
 
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "È disponibile una nuova versione di Tiny Tiny RSS (%s)."
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 msgid "Details"
 msgstr "Dettagli"
 
 msgid "Details"
 msgstr "Dettagli"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr "Scarica"
 
 msgid "Download"
 msgstr "Scarica"
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1222,153 +1094,138 @@ msgstr ""
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può "
 "essere utilizzato come base."
 
 "target=\"_blank\" class=\"visibleLink\" href=\"%s\">Questo file</a> può "
 "essere utilizzato come base."
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr "Istanza"
 
 msgid "Instance"
 msgstr "Istanza"
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr "URL dell'istanza"
 
 msgid "Instance URL"
 msgstr "URL dell'istanza"
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 msgid "Access key:"
 msgstr "Chiave di accesso:"
 
 msgid "Access key:"
 msgstr "Chiave di accesso:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 msgid "Access key"
 msgstr "Chiave di accesso"
 
 msgid "Access key"
 msgstr "Chiave di accesso"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr "Utilizzare una chiave di accesso per entrambe le istanze collegate."
 
 msgid "Use one access key for both linked instances."
 msgstr "Utilizzare una chiave di accesso per entrambe le istanze collegate."
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 msgid "Generate new key"
 msgstr "Genera nuova chiave"
 
 msgid "Generate new key"
 msgstr "Genera nuova chiave"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 msgid "Create link"
 msgstr "Crea collegamento"
 
 msgid "Create link"
 msgstr "Crea collegamento"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 msgid "Feeds require authentication."
 msgstr ""
 
 msgid "Feeds require authentication."
 msgstr ""
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 msgid "Visit the website"
 msgstr "Visita il sito web"
 
 msgid "Visit the website"
 msgstr "Visita il sito web"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 msgid "View as RSS feed"
 msgstr "Visualizza come RSS del notiziario"
 
 msgid "View as RSS feed"
 msgstr "Visualizza come RSS del notiziario"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Seleziona:"
 
 msgid "Select:"
 msgstr "Seleziona:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Tutti"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Inverti"
 
 msgid "Invert"
 msgstr "Inverti"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Nessuno"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Inverti selezione:"
 
 msgid "Selection toggle:"
 msgstr "Inverti selezione:"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Selezione:"
 
 msgid "Selection:"
 msgstr "Selezione:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 msgid "Archive"
 msgstr "Archivio"
 
 msgid "Archive"
 msgstr "Archivio"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 msgid "Move back"
 msgstr "Sposta indietro"
 
 msgid "Move back"
 msgstr "Sposta indietro"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 msgid "Delete"
 msgstr "Elimina"
 
 msgid "Delete"
 msgstr "Elimina"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 msgid "Forward by email"
 msgstr "Inoltra per email"
 
 msgid "Forward by email"
 msgstr "Inoltra per email"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "Notiziario:"
 
 msgid "Feed:"
 msgstr "Notiziario:"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "segna come letto"
 
 msgid "mark as read"
 msgstr "segna come letto"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 msgid "Originally from:"
 msgstr "Originariamente da:"
 
 msgid "Originally from:"
 msgstr "Originariamente da:"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 msgid "Open article in new tab"
 msgstr "Apri articolo in una nuova scheda"
 
 msgid "Open article in new tab"
 msgstr "Apri articolo in una nuova scheda"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 msgid "Close article"
 msgstr ""
 
 msgid "Close article"
 msgstr ""
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "Nessun articolo non aggiornato trovato da visualizzare."
 
 msgid "No updated articles found to display."
 msgstr "Nessun articolo non aggiornato trovato da visualizzare."
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1377,853 +1234,227 @@ msgstr ""
 "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
 "filtro."
 
 "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
 "filtro."
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "Senza categoria"
-
-#: 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/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utilità OPML"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-msgid "Edit article note"
-msgstr "Modifica note articolo"
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Importazione OPML..."

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "Spuntare per abilitare il campo"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Ritorna alle preferenze"

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#: classes/opml.php:270

 #, php-format
 #, php-format

-msgid "(%d feeds)"
+msgid "Adding feed: %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:306
-msgid "Feed Title"
-msgstr "Titolo notiziario"
-
-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "utilizzando"
-
-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Eliminazione articoli:"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Aggiorna notiziario"

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
+#: classes/opml.php:293
+#, php-format
+msgid "Adding label %s"

 msgstr ""
 msgstr ""

-"<b>Suggerimento:</b> occorre riempire la informazioni di accesso se il "
-"proprio notiziario richiede l'autenticazione, eccetto per i notiziari di "
-"Twitter."
-
-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-msgid "Hide from Popular feeds"
-msgstr "Nascondere nei notiziari popolari"
-
-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "Contenuto da destra a sinistra"

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "Includere nell&apos;email riassunto"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr "Mostrare sempre le immagini allegate"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Impostazione della voce delle preferenze %s a %s"

 
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Memorizzare le immagini localmente"
+#: classes/opml.php:337
+#, fuzzy
+msgid "Adding filter..."
+msgstr "Crea filtro..."

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
-msgid "Mark updated articles as unread"
-msgstr "Segnare gli articoli aggiornati come non letti"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Senza categoria"

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
-msgstr "Segnare gli articoli come aggiornati al cambiamento del contenuto"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Mettere nella categoria:"

 
 

-#: classes/pref_feeds.php:491
-msgid "Icon"
-msgstr "Icona"
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Errore: caricare il file OPML."

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
-msgstr "Sostituisci"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Errore durante l&apos;analisi del documento."

 
 

-#: classes/pref_feeds.php:524
-msgid "Resubscribe to push updates"
-msgstr "Sottoscrivi per inviare aggiornamenti"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "nessuna etichetta"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-"Reimposta lo stato di sottoscrizione a PubSubHubbub per notiziari abilitati "
-"all'invio."
+#: classes/rpc.php:736
+msgid "Your request could not be completed."
+msgstr "La richiesta non può essere completata."

 
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Fatto tutto."
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."
+msgstr "L'aggiornamento del notiziario è stato pianificato con successo."

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Sottoscrizione avvenuta a <b>%s</b>."
+#: classes/rpc.php:748
+msgid "Category update has been scheduled."
+msgstr "Pianificato l'aggiornamento della categoria."

 
 

-#: classes/pref_feeds.php:1021
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Impossibile sottoscrivere <b>%s</b>."
+#: classes/rpc.php:761
+msgid "Can't update this kind of feed."
+msgstr "Impossibile aggiornare questo tipo di notiziario."

 
 

-#: classes/pref_feeds.php:1024
+#: include/functions.php:669

 #, php-format
 #, php-format

-msgid "No feeds found in <b>%s</b>."
+msgid "Fatal: authentication module %s not found."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Si ha già una sottoscrizione a <b>%s</b>."
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "La validazione della sessione è fallita (IP non corretto)"

 
 

-#: classes/pref_feeds.php:1030
-#, fuzzy
-msgid "Multiple feed URLs found."
-msgstr "Nessun notiziario trovato."
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "Nome utente o password sbagliati"

 
 

-#: classes/pref_feeds.php:1035
-#, 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."
+#: include/functions.php:2049
+msgid "Archived articles"
+msgstr "Articoli archiviati"

 
 

-#: classes/pref_feeds.php:1057
-msgid "Subscribe to selected feed"
-msgstr "Sottoscrivi il notiziario selezionato"
+#: include/functions.php:2051
+msgid "Recently read"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "Modifica opzioni di sottoscrizione"
+#: include/functions.php:3223 js/viewfeed.js:1996
+msgid "Click to play"
+msgstr "Fare clic per riprodurre"

 
 

-#: classes/pref_feeds.php:1161
-#, php-format
-msgid "Category <b>$%s</b> already exists in the database."
-msgstr "La categoria <b>%s</b> esiste già nel database."
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"
+msgstr "Riproduci"

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Crea categoria"
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "Nessuna categoria notiziari definita."
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1243
-msgid "Remove selected categories"
-msgstr "Rimuovi le categorie selezionate"
+#: include/functions.php:4186
+msgid "(edit note)"
+msgstr "(modifica note)"

 
 

-#: classes/pref_feeds.php:1267
-msgid "Feeds with errors"
-msgstr "Notiziari con errori"
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "Nessun notiziario selezionato."

 
 

-#: classes/pref_feeds.php:1287
-msgid "Inactive feeds"
-msgstr "Notiziari non attivi"
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "tipo sconosciuto"

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-msgid "Select"
-msgstr "Seleziona"
+#: include/functions.php:4844
+#, fuzzy
+msgid "Attachments"
+msgstr "Allegati:"

 
 

-#: classes/pref_feeds.php:1324
-msgid "Edit selected feeds"
-msgstr "Modifica i notiziari selezionati"
+#: include/functions.php:5286
+#, php-format
+msgid "%d archived articles"
+msgstr "%d articoli archiviati"

 
 

-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-msgid "Reset sort order"
-msgstr "Reimposta ordinamento"
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "Nessun notiziario trovato."

 
 

-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-msgid "Batch subscribe"
+#: include/functions.php:5356
+msgid "Could not import: incorrect schema version."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1333
-msgid "Categories"
-msgstr "Categorie"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Modifica categorie"
+#: include/functions.php:5520
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Modifica categorie"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1354
-msgid "More actions..."
-msgstr "Altre azioni..."
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Titolo o contenuto"

 
 

-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Eliminazione manuale"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Collegamento"

 
 

-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Pulisci i dati del notiziario"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Data dell&apos;articolo"

 
 

-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "Cambio punteggio degli articoli"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "Elimina articolo"

 
 

-#: classes/pref_feeds.php:1405
-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."
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Imposta con stella"

 
 

-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:475
+msgid "Publish article"
+msgstr "Pubblica articolo"

 
 

-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Assegna etichette"

 
 

-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
+#: include/localized_schema.php:14 js/viewfeed.js:1960
+msgid "Assign label"
+msgstr "Assegna etichetta"

 
 

-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
+#: include/localized_schema.php:15
+msgid "Modify score"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1432
-msgid "Import my OPML"
+#: include/localized_schema.php:17
+msgid "General"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1436
-msgid "Filename:"
+#: include/localized_schema.php:18
+msgid "Interface"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1438
-msgid "Include settings"
-msgstr ""
-
-#: classes/pref_feeds.php:1442
-msgid "Export OPML"
-msgstr ""
-
-#: classes/pref_feeds.php:1446
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"OPML può essere pubblicato e può essere sottoscritto da chiunque conosca "
-"l&apos;URL seguente."
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-msgid "Article archive"
-msgstr ""
-
-#: classes/pref_feeds.php:1456
-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:1459
-msgid "Export my data"
-msgstr ""
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importa"
-
-#: classes/pref_feeds.php:1481
-msgid "Firefox integration"
-msgstr "Integrazione con Firefox"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
-"di Firefox facendo clic sul collegamento qui sotto."
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr "Sottoscrizione utilizzando bookmarklet"
-
-#: classes/pref_feeds.php:1500
-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 ""
-"Trascinare il collegamento seguente nella barra degli strumenti del browser; "
-"aprire il notiziario al quale si è interessati nel browser a fare clic sul "
-"collegamento per sottoscriverlo."
-
-#: classes/pref_feeds.php:1504
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Sottoscrivere %s in Tiny Tiny RSS?"
-
-#: classes/pref_feeds.php:1508
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Sottoscrive in Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1512
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-
-#: classes/pref_feeds.php:1514
-msgid "Published articles and generated feeds"
-msgstr "Articoli pubblicati e notiziari generati"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-"Gli articoli pubblicati vengono esportati come un notiziario pubblico e "
-"possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
-"sotto."
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr "Visualizza URL"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr "Pulisci tutti gli URL generati"
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-msgid "Unshare all articles"
-msgstr ""
-
-#: classes/pref_feeds.php:1538
-msgid "Twitter"
-msgstr "Twitter"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-"Prima di poter aggiornare i notiziari di Twitter, occorre registrare questa "
-"instanza di Tiny Tiny RSS su Twitter.com."
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-"La registrazione su Twitter.com è avvenuta con successo; adesso si è in "
-"grado di accedere a notiziari di Twitter."
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr "Registra su Twitter.com"
-
-#: classes/pref_feeds.php:1559
-msgid "Clear stored credentials"
-msgstr "Pulisci le credenziali memorizzate"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr "Articoli che corrispondono a questo filtro:"
-
-#: classes/pref_filters.php:89
-msgid "No articles matching this filter has been found."
-msgstr "Nessun articolo trovato che corrisponde a questo filtro."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "Filtro <b>%s</b> creato"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Modifica"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr "Collega istanza"
-
-#: 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 ""
-"Impossibile connettere altre istanze di Tiny Tiny RSS a questa per "
-"condividere i notiziari popolari. Collegare questa istanza di Tiny Tiny RSS "
-"utilizzando questo URL:"
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr "Ultimo connesso"
-
-#: classes/pref_instances.php:170
-msgid "Stored feeds"
-msgstr "Notiziari memorizzati"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Fare clic per modificare"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "Intestazione"
-
-#: classes/pref_labels.php:37
-msgid "Colors"
-msgstr "Colori"
-
-#: classes/pref_labels.php:42
-msgid "Foreground:"
-msgstr "Primo piano:"
-
-#: classes/pref_labels.php:42
-msgid "Background:"
-msgstr "Sfondo:"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Etichetta <b>%s</b> creata"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Pulisci colori"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "La vecchia password non può essere vuota."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "La nuova password non può essere vuota."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "Le password inserite non corrispondono."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "La password è stata cambiata"
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "La vecchia password non è corretta."
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "La configurazione è stata salvata."
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Opzione sconosciuta: %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr "I dati personali sono stati salvati."
-
-#: classes/pref_prefs.php:166
-msgid "Personal data / Authentication"
-msgstr ""
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr "Nome completo"
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "Email"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Livello di accesso"
-
-#: classes/pref_prefs.php:213
-msgid "Save data"
-msgstr "Salva dati"
-
-#: classes/pref_prefs.php:224
-msgid "Your password is at default value, please change it."
-msgstr "La password è impostata al valore predefinito: cambiarla."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Vecchia password"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Nuova password"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Conferma password"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Cambia password"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Seleziona tema"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr "Personalizza"
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Sì"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "No"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr "Pulisci"
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Salva configurazione"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr "Gestisci profili"
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Reimposta ai valori predefiniti"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Dettagli utente"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "Utente non trovato"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Registrato"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Ultimo accesso"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Numero notiziari sottoscritti"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Sottoscrivi notiziari"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Editor utente"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Livello di accesso: "
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Cambiare la password a"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "Email:"
-
-#: classes/pref_users.php:257
-#, 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>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Impossibile creare l&apos;utente <b>%s<b>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "L&apos;utente <b>%s</b> esiste già."
-
-#: classes/pref_users.php:291
-#, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
-msgstr ""
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "Notifica a <b>%s</b>"
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Notifica di cambio password"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Reimposta password"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Livello di accesso"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Ultimo accesso"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "Nessun utente definito."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "Nessun utente corrispondente trovato."
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "nessuna etichetta"
-
-#: classes/rpc.php:742
-msgid "Your request could not be completed."
-msgstr "La richiesta non può essere completata."
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr "L'aggiornamento del notiziario è stato pianificato con successo."
-
-#: classes/rpc.php:754
-msgid "Category update has been scheduled."
-msgstr "Pianificato l'aggiornamento della categoria."
-
-#: classes/rpc.php:767
-msgid "Can't update this kind of feed."
-msgstr "Impossibile aggiornare questo tipo di notiziario."
-
-#: classes/share_button.php:7
-msgid "Share by URL"
-msgstr ""
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-msgid "Share on Twitter"
-msgstr "Condividi su Twitter"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "La validazione della sessione è fallita (IP non corretto)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "Nome utente o password sbagliati"
-
-#: include/functions.php:2099
-msgid "Archived articles"
-msgstr "Articoli archiviati"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-msgid "Click to play"
-msgstr "Fare clic per riprodurre"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr "Riproduci"
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-msgid "(edit note)"
-msgstr "(modifica note)"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "Nessun notiziario selezionato."
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "tipo sconosciuto"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Allegato:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Allegati:"
-
-#: include/functions.php:5261
-#, php-format
-msgid "%d archived articles"
-msgstr "%d articoli archiviati"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "Nessun notiziario trovato."
-
-#: include/functions.php:5331
-msgid "Could not import: incorrect schema version."
-msgstr ""
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-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"
-
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "Imposta con stella"
-
-#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
-#: js/viewfeed.js:466
-msgid "Publish article"
-msgstr "Pubblica articolo"
-
-#: include/localized_schema.php:13
-msgid "Assign tags"
-msgstr "Assegna etichette"
-
-#: include/localized_schema.php:14 js/viewfeed.js:1935
-msgid "Assign label"
-msgstr "Assegna etichetta"
-
-#: include/localized_schema.php:15
-msgid "Modify score"
-msgstr ""
-
-#: include/localized_schema.php:17
-msgid "General"
-msgstr ""
-
-#: include/localized_schema.php:18
-msgid "Interface"
-msgstr ""
-
-#: include/localized_schema.php:19
-msgid "Advanced"
+#: include/localized_schema.php:19
+msgid "Advanced"

 msgstr ""
 
 #: include/localized_schema.php:21
 msgstr ""
 
 #: include/localized_schema.php:21


@@ -2288,15 +1519,15 @@ msgstr ""
 "etichette vengono raggruppati per notiziario"
 
 #: include/localized_schema.php:29
 "etichette vengono raggruppati per notiziario"
 
 #: include/localized_schema.php:29

+msgid "Customize CSS stylesheet to your liking"
+msgstr "Personalizza a piacimento il foglio di stile CSS"
+
+#: include/localized_schema.php:30

 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."
 
 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"
-

 #: 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"
 #: 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"


@@ -2307,7 +1538,8 @@ msgid "Uses UTC timezone"
 msgstr "Fuso orario dell'utente"
 
 #: include/localized_schema.php:33
 msgstr "Fuso orario dell'utente"
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr ""
 "Eliminare le notizie vecchie dopo questo numero di giorni (0 - disabilitato)"
 
 msgstr ""
 "Eliminare le notizie vecchie dopo questo numero di giorni (0 - disabilitato)"
 


@@ -2416,14 +1648,14 @@ msgstr "Abilita API esterna"
 msgid "User timezone"
 msgstr "Fuso orario dell'utente"
 
 msgid "User timezone"
 msgstr "Fuso orario dell'utente"
 

-#: include/localized_schema.php:60
-msgid "Sort headlines by feed date"
-msgstr "Ordinare i sommari per data del notiziario"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 
 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 

+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"
+msgstr "Ordinare i sommari per data del notiziario"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Accesso con un certificato SSL"
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Accesso con un certificato SSL"


@@ -2444,7 +1676,7 @@ msgstr "Profilo:"
 msgid "Use less traffic"
 msgstr "Utilizzare minor traffico"
 
 msgid "Use less traffic"
 msgstr "Utilizzare minor traffico"
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in «%s» come letti?"
 


@@ -2452,15 +1684,19 @@ msgstr "Segnare tutti gli articoli in «%s» come letti?"
 msgid "Mark %d displayed articles as read?"
 msgstr "Segnare %d articolo/i visualizzato/i come letto/i?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "Segnare %d articolo/i visualizzato/i come letto/i?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "in"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Togli la stella all&apos;articolo"
 
 msgid "Unstar article"
 msgstr "Togli la stella all&apos;articolo"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Metti la stella all&apos;articolo"
 
 msgid "Star article"
 msgstr "Metti la stella all&apos;articolo"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Non pubblicare articolo"
 
 msgid "Unpublish article"
 msgstr "Non pubblicare articolo"
 


@@ -2492,12 +1728,12 @@ msgstr "Nessun notiziario non letto."
 msgid "Load more..."
 msgstr "Carica altri..."
 
 msgid "Load more..."
 msgstr "Carica altri..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 "Nuovi articoli disponibili per questo notiziario (fare clic per mostrarli)"
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 msgid "Update feed"
 msgstr "Aggiorna notiziario"
 
 msgid "Update feed"
 msgstr "Aggiorna notiziario"
 


@@ -2509,71 +1745,83 @@ msgstr ""
 "Si vuole notificare questa eccezione a tt-rss.org? La notifica includerà le "
 "informazioni sul browser. L'IP verrà salvato in un database."
 
 "Si vuole notificare questa eccezione a tt-rss.org? La notifica includerà le "
 "informazioni sul browser. L'IP verrà salvato in un database."
 

-#: js/functions.js:647
+#: js/functions.js:618

 msgid "Date syntax appears to be correct:"
 msgstr "La sintassi della data appare con corretta:"
 
 msgid "Date syntax appears to be correct:"
 msgstr "La sintassi della data appare con corretta:"
 

-#: js/functions.js:650
+#: js/functions.js:621

 msgid "Date syntax is incorrect."
 msgstr "La sintassi della data non è corretta."
 
 msgid "Date syntax is incorrect."
 msgstr "La sintassi della data non è corretta."
 

-#: js/functions.js:777
+#: js/functions.js:748

 msgid "Remove stored feed icon?"
 msgstr "Rimuovi le icone salvate dei notiziari?"
 
 msgid "Remove stored feed icon?"
 msgstr "Rimuovi le icone salvate dei notiziari?"
 

-#: js/functions.js:809
+#: js/functions.js:780

 msgid "Please select an image file to upload."
 msgstr "Selezionare un file immagine da caricare."
 
 msgid "Please select an image file to upload."
 msgstr "Selezionare un file immagine da caricare."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr "Caricare una nuova icona per questo notiziario?"
 
 msgid "Upload new icon for this feed?"
 msgstr "Caricare una nuova icona per questo notiziario?"
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Inserire l'intestazione dell'etichetta:"
 
 msgid "Please enter label caption:"
 msgstr "Inserire l'intestazione dell'etichetta:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "Impossibile creare l'etichetta: intestazione mancante."
 
 msgid "Can't create label: missing caption."
 msgstr "Impossibile creare l'etichetta: intestazione mancante."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "Sottoscrivi il notiziario"
 
 msgid "Subscribe to Feed"
 msgstr "Sottoscrivi il notiziario"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "Sottoscrizione al notiziario..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 msgid "Subscribed to %s"
 msgstr "Sottoscrizione effettuata a «%s»"
 
 msgid "Subscribed to %s"
 msgstr "Sottoscrizione effettuata a «%s»"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr "L'URL specifica sembra essere non valido."
 
 msgid "Specified URL seems to be invalid."
 msgstr "L'URL specifica sembra essere non valido."
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL specificato non sembra contenere alcun notiziario."
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "L'URL specificato non sembra contenere alcun notiziario."
 

-#: js/functions.js:945
-msgid "Couldn't download the specified URL."
+#: js/functions.js:917
+#, fuzzy
+msgid "Couldn't download the specified URL: %s"

 msgstr "Impossibile scaricare l'URL specificato."
 
 msgstr "Impossibile scaricare l'URL specificato."
 

-#: js/functions.js:948
+#: js/functions.js:921

 msgid "You are already subscribed to this feed."
 msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
 
 msgid "You are already subscribed to this feed."
 msgstr "La sottoscrizione a questo notiziario è già stata effettuata."
 

-#: js/functions.js:980
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Modifica filtro"
+
+#: js/functions.js:1049
+msgid "Add rule"
+msgstr ""
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Edit action"
+msgstr "Azioni notiziari"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "Azioni notiziari"
+
+#: js/functions.js:1112

 msgid "Create Filter"
 msgstr "Crea filtro"
 
 msgid "Create Filter"
 msgstr "Crea filtro"
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
-msgstr "Filtra risultati di prova"
-
-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."


@@ -2581,37 +1829,37 @@ msgstr ""
 "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo "
 "aggiornamento del notiziario a sottoscrivere il centro notifiche."
 
 "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo "
 "aggiornamento del notiziario a sottoscrivere il centro notifiche."
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a «%s»?"
 
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a «%s»?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 msgid "Please enter category title:"
 msgstr "Inserire il titolo della categoria:"
 
 msgid "Please enter category title:"
 msgstr "Inserire il titolo della categoria:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 msgid "Edit Feed"
 msgstr "Modifica notiziario"
 
 msgid "Edit Feed"
 msgstr "Modifica notiziario"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 msgid "More Feeds"
 msgstr "Altri notiziari"
 
 msgid "More Feeds"
 msgstr "Altri notiziari"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."


@@ -2619,17 +1867,17 @@ msgstr ""
 "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
 "archiviati non saranno rimossi."
 
 "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articoli "
 "archiviati non saranno rimossi."
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 
 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 
 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
 


@@ -2637,6 +1885,20 @@ msgstr "Nessun articolo selezionato."
 msgid "Forward article by email"
 msgstr "Inoltra l'articolo per email"
 
 msgid "Forward article by email"
 msgstr "Inoltra l'articolo per email"
 

+#: js/note_button.js:11
+msgid "Edit article note"
+msgstr "Modifica note articolo"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Modifica categorie"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Crea categoria"
+

 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "Inverso"
 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "Inverso"


@@ -2653,19 +1915,20 @@ msgstr "Impossibile creare l'utente: nessun accesso specificato."
 msgid "Edit Filter"
 msgstr "Modifica filtro"
 
 msgid "Edit Filter"
 msgstr "Modifica filtro"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "Rimuovere il filtro «%s»?"
 
 msgstr "Rimuovere il filtro «%s»?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "Rimuovere le etichette selezionate?"
 
 msgid "Remove selected labels?"
 msgstr "Rimuovere le etichette selezionate?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."


@@ -2673,292 +1936,808 @@ msgstr ""
 "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore "
 "predefinito e il proprio utente."
 
 "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore "
 "predefinito e il proprio utente."
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "Rimuovere i filtri selezionati?"
 
 msgid "Remove selected filters?"
 msgstr "Rimuovere i filtri selezionati?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "Annullare la sottoscrizione ai notiziari selezionati?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Selezionare solo un notiziario."
 
 msgid "Please select only one feed."
 msgstr "Selezionare solo un notiziario."
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "Eliminare tutti gli articoli senza la stella nel notiziario selezionato?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Quanti giorni di articoli tenere (0 - utilizza il valore predefinito)?"
 
 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:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "Il campo accesso non può essere vuoto."
 
 msgid "Login field cannot be blank."
 msgstr "Il campo accesso non può essere vuoto."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "Reimpostare la password per l&apos;utente selezionato?"
 
 msgid "Reset password of selected user?"
 msgstr "Reimpostare la password per l&apos;utente selezionato?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Selezionare solo un filtro."
 
 msgid "Please select only one filter."
 msgstr "Selezionare solo un filtro."
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Rimuovere i filtri selezionati?"
+
+#: js/prefs.js:704

 msgid "Edit Multiple Feeds"
 msgstr "Modifica notiziari multipli"
 
 msgid "Edit Multiple Feeds"
 msgstr "Modifica notiziari multipli"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 
 msgid "Save changes to selected feeds?"
 msgstr "Salvare i cambiamenti ai notiziari selezionati?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 msgid "OPML Import"
 msgstr "Importazione OPML"
 
 msgid "OPML Import"
 msgstr "Importazione OPML"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 
 msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 msgid "Please choose the file first."
 msgstr ""
 
 msgid "Please choose the file first."
 msgstr ""
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "Reimpostare ai valori predefiniti?"
 
 msgid "Reset to defaults?"
 msgstr "Reimpostare ai valori predefiniti?"
 

-#: js/prefs.js:1152
-msgid "Feed Categories"
-msgstr "Categorie notiziario"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Rimuovere le categorie selezionate?"
 
 msgid "Remove selected categories?"
 msgstr "Rimuovere le categorie selezionate?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "Nessuna categoria selezionata."
 
 msgid "No categories are selected."
 msgstr "Nessuna categoria selezionata."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Categorie"
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr "Notiziari senza aggiornamenti recenti"
 
 msgid "Feeds without recent updates"
 msgstr "Notiziari senza aggiornamenti recenti"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 "Sostituire l&apos;indirizzo di pubblicazione OPML attuale con uno nuovo?"
 
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 "Sostituire l&apos;indirizzo di pubblicazione OPML attuale con uno nuovo?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr "Cambiare il punteggio agli articoli nel notiziario selezionato?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 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 "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/prefs.js:1422
+#: js/prefs.js:1507

 msgid "Reset selected labels to default colors?"
 msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
 
 msgid "Reset selected labels to default colors?"
 msgstr "Reimpostare le etichette selezionate ai colori predefiniti?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr "Impostazioni dei profili"
 
 msgid "Settings Profiles"
 msgstr "Impostazioni dei profili"
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 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 ""
 "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/prefs.js:1486
+#: js/prefs.js:1571

 msgid "No profiles are selected."
 msgstr "Nessun profilo selezionato."
 
 msgid "No profiles are selected."
 msgstr "Nessun profilo selezionato."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 msgid "Activate selected profile?"
 msgstr "Attivare il profilo selezionato?"
 
 msgid "Activate selected profile?"
 msgstr "Attivare il profilo selezionato?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 msgid "Please choose a profile to activate."
 msgstr "Scegliere un profilo da attivare"
 
 msgid "Please choose a profile to activate."
 msgstr "Scegliere un profilo da attivare"
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
 "Continuare?"
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 "Questo invaliderà tutti gli URL di notiziari generati precedentemente. "
 "Continuare?"
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "Editor etichette"
 
 msgid "Label Editor"
 msgstr "Editor etichette"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Questo pulirà le informazioni di autenticazione memorizzate per Twitter. "
 "Continuare?"
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 "Questo pulirà le informazioni di autenticazione memorizzate per Twitter. "
 "Continuare?"
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 msgid "Link Instance"
 msgstr "Collega istanza"
 
 msgid "Link Instance"
 msgstr "Collega istanza"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 msgid "Edit Instance"
 msgstr "Modifica istanza"
 
 msgid "Edit Instance"
 msgstr "Modifica istanza"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 msgid "Remove selected instances?"
 msgstr "Rimuovere le istanze selezionate?"
 
 msgid "Remove selected instances?"
 msgstr "Rimuovere le istanze selezionate?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 msgid "No instances are selected."
 msgstr "Nessun istanza selezionata."
 
 msgid "No instances are selected."
 msgstr "Nessun istanza selezionata."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 msgid "Please select only one instance."
 msgstr "Selezionare solo un'istanza."
 
 msgid "Please select only one instance."
 msgstr "Selezionare solo un'istanza."
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 msgid "Export Data"
 msgstr ""
 
 msgid "Export Data"
 msgstr ""
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 msgid "Data Import"
 msgstr ""
 
 msgid "Data Import"
 msgstr ""
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+msgid "Batch subscribe"
+msgstr ""
+
+#: js/prefs.js:2191

 msgid "Subscribing to feeds..."
 msgstr ""
 
 msgid "Subscribing to feeds..."
 msgstr ""
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Ritorna a Tiny Tiny RSS"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr ""
 
 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr ""
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "Segnare tutti gli articoli come letti?"
 
 msgid "Mark all articles as read?"
 msgstr "Segnare tutti gli articoli come letti?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
 
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 msgid "New version available!"
 msgstr "Nuova versione disponibile."
 
 msgid "New version available!"
 msgstr "Nuova versione disponibile."
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "Segnare tutti gli articoli visibili in «%s» come letti?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 msgid "Delete %d selected articles in %s?"
 msgstr "Eliminare i %d articoli selezionati in «%s»?"
 
 msgid "Delete %d selected articles in %s?"
 msgstr "Eliminare i %d articoli selezionati in «%s»?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 msgid "Delete %d selected articles?"
 msgstr "Eliminare i %d articoli selezionati?"
 
 msgid "Delete %d selected articles?"
 msgstr "Eliminare i %d articoli selezionati?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 msgid "Archive %d selected articles in %s?"
 msgstr "Archiviare i %d articoli selezionati in «%s»?"
 
 msgid "Archive %d selected articles in %s?"
 msgstr "Archiviare i %d articoli selezionati in «%s»?"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 msgid "Move %d archived articles back?"
 msgstr "Spostare %d articoli archiviati indietro?"
 
 msgid "Move %d archived articles back?"
 msgstr "Spostare %d articoli archiviati indietro?"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "Segnare %d articoli selezionati in «%s» come letti?"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Segnare %d articoli selezionati in «%s» come letti?"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 msgid "Edit article Tags"
 msgstr "Modifica etichette articolo"
 
 msgid "Edit article Tags"
 msgstr "Modifica etichette articolo"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "Nessun articolo selezionato."
 
 msgid "No article is selected."
 msgstr "Nessun articolo selezionato."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "Nessun articolo trovato da segnare"
 
 msgid "No articles found to mark"
 msgstr "Nessun articolo trovato da segnare"
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "Segnare %d articolo/i come letto/i?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "Segnare %d articolo/i come letto/i?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 msgid "Loading..."
 msgstr "Caricamento..."
 
 msgid "Loading..."
 msgstr "Caricamento..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 msgid "Open original article"
 msgstr "Apri articolo di origine"
 
 msgid "Open original article"
 msgstr "Apri articolo di origine"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 msgid "View in a tt-rss tab"
 msgstr "Visualizza in una scheda tt-rss"
 
 msgid "View in a tt-rss tab"
 msgstr "Visualizza in una scheda tt-rss"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 msgid "Mark above as read"
 msgstr ""
 
 msgid "Mark above as read"
 msgstr ""
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 msgid "Mark below as read"
 msgstr ""
 
 msgid "Mark below as read"
 msgstr ""
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 msgid "Remove label"
 msgstr "Rimuovi etichetta"
 
 msgid "Remove label"
 msgstr "Rimuovi etichetta"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 msgid "Playing..."
 msgstr "In riproduzione..."
 
 msgid "Playing..."
 msgstr "In riproduzione..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 msgid "Click to pause"
 msgstr "Fare clic per mettere in pausa"
 
 msgid "Click to pause"
 msgstr "Fare clic per mettere in pausa"
 

+#~ msgid "Twitter OAuth"
+#~ msgstr "Twitter OAuth"
+
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "<li>Aggiunta della categoria <b>%s</b>.</li>"
+
+#~ msgid "is already imported."
+#~ msgstr "già importato."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Register with Twitter"
+#~ msgstr "Registra su Twitter"
+
+#~ 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."
+
+#~ msgid "Congratulations! You have successfully registered with Twitter."
+#~ msgstr "Registrazione su Twitter effettuata con successo."
+
+#~ msgid "Register"
+#~ msgstr "Registro"
+
+#~ msgid "Match"
+#~ msgstr "Corrisponde"
+
+#~ msgid "before"
+#~ msgstr "prima"
+
+#~ msgid "after"
+#~ msgstr "dopo"
+
+#~ msgid "Check it"
+#~ msgstr "Controllalo"
+
+#~ msgid "on field"
+#~ msgstr "al campo"
+
+#~ msgid "Perform Action"
+#~ msgstr "Esegui azione"
+
+#~ msgid "with parameters:"
+#~ msgstr "con parametri:"
+
+#~ msgid "Options"
+#~ msgstr "Opzioni"
+
+#~ msgid "Enabled"
+#~ msgstr "Abilitato"
+
+#~ msgid "Inverse match"
+#~ msgstr "Corrispondenza inversa"
+
+#~ msgid "Test"
+#~ msgstr "Prova"
+
+#~ msgid "Create"
+#~ msgstr "Crea"
+
+#~ msgid "[Forwarded]"
+#~ msgstr "[Inoltrato]"
+
+#~ msgid "Multiple articles"
+#~ msgstr "Articoli multipli"
+
+#~ msgid "From:"
+#~ msgstr "Da:"
+
+#~ msgid "To:"
+#~ msgstr "A:"
+
+#~ msgid "Subject:"
+#~ msgstr "Oggetto:"
+
+#~ msgid "Send e-mail"
+#~ msgstr "Invia email"
+
+#~ msgid "Check to enable field"
+#~ msgstr "Spuntare per abilitare il campo"
+
+#~ msgid "Feed Title"
+#~ msgstr "Titolo notiziario"
+
+#~ msgid "using"
+#~ msgstr "utilizzando"
+
+#~ msgid "Article purging:"
+#~ msgstr "Eliminazione articoli:"
+
+#~ msgid ""
+#~ "<b>Hint:</b> you need to fill in your login information if your feed "
+#~ "requires authentication, except for Twitter feeds."
+#~ msgstr ""
+#~ "<b>Suggerimento:</b> occorre riempire la informazioni di accesso se il "
+#~ "proprio notiziario richiede l'autenticazione, eccetto per i notiziari di "
+#~ "Twitter."
+
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Nascondere nei notiziari popolari"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Contenuto da destra a sinistra"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "Includere nell&apos;email riassunto"
+
+#~ msgid "Always display image attachments"
+#~ msgstr "Mostrare sempre le immagini allegate"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Memorizzare le immagini localmente"
+
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Segnare gli articoli aggiornati come non letti"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "Segnare gli articoli come aggiornati al cambiamento del contenuto"
+
+#~ msgid "Icon"
+#~ msgstr "Icona"
+
+#~ msgid "Replace"
+#~ msgstr "Sostituisci"
+
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Sottoscrivi per inviare aggiornamenti"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr ""
+#~ "Reimposta lo stato di sottoscrizione a PubSubHubbub per notiziari "
+#~ "abilitati all'invio."
+
+#~ msgid "All done."
+#~ msgstr "Fatto tutto."
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "Sottoscrizione avvenuta a <b>%s</b>."
+
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Impossibile sottoscrivere <b>%s</b>."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "Si ha già una sottoscrizione a <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "Nessun notiziario trovato."
+
+#~ 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."
+
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "Sottoscrivi il notiziario selezionato"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Modifica opzioni di sottoscrizione"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "La categoria <b>%s</b> esiste già nel database."
+
+#~ msgid "No feed categories defined."
+#~ msgstr "Nessuna categoria notiziari definita."
+
+#~ msgid "Remove selected categories"
+#~ msgstr "Rimuovi le categorie selezionate"
+
+#~ msgid "Feeds with errors"
+#~ msgstr "Notiziari con errori"
+
+#~ msgid "Inactive feeds"
+#~ msgstr "Notiziari non attivi"
+
+#~ msgid "Edit selected feeds"
+#~ msgstr "Modifica i notiziari selezionati"
+
+#~ msgid "Reset sort order"
+#~ msgstr "Reimposta ordinamento"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Modifica categorie"
+
+#~ msgid "More actions..."
+#~ msgstr "Altre azioni..."
+
+#~ msgid "Manual purge"
+#~ msgstr "Eliminazione manuale"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Pulisci i dati del notiziario"
+
+#~ msgid "Rescore articles"
+#~ msgstr "Cambio punteggio degli articoli"
+
+#~ 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."
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ msgstr ""
+#~ "OPML può essere pubblicato e può essere sottoscritto da chiunque conosca "
+#~ "l&apos;URL seguente."
+
+#~ msgid "Import"
+#~ msgstr "Importa"
+
+#~ msgid "Firefox integration"
+#~ msgstr "Integrazione con Firefox"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di "
+#~ "notiziari di Firefox facendo clic sul collegamento qui sotto."
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
+
+#~ msgid "Subscribing using bookmarklet"
+#~ msgstr "Sottoscrizione utilizzando bookmarklet"
+
+#~ 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 ""
+#~ "Trascinare il collegamento seguente nella barra degli strumenti del "
+#~ "browser; aprire il notiziario al quale si è interessati nel browser a "
+#~ "fare clic sul collegamento per sottoscriverlo."
+
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Sottoscrivere %s in Tiny Tiny RSS?"
+
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Sottoscrive in Tiny Tiny RSS"
+
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "Articoli pubblicati e notiziari generati"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ msgstr ""
+#~ "Gli articoli pubblicati vengono esportati come un notiziario pubblico e "
+#~ "possono essere sottoscritti da chiunque conosca l&apos;URL specificato "
+#~ "qui sotto."
+
+#~ msgid "Display URL"
+#~ msgstr "Visualizza URL"
+
+#~ msgid "Clear all generated URLs"
+#~ msgstr "Pulisci tutti gli URL generati"
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "Before you can update your Twitter feeds, you must register this instance "
+#~ "of Tiny Tiny RSS with Twitter.com."
+#~ msgstr ""
+#~ "Prima di poter aggiornare i notiziari di Twitter, occorre registrare "
+#~ "questa instanza di Tiny Tiny RSS su Twitter.com."
+
+#~ msgid ""
+#~ "You have been successfully registered with Twitter.com and should be able "
+#~ "to access your Twitter feeds."
+#~ msgstr ""
+#~ "La registrazione su Twitter.com è avvenuta con successo; adesso si è in "
+#~ "grado di accedere a notiziari di Twitter."
+
+#~ msgid "Register with Twitter.com"
+#~ msgstr "Registra su Twitter.com"
+
+#~ msgid "Clear stored credentials"
+#~ msgstr "Pulisci le credenziali memorizzate"
+
+#~ msgid "Articles matching this filter:"
+#~ msgstr "Articoli che corrispondono a questo filtro:"
+
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "Nessun articolo trovato che corrisponde a questo filtro."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "Filtro <b>%s</b> creato"
+
+#~ msgid "Edit"
+#~ msgstr "Modifica"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
+
+#~ msgid "Link instance"
+#~ msgstr "Collega istanza"
+
+#~ 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 ""
+#~ "Impossibile connettere altre istanze di Tiny Tiny RSS a questa per "
+#~ "condividere i notiziari popolari. Collegare questa istanza di Tiny Tiny "
+#~ "RSS utilizzando questo URL:"
+
+#~ msgid "Last connected"
+#~ msgstr "Ultimo connesso"
+
+#~ msgid "Stored feeds"
+#~ msgstr "Notiziari memorizzati"
+
+#~ msgid "Click to edit"
+#~ msgstr "Fare clic per modificare"
+
+#~ msgid "Caption"
+#~ msgstr "Intestazione"
+
+#~ msgid "Colors"
+#~ msgstr "Colori"
+
+#~ msgid "Foreground:"
+#~ msgstr "Primo piano:"
+
+#~ msgid "Background:"
+#~ msgstr "Sfondo:"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "Etichetta <b>%s</b> creata"
+
+#~ msgid "Clear colors"
+#~ msgstr "Pulisci colori"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "La vecchia password non può essere vuota."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "La nuova password non può essere vuota."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "Le password inserite non corrispondono."
+
+#~ msgid "Password has been changed."
+#~ msgstr "La password è stata cambiata"
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "La vecchia password non è corretta."
+
+#~ msgid "The configuration was saved."
+#~ msgstr "La configurazione è stata salvata."
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Opzione sconosciuta: %s"
+
+#~ msgid "Your personal data has been saved."
+#~ msgstr "I dati personali sono stati salvati."
+
+#~ msgid "Full name"
+#~ msgstr "Nome completo"
+
+#~ msgid "E-mail"
+#~ msgstr "Email"
+
+#~ msgid "Access level"
+#~ msgstr "Livello di accesso"
+
+#~ msgid "Save data"
+#~ msgstr "Salva dati"
+
+#~ msgid "Your password is at default value, please change it."
+#~ msgstr "La password è impostata al valore predefinito: cambiarla."
+
+#~ msgid "Old password"
+#~ msgstr "Vecchia password"
+
+#~ msgid "New password"
+#~ msgstr "Nuova password"
+
+#~ msgid "Confirm password"
+#~ msgstr "Conferma password"
+
+#~ msgid "Change password"
+#~ msgstr "Cambia password"
+
+#~ msgid "Select theme"
+#~ msgstr "Seleziona tema"
+
+#~ msgid "Customize"
+#~ msgstr "Personalizza"
+
+#~ msgid "Yes"
+#~ msgstr "Sì"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Clear"
+#~ msgstr "Pulisci"
+
+#~ msgid "Save configuration"
+#~ msgstr "Salva configurazione"
+
+#~ msgid "Manage profiles"
+#~ msgstr "Gestisci profili"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Reimposta ai valori predefiniti"
+
+#~ msgid "User details"
+#~ msgstr "Dettagli utente"
+
+#~ msgid "User not found"
+#~ msgstr "Utente non trovato"
+
+#~ msgid "Registered"
+#~ msgstr "Registrato"
+
+#~ msgid "Last logged in"
+#~ msgstr "Ultimo accesso"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Numero notiziari sottoscritti"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Sottoscrivi notiziari"
+
+#~ msgid "User Editor"
+#~ msgstr "Editor utente"
+
+#~ msgid "Access level: "
+#~ msgstr "Livello di accesso: "
+
+#~ msgid "Change password to"
+#~ msgstr "Cambiare la password a"
+
+#~ msgid "E-mail: "
+#~ msgstr "Email:"
+
+#~ msgid "Added user <b>%s</b> with password <b>%s</b>"
+#~ msgstr "Aggiunto l&apos;utente <b>%s</b> con password <b>%s</b>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "Impossibile creare l&apos;utente <b>%s<b>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "L&apos;utente <b>%s</b> esiste già."
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "Notifica a <b>%s</b>"
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Notifica di cambio password"
+
+#~ msgid "Reset password"
+#~ msgstr "Reimposta password"
+
+#~ msgid "Access Level"
+#~ msgstr "Livello di accesso"
+
+#~ msgid "Last login"
+#~ msgstr "Ultimo accesso"
+
+#~ msgid "No users defined."
+#~ msgstr "Nessun utente definito."
+
+#~ msgid "No matching users found."
+#~ msgstr "Nessun utente corrispondente trovato."
+
+#~ msgid "Share on Twitter"
+#~ msgstr "Condividi su Twitter"
+
+#~ msgid "Attachment:"
+#~ msgstr "Allegato:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Sottoscrizione al notiziario..."
+
+#~ msgid "Filter Test Results"
+#~ msgstr "Filtra risultati di prova"
+
+#~ msgid "Feed Categories"
+#~ msgstr "Categorie notiziario"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 9f8da728c89e60366a7c6a505bed929f04e02bea..d492447a98d5795aa5fb63be8fe0bec71b0f9872 100644 (file)
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 b0363a1f6b9d7bf4dff119eb6f36a4ece77b33e5..ae68d9b832dfd2c4a74ed8ad3e45415adc5e9fef 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+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"
 "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,95 +16,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "標準を使用する"
 
 msgid "Use default"
 msgstr "標準を使用する"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "ずっと削除しない"
 
 msgid "Never purge"
 msgstr "ずっと削除しない"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "1 週間前"
 
 msgid "1 week old"
 msgstr "1 週間前"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "2 週間前"
 
 msgid "2 weeks old"
 msgstr "2 週間前"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "1 ヶ月前"
 
 msgid "1 month old"
 msgstr "1 ヶ月前"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "2 日月前"
 
 msgid "2 months old"
 msgstr "2 日月前"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "3 ヶ月前"
 
 msgid "3 months old"
 msgstr "3 ヶ月前"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "更新の間隔"
 
 msgid "Default interval"
 msgstr "更新の間隔"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "更新を無効にする"
 
 msgid "Disable updates"
 msgstr "更新を無効にする"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "各 15 分"
 
 msgid "Each 15 minutes"
 msgstr "各 15 分"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "各 30 分"
 
 msgid "Each 30 minutes"
 msgstr "各 30 分"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "毎時"
 
 msgid "Hourly"
 msgstr "毎時"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "各 4 時間"
 
 msgid "Each 4 hours"
 msgstr "各 4 時間"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "各 12 時間"
 
 msgid "Each 12 hours"
 msgstr "各 12 時間"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "毎日"
 
 msgid "Daily"
 msgstr "毎日"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "毎週"
 
 msgid "Weekly"
 msgstr "毎週"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "標準"
 
 msgid "Default"
 msgstr "標準"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "ユーザー"
 
 msgid "User"
 msgstr "ユーザー"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "パワーユーザー"
 
 msgid "Power User"
 msgstr "パワーユーザー"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "管理者"
 
 msgid "Administrator"
 msgstr "管理者"
 


@@ -135,8 +131,7 @@ msgstr "Tiny Tiny RSS のデータベースを更新しました。"
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Tiny Tiny RSS に戻る"
 


@@ -209,22 +204,24 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr ""
 
 "\t\t\tbrowser settings."
 msgstr ""
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 
 msgid "Loading, please wait..."
 msgstr "読み込みんでいます。しばらくお待ちください..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "ようこそ、"
 
 msgid "Hello,"
 msgstr "ようこそ、"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "ログアウト"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "ログアウト"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -298,214 +295,157 @@ msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "設定"
 
 msgid "Preferences"
 msgstr "設定"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "コメントしますか?"
 
 msgid "Comments?"
 msgstr "コメントしますか?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 
 msgid "Collapse feedlist"
 msgstr "フィード一覧を閉じる"
 

-#: index.php:148
+#: index.php:165

 #, fuzzy
 msgid "Show articles"
 msgstr "記事を保管しました"
 
 #, fuzzy
 msgid "Show articles"
 msgstr "記事を保管しました"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr ""
 
 msgid "Adaptive"
 msgstr ""
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "すべての記事"
 
 msgid "All Articles"
 msgstr "すべての記事"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "お気に入り"
 
 msgid "Starred"
 msgstr "お気に入り"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "公開済み"
 
 msgid "Published"
 msgstr "公開済み"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "未読"
 
 msgid "Unread"
 msgstr "未読"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 
 msgid "Ignore Scoring"
 msgstr "スコア計算の無効化"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "更新日時"
 
 msgid "Updated"
 msgstr "更新日時"
 

-#: index.php:160
+#: index.php:177

 #, fuzzy
 msgid "Sort articles"
 msgstr "記事を保管しました"
 
 #, fuzzy
 msgid "Sort articles"
 msgstr "記事を保管しました"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "日付"
 
 msgid "Date"
 msgstr "日付"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "題名"
 
 msgid "Title"
 msgstr "題名"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "スコア"
 
 msgid "Score"
 msgstr "スコア"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "カテゴリーの編集"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "更新"
 
 msgid "Update"
 msgstr "更新"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "既読にする"
 
 msgid "Mark as read"
 msgstr "既読にする"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "操作..."
 
 msgid "Actions..."
 msgstr "操作..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "検索..."
 
 msgid "Search..."
 msgstr "検索..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "フィード操作"
 
 msgid "Feed actions:"
 msgstr "フィード操作"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 
 msgid "Subscribe to feed..."
 msgstr "フィードを購読する..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 
 msgid "Edit this feed..."
 msgstr "フィードを編集する..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 
 msgid "Rescore feed"
 msgstr "フィードのスコアを再計算しています..."
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "購読をやめる"
 
 msgid "Unsubscribe"
 msgstr "購読をやめる"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "すべてのフィード:"
 
 msgid "All feeds:"
 msgstr "すべてのフィード:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 
 msgid "(Un)hide read feeds"
 msgstr "読んだフィードを隠す/再表示する"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "その他の操作:"
 
 msgid "Other actions:"
 msgstr "その他の操作:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr ""
 
 msgid "Switch to digest..."
 msgstr ""
 

-#: index.php:194
+#: index.php:216

 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "タグクラウド"
 
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "タグクラウド"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 
 msgid "Create filter..."
 msgstr "フィルターを作成しています..."
 

-#: index.php:198
+#: index.php:220

 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "キーボードショートカット"
 

-#: opml.php:81
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "カテゴリー <b>%s</b> の追加中です。"
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: opml.php:123
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "ラベルの割り当て"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, fuzzy, php-format
-msgid "Adding filter %s"
-msgstr "フィードを追加しています..."
-
-#: opml.php:196
-#, fuzzy, php-format
-msgid "Duplicate filter %s"
-msgstr "フィルターを作成する"
-
-#: opml.php:241
-#, fuzzy
-msgid "is already imported."
-msgstr "既にインポート済みです。"
-
-#: opml.php:271
-#, fuzzy
-msgid "OK"
-msgstr "OK!"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "ドキュメントの解析中のエラーです。"
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "エラー: OPML ファイルをアップロードしてください。"
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "OPML ユーティリティ"
-
-#: opml.php:530
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "設定に戻る"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"


@@ -514,18 +454,16 @@ msgstr "キーボードショートカット"
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
 msgid "Exit preferences"
 msgstr "設定を終了する"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "フィード"
 
 msgid "Feeds"
 msgstr "フィード"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "フィルター"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "フィルター"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "ラベル"
 
 msgid "Labels"
 msgstr "ラベル"
 


@@ -593,23 +531,6 @@ msgstr "アカウントの作成に成功しました。"
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 
 msgid "New user registrations are currently closed."
 msgstr "新規ユーザーの登録は現在行っていません。"
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-#, fuzzy
-msgid "Register"
-msgstr "登録済み"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"


@@ -685,11 +606,11 @@ msgstr "その他の操作"
 msgid "Select article under mouse cursor"
 msgstr "マウスカーソルの下の記事を選択する"
 
 msgid "Select article under mouse cursor"
 msgstr "マウスカーソルの下の記事を選択する"
 

-#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "ラベルを作成する"
 
 msgid "Create label"
 msgstr "ラベルを作成する"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "フィルターを作成する"
 
 msgid "Create filter"
 msgstr "フィルターを作成する"
 


@@ -735,11 +656,11 @@ msgstr "フィード操作"
 msgid "Refresh active feed"
 msgstr "有効なフィードの更新"
 
 msgid "Refresh active feed"
 msgstr "有効なフィードの更新"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 
 msgid "Subscribe to feed"
 msgstr "フィードを購読する"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "フィードを編集する"
 
 msgid "Edit feed"
 msgstr "フィードを編集する"
 


@@ -764,19 +685,19 @@ msgstr ""
 msgid "Go to..."
 msgstr "移動..."
 
 msgid "Go to..."
 msgstr "移動..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "すべての記事"
 
 msgid "All articles"
 msgstr "すべての記事"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "新しい記事"
 
 msgid "Fresh articles"
 msgstr "新しい記事"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "公開済みの記事"
 
 msgid "Published articles"
 msgstr "公開済みの記事"
 


@@ -812,7 +733,7 @@ msgstr "トップ 25 フィード"
 msgid "Edit feed categories"
 msgstr "フィードカテゴリーを編集する"
 
 msgid "Edit feed categories"
 msgstr "フィードカテゴリーを編集する"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "ユーザーの作成"
 
 msgid "Create user"
 msgstr "ユーザーの作成"
 


@@ -838,6 +759,10 @@ msgstr "ログイン:"
 msgid "Password:"
 msgstr "パスワード:"
 
 msgid "Password:"
 msgstr "パスワード:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -845,8 +770,8 @@ msgstr "パスワード:"
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "特別"
 
 msgid "Special"
 msgstr "特別"
 


@@ -903,13 +828,11 @@ msgstr "ヘルプのトピックが見つかりません。"
 msgid "Prepare data"
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 


@@ -919,323 +842,269 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+#, fuzzy
+msgid "Select"
+msgstr "選択:"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "すべて"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "なし"
+
+#: classes/dlg.php:85

 #, fuzzy
 msgid "Create profile"
 msgstr "フィルターを作成する"
 
 #, fuzzy
 msgid "Create profile"
 msgstr "フィルターを作成する"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 msgid "(active)"
 msgstr ""
 
 msgid "(active)"
 msgstr ""
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 #, fuzzy
 msgid "Default profile"
 msgstr "標準の記事制限"
 
 #, fuzzy
 msgid "Default profile"
 msgstr "標準の記事制限"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "選択されたフィルターを削除しますか?"
 
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "選択されたフィルターを削除しますか?"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 #, fuzzy
 msgid "Activate profile"
 msgstr "選択されたフィルターを削除しますか?"
 
 #, fuzzy
 msgid "Activate profile"
 msgstr "選択されたフィルターを削除しますか?"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr ""
 
 msgid "Public OPML URL"
 msgstr ""
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "公開記事フィードへのリンクです。"
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
 
 #, fuzzy
 msgid "Generate new URL"
 msgstr "生成したフィード"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "通知"
 
 msgid "Notice"
 msgstr "通知"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 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 ""
 
 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 ""
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "最終更新:"
 
 msgid "Last update:"
 msgstr "最終更新:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 ""
 
 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 ""
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "フィード"
 
 msgid "Feed"
 msgstr "フィード"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 
 msgid "Place in category:"
 msgstr "カテゴリーの場所:"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 #, fuzzy
 msgid "Available feeds"
 msgstr "すべてのフィード"
 
 #, fuzzy
 msgid "Available feeds"
 msgstr "すべてのフィード"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "認証"
 
 msgid "Authentication"
 msgstr "認証"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "ログイン"
 
 msgid "Login"
 msgstr "ログイン"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
 
 #, fuzzy
 msgid "Password"
 msgstr "パスワード:"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 
 msgid "This feed requires authentication."
 msgstr "このフィードは認証を要求します。"
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "購読"
 
 msgid "Subscribe"
 msgstr "購読"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 #, fuzzy
 msgid "More feeds"
 msgstr "さらなるフィード"
 
 #, fuzzy
 msgid "More feeds"
 msgstr "さらなるフィード"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "取り消し"
 
 msgid "Cancel"
 msgstr "取り消し"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "検索"
 
 msgid "Search"
 msgstr "検索"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 #, fuzzy
 msgid "Popular feeds"
 msgstr "フィードの表示"
 
 #, fuzzy
 msgid "Popular feeds"
 msgstr "フィードの表示"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 #, fuzzy
 msgid "Feed archive"
 msgstr "フィード操作"
 
 #, fuzzy
 msgid "Feed archive"
 msgstr "フィード操作"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 #, fuzzy
 msgid "limit:"
 msgstr "制限:"
 
 #, fuzzy
 msgid "limit:"
 msgstr "制限:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "削除"
 
 msgid "Remove"
 msgstr "削除"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr ""
 
 msgid "Look for"
 msgstr ""
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 #, fuzzy
 msgid "match on"
 msgstr "対象項目:"
 
 #, fuzzy
 msgid "match on"
 msgstr "対象項目:"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "内容"
 
 msgid "Content"
 msgstr "内容"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "題名か内容"
 
 msgid "Title or content"
 msgstr "題名か内容"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "対象範囲"
 
 msgid "Limit search to:"
 msgstr "対象範囲"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "すべてのフィード"
 
 msgid "All feeds"
 msgstr "すべてのフィード"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "このフィード"
 
 msgid "This feed"
 msgstr "このフィード"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "一致"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "前"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "後"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr ""
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr ""
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr ""
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "操作の実行"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "パラメーター:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "オプション"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "有効にする"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "一致しない"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-#, fuzzy
-msgid "Apply to category"
-msgstr "カテゴリーの場所:"
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "テスト"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "作成"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
 #, fuzzy
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "エラーのため、フィードは更新されませんでした:"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 #, fuzzy
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "編集するにはクリック"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "選択されたフィードの購読をやめますか?"
 
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "選択されたフィードの購読をやめますか?"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "エラーのため、フィードは更新されませんでした:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "この記事のタグ (カンマで区切ります):"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 #, fuzzy
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "タグクラウド"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 #, fuzzy
 msgid "Match:"
 msgstr "一致"
 
 #, fuzzy
 msgid "Match:"
 msgstr "一致"
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 #, fuzzy
 msgid "Display entries"
 msgstr "フィードの表示"
 
 #, fuzzy
 msgid "Display entries"
 msgstr "フィードの表示"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
 
 #, fuzzy
 msgid "View as RSS"
 msgstr "タグを閲覧する"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 
 #, fuzzy
 msgid "Details"
 msgstr "毎日"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1243,167 +1112,152 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr ""
 
 msgid "Instance"
 msgstr ""
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr ""
 
 msgid "Instance URL"
 msgstr ""
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 #, fuzzy
 msgid "Access key:"
 msgstr "アクセスレベル: "
 
 #, fuzzy
 msgid "Access key:"
 msgstr "アクセスレベル: "
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 #, fuzzy
 msgid "Access key"
 msgstr "アクセスレベル"
 
 #, fuzzy
 msgid "Access key"
 msgstr "アクセスレベル"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 #, fuzzy
 msgid "Generate new key"
 msgstr "生成したフィード"
 
 #, fuzzy
 msgid "Generate new key"
 msgstr "生成したフィード"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 #, fuzzy
 msgid "Create link"
 msgstr "作成"
 
 #, fuzzy
 msgid "Create link"
 msgstr "作成"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "このフィードは認証を要求します。"
 
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "このフィードは認証を要求します。"
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 #, fuzzy
 msgid "Visit the website"
 msgstr "オフィシャルサイトに訪問する"
 
 #, fuzzy
 msgid "Visit the website"
 msgstr "オフィシャルサイトに訪問する"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 #, fuzzy
 msgid "View as RSS feed"
 msgstr "フィードを閲覧する"
 
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "フィードを閲覧する"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "選択:"
 
 msgid "Select:"
 msgstr "選択:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "すべて"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "反転"
 
 msgid "Invert"
 msgstr "反転"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "なし"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "選択:"
 
 msgid "Selection:"
 msgstr "選択:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 #, fuzzy
 msgid "Archive"
 msgstr "記事の日付"
 
 #, fuzzy
 msgid "Archive"
 msgstr "記事の日付"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 #, fuzzy
 msgid "Move back"
 msgstr "戻る"
 
 #, fuzzy
 msgid "Move back"
 msgstr "戻る"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 
 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 #, fuzzy
 msgid "Forward by email"
 msgstr "記事をお気に入りにする"
 
 #, fuzzy
 msgid "Forward by email"
 msgstr "記事をお気に入りにする"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "フィード:"
 
 msgid "Feed:"
 msgstr "フィード:"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "既読にする"
 
 msgid "mark as read"
 msgstr "既読にする"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 #, fuzzy
 msgid "Originally from:"
 msgstr "元の記事内容を表示する"
 
 #, fuzzy
 msgid "Originally from:"
 msgstr "元の記事内容を表示する"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新しいウィンドウで記事を開く"
 
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新しいウィンドウで記事を開く"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 #, fuzzy
 msgid "Close article"
 msgstr "記事を消去する"
 
 #, fuzzy
 msgid "Close article"
 msgstr "記事を消去する"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1411,859 +1265,211 @@ msgstr ""
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr "いくつかのフィードの更新エラーです (詳細はクリックしてください)"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "カテゴリー割り当てなし"
-
-#: classes/mail_button.php:52 classes/mail_button.php:58
-msgid "[Forwarded]"
-msgstr ""
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML ユーティリティ"

 
 

-#: classes/mail_button.php:52
+#: classes/opml.php:37

 #, fuzzy
 #, fuzzy

-msgid "Multiple articles"
-msgstr "すべての記事"
-
-#: classes/mail_button.php:73
-msgid "From:"
-msgstr ""
+msgid "Importing OPML..."
+msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."

 
 

-#: classes/mail_button.php:82
-#, fuzzy
-msgid "To:"
-msgstr "トップ"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "設定に戻る"

 
 

-#: classes/mail_button.php:95
-#, fuzzy
-msgid "Subject:"
-msgstr "選択:"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "フィードを追加しています..."

 
 

-#: classes/mail_button.php:111
-#, fuzzy
-msgid "Send e-mail"
-msgstr "電子メールを変更する"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "フィルターを作成する"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "ã\82¿ã\82°ã\82\92ç·¨é\9b\86ã\81\99ã\82\8b"
+#: classes/opml.php:293
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "ã\83©ã\83\99ã\83«ã\81®å\89²ã\82\8aå½\93ã\81¦"

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
-#, fuzzy, php-format
-msgid "(%d feeds)"
-msgstr "フィードを編集する"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:306
+#: classes/opml.php:337

 #, fuzzy
 #, fuzzy

-msgid "Feed Title"
-msgstr "題名"
+msgid "Adding filter..."
+msgstr "フィードを追加しています..."

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr ""
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "カテゴリー割り当てなし"

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "記事の削除:"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "カテゴリーの場所:"

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "エラー: OPML ファイルをアップロードしてください。"

 
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-#, fuzzy
-msgid "Hide from Popular feeds"
-msgstr "自分のフィード一覧から隠す"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "ドキュメントの解析中のエラーです。"

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "右から左のコンテンツ"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "タグがありません"

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "電子メールダイジェストに含む"
+#: classes/rpc.php:736
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "登録情報が完成していません。"

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "ローカルに画像をキャッシュする"
+#: classes/rpc.php:748
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "パスワードを変更しました。"

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
+#: classes/rpc.php:761

 #, fuzzy
 #, fuzzy

-msgid "Mark updated articles as unread"
-msgstr "ã\81\99ã\81¹ã\81¦ã\81®è¨\98äº\8bã\82\92æ\97¢èª­ã\81«ã\81\97ã\81¾ã\81\99ã\81\8b?"
+msgid "Can't update this kind of feed."
+msgstr "ã\83\95ã\82£ã\83¼ã\83\89ã\81®ã\81\93ã\81®ç¨®é¡\9eã\82\92æ¶\88å\8e»ã\81§ã\81\8dã\81¾ã\81\9bã\82\93ã\80\82"

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:491
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "セッションの検査に失敗しました (IP が正しくない)"
+
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "ユーザー名かパスワードが正しくありません"
+
+#: include/functions.php:2049

 #, fuzzy
 #, fuzzy

-msgid "Icon"
-msgstr "æ\93\8dä½\9c"
+msgid "Archived articles"
+msgstr "æ\9cªèª­è¨\98äº\8b"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
+#: include/functions.php:2051
+msgid "Recently read"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:524
+#: include/functions.php:3223 js/viewfeed.js:1996

 #, fuzzy
 #, fuzzy

-msgid "Resubscribe to push updates"
-msgstr "フィードを購読する:"
+msgid "Click to play"
+msgstr "編集するにはクリック"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "すべて終了しました。"
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "<b>%s</b> を購読しました。"
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1021
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "<b>%s</b> は既に購読しています。"
+#: include/functions.php:4186
+#, fuzzy
+msgid "(edit note)"
+msgstr "ノートの編集"

 
 

-#: classes/pref_feeds.php:1024
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "フィードがありません。"
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "フィードは選択されていません。"

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "<b>%s</b> は既に購読しています。"
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "未知の種類"

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:4844

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "公開フィードの URL を変更しました。"
+msgid "Attachments"
+msgstr "添付:"

 
 

-#: classes/pref_feeds.php:1035
+#: include/functions.php:5286

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr "<b>%s</b> は既に購読しています。"
+msgid "%d archived articles"
+msgstr "お気に入りの記事"

 
 

-#: classes/pref_feeds.php:1057
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "フィードがありません。"
+
+#: include/functions.php:5356

 #, fuzzy
 #, fuzzy

-msgid "Subscribe to selected feed"
-msgstr "選択されたフィードの購読をやめますか?"
+msgid "Could not import: incorrect schema version."
+msgstr ""
+"必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "購読オプションの編集"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1161
+#: include/functions.php:5520

 #, php-format
 #, php-format

-msgid "Category <b>$%s</b> already exists in the database."
-msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "カテゴリーの作成"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "フィードカテゴリーが定義されていません。"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "題名か内容"

 
 

-#: classes/pref_feeds.php:1243
-#, fuzzy
-msgid "Remove selected categories"
-msgstr "選択されたカテゴリーを削除しますか?"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "リンク"

 
 

-#: classes/pref_feeds.php:1267
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "フィードエディター"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "記事の日付"

 
 

-#: classes/pref_feeds.php:1287
+#: include/localized_schema.php:9

 #, fuzzy
 #, fuzzy

-msgid "Inactive feeds"
-msgstr "元のフィード"
-
-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-#, fuzzy
-msgid "Select"
-msgstr "選択:"
-
-#: classes/pref_feeds.php:1324
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "選択したフィードを削除しています..."
-
-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-#, fuzzy
-msgid "Reset sort order"
-msgstr "パスワードのリセット"
-
-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "購読をやめる"
-
-#: classes/pref_feeds.php:1333
-#, fuzzy
-msgid "Categories"
-msgstr "カテゴリー:"
-
-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "カテゴリーの編集"
-
-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "カテゴリーの編集"
-
-#: classes/pref_feeds.php:1354
-#, fuzzy
-msgid "More actions..."
-msgstr "操作..."
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "手動削除"
-
-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "フィードデータの消去"
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "記事のスコアの再集計"
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref_feeds.php:1432
-#, fuzzy
-msgid "Import my OPML"
-msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-#, fuzzy
-msgid "Include settings"
-msgstr "電子メールダイジェストに含む"
-
-#: classes/pref_feeds.php:1442
-#, fuzzy
-msgid "Export OPML"
-msgstr "OPML エクスポート"
-
-#: classes/pref_feeds.php:1446
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-#, fuzzy
-msgid "Article archive"
-msgstr "記事の日付"
-
-#: classes/pref_feeds.php:1456
-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:1459
-#, fuzzy
-msgid "Export my data"
-msgstr "OPML エクスポート"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "インポート"
-
-#: classes/pref_feeds.php:1481
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Firefox 統合"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
-"Tiny RSS のサイトを使うことができます。"
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Tiny Tiny RSS に戻る"
-
-#: classes/pref_feeds.php:1508
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS に戻る"
-
-#: classes/pref_feeds.php:1512
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "選択したフィードの記事のスコアを再計算しますか?"
-
-#: classes/pref_feeds.php:1514
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr "選択したフィードの記事のスコアを再計算しますか?"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-
-#: classes/pref_feeds.php:1522
-#, fuzzy
-msgid "Display URL"
-msgstr "タグの表示"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "記事のお気に入りを解除する"
-
-#: classes/pref_feeds.php:1538
-#, fuzzy
-msgid "Twitter"
-msgstr "題名"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-#, fuzzy
-msgid "Clear stored credentials"
-msgstr "フィードデータの消去"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: classes/pref_filters.php:89
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "一致するフィルターが見つかりません。"
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "フィルター <b>%s</b> を作成しました"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "編集"
-
-#: classes/pref_instances.php:13 classes/pref_users.php:6
-msgid "Your access level is insufficient to open this tab."
-msgstr "このタブを開くにはアクセスレベルが不十分です。"
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr ""
-
-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-#, fuzzy
-msgid "Stored feeds"
-msgstr "さらなるフィード"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "編集するにはクリック"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "キャプション"
-
-#: classes/pref_labels.php:37
-#, fuzzy
-msgid "Colors"
-msgstr "閉じる"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Foreground:"
-msgstr "前景色"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Background:"
-msgstr "背景色"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "ラベル <b>%s</b> を作成しました"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "色の消去"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "古いパスワードを空にできません。"
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "新しいパスワードを空にできません。"
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "パスワードが一致しません。"
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "パスワードを変更しました。"
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "古いパスワードが不正確です。"
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "設定を保存しました。"
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "不明なオプション: %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-#, fuzzy
-msgid "Personal data / Authentication"
-msgstr "認証"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr ""
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "電子メール"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "アクセスレベル"
-
-#: classes/pref_prefs.php:213
-#, fuzzy
-msgid "Save data"
-msgstr "保存"
-
-#: classes/pref_prefs.php:224
-#, fuzzy
-msgid "Your password is at default value, please change it."
-msgstr ""
-"パスワードが標準のままです。\n"
-"                                                変更してください。"
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "現在のパスワード"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "新しいパスワード"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "新しいパスワード(確認)"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "パスワードを変更する"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "テーマを選択する"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "はい"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "いいえ"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "設定を保存する"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr ""
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "標準に戻す"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "ユーザーの詳細"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "ユーザーが見つかりません"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "登録済み"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "最終ログイン"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "購読フィード数"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "購読したフィード"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "ユーザーエディター"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "アクセスレベル: "
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "次のパスワードに変更する:"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "電子メール: "
-
-#: classes/pref_users.php:257
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "ユーザー名 <b>%s</b> とパスワード <b>%s</b> で追加しました"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "ユーザー <b>%s</b> の追加中です。"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "ユーザー <b>%s</b> は既に存在します。"
-
-#: classes/pref_users.php:291
-#, fuzzy, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
-msgstr ""
-"ユーザー <b>%s</b> のパスワードを\n"
-"                                        <b>%s</b>に変更しました"
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "<b>%s</b> の通知中です。"
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] パスワード変更通知"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "パスワードのリセット"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "アクセスレベル"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "最終ログイン"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "ユーザーが定義されていません。"
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "ユーザーが見つかりません。"
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "タグがありません"
-
-#: classes/rpc.php:742
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "登録情報が完成していません。"
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr ""
-
-#: classes/rpc.php:754
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "パスワードを変更しました。"
-
-#: classes/rpc.php:767
-#, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "フィードのこの種類を消去できません。"
-
-#: classes/share_button.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "記事をお気に入りにする"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "題名"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "セッションの検査に失敗しました (IP が正しくない)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "ユーザー名かパスワードが正しくありません"
-
-#: include/functions.php:2099
-#, fuzzy
-msgid "Archived articles"
-msgstr "未読記事"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-#, fuzzy
-msgid "Click to play"
-msgstr "編集するにはクリック"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-#, fuzzy
-msgid "(edit note)"
-msgstr "ノートの編集"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "フィードは選択されていません。"
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "未知の種類"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "添付:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "添付:"
-
-#: include/functions.php:5261
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "お気に入りの記事"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "フィードがありません。"
-
-#: include/functions.php:5331
-#, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr ""
-"必要なスキーマファイルを見つけられませんでした。次のバージョンが必要です:"
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr ""
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "題名か内容"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "リンク"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "記事の日付"
-
-#: include/localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "記事を消去する"
+msgid "Delete article"
+msgstr "記事を消去する"

 
 #: include/localized_schema.php:11
 msgid "Set starred"
 msgstr "お気に入りに設定する"
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
 
 #: include/localized_schema.php:11
 msgid "Set starred"
 msgstr "お気に入りに設定する"
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730

-#: js/viewfeed.js:466
+#: js/viewfeed.js:475

 msgid "Publish article"
 msgstr "公開記事"
 
 msgid "Publish article"
 msgstr "公開記事"
 


@@ -2271,7 +1477,7 @@ msgstr "公開記事"
 msgid "Assign tags"
 msgstr "タグの割り当て"
 
 msgid "Assign tags"
 msgstr "タグの割り当て"
 

-#: include/localized_schema.php:14 js/viewfeed.js:1935
+#: include/localized_schema.php:14 js/viewfeed.js:1960

 msgid "Assign label"
 msgstr "ラベルの割り当て"
 
 msgid "Assign label"
 msgstr "ラベルの割り当て"
 


@@ -2338,11 +1544,11 @@ msgid ""
 msgstr ""
 
 #: include/localized_schema.php:29
 msgstr ""
 
 #: include/localized_schema.php:29

-msgid "Use feed-specified date to sort headlines instead of local import date."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2354,7 +1560,8 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
 msgstr ""
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
 
 #: include/localized_schema.php:34
 msgstr "この日数よりあとの古い投稿を削除する (0 は無効です)"
 
 #: include/localized_schema.php:34


@@ -2464,16 +1671,16 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
 msgid "User timezone"
 msgstr ""
 

-#: include/localized_schema.php:60
-#, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "未読記事数によるフィードの並び替え"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "ユーザースタイルシートの URL"
 
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "ユーザースタイルシートの URL"
 

+#: include/localized_schema.php:61
+#, fuzzy
+msgid "Sort headlines by feed date"
+msgstr "未読記事数によるフィードの並び替え"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""


@@ -2495,7 +1702,7 @@ msgstr "ファイル:"
 msgid "Use less traffic"
 msgstr ""
 
 msgid "Use less traffic"
 msgstr ""
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "「%s」のすべての記事を既読に設定しますか?"
 


@@ -2504,15 +1711,19 @@ msgstr "「%s」のすべての記事を既読に設定しますか?"
 msgid "Mark %d displayed articles as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr ""
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "記事のお気に入りを解除する"
 
 msgid "Unstar article"
 msgstr "記事のお気に入りを解除する"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "記事をお気に入りにする"
 
 msgid "Star article"
 msgstr "記事をお気に入りにする"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "非公開記事"
 
 msgid "Unpublish article"
 msgstr "非公開記事"
 


@@ -2551,11 +1762,11 @@ msgstr "読んだフィードを隠す/再表示する"
 msgid "Load more..."
 msgstr "ヘルプを読み込んでいます..."
 
 msgid "Load more..."
 msgstr "ヘルプを読み込んでいます..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 #, fuzzy
 msgid "Update feed"
 msgstr "すべてのフィードの更新"
 #, fuzzy
 msgid "Update feed"
 msgstr "すべてのフィードの更新"


@@ -2566,137 +1777,148 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "古いパスワードが不正確です。"
 
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "古いパスワードが不正確です。"
 

-#: js/functions.js:650
+#: js/functions.js:621

 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "古いパスワードが不正確です。"
 
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "古いパスワードが不正確です。"
 

-#: js/functions.js:777
+#: js/functions.js:748

 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "保存したデータを削除する"
 
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "保存したデータを削除する"
 

-#: js/functions.js:809
+#: js/functions.js:780

 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "フィードをひとつ選択してください"
 
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "フィードをひとつ選択してください"
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "ラベルのキャプションを入力してください:"
 
 msgid "Please enter label caption:"
 msgstr "ラベルのキャプションを入力してください:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "ラベルが作成できません: キャプションが見当たりません。"
 
 msgid "Can't create label: missing caption."
 msgstr "ラベルが作成できません: キャプションが見当たりません。"
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "フィードを購読する"
 
 msgid "Subscribe to Feed"
 msgstr "フィードを購読する"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "フィードを購読しています..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "フィードを購読する:"
 
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "フィードを購読する:"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 msgid "Specified URL seems to be invalid."
 msgstr ""
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 

-#: js/functions.js:945
+#: js/functions.js:917

 #, fuzzy
 #, fuzzy

-msgid "Couldn't download the specified URL."
+msgid "Couldn't download the specified URL: %s"

 msgstr "購読できません: フィード URL が入力されていません。"
 
 msgstr "購読できません: フィード URL が入力されていません。"
 

-#: js/functions.js:948
+#: js/functions.js:921

 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "カテゴリーから購読をやめることができません。"
 
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "カテゴリーから購読をやめることができません。"
 

-#: js/functions.js:980
-msgid "Create Filter"
-msgstr "フィルターを作成する"
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "フィルター"
+
+#: js/functions.js:1049
+#, fuzzy
+msgid "Add rule"
+msgstr "フィードカテゴリーを追加しています..."

 
 

-#: js/functions.js:1008 js/prefs.js:168
+#: js/functions.js:1075

 #, fuzzy
 #, fuzzy

-msgid "Filter Test Results"
-msgstr "フィルター表現"
+msgid "Edit action"
+msgstr "フィード操作"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "フィード操作"

 
 

-#: js/functions.js:1068
+#: js/functions.js:1112
+msgid "Create Filter"
+msgstr "フィルターを作成する"
+
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 
 msgid "Unsubscribe from %s?"
 msgstr "%s の購読をやめますか?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 #, fuzzy
 msgid "Please enter category title:"
 msgstr "このアーティクルのノートを入力してください:"
 
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "このアーティクルのノートを入力してください:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 #, fuzzy
 msgid "You can't edit this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
 #, fuzzy
 msgid "You can't edit this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 #, fuzzy
 msgid "Edit Feed"
 msgstr "フィードを編集する"
 
 #, fuzzy
 msgid "Edit Feed"
 msgstr "フィードを編集する"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 #, fuzzy
 msgid "More Feeds"
 msgstr "さらなるフィード"
 
 #, fuzzy
 msgid "More Feeds"
 msgstr "さらなるフィード"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 
 msgid "No feeds are selected."
 msgstr "選択されたフィードはありません。"
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "フィードエディター"
 
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "フィードエディター"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "選択されたフィルターを削除しますか?"
 
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "選択されたフィルターを削除しますか?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 
 msgid "No articles are selected."
 msgstr "記事は選択されていません。"
 


@@ -2705,6 +1927,21 @@ msgstr "記事は選択されていません。"
 msgid "Forward article by email"
 msgstr "記事をお気に入りにする"
 
 msgid "Forward article by email"
 msgstr "記事をお気に入りにする"
 

+#: js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "タグを編集する"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "カテゴリーの編集"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "カテゴリーの作成"
+

 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"


@@ -2723,336 +1960,815 @@ msgstr "ユーザーが追加できません: ログイン名が指定されて
 msgid "Edit Filter"
 msgstr "フィルター"
 
 msgid "Edit Filter"
 msgstr "フィルター"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "フィルター %s を削除しますか?"
 
 msgstr "フィルター %s を削除しますか?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "選択したラベルを削除しますか?"
 
 msgid "Remove selected labels?"
 msgstr "選択したラベルを削除しますか?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
 msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "選択されたユーザーはありません。"
 
 msgid "No users are selected."
 msgstr "選択されたユーザーはありません。"
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "選択されたフィルターを削除しますか?"
 
 msgid "Remove selected filters?"
 msgstr "選択されたフィルターを削除しますか?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "選択されたフィルターはありません。"
 
 msgid "No filters are selected."
 msgstr "選択されたフィルターはありません。"
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "選択されたフィードの購読をやめますか?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "選択されたフィードの購読をやめますか?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "フィードをひとつだけ選択してください。"
 
 msgid "Please select only one feed."
 msgstr "フィードをひとつだけ選択してください。"
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 "選択したフィード内のすべてのお気に入りしていない記事をすべて削除しますか?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "記事を維持したい日数は? (0: 標準を使う)"
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "記事を維持したい日数は? (0: 標準を使う)"
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "ログイン名の項目は空にできません。"
 
 msgid "Login field cannot be blank."
 msgstr "ログイン名の項目は空にできません。"
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "ひとつだけユーザーを選択してください。"
 
 msgid "Please select only one user."
 msgstr "ひとつだけユーザーを選択してください。"
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "選択したユーザーのパスワードをリセットしますか?"
 
 msgid "Reset password of selected user?"
 msgstr "選択したユーザーのパスワードをリセットしますか?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
 
 msgid "Please select only one filter."
 msgstr "フィルターをひとつだけ選択してください。"
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "選択されたフィルターを削除しますか?"
+
+#: js/prefs.js:704

 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "複数フィードエディター"
 
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "複数フィードエディター"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 
 msgid "Save changes to selected feeds?"
 msgstr "選択したフィードの変更を保存しますか?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 #, fuzzy
 msgid "OPML Import"
 msgstr "インポート"
 
 #, fuzzy
 msgid "OPML Import"
 msgstr "インポート"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 #, fuzzy
 msgid "Please choose the file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
 #, fuzzy
 msgid "Please choose the file first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 
 msgid "Reset to defaults?"
 msgstr "標準に戻しますか?"
 

-#: js/prefs.js:1152
-#, fuzzy
-msgid "Feed Categories"
-msgstr "カテゴリー:"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "選択されたカテゴリーを削除しますか?"
 
 msgid "Remove selected categories?"
 msgstr "選択されたカテゴリーを削除しますか?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "選択されたカテゴリーはありません。"
 
 msgid "No categories are selected."
 msgstr "選択されたカテゴリーはありません。"
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "カテゴリーエディター"
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr ""
 
 msgid "Feeds without recent updates"
 msgstr ""
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "新しいもので現在の公開アドレスを置き換えますか?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr "選択したフィードの記事のスコアを再計算しますか?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
 
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "すべての記事のスコアを再計算しますか? この操作は大量の時間を使うでしょう。"
 

-#: js/prefs.js:1422
+#: js/prefs.js:1507

 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "ラベルの色を標準にリセットしますか?"
 
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "ラベルの色を標準にリセットしますか?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr ""
 
 msgid "Settings Profiles"
 msgstr ""
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 #, fuzzy
 msgid "No profiles are selected."
 msgstr "選択された記事はありません。"
 
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "選択された記事はありません。"
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "選択されたフィルターを削除しますか?"
 
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "選択されたフィルターを削除しますか?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "はじめにいくつかのフィードを選択してください。"
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "ラベルエディター"
 
 msgid "Label Editor"
 msgstr "ラベルエディター"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 #, fuzzy
 msgid "Link Instance"
 msgstr "タグを編集する"
 
 #, fuzzy
 msgid "Link Instance"
 msgstr "タグを編集する"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 #, fuzzy
 msgid "Edit Instance"
 msgstr "タグを編集する"
 
 #, fuzzy
 msgid "Edit Instance"
 msgstr "タグを編集する"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "選択されたフィルターを削除しますか?"
 
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "選択されたフィルターを削除しますか?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 #, fuzzy
 msgid "No instances are selected."
 msgstr "選択されたフィルターはありません。"
 
 #, fuzzy
 msgid "No instances are selected."
 msgstr "選択されたフィルターはありません。"
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 #, fuzzy
 msgid "Please select only one instance."
 msgstr "フィルターをひとつだけ選択してください。"
 
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "フィルターをひとつだけ選択してください。"
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 #, fuzzy
 msgid "Export Data"
 msgstr "OPML エクスポート"
 
 #, fuzzy
 msgid "Export Data"
 msgstr "OPML エクスポート"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 #, fuzzy
 msgid "Data Import"
 msgstr "インポート"
 
 #, fuzzy
 msgid "Data Import"
 msgstr "インポート"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "購読をやめる"
+
+#: js/prefs.js:2191

 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "フィードを購読しています..."
 
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "フィードを購読しています..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Tiny Tiny RSS に戻る"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "記事をお気に入りにする"
 
 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "記事をお気に入りにする"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 
 msgid "Mark all articles as read?"
 msgstr "すべての記事を既読にしますか?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 
 msgid "You can't unsubscribe from the category."
 msgstr "カテゴリーから購読をやめることができません。"
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 
 msgid "Please select some feed first."
 msgstr "はじめにいくつかのフィードを選択してください。"
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "フィードのこの種類を消去できません。"
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 
 #, fuzzy
 msgid "New version available!"
 msgstr "Tiny Tiny RSS の新しいバージョンが利用できます!"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "「%s」のすべての可視記事を既読に設定しますか?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "「%s」のすべての可視記事を既読に設定しますか?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "ラベルから選択した記事を削除しますか?"
 
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "ラベルから選択した記事を削除しますか?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "お気に入りの記事"
 
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "お気に入りの記事"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "選択した %d 件の記事を「%s」に設定しますか?"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 #, fuzzy
 msgid "Edit article Tags"
 msgstr "タグを編集する"
 
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "タグを編集する"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 
 msgid "No article is selected."
 msgstr "選択された記事はありません。"
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 
 msgid "No articles found to mark"
 msgstr "マークした記事が見つかりません"
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "%d 件のマークした記事を既読として設定しますか?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 #, fuzzy
 msgid "Loading..."
 msgstr "フィード一覧を読み込んでいます..."
 
 #, fuzzy
 msgid "Loading..."
 msgstr "フィード一覧を読み込んでいます..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 
 #, fuzzy
 msgid "Open original article"
 msgstr "元の記事内容を表示する"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "新しいウィンドウで記事を開く"
 
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "新しいウィンドウで記事を開く"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 #, fuzzy
 msgid "Mark above as read"
 msgstr "既読にする"
 
 #, fuzzy
 msgid "Mark above as read"
 msgstr "既読にする"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 #, fuzzy
 msgid "Mark below as read"
 msgstr "既読にする"
 
 #, fuzzy
 msgid "Mark below as read"
 msgstr "既読にする"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 
 #, fuzzy
 msgid "Remove label"
 msgstr "選択したラベルを削除しますか?"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 #, fuzzy
 msgid "Playing..."
 msgstr "フィード一覧を読み込んでいます..."
 
 #, fuzzy
 msgid "Playing..."
 msgstr "フィード一覧を読み込んでいます..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 #, fuzzy
 msgid "Click to pause"
 msgstr "編集するにはクリック"
 
 #, fuzzy
 msgid "Click to pause"
 msgstr "編集するにはクリック"
 

+#, fuzzy
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "カテゴリー <b>%s</b> の追加中です。"
+
+#, fuzzy
+#~ msgid "is already imported."
+#~ msgstr "既にインポート済みです。"
+
+#, fuzzy
+#~ msgid "OK"
+#~ msgstr "OK!"
+
+#, fuzzy
+#~ msgid "Register"
+#~ msgstr "登録済み"
+
+#~ msgid "Match"
+#~ msgstr "一致"
+
+#~ msgid "before"
+#~ msgstr "前"
+
+#~ msgid "after"
+#~ msgstr "後"
+
+#~ msgid "Perform Action"
+#~ msgstr "操作の実行"
+
+#~ msgid "with parameters:"
+#~ msgstr "パラメーター:"
+
+#~ msgid "Options"
+#~ msgstr "オプション"
+
+#~ msgid "Enabled"
+#~ msgstr "有効にする"
+
+#~ msgid "Inverse match"
+#~ msgstr "一致しない"
+
+#, fuzzy
+#~ msgid "Apply to category"
+#~ msgstr "カテゴリーの場所:"
+
+#~ msgid "Test"
+#~ msgstr "テスト"
+
+#~ msgid "Create"
+#~ msgstr "作成"
+
+#, fuzzy
+#~ msgid "Multiple articles"
+#~ msgstr "すべての記事"
+
+#, fuzzy
+#~ msgid "To:"
+#~ msgstr "トップ"
+
+#, fuzzy
+#~ msgid "Subject:"
+#~ msgstr "選択:"
+
+#, fuzzy
+#~ msgid "Send e-mail"
+#~ msgstr "電子メールを変更する"
+
+#, fuzzy
+#~ msgid "(%d feeds)"
+#~ msgstr "フィードを編集する"
+
+#, fuzzy
+#~ msgid "Feed Title"
+#~ msgstr "題名"
+
+#~ msgid "Article purging:"
+#~ msgstr "記事の削除:"
+
+#, fuzzy
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "自分のフィード一覧から隠す"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "右から左のコンテンツ"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "電子メールダイジェストに含む"
+
+#~ msgid "Cache images locally"
+#~ msgstr "ローカルに画像をキャッシュする"
+
+#, fuzzy
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "すべての記事を既読にしますか?"
+
+#, fuzzy
+#~ msgid "Icon"
+#~ msgstr "操作"
+
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "フィードを購読する:"
+
+#~ msgid "All done."
+#~ msgstr "すべて終了しました。"
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "<b>%s</b> を購読しました。"
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "<b>%s</b> は既に購読しています。"
+
+#, fuzzy
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "フィードがありません。"
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "<b>%s</b> は既に購読しています。"
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "公開フィードの URL を変更しました。"
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#~ msgstr "<b>%s</b> は既に購読しています。"
+
+#, fuzzy
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "選択されたフィードの購読をやめますか?"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "購読オプションの編集"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "カテゴリー <b>%s</b> はデータベースに既に存在します。"
+
+#~ msgid "No feed categories defined."
+#~ msgstr "フィードカテゴリーが定義されていません。"
+
+#, fuzzy
+#~ msgid "Remove selected categories"
+#~ msgstr "選択されたカテゴリーを削除しますか?"
+
+#, fuzzy
+#~ msgid "Feeds with errors"
+#~ msgstr "フィードエディター"
+
+#, fuzzy
+#~ msgid "Inactive feeds"
+#~ msgstr "元のフィード"
+
+#, fuzzy
+#~ msgid "Edit selected feeds"
+#~ msgstr "選択したフィードを削除しています..."
+
+#, fuzzy
+#~ msgid "Reset sort order"
+#~ msgstr "パスワードのリセット"
+
+#, fuzzy
+#~ msgid "Categories"
+#~ msgstr "カテゴリー:"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "カテゴリーの編集"
+
+#, fuzzy
+#~ msgid "More actions..."
+#~ msgstr "操作..."
+
+#~ msgid "Manual purge"
+#~ msgstr "手動削除"
+
+#~ msgid "Clear feed data"
+#~ msgstr "フィードデータの消去"
+
+#~ msgid "Rescore articles"
+#~ msgstr "記事のスコアの再集計"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#, fuzzy
+#~ msgid "Import my OPML"
+#~ msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
+
+#, fuzzy
+#~ msgid "Include settings"
+#~ msgstr "電子メールダイジェストに含む"
+
+#, fuzzy
+#~ msgid "Export OPML"
+#~ msgstr "OPML エクスポート"
+
+#, fuzzy
+#~ msgid "Article archive"
+#~ msgstr "記事の日付"
+
+#, fuzzy
+#~ msgid "Export my data"
+#~ msgstr "OPML エクスポート"
+
+#~ msgid "Import"
+#~ msgstr "インポート"
+
+#, fuzzy
+#~ msgid "Firefox integration"
+#~ msgstr "Firefox 統合"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
+#~ "Tiny RSS のサイトを使うことができます。"
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
+
+#, fuzzy
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Tiny Tiny RSS に戻る"
+
+#, fuzzy
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Tiny Tiny RSS に戻る"
+
+#, fuzzy
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr "選択したフィードの記事のスコアを再計算しますか?"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "選択したフィードの記事のスコアを再計算しますか?"
+
+#, fuzzy
+#~ msgid "Display URL"
+#~ msgstr "タグの表示"
+
+#, fuzzy
+#~ msgid "Unshare all articles"
+#~ msgstr "記事のお気に入りを解除する"
+
+#, fuzzy
+#~ msgid "Twitter"
+#~ msgstr "題名"
+
+#, fuzzy
+#~ msgid "Clear stored credentials"
+#~ msgstr "フィードデータの消去"
+
+#, fuzzy
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "一致するフィルターが見つかりません。"
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "フィルター <b>%s</b> を作成しました"
+
+#~ msgid "Edit"
+#~ msgstr "編集"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "このタブを開くにはアクセスレベルが不十分です。"
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "さらなるフィード"
+
+#~ msgid "Click to edit"
+#~ msgstr "編集するにはクリック"
+
+#~ msgid "Caption"
+#~ msgstr "キャプション"
+
+#, fuzzy
+#~ msgid "Colors"
+#~ msgstr "閉じる"
+
+#, fuzzy
+#~ msgid "Foreground:"
+#~ msgstr "前景色"
+
+#, fuzzy
+#~ msgid "Background:"
+#~ msgstr "背景色"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "ラベル <b>%s</b> を作成しました"
+
+#~ msgid "Clear colors"
+#~ msgstr "色の消去"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "古いパスワードを空にできません。"
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "新しいパスワードを空にできません。"
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "パスワードが一致しません。"
+
+#~ msgid "Password has been changed."
+#~ msgstr "パスワードを変更しました。"
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "古いパスワードが不正確です。"
+
+#~ msgid "The configuration was saved."
+#~ msgstr "設定を保存しました。"
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "不明なオプション: %s"
+
+#, fuzzy
+#~ msgid "Personal data / Authentication"
+#~ msgstr "認証"
+
+#~ msgid "E-mail"
+#~ msgstr "電子メール"
+
+#~ msgid "Access level"
+#~ msgstr "アクセスレベル"
+
+#, fuzzy
+#~ msgid "Save data"
+#~ msgstr "保存"
+
+#, fuzzy
+#~ msgid "Your password is at default value, please change it."
+#~ msgstr ""
+#~ "パスワードが標準のままです。\n"
+#~ "                                                変更してください。"
+
+#~ msgid "Old password"
+#~ msgstr "現在のパスワード"
+
+#~ msgid "New password"
+#~ msgstr "新しいパスワード"
+
+#~ msgid "Confirm password"
+#~ msgstr "新しいパスワード(確認)"
+
+#~ msgid "Change password"
+#~ msgstr "パスワードを変更する"
+
+#~ msgid "Select theme"
+#~ msgstr "テーマを選択する"
+
+#~ msgid "Yes"
+#~ msgstr "はい"
+
+#~ msgid "No"
+#~ msgstr "いいえ"
+
+#~ msgid "Save configuration"
+#~ msgstr "設定を保存する"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "標準に戻す"
+
+#~ msgid "User details"
+#~ msgstr "ユーザーの詳細"
+
+#~ msgid "User not found"
+#~ msgstr "ユーザーが見つかりません"
+
+#~ msgid "Registered"
+#~ msgstr "登録済み"
+
+#~ msgid "Last logged in"
+#~ msgstr "最終ログイン"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "購読フィード数"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "購読したフィード"
+
+#~ msgid "User Editor"
+#~ msgstr "ユーザーエディター"
+
+#~ msgid "Access level: "
+#~ msgstr "アクセスレベル: "
+
+#~ msgid "Change password to"
+#~ msgstr "次のパスワードに変更する:"
+
+#~ msgid "E-mail: "
+#~ msgstr "電子メール: "
+
+#~ msgid "Added user <b>%s</b> with password <b>%s</b>"
+#~ msgstr "ユーザー名 <b>%s</b> とパスワード <b>%s</b> で追加しました"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "ユーザー <b>%s</b> の追加中です。"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "ユーザー <b>%s</b> は既に存在します。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\t\t\t\t to <b>%s</b>"
+#~ msgstr ""
+#~ "ユーザー <b>%s</b> のパスワードを\n"
+#~ "                                        <b>%s</b>に変更しました"
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "<b>%s</b> の通知中です。"
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] パスワード変更通知"
+
+#~ msgid "Reset password"
+#~ msgstr "パスワードのリセット"
+
+#~ msgid "Access Level"
+#~ msgstr "アクセスレベル"
+
+#~ msgid "Last login"
+#~ msgstr "最終ログイン"
+
+#~ msgid "No users defined."
+#~ msgstr "ユーザーが定義されていません。"
+
+#~ msgid "No matching users found."
+#~ msgstr "ユーザーが見つかりません。"
+
+#, fuzzy
+#~ msgid "Share by URL"
+#~ msgstr "記事をお気に入りにする"
+
+#, fuzzy
+#~ msgid "Share on Twitter"
+#~ msgstr "題名"
+
+#~ msgid "Attachment:"
+#~ msgstr "添付:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "フィードを購読しています..."
+
+#, fuzzy
+#~ msgid "Filter Test Results"
+#~ msgstr "フィルター表現"
+
+#, fuzzy
+#~ msgid "Feed Categories"
+#~ msgstr "カテゴリー:"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."


@@ -3100,10 +2816,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Add category..."
 #~ msgstr "フィードカテゴリーを追加しています..."
 
 #~ msgid "Add category..."
 #~ msgstr "フィードカテゴリーを追加しています..."
 

-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "フィードカテゴリーを追加しています..."
-

 #~ msgid "description"
 #~ msgstr "説明"
 
 #~ msgid "description"
 #~ msgstr "説明"
 


@@ -3245,9 +2957,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Update Errors"
 #~ msgstr "更新エラー"
 
 #~ msgid "Update Errors"
 #~ msgstr "更新エラー"
 

-#~ msgid "Category editor"
-#~ msgstr "カテゴリーエディター"
-

 #~ msgid "Show last article times"
 #~ msgstr "最後の記事の時間を表示する"
 
 #~ msgid "Show last article times"
 #~ msgstr "最後の記事の時間を表示する"
 


@@ -3323,10 +3032,6 @@ msgstr "編集するにはクリック"
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "フィルター <b>%s</b> を保存しました"
 
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "フィルター <b>%s</b> を保存しました"
 

-#, fuzzy
-#~ msgid "Tiny Tiny RSS"
-#~ msgstr "Tiny Tiny RSS に戻る"
-

 #~ msgid "Click to collapse category"
 #~ msgstr "閉じたカテゴリーのクリック"
 
 #~ msgid "Click to collapse category"
 #~ msgstr "閉じたカテゴリーのクリック"
 

diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 1961f370b30b36bc9ef197642294ac686ff084d3..ab4f7fd999d434deddab2b1a46a5788f9cb96984 100644 (file)
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 861118f1cbcec4eb49ea51558ccff21e0fd852c8..c9145f50f0a6e4ca14514fb56bbdb929159022b4 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+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"
 "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,95 +16,91 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Bruk standard"
 
 msgid "Use default"
 msgstr "Bruk standard"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Slett aldri"
 
 msgid "Never purge"
 msgstr "Slett aldri"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "1 uke gammel"
 
 msgid "1 week old"
 msgstr "1 uke gammel"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "2 uker gammel"
 
 msgid "2 weeks old"
 msgstr "2 uker gammel"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "1 måned gammel"
 
 msgid "1 month old"
 msgstr "1 måned gammel"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "2 måneder gammel"
 
 msgid "2 months old"
 msgstr "2 måneder gammel"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "3 måneder gammel"
 
 msgid "3 months old"
 msgstr "3 måneder gammel"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Standard intervall:"
 
 msgid "Default interval"
 msgstr "Standard intervall:"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Slå av oppdateringer"
 
 msgid "Disable updates"
 msgstr "Slå av oppdateringer"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Hvert 15. minutt"
 
 msgid "Each 15 minutes"
 msgstr "Hvert 15. minutt"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Hvert 30. minutt"
 
 msgid "Each 30 minutes"
 msgstr "Hvert 30. minutt"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "På timen"
 
 msgid "Hourly"
 msgstr "På timen"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Hver 4. time"
 
 msgid "Each 4 hours"
 msgstr "Hver 4. time"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Hver 12. time"
 
 msgid "Each 12 hours"
 msgstr "Hver 12. time"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Daglig"
 
 msgid "Daily"
 msgstr "Daglig"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Ukentlig"
 
 msgid "Weekly"
 msgstr "Ukentlig"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Standard"
 
 msgid "Default"
 msgstr "Standard"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Bruker"
 
 msgid "User"
 msgstr "Bruker"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Superbruker"
 
 msgid "Power User"
 msgstr "Superbruker"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Administrator"
 
 msgid "Administrator"
 msgstr "Administrator"
 


@@ -134,8 +130,7 @@ msgstr "Tiny Tiny RSS-databasen er oppdatert"
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Returner til Tiny Tiny RSS"
 


@@ -212,22 +207,24 @@ msgstr ""
 "\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
 "\t\tnettlesers instillinger."
 
 "\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
 "\t\tnettlesers instillinger."
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 
 msgid "Loading, please wait..."
 msgstr "laster, vennligst vent"
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Hei, "
 
 msgid "Hello,"
 msgstr "Hei, "
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Logg ut"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Logg ut"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -300,214 +297,157 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Innstillinger"
 
 msgid "Preferences"
 msgstr "Innstillinger"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "Kommentarer?"
 
 msgid "Comments?"
 msgstr "Kommentarer?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 

-#: index.php:148
+#: index.php:165

 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 
 #, fuzzy
 msgid "Show articles"
 msgstr "Lagrede artikler"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Tilpasset"
 
 msgid "Adaptive"
 msgstr "Tilpasset"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Alle artikler"
 
 msgid "All Articles"
 msgstr "Alle artikler"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Favoritter"
 
 msgid "Starred"
 msgstr "Favoritter"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Publisert"
 
 msgid "Published"
 msgstr "Publisert"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Ulest"
 
 msgid "Unread"
 msgstr "Ulest"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 
 msgid "Ignore Scoring"
 msgstr "Ignorer poenggivning"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Oppdatert"
 
 msgid "Updated"
 msgstr "Oppdatert"
 

-#: index.php:160
+#: index.php:177

 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 
 #, fuzzy
 msgid "Sort articles"
 msgstr "Lagrede artikler"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Dato"
 
 msgid "Date"
 msgstr "Dato"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Tittel"
 
 msgid "Title"
 msgstr "Tittel"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "Poeng"
 
 msgid "Score"
 msgstr "Poeng"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Rediger kategorier"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Oppdater"
 
 msgid "Update"
 msgstr "Oppdater"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Marker som lest"
 
 msgid "Mark as read"
 msgstr "Marker som lest"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Handlinger..."
 
 msgid "Actions..."
 msgstr "Handlinger..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Søk..."
 
 msgid "Search..."
 msgstr "Søk..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 
 msgid "Feed actions:"
 msgstr "Nyhetsstrømshandlinger:"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 
 msgid "Subscribe to feed..."
 msgstr "Abonner på nyhetsstrøm..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 
 msgid "Edit this feed..."
 msgstr "Rediger nyhetsstrømmen..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 
 msgid "Rescore feed"
 msgstr "Sett poeng på nytt for nyhetskanalene"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Avabonner"
 
 msgid "Unsubscribe"
 msgstr "Avabonner"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 
 msgid "All feeds:"
 msgstr "Alle nyhetsstrømmer:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 
 msgid "(Un)hide read feeds"
 msgstr "Skjul/vis leste nyhetsstrømmer"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Andre handlinger:"
 
 msgid "Other actions:"
 msgstr "Andre handlinger:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr ""
 
 msgid "Switch to digest..."
 msgstr ""
 

-#: index.php:194
+#: index.php:216

 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "Tag-sky"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Lag filter..."
 
 msgid "Create filter..."
 msgstr "Lag filter..."
 

-#: index.php:198
+#: index.php:220

 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "Tastatursnarveier"
 

-#: opml.php:81
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Legger til kategori <b>%s</b>."
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: opml.php:123
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Tildel stikkord"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, fuzzy, php-format
-msgid "Adding filter %s"
-msgstr "Legger til nyhetsstrøm..."
-
-#: opml.php:196
-#, fuzzy, php-format
-msgid "Duplicate filter %s"
-msgstr "Lag filter"
-
-#: opml.php:241
-#, fuzzy
-msgid "is already imported."
-msgstr "Allerede importert."
-
-#: opml.php:271
-#, fuzzy
-msgid "OK"
-msgstr "OK!"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Feil under behandling av dokumentet"
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Feil: Kan ikke laste opp OPMLfil"
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "OPML-verktøy"
-
-#: opml.php:530
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Returner til innstillinger"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"


@@ -516,18 +456,16 @@ msgstr "Tastatursnarveier"
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 
 msgid "Feeds"
 msgstr "Nyhetsstrømmer"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Filtre"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Merkelapper"
 
 msgid "Labels"
 msgstr "Merkelapper"
 


@@ -598,23 +536,6 @@ msgstr "Kontoen ble opprettet med suksess."
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 
 msgid "New user registrations are currently closed."
 msgstr "Registrering av nye brukere er stengt."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-#, fuzzy
-msgid "Register"
-msgstr "Registrert"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"


@@ -690,11 +611,11 @@ msgstr "Andre handlinger"
 msgid "Select article under mouse cursor"
 msgstr "Velg artikkelen under musepekeren"
 
 msgid "Select article under mouse cursor"
 msgstr "Velg artikkelen under musepekeren"
 

-#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Lag merkelapp"
 
 msgid "Create label"
 msgstr "Lag merkelapp"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Lag filter"
 
 msgid "Create filter"
 msgstr "Lag filter"
 


@@ -740,11 +661,11 @@ msgstr "Nyhetsstrømshandlinger"
 msgid "Refresh active feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 
 msgid "Refresh active feed"
 msgstr "Oppdater aktive nyhetsstrømmer"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 
 msgid "Subscribe to feed"
 msgstr "Abonner på nyhetsstrøm"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 
 msgid "Edit feed"
 msgstr "Rediger nyhetsstrømmen"
 


@@ -769,19 +690,19 @@ msgstr "Hvis kategorien vises, brett ut/klapp den sammen."
 msgid "Go to..."
 msgstr "Gå til..."
 
 msgid "Go to..."
 msgstr "Gå til..."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Alle artikler"
 
 msgid "All articles"
 msgstr "Alle artikler"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Favorittartikler"
 
 msgid "Starred articles"
 msgstr "Favorittartikler"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Publiserte artikler"
 
 msgid "Published articles"
 msgstr "Publiserte artikler"
 


@@ -817,7 +738,7 @@ msgstr "Topp 25 nyhetsstrømmer"
 msgid "Edit feed categories"
 msgstr "Rediger nyyhetsstrømskategorier"
 
 msgid "Edit feed categories"
 msgstr "Rediger nyyhetsstrømskategorier"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Lag bruker"
 
 msgid "Create user"
 msgstr "Lag bruker"
 


@@ -845,6 +766,10 @@ msgstr "Brukernavn:"
 msgid "Password:"
 msgstr "Passord:"
 
 msgid "Password:"
 msgstr "Passord:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -852,8 +777,8 @@ msgstr "Passord:"
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Snarveier"
 
 msgid "Special"
 msgstr "Snarveier"
 


@@ -910,13 +835,11 @@ msgstr "Hjelp-emne kunne ikke bli funnet"
 msgid "Prepare data"
 msgstr "Lagre"
 
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 


@@ -926,51 +849,65 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+#, fuzzy
+msgid "Select"
+msgstr "Velg:"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Alle"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Ingen"
+
+#: classes/dlg.php:85

 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 
 #, fuzzy
 msgid "Create profile"
 msgstr "Lag filter"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 
 #, fuzzy
 msgid "(active)"
 msgstr "Tilpasset"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
 
 #, fuzzy
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Fjerne valgte filtre?"
 
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Fjerne valgte filtre?"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 #, fuzzy
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 
 #, fuzzy
 msgid "Activate profile"
 msgstr "Fjerne valgte filtre?"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr ""
 
 msgid "Public OPML URL"
 msgstr ""
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 
 #, fuzzy
 msgid "Your Public OPML URL is:"
 msgstr "Lenke til nyhetsstrøm for publiserte artikler"
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Generert nyhetsstrøm"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "Notis"
 
 msgid "Notice"
 msgstr "Notis"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -980,11 +917,11 @@ msgstr ""
 "ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst "
 "start prosessen eller konakt administratoren."
 
 "ikke kjørt, noe som gjør at ingen nyhetsstrømmer blir oppdatert. Vennligst "
 "start prosessen eller konakt administratoren."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -995,261 +932,193 @@ msgstr ""
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 
 "sjekk oppdateringsprosessen eller kontakt vedkommende som innehar "
 "nyhetsstrømmen."
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Nyhetsstrøm"
 
 msgid "Feed"
 msgstr "Nyhetsstrøm"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 
 msgid "Place in category:"
 msgstr "Plasser i kategori..."
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 
 #, fuzzy
 msgid "Available feeds"
 msgstr "Alle Nyhetsstrømmer"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Autentifisering"
 
 msgid "Authentication"
 msgstr "Autentifisering"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Logg inn"
 
 msgid "Login"
 msgstr "Logg inn"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
 
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
 msgid "This feed requires authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "Abonner"
 
 msgid "Subscribe"
 msgstr "Abonner"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 
 #, fuzzy
 msgid "More feeds"
 msgstr "Flere nyhetsstrømmer"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Avbryt"
 
 msgid "Cancel"
 msgstr "Avbryt"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Søk"
 
 msgid "Search"
 msgstr "Søk"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Vis nyhetsstrømmer"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 
 #, fuzzy
 msgid "Feed archive"
 msgstr "Nyhetsstrømshandlinger"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 
 #, fuzzy
 msgid "limit:"
 msgstr "Antall:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Fjern"
 
 msgid "Remove"
 msgstr "Fjern"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr ""
 
 msgid "Look for"
 msgstr ""
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 #, fuzzy
 msgid "match on"
 msgstr "Match på:"
 
 #, fuzzy
 msgid "match on"
 msgstr "Match på:"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Innhold"
 
 msgid "Content"
 msgstr "Innhold"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Tittel eller innhold"
 
 msgid "Title or content"
 msgstr "Tittel eller innhold"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 
 msgid "Limit search to:"
 msgstr "Begrens søket til:"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 
 msgid "This feed"
 msgstr "Denne nyhetsstrømmen"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Match"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "før"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "etter"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "Sjekk det"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "På felt:"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "i"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Utfør handlingen"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "med parametrene:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Alternativer:"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Tillatt"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "Motsatt markering"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-#, fuzzy
-msgid "Apply to category"
-msgstr "Plasser i kategori..."
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Test"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Lag"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 #, 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:"
 
 #, 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:"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Trykk for å endre"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "Disse nyhetsstrømmene kunne ikke oppdateres på grunn av feil:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "Denne artikkelens stikkord (separert med kommaer):"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Lagre"
 
 msgid "Save"
 msgstr "Lagre"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tag-sky"
 
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Tag-sky"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr "Matcher:"
 
 msgid "Match:"
 msgstr "Matcher:"
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 #, fuzzy
 msgid "Display entries"
 msgstr "Vis nyhetsstrømmer"
 
 #, fuzzy
 msgid "Display entries"
 msgstr "Vis nyhetsstrømmer"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 
 #, fuzzy
 msgid "View as RSS"
 msgstr "Se stikkord"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
 #, fuzzy, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 #, fuzzy
 msgid "Details"
 msgstr "Daglig"
 
 #, fuzzy
 msgid "Details"
 msgstr "Daglig"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1257,167 +1126,152 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr ""
 
 msgid "Instance"
 msgstr ""
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "Nettadresse:"
 
 msgid "URL:"
 msgstr "Nettadresse:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr ""
 
 msgid "Instance URL"
 msgstr ""
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 #, fuzzy
 msgid "Access key:"
 msgstr "Tilgangsnivå:"
 
 #, fuzzy
 msgid "Access key:"
 msgstr "Tilgangsnivå:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 #, fuzzy
 msgid "Access key"
 msgstr "Tilgangsnivå"
 
 #, fuzzy
 msgid "Access key"
 msgstr "Tilgangsnivå"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 #, fuzzy
 msgid "Generate new key"
 msgstr "Generert nyhetsstrøm"
 
 #, fuzzy
 msgid "Generate new key"
 msgstr "Generert nyhetsstrøm"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 #, fuzzy
 msgid "Create link"
 msgstr "Lag"
 
 #, fuzzy
 msgid "Create link"
 msgstr "Lag"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Denne nyhetsstrømmen krever autentifisering"
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 #, fuzzy
 msgid "Visit the website"
 msgstr "Besøk den offisielle siden"
 
 #, fuzzy
 msgid "Visit the website"
 msgstr "Besøk den offisielle siden"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Se nyhetsstrømmene"
 
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Se nyhetsstrømmene"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Velg:"
 
 msgid "Select:"
 msgstr "Velg:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Alle"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Motsatt"
 
 msgid "Invert"
 msgstr "Motsatt"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Ingen"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Utvalg:"
 
 msgid "Selection:"
 msgstr "Utvalg:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 #, fuzzy
 msgid "Archive"
 msgstr "Artikkeldato"
 
 #, fuzzy
 msgid "Archive"
 msgstr "Artikkeldato"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 #, fuzzy
 msgid "Move back"
 msgstr "Gå tilbake"
 
 #, fuzzy
 msgid "Move back"
 msgstr "Gå tilbake"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 #, fuzzy
 msgid "Forward by email"
 msgstr "Marker artikkel som favoritt"
 
 #, fuzzy
 msgid "Forward by email"
 msgstr "Marker artikkel som favoritt"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 
 msgid "Feed:"
 msgstr "Nyhetsstrøm:"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "marker som lest"
 
 msgid "mark as read"
 msgstr "marker som lest"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 
 #, fuzzy
 msgid "Originally from:"
 msgstr "Vis opprinnelig artikkelinnhold"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 #, fuzzy
 msgid "Close article"
 msgstr "Fjern artikler"
 
 #, fuzzy
 msgid "Close article"
 msgstr "Fjern artikler"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1425,863 +1279,210 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Oppdateringsfeil"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr "Noen nyhetsstrømmer har oppdateringsfeil (trykk for detaljer)"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "Ukategorisert"
-
-#: classes/mail_button.php:52 classes/mail_button.php:58
-msgid "[Forwarded]"
-msgstr ""
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML-verktøy"

 
 

-#: classes/mail_button.php:52
+#: classes/opml.php:37

 #, fuzzy
 #, fuzzy

-msgid "Multiple articles"
-msgstr "Alle artikler"
-
-#: classes/mail_button.php:73
-msgid "From:"
-msgstr ""
+msgid "Importing OPML..."
+msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."

 
 

-#: classes/mail_button.php:82
-#, fuzzy
-msgid "To:"
-msgstr "Topp"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Returner til innstillinger"

 
 

-#: classes/mail_button.php:95
-#, fuzzy
-msgid "Subject:"
-msgstr "Velg:"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Legger til nyhetsstrøm..."

 
 

-#: classes/mail_button.php:111
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Skift e-post"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Lag filter"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Endre Stikkord"
+#: classes/opml.php:293
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Tildel stikkord"

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "Marker for å tillate felt"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
-#, fuzzy, php-format
-msgid "(%d feeds)"
-msgstr "Rediger nyhetsstrømmen"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:306
+#: classes/opml.php:337

 #, fuzzy
 #, fuzzy

-msgid "Feed Title"
-msgstr "Tittel"
+msgid "Adding filter..."
+msgstr "Legger til nyhetsstrøm..."

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "bruker"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Ukategorisert"

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Slett artikler:"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Plasser i kategori..."

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Feil: Kan ikke laste opp OPMLfil"

 
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-#, fuzzy
-msgid "Hide from Popular feeds"
-msgstr "Skjul fra min nyhetsstrømslisten"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Feil under behandling av dokumentet"

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "Innhold som vises fra høyre til venstre"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "Ingen stikkord"

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "Inkluder i e-postsammendraget"
+#: classes/rpc.php:736
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Registreringsinformasjonen din er ufullstendig."

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Mellomlagre bilder lokalt på serveren"
+#: classes/rpc.php:748
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "Passord har blitt endret."

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
+#: classes/rpc.php:761

 #, fuzzy
 #, fuzzy

-msgid "Mark updated articles as unread"
-msgstr "Marker alle artikler som leste?"
+msgid "Can't update this kind of feed."
+msgstr "Du kan ikke endre denne typen nyhetsstrøm"

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:491
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Sesjonen kunne ikke valideres (feil IP)"
+
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "Feil brukernavn og/eller passord"
+
+#: include/functions.php:2049

 #, fuzzy
 #, fuzzy

-msgid "Icon"
-msgstr "Handling"
+msgid "Archived articles"
+msgstr "Lagrede artikler"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
+#: include/functions.php:2051
+msgid "Recently read"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:524
+#: include/functions.php:3223 js/viewfeed.js:1996

 #, fuzzy
 #, fuzzy

-msgid "Resubscribe to push updates"
-msgstr "Abonnerer på følgende nyhetsstrømmer:"
+msgid "Click to play"
+msgstr "Trykk for å endre"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Alt ferdig."
+#: include/functions.php:3356
+msgid " - "
+msgstr "-"

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Abonnerer på <b>%s</b>"
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1021
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Abonnerer allerede på <b>%s</b>"
+#: include/functions.php:4186
+#, fuzzy
+msgid "(edit note)"
+msgstr "Rediger notat"

 
 

-#: classes/pref_feeds.php:1024
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Ingen nyhetsstrømmer ble funnet."
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "Ingen valgt nyhetsstrøm"

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Abonnerer allerede på <b>%s</b>"
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "Ukjent type"

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:4844

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
+msgid "Attachments"
+msgstr "Vedlegg:"

 
 

-#: classes/pref_feeds.php:1035
+#: include/functions.php:5286

 #, fuzzy, php-format
 #, 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>"
+msgid "%d archived articles"
+msgstr "Favorittartikler"
+
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "Ingen nyhetsstrømmer ble funnet."

 
 

-#: classes/pref_feeds.php:1057
+#: include/functions.php:5356

 #, fuzzy
 #, fuzzy

-msgid "Subscribe to selected feed"
-msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+msgid "Could not import: incorrect schema version."
+msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "Rediger abonnementsalternativer"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1161
+#: include/functions.php:5520

 #, php-format
 #, php-format

-msgid "Category <b>$%s</b> already exists in the database."
-msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Lag kategori"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "Ingen kategorier ble markert"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Tittel eller innhold"

 
 

-#: classes/pref_feeds.php:1243
-#, fuzzy
-msgid "Remove selected categories"
-msgstr "Fjerne valgte kategorier?"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Lenke"

 
 

-#: classes/pref_feeds.php:1267
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "Nyhetsstrømsredigerer"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Artikkeldato"

 
 

-#: classes/pref_feeds.php:1287
+#: include/localized_schema.php:9

 #, fuzzy
 #, fuzzy

-msgid "Inactive feeds"
-msgstr "Hele nyhetsstrømmen"
+msgid "Delete article"
+msgstr "Fjern artikler"

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-#, fuzzy
-msgid "Select"
-msgstr "Velg:"
-
-#: classes/pref_feeds.php:1324
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "Sletter den valgte nyhetsstrømmen..."
-
-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Nullstill passordet"
-
-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "Avabonner"
-
-#: classes/pref_feeds.php:1333
-#, fuzzy
-msgid "Categories"
-msgstr "Kategori:"
-
-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Rediger kategorier"
-
-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Rediger kategorier"
-
-#: classes/pref_feeds.php:1354
-#, fuzzy
-msgid "More actions..."
-msgstr "Handlinger..."
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Slett manuelt"
-
-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Slett nyhetsstrømsdata"
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "Tilbakestill poengsummene for artiklene"
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref_feeds.php:1432
-#, fuzzy
-msgid "Import my OPML"
-msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-#, fuzzy
-msgid "Include settings"
-msgstr "Inkluder i e-postsammendraget"
-
-#: classes/pref_feeds.php:1442
-#, fuzzy
-msgid "Export OPML"
-msgstr "Eksporter OPML"
-
-#: classes/pref_feeds.php:1446
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-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."
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-#, fuzzy
-msgid "Article archive"
-msgstr "Artikkeldato"
-
-#: classes/pref_feeds.php:1456
-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:1459
-#, fuzzy
-msgid "Export my data"
-msgstr "Eksporter OPML"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importer"
-
-#: classes/pref_feeds.php:1481
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Firefox integrering"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
-"ved å trykke på lenken nedenfor."
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1508
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1512
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
-
-#: classes/pref_feeds.php:1514
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-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."
-
-#: classes/pref_feeds.php:1522
-#, fuzzy
-msgid "Display URL"
-msgstr "Vis stikkord"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Uleste artikler"
-
-#: classes/pref_feeds.php:1538
-#, fuzzy
-msgid "Twitter"
-msgstr "Tittel"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-#, fuzzy
-msgid "Clear stored credentials"
-msgstr "Slett nyhetsstrømsdata"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: classes/pref_filters.php:89
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "Ingen filtre ble funnet."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "Laget filter <b>%s</b>"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Rediger"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr ""
-
-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-#, fuzzy
-msgid "Stored feeds"
-msgstr "Flere nyhetsstrømmer"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Trykk for å endre"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "Overskrift"
-
-#: classes/pref_labels.php:37
-#, fuzzy
-msgid "Colors"
-msgstr "Steng"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Foreground:"
-msgstr "Forgrunn"
-
-#: classes/pref_labels.php:42
-#, fuzzy
-msgid "Background:"
-msgstr "bakgrunn"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Laget merkelappen <b>%s</b>"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Fjern farger"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "Gammelt passord kan ikke være blankt."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "Nytt passord kan ikke vært blankt."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "Innskrivne passord matcher ikke."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "Passord har blitt endret."
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "Gammelt passord er feil"
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "Konfigurasjonen er lagret."
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Ukjent valg: %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-#, fuzzy
-msgid "Personal data / Authentication"
-msgstr "Autentifisering"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr ""
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "E-post"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Tilgangsnivå"
-
-#: classes/pref_prefs.php:213
-#, fuzzy
-msgid "Save data"
-msgstr "Lagre"
-
-#: classes/pref_prefs.php:224
-#, 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."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Gammelt passord"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Nytt passord"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Bekreft passord"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Endre passord"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Velg utseende"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Ja"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "Nei"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Lagre konfigurasjonen"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr ""
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Tilbake til standard"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Brukerdetaljer"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "Brukeren ble  ikke funnet"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Registrert"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Sist innlogget"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Antall nyhetsstrømmer som abonneres på"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Nyhetsstrømmer som abonneres på"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Brukeradministrering"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Tilgangsnivå:"
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Endre passordet til"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "E-post: "
-
-#: classes/pref_users.php:257
-#, 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>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Kunne ikke lage brukeren <b>%s</b>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Brukeren <b>%s</b> finnes allerede."
-
-#: classes/pref_users.php:291
-#, fuzzy, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\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>"
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "Gir beskjed til <b>%s</b>"
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Varsel om endring av passord"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Nullstill passordet"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Tilgangsnivå"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Siste innlogging"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "Ingen brukere er valgt"
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "Ingen matchende brukere ble funnet"
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "Ingen stikkord"
-
-#: classes/rpc.php:742
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "Registreringsinformasjonen din er ufullstendig."
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr ""
-
-#: classes/rpc.php:754
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "Passord har blitt endret."
-
-#: classes/rpc.php:767
-#, fuzzy
-msgid "Can't update this kind of feed."
-msgstr "Du kan ikke endre denne typen nyhetsstrøm"
-
-#: classes/share_button.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "Marker artikkel som favoritt"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "Tittel"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Sesjonen kunne ikke valideres (feil IP)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "Feil brukernavn og/eller passord"
-
-#: include/functions.php:2099
-#, fuzzy
-msgid "Archived articles"
-msgstr "Lagrede artikler"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-#, fuzzy
-msgid "Click to play"
-msgstr "Trykk for å endre"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3359
-msgid " - "
-msgstr "-"
-
-#: include/functions.php:4178
-#, fuzzy
-msgid "(edit note)"
-msgstr "Rediger notat"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "Ingen valgt nyhetsstrøm"
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "Ukjent type"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Vedlegg:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Vedlegg:"
-
-#: include/functions.php:5261
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Favorittartikler"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "Ingen nyhetsstrømmer ble funnet."
-
-#: include/functions.php:5331
-#, fuzzy
-msgid "Could not import: incorrect schema version."
-msgstr "Kunne ikke finne den nødvendige skjemafilen, nødvendig versjon:"
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr ""
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "Tittel eller innhold"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "Lenke"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "Artikkeldato"
-
-#: include/localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Fjern artikler"
-
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "Sett som favorittartikkel"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Sett som favorittartikkel"

 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730

-#: js/viewfeed.js:466
+#: js/viewfeed.js:475

 msgid "Publish article"
 msgstr "Publiser artiklen"
 
 msgid "Publish article"
 msgstr "Publiser artiklen"
 


@@ -2289,7 +1490,7 @@ msgstr "Publiser artiklen"
 msgid "Assign tags"
 msgstr "Tildel stikkord"
 
 msgid "Assign tags"
 msgstr "Tildel stikkord"
 

-#: include/localized_schema.php:14 js/viewfeed.js:1935
+#: include/localized_schema.php:14 js/viewfeed.js:1960

 msgid "Assign label"
 msgstr "Tildel stikkord"
 
 msgid "Assign label"
 msgstr "Tildel stikkord"
 


@@ -2372,11 +1573,11 @@ msgstr ""
 "merkelapper grupperes etter nyhetskanalene"
 
 #: include/localized_schema.php:29
 "merkelapper grupperes etter nyhetskanalene"
 
 #: include/localized_schema.php:29

-msgid "Use feed-specified date to sort headlines instead of local import date."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2388,7 +1589,8 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
 msgstr ""
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
 
 #: include/localized_schema.php:34
 msgstr "Slett gamle poster etter så mange dager (0 - fjerner denne funksjonen)"
 
 #: include/localized_schema.php:34


@@ -2498,16 +1700,16 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
 msgid "User timezone"
 msgstr ""
 

-#: include/localized_schema.php:60
-#, fuzzy
-msgid "Sort headlines by feed date"
-msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
 
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "URL til brukerbestemt utseendemal (CSS)"
 

+#: include/localized_schema.php:61
+#, fuzzy
+msgid "Sort headlines by feed date"
+msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr ""


@@ -2529,7 +1731,7 @@ msgstr "Fil:"
 msgid "Use less traffic"
 msgstr ""
 
 msgid "Use less traffic"
 msgstr ""
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "Marker alle artikler i %s som leste?"
 


@@ -2538,15 +1740,19 @@ msgstr "Marker alle artikler i %s som leste?"
 msgid "Mark %d displayed articles as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "i"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 
 msgid "Unstar article"
 msgstr "Fjern favorittmerkingen fra artiklen"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 
 msgid "Star article"
 msgstr "Marker artikkel som favoritt"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 
 msgid "Unpublish article"
 msgstr "Fjern publiseringen av artikkelen."
 


@@ -2585,11 +1791,11 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Load more..."
 msgstr "Laster hjelp..."
 
 msgid "Load more..."
 msgstr "Laster hjelp..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 #, fuzzy
 msgid "Update feed"
 msgstr "Oppdater alle nyhetsstrømmer"
 #, fuzzy
 msgid "Update feed"
 msgstr "Oppdater alle nyhetsstrømmer"


@@ -2600,136 +1806,147 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Gammelt passord er feil"
 
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Gammelt passord er feil"
 

-#: js/functions.js:650
+#: js/functions.js:621

 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Gammelt passord er feil"
 
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Gammelt passord er feil"
 

-#: js/functions.js:777
+#: js/functions.js:748

 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Fjern lagrede data"
 
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Fjern lagrede data"
 

-#: js/functions.js:809
+#: js/functions.js:780

 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Vennligst velg en nyhetsstrøm"
 
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Vennligst velg en nyhetsstrøm"
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Vennligst skriv inn merkelappstekst:"
 
 msgid "Please enter label caption:"
 msgstr "Vennligst skriv inn merkelappstekst:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "Kan ikke skape merkelapp, mangler overskrift."
 
 msgid "Can't create label: missing caption."
 msgstr "Kan ikke skape merkelapp, mangler overskrift."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "Abonner på nyhetsstrøm"
 
 msgid "Subscribe to Feed"
 msgstr "Abonner på nyhetsstrøm"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "Abonnerer på nyhetsstrømmen..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Abonnerer på følgende nyhetsstrømmer:"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 msgid "Specified URL seems to be invalid."
 msgstr ""
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 

-#: js/functions.js:945
+#: js/functions.js:917

 #, fuzzy
 #, fuzzy

-msgid "Couldn't download the specified URL."
+msgid "Couldn't download the specified URL: %s"

 msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 
 msgstr "Kan ikke abonnere: Ingen nyhetsstrømsadresse er blitt gitt"
 

-#: js/functions.js:948
+#: js/functions.js:921

 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 

-#: js/functions.js:980
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Filtre"
+
+#: js/functions.js:1049
+#, fuzzy
+msgid "Add rule"
+msgstr "Legger til kategori for nyhetsstrømmer"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Edit action"
+msgstr "Nyhetsstrømshandlinger"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "Nyhetsstrømshandlinger"
+
+#: js/functions.js:1112

 msgid "Create Filter"
 msgstr "Lag filter"
 
 msgid "Create Filter"
 msgstr "Lag filter"
 

-#: js/functions.js:1008 js/prefs.js:168
-#, fuzzy
-msgid "Filter Test Results"
-msgstr "Filteruttrykk"
-
-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 
 msgid "Unsubscribe from %s?"
 msgstr "Fjerne abonnement på %s?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 
 msgid "You can't edit this kind of feed."
 msgstr "Du kan ikke endre denne typen nyhetsstrøm"
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Rediger nyhetsstrømmen"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 
 #, fuzzy
 msgid "More Feeds"
 msgstr "Flere nyhetsstrømmer"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 
 msgid "No feeds are selected."
 msgstr "Ingen nyhetsstrømmer er valgt"
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Oppdateringsfeil"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Fjerne valgte filtre?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 
 msgid "No articles are selected."
 msgstr "Ingen artikler er valgt."
 


@@ -2738,6 +1955,21 @@ msgstr "Ingen artikler er valgt."
 msgid "Forward article by email"
 msgstr "Marker artikkel som favoritt"
 
 msgid "Forward article by email"
 msgstr "Marker artikkel som favoritt"
 

+#: js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Endre Stikkord"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Rediger kategorier"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Lag kategori"
+

 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"


@@ -2756,334 +1988,843 @@ msgstr "Kan ikke legge til bruker: brukernavn mangler."
 msgid "Edit Filter"
 msgstr "Filtre"
 
 msgid "Edit Filter"
 msgstr "Filtre"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "Fjerne %s filteret?"
 
 msgstr "Fjerne %s filteret?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 
 msgid "Remove selected labels?"
 msgstr "Fjerne merkede merkelapper?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
 msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 
 msgid "No users are selected."
 msgstr "Ingen bruker er markert"
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 
 msgid "Remove selected filters?"
 msgstr "Fjerne valgte filtre?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 
 msgid "No filters are selected."
 msgstr "Ingen filtre er valgt"
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "Fjern abonnement på valgte nyhetsstrømmer"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Vennligst velg kun en nyhetsstrøm"
 
 msgid "Please select only one feed."
 msgstr "Vennligst velg kun en nyhetsstrøm"
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Fjern alle ikke-favoriserte artikler i den valgte nyhetsstrømmen?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Hvor mange dager med artikler skal beholdes (0 - bruk standard)?"
 
 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:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "Brukernavn kan ikke være blankt"
 
 msgid "Login field cannot be blank."
 msgstr "Brukernavn kan ikke være blankt"
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 
 msgid "Please select only one user."
 msgstr "Vennligst velg kun en bruker"
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 
 msgid "Reset password of selected user?"
 msgstr "Nullstill passordet til utvalgte bruker?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 
 msgid "Please select only one filter."
 msgstr "Vennligst velg kun et filter"
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Fjerne valgte filtre?"
+
+#: js/prefs.js:704

 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Nyhetsstrømsredigerer"
 
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Nyhetsstrømsredigerer"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 
 msgid "Save changes to selected feeds?"
 msgstr "Lagre endringer til de valgte nyhetsstrømmene?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 #, fuzzy
 msgid "OPML Import"
 msgstr "Importer"
 
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importer"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 
 msgid "Reset to defaults?"
 msgstr "Tilbakefør til standardinnstillingene"
 

-#: js/prefs.js:1152
-#, fuzzy
-msgid "Feed Categories"
-msgstr "Kategori:"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Fjerne valgte kategorier?"
 
 msgid "Remove selected categories?"
 msgstr "Fjerne valgte kategorier?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "Ingen kategorier er valgt."
 
 msgid "No categories are selected."
 msgstr "Ingen kategorier er valgt."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Kategoriredigerer"
+
+#: js/prefs.js:1306

 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Oppdateringsfeil"
 
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Oppdateringsfeil"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Bytt ut nåværende publiseringsadresse med en ny?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "Endre poengene til artiklene? Dette kan ta lang tid."
 

-#: js/prefs.js:1422
+#: js/prefs.js:1507

 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Sett merkelappsfargene til standard?"
 
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Sett merkelappsfargene til standard?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr ""
 
 msgid "Settings Profiles"
 msgstr ""
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Ingen artikkel er valgt."
 
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Ingen artikkel er valgt."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Fjerne valgte filtre?"
 
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Fjerne valgte filtre?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 
 msgid "Label Editor"
 msgstr "Merkelappredigerer"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 #, fuzzy
 msgid "Link Instance"
 msgstr "Endre stikkord"
 
 #, fuzzy
 msgid "Link Instance"
 msgstr "Endre stikkord"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 #, fuzzy
 msgid "Edit Instance"
 msgstr "Endre stikkord"
 
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Endre stikkord"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Fjerne valgte filtre?"
 
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Fjerne valgte filtre?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 #, fuzzy
 msgid "No instances are selected."
 msgstr "Ingen filtre er valgt"
 
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Ingen filtre er valgt"
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Vennligst velg kun et filter"
 
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Vennligst velg kun et filter"
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 #, fuzzy
 msgid "Export Data"
 msgstr "Eksporter OPML"
 
 #, fuzzy
 msgid "Export Data"
 msgstr "Eksporter OPML"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 #, fuzzy
 msgid "Data Import"
 msgstr "Importer"
 
 #, fuzzy
 msgid "Data Import"
 msgstr "Importer"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "Avabonner"
+
+#: js/prefs.js:2191

 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Abonnerer på nyhetsstrømmen..."
 
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Abonnerer på nyhetsstrømmen..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Returner til Tiny Tiny RSS"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marker artikkel som favoritt"
 
 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Marker artikkel som favoritt"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 
 msgid "Mark all articles as read?"
 msgstr "Marker alle artikler som leste?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 
 msgid "You can't unsubscribe from the category."
 msgstr "Du kan ikke fjerne abonnement fra kategorien."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 
 msgid "Please select some feed first."
 msgstr "Vennligst velg en eller flere nyhetsstrømmer først"
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 
 msgid "You can't rescore this kind of feed."
 msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 #, fuzzy
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 
 #, fuzzy
 msgid "New version available!"
 msgstr "Ny versjon av Tiny Tiny Rss er tilgjengelig!"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marker alle synlige artikler i %s som leste?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Fjerne merkede artikler fra merkelappen?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favorittartikler"
 
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favorittartikler"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marker %d valgte artikler i %s som leste?"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Endre Stikkord"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 
 msgid "No article is selected."
 msgstr "Ingen artikkel er valgt."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 
 msgid "No articles found to mark"
 msgstr "Ingen artikler funnet som kan markeres"
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "Marker %d artikkel/artikler som leste?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 #, fuzzy
 msgid "Loading..."
 msgstr "Laster nyhetsstrømmer..."
 
 #, fuzzy
 msgid "Loading..."
 msgstr "Laster nyhetsstrømmer..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 
 #, fuzzy
 msgid "Open original article"
 msgstr "Vis opprinnelig artikkelinnhold"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "Åpne artikkel i nytt nettleservindu"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marker som lest"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marker som lest"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 
 #, fuzzy
 msgid "Remove label"
 msgstr "Fjerne merkede merkelapper?"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 #, fuzzy
 msgid "Playing..."
 msgstr "Laster nyhetsstrømmer..."
 
 #, fuzzy
 msgid "Playing..."
 msgstr "Laster nyhetsstrømmer..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 #, fuzzy
 msgid "Click to pause"
 msgstr "Trykk for å endre"
 
 #, fuzzy
 msgid "Click to pause"
 msgstr "Trykk for å endre"
 

+#, fuzzy
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "Legger til kategori <b>%s</b>."
+
+#, fuzzy
+#~ msgid "is already imported."
+#~ msgstr "Allerede importert."
+
+#, fuzzy
+#~ msgid "OK"
+#~ msgstr "OK!"
+
+#, fuzzy
+#~ msgid "Register"
+#~ msgstr "Registrert"
+
+#~ msgid "Match"
+#~ msgstr "Match"
+
+#~ msgid "before"
+#~ msgstr "før"
+
+#~ msgid "after"
+#~ msgstr "etter"
+
+#~ msgid "Check it"
+#~ msgstr "Sjekk det"
+
+#~ msgid "on field"
+#~ msgstr "På felt:"
+
+#~ msgid "Perform Action"
+#~ msgstr "Utfør handlingen"
+
+#~ msgid "with parameters:"
+#~ msgstr "med parametrene:"
+
+#~ msgid "Options"
+#~ msgstr "Alternativer:"
+
+#~ msgid "Enabled"
+#~ msgstr "Tillatt"
+
+#~ msgid "Inverse match"
+#~ msgstr "Motsatt markering"
+
+#, fuzzy
+#~ msgid "Apply to category"
+#~ msgstr "Plasser i kategori..."
+
+#~ msgid "Test"
+#~ msgstr "Test"
+
+#~ msgid "Create"
+#~ msgstr "Lag"
+
+#, fuzzy
+#~ msgid "Multiple articles"
+#~ msgstr "Alle artikler"
+
+#, fuzzy
+#~ msgid "To:"
+#~ msgstr "Topp"
+
+#, fuzzy
+#~ msgid "Subject:"
+#~ msgstr "Velg:"
+
+#, fuzzy
+#~ msgid "Send e-mail"
+#~ msgstr "Skift e-post"
+
+#~ msgid "Check to enable field"
+#~ msgstr "Marker for å tillate felt"
+
+#, fuzzy
+#~ msgid "(%d feeds)"
+#~ msgstr "Rediger nyhetsstrømmen"
+
+#, fuzzy
+#~ msgid "Feed Title"
+#~ msgstr "Tittel"
+
+#~ msgid "using"
+#~ msgstr "bruker"
+
+#~ msgid "Article purging:"
+#~ msgstr "Slett artikler:"
+
+#, fuzzy
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Skjul fra min nyhetsstrømslisten"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Innhold som vises fra høyre til venstre"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "Inkluder i e-postsammendraget"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Mellomlagre bilder lokalt på serveren"
+
+#, fuzzy
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Marker alle artikler som leste?"
+
+#, fuzzy
+#~ msgid "Icon"
+#~ msgstr "Handling"
+
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Abonnerer på følgende nyhetsstrømmer:"
+
+#~ msgid "All done."
+#~ msgstr "Alt ferdig."
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "Abonnerer på <b>%s</b>"
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Abonnerer allerede på <b>%s</b>"
+
+#, fuzzy
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "Ingen nyhetsstrømmer ble funnet."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "Abonnerer allerede på <b>%s</b>"
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr ""
+#~ "Adresse for nyhetsstrømmen for offentliggjorte innlegg har endret seg."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#~ msgstr "Abonnerer allerede på <b>%s</b>"
+
+#, fuzzy
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "Fjern abonnement på valgte nyhetsstrømmer"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Rediger abonnementsalternativer"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "Kategorien <b>$%s</b> eksisterer allerede i databasen"
+
+#~ msgid "No feed categories defined."
+#~ msgstr "Ingen kategorier ble markert"
+
+#, fuzzy
+#~ msgid "Remove selected categories"
+#~ msgstr "Fjerne valgte kategorier?"
+
+#, fuzzy
+#~ msgid "Feeds with errors"
+#~ msgstr "Nyhetsstrømsredigerer"
+
+#, fuzzy
+#~ msgid "Inactive feeds"
+#~ msgstr "Hele nyhetsstrømmen"
+
+#, fuzzy
+#~ msgid "Edit selected feeds"
+#~ msgstr "Sletter den valgte nyhetsstrømmen..."
+
+#, fuzzy
+#~ msgid "Reset sort order"
+#~ msgstr "Nullstill passordet"
+
+#, fuzzy
+#~ msgid "Categories"
+#~ msgstr "Kategori:"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Rediger kategorier"
+
+#, fuzzy
+#~ msgid "More actions..."
+#~ msgstr "Handlinger..."
+
+#~ msgid "Manual purge"
+#~ msgstr "Slett manuelt"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Slett nyhetsstrømsdata"
+
+#~ msgid "Rescore articles"
+#~ msgstr "Tilbakestill poengsummene for artiklene"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#, fuzzy
+#~ msgid "Import my OPML"
+#~ msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
+
+#, fuzzy
+#~ msgid "Include settings"
+#~ msgstr "Inkluder i e-postsammendraget"
+
+#, fuzzy
+#~ msgid "Export OPML"
+#~ msgstr "Eksporter OPML"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ 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."
+
+#, fuzzy
+#~ msgid "Article archive"
+#~ msgstr "Artikkeldato"
+
+#, fuzzy
+#~ msgid "Export my data"
+#~ msgstr "Eksporter OPML"
+
+#~ msgid "Import"
+#~ msgstr "Importer"
+
+#, fuzzy
+#~ msgid "Firefox integration"
+#~ msgstr "Firefox integrering"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
+#~ "ved å trykke på lenken nedenfor."
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
+
+#, fuzzy
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Returner til Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Returner til Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "Sett poeng på nytt for artiklene i de valgte nyhetskanalene?"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ 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."
+
+#, fuzzy
+#~ msgid "Display URL"
+#~ msgstr "Vis stikkord"
+
+#, fuzzy
+#~ msgid "Unshare all articles"
+#~ msgstr "Uleste artikler"
+
+#, fuzzy
+#~ msgid "Twitter"
+#~ msgstr "Tittel"
+
+#, fuzzy
+#~ msgid "Clear stored credentials"
+#~ msgstr "Slett nyhetsstrømsdata"
+
+#, fuzzy
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "Ingen filtre ble funnet."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "Laget filter <b>%s</b>"
+
+#~ msgid "Edit"
+#~ msgstr "Rediger"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "Adgangsnivået ditt er for lavt for å åpne denne siden."
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Flere nyhetsstrømmer"
+
+#~ msgid "Click to edit"
+#~ msgstr "Trykk for å endre"
+
+#~ msgid "Caption"
+#~ msgstr "Overskrift"
+
+#, fuzzy
+#~ msgid "Colors"
+#~ msgstr "Steng"
+
+#, fuzzy
+#~ msgid "Foreground:"
+#~ msgstr "Forgrunn"
+
+#, fuzzy
+#~ msgid "Background:"
+#~ msgstr "bakgrunn"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "Laget merkelappen <b>%s</b>"
+
+#~ msgid "Clear colors"
+#~ msgstr "Fjern farger"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "Gammelt passord kan ikke være blankt."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "Nytt passord kan ikke vært blankt."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "Innskrivne passord matcher ikke."
+
+#~ msgid "Password has been changed."
+#~ msgstr "Passord har blitt endret."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "Gammelt passord er feil"
+
+#~ msgid "The configuration was saved."
+#~ msgstr "Konfigurasjonen er lagret."
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Ukjent valg: %s"
+
+#, fuzzy
+#~ msgid "Personal data / Authentication"
+#~ msgstr "Autentifisering"
+
+#~ msgid "E-mail"
+#~ msgstr "E-post"
+
+#~ msgid "Access level"
+#~ msgstr "Tilgangsnivå"
+
+#, fuzzy
+#~ msgid "Save data"
+#~ msgstr "Lagre"
+
+#, 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."
+
+#~ msgid "Old password"
+#~ msgstr "Gammelt passord"
+
+#~ msgid "New password"
+#~ msgstr "Nytt passord"
+
+#~ msgid "Confirm password"
+#~ msgstr "Bekreft passord"
+
+#~ msgid "Change password"
+#~ msgstr "Endre passord"
+
+#~ msgid "Select theme"
+#~ msgstr "Velg utseende"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nei"
+
+#~ msgid "Save configuration"
+#~ msgstr "Lagre konfigurasjonen"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Tilbake til standard"
+
+#~ msgid "User details"
+#~ msgstr "Brukerdetaljer"
+
+#~ msgid "User not found"
+#~ msgstr "Brukeren ble  ikke funnet"
+
+#~ msgid "Registered"
+#~ msgstr "Registrert"
+
+#~ msgid "Last logged in"
+#~ msgstr "Sist innlogget"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Antall nyhetsstrømmer som abonneres på"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Nyhetsstrømmer som abonneres på"
+
+#~ msgid "User Editor"
+#~ msgstr "Brukeradministrering"
+
+#~ msgid "Access level: "
+#~ msgstr "Tilgangsnivå:"
+
+#~ msgid "Change password to"
+#~ msgstr "Endre passordet til"
+
+#~ msgid "E-mail: "
+#~ msgstr "E-post: "
+
+#~ msgid "Added user <b>%s</b> with password <b>%s</b>"
+#~ msgstr "La til bruker <b>%s</b> med passordet <b>%s</b>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "Kunne ikke lage brukeren <b>%s</b>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "Brukeren <b>%s</b> finnes allerede."
+
+#, fuzzy
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\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>"
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "Gir beskjed til <b>%s</b>"
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Varsel om endring av passord"
+
+#~ msgid "Reset password"
+#~ msgstr "Nullstill passordet"
+
+#~ msgid "Access Level"
+#~ msgstr "Tilgangsnivå"
+
+#~ msgid "Last login"
+#~ msgstr "Siste innlogging"
+
+#~ msgid "No users defined."
+#~ msgstr "Ingen brukere er valgt"
+
+#~ msgid "No matching users found."
+#~ msgstr "Ingen matchende brukere ble funnet"
+
+#, fuzzy
+#~ msgid "Share by URL"
+#~ msgstr "Marker artikkel som favoritt"
+
+#, fuzzy
+#~ msgid "Share on Twitter"
+#~ msgstr "Tittel"
+
+#~ msgid "Attachment:"
+#~ msgstr "Vedlegg:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Abonnerer på nyhetsstrømmen..."
+
+#, fuzzy
+#~ msgid "Filter Test Results"
+#~ msgstr "Filteruttrykk"
+
+#, fuzzy
+#~ msgid "Feed Categories"
+#~ msgstr "Kategori:"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."


@@ -3169,10 +2910,6 @@ msgstr "Trykk for å endre"
 #~ msgid "Add category..."
 #~ msgstr "Legger til kategori for nyhetsstrømmer"
 
 #~ msgid "Add category..."
 #~ msgstr "Legger til kategori for nyhetsstrømmer"
 

-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "Legger til kategori for nyhetsstrømmer"
-

 #~ msgid "description"
 #~ msgstr "beskrivelse"
 
 #~ msgid "description"
 #~ msgstr "beskrivelse"
 


@@ -3373,9 +3110,6 @@ msgstr "Trykk for å endre"
 #~ msgid "Update Errors"
 #~ msgstr "Oppdaterer feil"
 
 #~ msgid "Update Errors"
 #~ msgstr "Oppdaterer feil"
 

-#~ msgid "Category editor"
-#~ msgstr "Kategoriredigerer"
-

 #~ msgid "Show last article times"
 #~ msgstr "Vis tidspunktene for siste artikkel"
 
 #~ msgid "Show last article times"
 #~ msgstr "Vis tidspunktene for siste artikkel"
 


@@ -3451,10 +3185,6 @@ msgstr "Trykk for å endre"
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Lagret filter <b>%s</b>"
 
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Lagret filter <b>%s</b>"
 

-#, fuzzy
-#~ msgid "Tiny Tiny RSS"
-#~ msgstr "Returner til Tiny Tiny RSS"
-

 #~ msgid "Click to collapse category"
 #~ msgstr "Velg for å slå sammen kategorien"
 
 #~ msgid "Click to collapse category"
 #~ msgstr "Velg for å slå sammen kategorien"
 

diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index e8723319cea3fe2b5ced203ff7eee3938e0a9053..1cf4a439164322f7531c26d7368b0ddbbfbff9cd 100644 (file)
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 301021743782b4e2c5c7fc656b475d588ff09de0..fd7654c05ac1077ad3672c0fe1562154b0519186 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+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"
 "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,97 +17,93 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "Usar o padrão"
 
 msgid "Use default"
 msgstr "Usar o padrão"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Nunca remover"
 
 msgid "Never purge"
 msgstr "Nunca remover"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "1 semana atrás"
 
 msgid "1 week old"
 msgstr "1 semana atrás"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "2 semanas atrás"
 
 msgid "2 weeks old"
 msgstr "2 semanas atrás"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "1 mês atrás"
 
 msgid "1 month old"
 msgstr "1 mês atrás"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "2 meses atrás"
 
 msgid "2 months old"
 msgstr "2 meses atrás"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "3 meses atrás"
 
 msgid "3 months old"
 msgstr "3 meses atrás"
 

-#: backend.php:91
+#: backend.php:90

 #, fuzzy
 msgid "Default interval"
 msgstr "Padrão"
 
 #, fuzzy
 msgid "Default interval"
 msgstr "Padrão"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Desabilitar updates"
 
 msgid "Disable updates"
 msgstr "Desabilitar updates"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 
 msgid "Each 15 minutes"
 msgstr "Cada 15 minutos"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 
 msgid "Each 30 minutes"
 msgstr "Cada 30 minutos"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "Toda hora"
 
 msgid "Hourly"
 msgstr "Toda hora"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 
 msgid "Each 4 hours"
 msgstr "Cada 4 horas"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 
 msgid "Each 12 hours"
 msgstr "Cada 12 horas"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Diariamente"
 
 msgid "Daily"
 msgstr "Diariamente"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Semanalmente"
 
 msgid "Weekly"
 msgstr "Semanalmente"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "Padrão"
 
 msgid "Default"
 msgstr "Padrão"
 

-#: backend.php:113
+#: backend.php:112

 #, fuzzy
 msgid "Magpie"
 msgstr "Página"
 
 #, fuzzy
 msgid "Magpie"
 msgstr "Página"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr ""
 
 msgid "SimplePie"
 msgstr ""
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Usuário"
 
 msgid "User"
 msgstr "Usuário"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr ""
 
 msgid "Power User"
 msgstr ""
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Administrador"
 
 msgid "Administrator"
 msgstr "Administrador"
 


@@ -137,8 +133,7 @@ msgstr ""
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 


@@ -207,22 +202,24 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr ""
 
 "\t\t\tbrowser settings."
 msgstr ""
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr ""
 
 msgid "Loading, please wait..."
 msgstr ""
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Olá,"
 
 msgid "Hello,"
 msgstr "Olá,"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Sair"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Sair"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -284,221 +281,165 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Preferências"
 
 msgid "Preferences"
 msgstr "Preferências"
 

-#: index.php:103
+#: index.php:120

 #, fuzzy
 msgid "Comments?"
 msgstr "Conteúdo"
 
 #, fuzzy
 msgid "Comments?"
 msgstr "Conteúdo"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 

-#: index.php:148
+#: index.php:165

 #, fuzzy
 msgid "Show articles"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Show articles"
 msgstr "Favoritos"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr ""
 
 msgid "Adaptive"
 msgstr ""
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr ""
 
 msgid "All Articles"
 msgstr ""
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Favoritos"
 
 msgid "Starred"
 msgstr "Favoritos"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Publicado"
 
 msgid "Published"
 msgstr "Publicado"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Não Lido"
 
 msgid "Unread"
 msgstr "Não Lido"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr ""
 
 msgid "Ignore Scoring"
 msgstr ""
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Atualizado"
 
 msgid "Updated"
 msgstr "Atualizado"
 

-#: index.php:160
+#: index.php:177

 #, fuzzy
 msgid "Sort articles"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Sort articles"
 msgstr "Favoritos"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
 
 #, fuzzy
 msgid "Date"
 msgstr "Atualizar"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Título"
 
 msgid "Title"
 msgstr "Título"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr ""
 
 msgid "Score"
 msgstr ""
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Editar categorias"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Atualizar"
 
 msgid "Update"
 msgstr "Atualizar"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Marcar como lido"
 
 msgid "Mark as read"
 msgstr "Marcar como lido"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Ações..."
 
 msgid "Actions..."
 msgstr "Ações..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr ""
 
 msgid "Search..."
 msgstr ""
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Ações do Feed:"
 
 msgid "Feed actions:"
 msgstr "Ações do Feed:"
 

-#: index.php:185
+#: index.php:207

 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "Removendo o Feed..."
 

-#: index.php:186
+#: index.php:208

 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Editar"
 
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "Editar"
 

-#: index.php:187
+#: index.php:209

 #, fuzzy
 msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Rescore feed"
 msgstr "Removendo o Feed..."
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr ""
 
 msgid "Unsubscribe"
 msgstr ""
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 
 msgid "All feeds:"
 msgstr "Todos os Feeds:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr ""
 
 msgid "(Un)hide read feeds"
 msgstr ""
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Outras ações:"
 
 msgid "Other actions:"
 msgstr "Outras ações:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr ""
 
 msgid "Switch to digest..."
 msgstr ""
 

-#: index.php:194
+#: index.php:216

 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "núvem de tags"
 
 #, fuzzy
 msgid "Show tag cloud..."
 msgstr "núvem de tags"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 #, fuzzy
 msgid "Create label..."
 msgstr "Criar um usuário"
 
 #, fuzzy
 msgid "Create label..."
 msgstr "Criar um usuário"
 

-#: index.php:197
+#: index.php:219

 #, fuzzy
 msgid "Create filter..."
 msgstr "Criar um usuário"
 
 #, fuzzy
 msgid "Create filter..."
 msgstr "Criar um usuário"
 

-#: index.php:198
+#: index.php:220

 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "&nbsp;&nbsp;Criar filtro"
 

-#: opml.php:81
-#, fuzzy, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "Adicionando a categoria <b>%s</b>."
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: opml.php:123
-#, fuzzy, php-format
-msgid "Adding label %s"
-msgstr "Adicionando o Feed..."
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, fuzzy, php-format
-msgid "Adding filter %s"
-msgstr "Adicionando o Feed..."
-
-#: opml.php:196
-#, fuzzy, php-format
-msgid "Duplicate filter %s"
-msgstr "Remover os filtros selecionados?"
-
-#: opml.php:241
-msgid "is already imported."
-msgstr ""
-
-#: opml.php:271
-#, fuzzy
-msgid "OK"
-msgstr "OK!"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr ""
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "Utilitário OPML"
-
-#: opml.php:530
-#, fuzzy
-msgid "Importing OPML..."
-msgstr "Importando OPML (usando a extensão DOMXML)..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Retornar às preferências"
-

 #: prefs.php:81
 #, fuzzy
 msgid "Keyboard shortcuts"
 #: prefs.php:81
 #, fuzzy
 msgid "Keyboard shortcuts"


@@ -508,20 +449,18 @@ msgstr "&nbsp;&nbsp;Criar filtro"
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
 
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 #, fuzzy
 msgid "Filters"
 msgstr "Arquivo:"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 #, fuzzy
 msgid "Filters"
 msgstr "Arquivo:"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr ""
 
 msgid "Labels"
 msgstr ""
 


@@ -592,23 +531,6 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
 msgid "New user registrations are currently closed."
 msgstr ""
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-#, fuzzy
-msgid "Register"
-msgstr "Remover as categorias selecionadas?"
-

 #: help/main.php:1 help/prefs.php:1
 #, fuzzy
 msgid "Keyboard Shortcuts"
 #: help/main.php:1 help/prefs.php:1
 #, fuzzy
 msgid "Keyboard Shortcuts"


@@ -694,11 +616,11 @@ msgstr "Outras ações:"
 msgid "Select article under mouse cursor"
 msgstr ""
 
 msgid "Select article under mouse cursor"
 msgstr ""
 

-#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr ""
 
 msgid "Create label"
 msgstr ""
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr ""
 
 msgid "Create filter"
 msgstr ""
 


@@ -746,11 +668,11 @@ msgstr "Ações do Feed:"
 msgid "Refresh active feed"
 msgstr "Favoritos"
 
 msgid "Refresh active feed"
 msgstr "Favoritos"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr ""
 
 msgid "Subscribe to feed"
 msgstr ""
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 #, fuzzy
 msgid "Edit feed"
 msgstr "Editar"
 #, fuzzy
 msgid "Edit feed"
 msgstr "Editar"


@@ -778,20 +700,20 @@ msgstr ""
 msgid "Go to..."
 msgstr ""
 
 msgid "Go to..."
 msgstr ""
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr ""
 
 msgid "Fresh articles"
 msgstr ""
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr ""
 
 msgid "Starred articles"
 msgstr ""
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr ""
 
 msgid "Published articles"
 msgstr ""
 


@@ -830,7 +752,7 @@ msgstr ""
 msgid "Edit feed categories"
 msgstr "Editar categorias"
 
 msgid "Edit feed categories"
 msgstr "Editar categorias"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Criar um usuário"
 
 msgid "Create user"
 msgstr "Criar um usuário"
 


@@ -857,6 +779,10 @@ msgstr "Login:"
 msgid "Password:"
 msgstr "Senha:"
 
 msgid "Password:"
 msgstr "Senha:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -864,8 +790,8 @@ msgstr "Senha:"
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Especial"
 
 msgid "Special"
 msgstr "Especial"
 


@@ -919,13 +845,11 @@ msgstr "Tópico de ajuda não encontrado."
 msgid "Prepare data"
 msgstr "Salvar"
 
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Fechar esta janela"
 
 msgid "Close this window"
 msgstr "Fechar esta janela"
 


@@ -935,323 +859,265 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+#, fuzzy
+msgid "Select"
+msgstr "Selecione:"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Todos"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Nenhum"
+
+#: classes/dlg.php:85

 #, fuzzy
 msgid "Create profile"
 msgstr "Criar um usuário"
 
 #, fuzzy
 msgid "Create profile"
 msgstr "Criar um usuário"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 msgid "(active)"
 msgstr ""
 
 msgid "(active)"
 msgstr ""
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 #, fuzzy
 msgid "Default profile"
 msgstr "Padrão"
 
 #, fuzzy
 msgid "Default profile"
 msgstr "Padrão"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Remove selected profiles"
 msgstr "Remover os filtros selecionados?"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 #, fuzzy
 msgid "Activate profile"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Activate profile"
 msgstr "Remover os filtros selecionados?"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr ""
 
 msgid "Public OPML URL"
 msgstr ""
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 msgid "Your Public OPML URL is:"
 msgstr ""
 
 msgid "Your Public OPML URL is:"
 msgstr ""
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 #, fuzzy
 msgid "Generate new URL"
 msgstr "Gerar um outro endereço"
 
 #, fuzzy
 msgid "Generate new URL"
 msgstr "Gerar um outro endereço"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr ""
 
 msgid "Notice"
 msgstr ""
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 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 ""
 
 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 ""
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr ""
 
 msgid "Last update:"
 msgstr ""
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 ""
 
 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 ""
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Feed"
 
 msgid "Feed"
 msgstr "Feed"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 #, fuzzy
 msgid "Place in category:"
 msgstr "Salvando categoria..."
 
 #, fuzzy
 msgid "Place in category:"
 msgstr "Salvando categoria..."
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 #, fuzzy
 msgid "Available feeds"
 msgstr "Todos os feeds"
 
 #, fuzzy
 msgid "Available feeds"
 msgstr "Todos os feeds"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr ""
 
 msgid "Authentication"
 msgstr ""
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Login"
 
 msgid "Login"
 msgstr "Login"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 
 msgid "This feed requires authentication."
 msgstr "Este feed requer autenticação."
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr ""
 
 msgid "Subscribe"
 msgstr ""
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 #, fuzzy
 msgid "More feeds"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "More feeds"
 msgstr "Removendo o Feed..."
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Cancelar"
 
 msgid "Cancel"
 msgstr "Cancelar"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 #, fuzzy
 msgid "Popular feeds"
 msgstr "Todos os feeds"
 
 #, fuzzy
 msgid "Popular feeds"
 msgstr "Todos os feeds"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 #, fuzzy
 msgid "Feed archive"
 msgstr "Ações do Feed:"
 
 #, fuzzy
 msgid "Feed archive"
 msgstr "Ações do Feed:"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 #, fuzzy
 msgid "limit:"
 msgstr "Limite:"
 
 #, fuzzy
 msgid "limit:"
 msgstr "Limite:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Remover"
 
 msgid "Remove"
 msgstr "Remover"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr ""
 
 msgid "Look for"
 msgstr ""
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr ""
 
 msgid "match on"
 msgstr ""
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Conteúdo"
 
 msgid "Content"
 msgstr "Conteúdo"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Título ou conteúdo"
 
 msgid "Title or content"
 msgstr "Título ou conteúdo"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr ""
 
 msgid "Limit search to:"
 msgstr ""
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Todos os feeds"
 
 msgid "All feeds"
 msgstr "Todos os feeds"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr ""
 
 msgid "This feed"
 msgstr ""
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr ""
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr ""
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-#, fuzzy
-msgid "after"
-msgstr "Atualizar"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr ""
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr ""
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-#, fuzzy
-msgid "in"
-msgstr "Link"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-#, fuzzy
-msgid "Perform Action"
-msgstr "Ação"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr ""
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-#, fuzzy
-msgid "Options"
-msgstr "Opções:"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Ativado"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr ""
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-#, fuzzy
-msgid "Apply to category"
-msgstr "Salvando categoria..."
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Teste"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Criar"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Click to edit feed"
 msgstr "Favoritos"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Unsubscribe from selected feeds"
 msgstr "Removendo o Feed..."
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Salvar"
 
 msgid "Save"
 msgstr "Salvar"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvem de tags"
 
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Núvem de tags"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr ""
 
 msgid "Match:"
 msgstr ""
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 msgid "Display entries"
 msgstr ""
 
 msgid "Display entries"
 msgstr ""
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 #, fuzzy
 msgid "View as RSS"
 msgstr "Editar Tags"
 
 #, fuzzy
 msgid "View as RSS"
 msgstr "Editar Tags"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 
 #, fuzzy
 msgid "Details"
 msgstr "Diariamente"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1259,1033 +1125,367 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr ""
 
 msgid "Instance"
 msgstr ""
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
 
 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr ""
 
 msgid "Instance URL"
 msgstr ""
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 #, fuzzy
 msgid "Access key:"
 msgstr "Nível de acesso:"
 
 #, fuzzy
 msgid "Access key:"
 msgstr "Nível de acesso:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 #, fuzzy
 msgid "Access key"
 msgstr "Nível de acesso:"
 
 #, fuzzy
 msgid "Access key"
 msgstr "Nível de acesso:"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 #, fuzzy
 msgid "Generate new key"
 msgstr "Gerar um outro endereço"
 
 #, fuzzy
 msgid "Generate new key"
 msgstr "Gerar um outro endereço"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 #, fuzzy
 msgid "Create link"
 msgstr "Criar"
 
 #, fuzzy
 msgid "Create link"
 msgstr "Criar"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Este feed requer autenticação."
 
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Este feed requer autenticação."
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 msgid "Visit the website"
 msgstr ""
 
 msgid "Visit the website"
 msgstr ""
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Todos os feeds"
 
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "Todos os feeds"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Selecione:"
 
 msgid "Select:"
 msgstr "Selecione:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Todos"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 #, fuzzy
 msgid "Invert"
 msgstr "(Inverso)"
 
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverso)"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Nenhum"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Seleção"
 
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Seleção"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 #, fuzzy
 msgid "Archive"
 msgstr "Feed não encontrado."
 
 #, fuzzy
 msgid "Archive"
 msgstr "Feed não encontrado."
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 msgid "Move back"
 msgstr ""
 
 msgid "Move back"
 msgstr ""
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 #, fuzzy
 msgid "Delete"
 msgstr "Padrão"
 
 #, fuzzy
 msgid "Delete"
 msgstr "Padrão"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 #, fuzzy
 msgid "Forward by email"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Forward by email"
 msgstr "Favoritos"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "Feed:"
 
 msgid "Feed:"
 msgstr "Feed:"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 #, fuzzy
 msgid "mark as read"
 msgstr "Marcar como lido"
 
 #, fuzzy
 msgid "mark as read"
 msgstr "Marcar como lido"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 #, fuzzy
 msgid "Originally from:"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Originally from:"
 msgstr "Favoritos"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 #, fuzzy
 msgid "Edit tags for this article"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Edit tags for this article"
 msgstr "Favoritos"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 msgid "Open article in new tab"
 msgstr ""
 
 msgid "Open article in new tab"
 msgstr ""
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 #, fuzzy
 msgid "Close article"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Close article"
 msgstr "Favoritos"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Sem Feeds para exibir."
 
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Sem Feeds para exibir."
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
 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:739
+#: classes/feeds.php:699

 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Atualizar"
 
 #, fuzzy, php-format
 msgid "Feeds last updated at %s"
 msgstr "Atualizar"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr "Alguns feeds estão com erros (clique aqui para detalhes)"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "Não Categorizado"
-
-#: classes/mail_button.php:52 classes/mail_button.php:58
-msgid "[Forwarded]"
-msgstr ""
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Utilitário OPML"

 
 

-#: classes/mail_button.php:52
+#: classes/opml.php:37

 #, fuzzy
 #, fuzzy

-msgid "Multiple articles"
-msgstr "Favoritos"
+msgid "Importing OPML..."
+msgstr "Importando OPML (usando a extensão DOMXML)..."

 
 

-#: classes/mail_button.php:73
-msgid "From:"
-msgstr ""
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Retornar às preferências"

 
 

-#: classes/mail_button.php:82
-msgid "To:"
-msgstr ""
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Adicionando o Feed..."

 
 

-#: classes/mail_button.php:95
-#, fuzzy
-msgid "Subject:"
-msgstr "Selecione:"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Remover os filtros selecionados?"

 
 

-#: classes/mail_button.php:111
-#, fuzzy
-msgid "Send e-mail"
-msgstr "Mudar E-mail"
+#: classes/opml.php:293
+#, fuzzy, php-format
+msgid "Adding label %s"
+msgstr "Adicionando o Feed..."

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-#, fuzzy
-msgid "Edit article note"
-msgstr "Editar Tags"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#: classes/opml.php:337
+#, fuzzy
+msgid "Adding filter..."
+msgstr "Adicionando o Feed..."
+
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Não Categorizado"
+
+#: classes/opml.php:411

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "(%d feeds)"
-msgstr "Editar"
+msgid "Processing category: %s"
+msgstr "Salvando categoria..."

 
 

-#: classes/pref_feeds.php:306
-#, fuzzy
-msgid "Feed Title"
-msgstr "Título"
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr ""

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
+#: classes/opml.php:465
+msgid "Error while parsing document."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "sem tags"
+
+#: classes/rpc.php:736
+msgid "Your request could not be completed."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-msgid "Hide from Popular feeds"
+#: classes/rpc.php:748
+msgid "Category update has been scheduled."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
+#: classes/rpc.php:761
+msgid "Can't update this kind of feed."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
+#: include/functions.php:861
+msgid "Incorrect username or password"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
+#: include/functions.php:2049

 #, fuzzy
 #, fuzzy

-msgid "Mark updated articles as unread"
-msgstr "Marcando todos os feeds como lidos..."
+msgid "Archived articles"
+msgstr "Favoritos"

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
+#: include/functions.php:2051
+msgid "Recently read"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:491
+#: include/functions.php:3223 js/viewfeed.js:1996

 #, fuzzy
 #, fuzzy

-msgid "Icon"
-msgstr "Ação"
+msgid "Click to play"
+msgstr "Favoritos"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:524
+#: include/functions.php:3356

 #, fuzzy
 #, fuzzy

-msgid "Resubscribe to push updates"
-msgstr "Removendo o Feed..."
-
-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
+msgid " - "
+msgstr " - por "

 
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
+#: include/functions.php:3485
+msgid "Related"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
+#: include/functions.php:4186
+msgid "(edit note)"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1021
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Não pode criar o usuário <b>%s</b>"
-
-#: classes/pref_feeds.php:1024
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Sem Feeds para exibir."
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "Nenhum feed foi selecionado."

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr ""
+#: include/functions.php:4802
+#, fuzzy
+msgid "unknown type"
+msgstr "Erro desconhecido"

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:4844

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "Sem Feeds para exibir."
+msgid "Attachments"
+msgstr "Conteúdo"

 
 

-#: classes/pref_feeds.php:1035
+#: include/functions.php:5286

 #, fuzzy, php-format
 #, 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>"
+msgid "%d archived articles"
+msgstr "Favoritos"

 
 

-#: classes/pref_feeds.php:1057
+#: include/functions.php:5310

 #, fuzzy
 #, fuzzy

-msgid "Subscribe to selected feed"
-msgstr "Removendo o Feed..."
+msgid "No feeds found."
+msgstr "Sem Feeds para exibir."

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
+#: include/functions.php:5356
+msgid "Could not import: incorrect schema version."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1161
-#, php-format
-msgid "Category <b>$%s</b> already exists in the database."
-msgstr "A categoria <b>$%s</b> já existe na base de dados."
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "Criar categoria"
+#: include/functions.php:5520
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
+#: include/functions.php:5526
+msgid "Could not load XML document."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1243
-#, fuzzy
-msgid "Remove selected categories"
-msgstr "Remover as categorias selecionadas?"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Título ou Conteúdo"

 
 

-#: classes/pref_feeds.php:1267
-#, fuzzy
-msgid "Feeds with errors"
-msgstr "Editor de Feed"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Link"

 
 

-#: classes/pref_feeds.php:1287
+#: include/localized_schema.php:7

 #, fuzzy
 #, fuzzy

-msgid "Inactive feeds"
-msgstr "Editar"
+msgid "Article Date"
+msgstr "Feed não encontrado."

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
+#: include/localized_schema.php:9

 #, fuzzy
 #, fuzzy

-msgid "Select"
-msgstr "Selecione:"
-
-#: classes/pref_feeds.php:1324
-#, fuzzy
-msgid "Edit selected feeds"
-msgstr "Removendo filtros selecionados…"
-
-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-#, fuzzy
-msgid "Reset sort order"
-msgstr "Remover as categorias selecionadas?"
-
-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-msgid "Batch subscribe"
-msgstr ""
-
-#: classes/pref_feeds.php:1333
-#, fuzzy
-msgid "Categories"
-msgstr "Categoria:"
-
-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Editar categorias"
-
-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Editar categorias"
-
-#: classes/pref_feeds.php:1354
-#, fuzzy
-msgid "More actions..."
-msgstr "Ações..."
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr ""
-
-#: classes/pref_feeds.php:1362
-#, fuzzy
-msgid "Clear feed data"
-msgstr "Salvando o Feed..."
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-#, fuzzy
-msgid "Rescore articles"
-msgstr "Favoritos"
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref_feeds.php:1432
-#, fuzzy
-msgid "Import my OPML"
-msgstr "Importando OPML (usando a extensão DOMXML)..."
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-msgid "Include settings"
-msgstr ""
-
-#: classes/pref_feeds.php:1442
-#, fuzzy
-msgid "Export OPML"
-msgstr "Exportar OPML"
-
-#: classes/pref_feeds.php:1446
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-#, fuzzy
-msgid "Article archive"
-msgstr "Feed não encontrado."
-
-#: classes/pref_feeds.php:1456
-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:1459
-#, fuzzy
-msgid "Export my data"
-msgstr "Exportar OPML"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Importar"
-
-#: classes/pref_feeds.php:1481
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Informações do Feed:"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr ""
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Removendo o Feed..."
-
-#: classes/pref_feeds.php:1508
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref_feeds.php:1512
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "Remover os filtros selecionados?"
-
-#: classes/pref_feeds.php:1514
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr "Remover os filtros selecionados?"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Favoritos"
-
-#: classes/pref_feeds.php:1538
-#, fuzzy
-msgid "Twitter"
-msgstr "Título"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-#, fuzzy
-msgid "Clear stored credentials"
-msgstr "Salvando o Feed..."
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: classes/pref_filters.php:89
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "Sem Feeds para exibir."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr ""
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Editar"
-
-#: 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."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr ""
-
-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-#, fuzzy
-msgid "Stored feeds"
-msgstr "Removendo o Feed..."
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr ""
-
-#: classes/pref_labels.php:22
-#, fuzzy
-msgid "Caption"
-msgstr "Opções:"
-
-#: classes/pref_labels.php:37
-#, fuzzy
-msgid "Colors"
-msgstr "Fechar"
-
-#: classes/pref_labels.php:42
-msgid "Foreground:"
-msgstr ""
-
-#: classes/pref_labels.php:42
-msgid "Background:"
-msgstr ""
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr ""
-
-#: classes/pref_labels.php:287
-#, fuzzy
-msgid "Clear colors"
-msgstr "Favoritos"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "A senha antiga não pode ser vazia."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "A nova senha não pode ser vazia."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "As senhas informadas não conferem."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr ""
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "Senha antiga incorreta"
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr ""
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr ""
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-msgid "Personal data / Authentication"
-msgstr ""
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr ""
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "E-mail"
-
-#: classes/pref_prefs.php:203
-#, fuzzy
-msgid "Access level"
-msgstr "Nível de acesso:"
-
-#: classes/pref_prefs.php:213
-#, fuzzy
-msgid "Save data"
-msgstr "Salvar"
-
-#: classes/pref_prefs.php:224
-#, 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."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Senha antiga"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Senha nova"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Confirmar senha"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Mudar senha"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Selecionar o tema"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Sim"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "Não"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Salvar configuração"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr ""
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr ""
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Detalhes do usuário"
-
-#: classes/pref_users.php:41
-#, fuzzy
-msgid "User not found"
-msgstr "Feed não encontrado."
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr ""
-
-#: classes/pref_users.php:61
-#, fuzzy
-msgid "Last logged in"
-msgstr "Último Login"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr ""
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr ""
-
-#: classes/pref_users.php:122
-#, fuzzy
-msgid "User Editor"
-msgstr "Editor de usuário"
-
-#: classes/pref_users.php:158
-#, fuzzy
-msgid "Access level: "
-msgstr "Nível de acesso:"
-
-#: classes/pref_users.php:171
-#, fuzzy
-msgid "Change password to"
-msgstr "Mudar senha"
-
-#: classes/pref_users.php:180
-#, fuzzy
-msgid "E-mail: "
-msgstr "E-mail:"
-
-#: classes/pref_users.php:257
-#, 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>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Não pode criar o usuário <b>%s</b>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "O usuário <b>%s</b> já existe."
-
-#: classes/pref_users.php:291
-#, fuzzy, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\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>"
-
-#: classes/pref_users.php:298
-#, fuzzy, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "Adicionando a categoria <b>%s</b>."
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr ""
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr ""
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Nível de acesso"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Último Login"
-
-#: classes/pref_users.php:480
-#, fuzzy
-msgid "No users defined."
-msgstr "Nenhum usuário foi selecionado."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr ""
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "sem tags"
-
-#: classes/rpc.php:742
-msgid "Your request could not be completed."
-msgstr ""
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr ""
-
-#: classes/rpc.php:754
-msgid "Category update has been scheduled."
-msgstr ""
-
-#: classes/rpc.php:767
-msgid "Can't update this kind of feed."
-msgstr ""
-
-#: classes/share_button.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "Favoritos"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "Título"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr ""
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr ""
-
-#: include/functions.php:2099
-#, fuzzy
-msgid "Archived articles"
-msgstr "Favoritos"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-#, fuzzy
-msgid "Click to play"
-msgstr "Favoritos"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr ""
-
-#: include/functions.php:3359
-#, fuzzy
-msgid " - "
-msgstr " - por "
-
-#: include/functions.php:4178
-msgid "(edit note)"
-msgstr ""
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "Nenhum feed foi selecionado."
-
-#: include/functions.php:4775
-#, fuzzy
-msgid "unknown type"
-msgstr "Erro desconhecido"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr ""
-
-#: include/functions.php:4817
-#, fuzzy
-msgid "Attachments:"
-msgstr "Conteúdo"
-
-#: include/functions.php:5261
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Favoritos"
-
-#: include/functions.php:5285
-#, fuzzy
-msgid "No feeds found."
-msgstr "Sem Feeds para exibir."
-
-#: include/functions.php:5331
-msgid "Could not import: incorrect schema version."
-msgstr ""
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr ""
-
-#: 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 "Article Date"
-msgstr "Feed não encontrado."
-
-#: include/localized_schema.php:9
-#, fuzzy
-msgid "Delete article"
-msgstr "Favoritos"
+msgid "Delete article"
+msgstr "Favoritos"

 
 #: 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
 
 #: 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:466
+#: js/viewfeed.js:475

 msgid "Publish article"
 msgstr ""
 
 msgid "Publish article"
 msgstr ""
 


@@ -2294,7 +1494,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr "sem tags"
 
 msgid "Assign tags"
 msgstr "sem tags"
 

-#: include/localized_schema.php:14 js/viewfeed.js:1935
+#: include/localized_schema.php:14 js/viewfeed.js:1960

 msgid "Assign label"
 msgstr ""
 
 msgid "Assign label"
 msgstr ""
 


@@ -2361,11 +1561,11 @@ msgid ""
 msgstr ""
 
 #: include/localized_schema.php:29
 msgstr ""
 
 #: include/localized_schema.php:29

-msgid "Use feed-specified date to sort headlines instead of local import date."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2377,7 +1577,7 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
 msgstr ""
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr ""
 
 #: include/localized_schema.php:34
 msgstr ""
 
 #: include/localized_schema.php:34


@@ -2488,12 +1688,12 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
 msgid "User timezone"
 msgstr ""
 

-#: include/localized_schema.php:60
-msgid "Sort headlines by feed date"
+#: include/localized_schema.php:60 js/prefs.js:1865
+msgid "Customize stylesheet"

 msgstr ""
 
 msgstr ""
 

-#: include/localized_schema.php:61 js/prefs.js:1780
-msgid "Customize stylesheet"
+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"

 msgstr ""
 
 #: include/localized_schema.php:62
 msgstr ""
 
 #: include/localized_schema.php:62


@@ -2517,7 +1717,7 @@ msgstr "Arquivo:"
 msgid "Use less traffic"
 msgstr ""
 
 msgid "Use less traffic"
 msgstr ""
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."


@@ -2527,17 +1727,22 @@ msgstr "Marcando todos os feeds como lidos..."
 msgid "Mark %d displayed articles as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
 msgid "Mark %d displayed articles as read?"
 msgstr "Marcando todos os feeds como lidos..."
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+#, fuzzy
+msgid "in"
+msgstr "Link"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 #, fuzzy
 msgid "Unstar article"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Unstar article"
 msgstr "Favoritos"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 #, fuzzy
 msgid "Star article"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Star article"
 msgstr "Favoritos"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 #, fuzzy
 msgid "Unpublish article"
 msgstr "Publicado"
 #, fuzzy
 msgid "Unpublish article"
 msgstr "Publicado"


@@ -2576,11 +1781,11 @@ msgstr "Favoritos"
 msgid "Load more..."
 msgstr "Salvando o Feed..."
 
 msgid "Load more..."
 msgstr "Salvando o Feed..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 #, fuzzy
 msgid "Update feed"
 msgstr "Favoritos"
 #, fuzzy
 msgid "Update feed"
 msgstr "Favoritos"


@@ -2591,138 +1796,148 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Senha antiga incorreta"
 
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Senha antiga incorreta"
 

-#: js/functions.js:650
+#: js/functions.js:621

 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Senha antiga incorreta"
 
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Senha antiga incorreta"
 

-#: js/functions.js:777
+#: js/functions.js:748

 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Remover as categorias selecionadas?"
 
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Remover as categorias selecionadas?"
 

-#: js/functions.js:809
+#: js/functions.js:780

 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Por favor selecione  um feed."
 
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Por favor selecione  um feed."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 #, fuzzy
 msgid "Please enter label caption:"
 msgstr "Último Login"
 
 #, fuzzy
 msgid "Please enter label caption:"
 msgstr "Último Login"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr ""
 
 msgid "Can't create label: missing caption."
 msgstr ""
 

-#: js/functions.js:875
+#: js/functions.js:846

 #, fuzzy
 msgid "Subscribe to Feed"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Subscribe to Feed"
 msgstr "Removendo o Feed..."
 

-#: js/functions.js:883
-#, fuzzy
-msgid "Subscribing to feed..."
-msgstr "Removendo o Feed..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Removendo o Feed..."
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 msgid "Specified URL seems to be invalid."
 msgstr ""
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 

-#: js/functions.js:945
-msgid "Couldn't download the specified URL."
+#: js/functions.js:917
+msgid "Couldn't download the specified URL: %s"

 msgstr ""
 
 msgstr ""
 

-#: js/functions.js:948
+#: js/functions.js:921

 msgid "You are already subscribed to this feed."
 msgstr ""
 
 msgid "You are already subscribed to this feed."
 msgstr ""
 

-#: js/functions.js:980
+#: js/functions.js:1049

 #, fuzzy
 #, fuzzy

-msgid "Create Filter"
-msgstr "Criar um usuário"
+msgid "Edit rule"
+msgstr "Arquivo:"

 
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
+#: js/functions.js:1049
+msgid "Add rule"

 msgstr ""
 
 msgstr ""
 

-#: js/functions.js:1068
+#: js/functions.js:1075
+#, fuzzy
+msgid "Edit action"
+msgstr "Ações do Feed:"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "Ações do Feed:"
+
+#: js/functions.js:1112
+#, fuzzy
+msgid "Create Filter"
+msgstr "Criar um usuário"
+
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 #, fuzzy
 msgid "Unsubscribe from %s?"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Unsubscribe from %s?"
 msgstr "Removendo o Feed..."
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Salvando categoria..."
 
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Salvando categoria..."
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr ""
 
 msgid "You can't edit this kind of feed."
 msgstr ""
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar"
 
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Editar"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 #, fuzzy
 msgid "More Feeds"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "More Feeds"
 msgstr "Removendo o Feed..."
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 
 msgid "No feeds are selected."
 msgstr "Nenhum feed foi selecionado."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Atualizar"
 
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Atualizar"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 #, fuzzy
 msgid "No articles are selected."
 msgstr "Nenhum filtro foi selecionado."
 #, fuzzy
 msgid "No articles are selected."
 msgstr "Nenhum filtro foi selecionado."


@@ -2732,6 +1947,21 @@ msgstr "Nenhum filtro foi selecionado."
 msgid "Forward article by email"
 msgstr "Favoritos"
 
 msgid "Forward article by email"
 msgstr "Favoritos"
 

+#: js/note_button.js:11
+#, fuzzy
+msgid "Edit article note"
+msgstr "Editar Tags"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Editar categorias"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Criar categoria"
+

 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"


@@ -2751,348 +1981,708 @@ msgstr ""
 msgid "Edit Filter"
 msgstr "Arquivo:"
 
 msgid "Edit Filter"
 msgstr "Arquivo:"
 

-#: js/prefs.js:141
+#: js/prefs.js:184

 #, fuzzy
 #, fuzzy

-msgid "Remove filter %s?"
+msgid "Remove filter?"

 msgstr "Remover os filtros selecionados?"
 
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 #, fuzzy
 msgid "Remove selected labels?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Remove selected labels?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 #, fuzzy
 msgid "No labels are selected."
 msgstr "Nenhum filtro foi selecionado."
 
 #, fuzzy
 msgid "No labels are selected."
 msgstr "Nenhum filtro foi selecionado."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 
 msgid "No users are selected."
 msgstr "Nenhum usuário foi selecionado."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 
 msgid "Remove selected filters?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 
 msgid "No filters are selected."
 msgstr "Nenhum filtro foi selecionado."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 #, fuzzy
 msgid "Unsubscribe from selected feeds?"
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Unsubscribe from selected feeds?"
 msgstr "Removendo o Feed..."
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Por favor selecione somente um feed"
 
 msgid "Please select only one feed."
 msgstr "Por favor selecione somente um feed"
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "O campo de Login não pode ser vazio."
 
 msgid "Login field cannot be blank."
 msgstr "O campo de Login não pode ser vazio."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 
 msgid "Please select only one user."
 msgstr "Por favor selecione somente um usuário."
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 #, fuzzy
 msgid "Reset password of selected user?"
 msgstr "Removendo usuários selecionados…"
 
 #, fuzzy
 msgid "Reset password of selected user?"
 msgstr "Removendo usuários selecionados…"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 
 msgid "Please select only one filter."
 msgstr "Por favor selecione somente um filtro."
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Remover os filtros selecionados?"
+
+#: js/prefs.js:704

 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor de Feed"
 
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Editor de Feed"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 #, fuzzy
 msgid "OPML Import"
 msgstr "Importar"
 
 #, fuzzy
 msgid "OPML Import"
 msgstr "Importar"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione somente um filtro."
 
 #, fuzzy
 msgid "Please choose an OPML file first."
 msgstr "Por favor selecione somente um filtro."
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Por favor selecione somente um filtro."
 
 #, fuzzy
 msgid "Please choose the file first."
 msgstr "Por favor selecione somente um filtro."
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 #, fuzzy
 msgid "Reset to defaults?"
 msgstr "Usar o padrão"
 
 #, fuzzy
 msgid "Reset to defaults?"
 msgstr "Usar o padrão"
 

-#: js/prefs.js:1152
-#, fuzzy
-msgid "Feed Categories"
-msgstr "Categoria:"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 
 msgid "Remove selected categories?"
 msgstr "Remover as categorias selecionadas?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 
 msgid "No categories are selected."
 msgstr "Nenhuma categoria foi selecionada."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Editor de Categoria"
+
+#: js/prefs.js:1306

 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Atualizar"
 
 #, fuzzy
 msgid "Feeds without recent updates"
 msgstr "Atualizar"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 

-#: js/prefs.js:1422
+#: js/prefs.js:1507

 msgid "Reset selected labels to default colors?"
 msgstr ""
 
 msgid "Reset selected labels to default colors?"
 msgstr ""
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr ""
 
 msgid "Settings Profiles"
 msgstr ""
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nenhum filtro foi selecionado."
 
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "Nenhum filtro foi selecionado."
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Por favor selecione somente um filtro."
 
 #, fuzzy
 msgid "Please choose a profile to activate."
 msgstr "Por favor selecione somente um filtro."
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de Feed"
 
 #, fuzzy
 msgid "Label Editor"
 msgstr "Editor de Feed"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 #, fuzzy
 msgid "Link Instance"
 msgstr "Editar Tags"
 
 #, fuzzy
 msgid "Link Instance"
 msgstr "Editar Tags"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 #, fuzzy
 msgid "Edit Instance"
 msgstr "Editar Tags"
 
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Editar Tags"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 #, fuzzy
 msgid "No instances are selected."
 msgstr "Nenhum filtro foi selecionado."
 
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Nenhum filtro foi selecionado."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Por favor selecione somente um filtro."
 
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Por favor selecione somente um filtro."
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 #, fuzzy
 msgid "Export Data"
 msgstr "Exportar OPML"
 
 #, fuzzy
 msgid "Export Data"
 msgstr "Exportar OPML"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 #, fuzzy
 msgid "Data Import"
 msgstr "Importar"
 
 #, fuzzy
 msgid "Data Import"
 msgstr "Importar"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+msgid "Batch subscribe"
+msgstr ""
+
+#: js/prefs.js:2191

 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Removendo o Feed..."
 
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Removendo o Feed..."
 

+#: js/prefs.js:2219
+msgid "Update Tiny Tiny RSS"
+msgstr ""
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Favoritos"
 
 #: js/share_button.js:10
 #, fuzzy
 msgid "Share article by URL"
 msgstr "Favoritos"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "Marcando todos os feeds como lidos..."
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr ""
 
 msgid "You can't unsubscribe from the category."
 msgstr ""
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Por favor selecione somente um feed"
 
 #, fuzzy
 msgid "Please select some feed first."
 msgstr "Por favor selecione somente um feed"
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr ""
 
 msgid "You can't rescore this kind of feed."
 msgstr ""
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 msgid "New version available!"
 msgstr ""
 
 msgid "New version available!"
 msgstr ""
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 #, fuzzy
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
 #, fuzzy
 msgid "Mark all visible articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Favoritos"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Remover os filtros selecionados?"
 
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "Remover os filtros selecionados?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "Favoritos"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Move %d archived articles back?"
 msgstr "Favoritos"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 #, fuzzy
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
 #, fuzzy
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Marcando todos os feeds como lidos..."
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Editar Tags"
 
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "Editar Tags"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 #, fuzzy
 msgid "No article is selected."
 msgstr "Nenhum filtro foi selecionado."
 
 #, fuzzy
 msgid "No article is selected."
 msgstr "Nenhum filtro foi selecionado."
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 #, fuzzy
 msgid "No articles found to mark"
 msgstr "Sem Feeds para exibir."
 
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "Sem Feeds para exibir."
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 #, fuzzy
 msgid "Mark %d article(s) as read?"
 msgstr "Marcando todos os feeds como lidos..."
 
 #, fuzzy
 msgid "Mark %d article(s) as read?"
 msgstr "Marcando todos os feeds como lidos..."
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 #, fuzzy
 msgid "Loading..."
 msgstr "Salvando o Feed..."
 
 #, fuzzy
 msgid "Loading..."
 msgstr "Salvando o Feed..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 #, fuzzy
 msgid "Open original article"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Open original article"
 msgstr "Favoritos"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 msgid "View in a tt-rss tab"
 msgstr ""
 
 msgid "View in a tt-rss tab"
 msgstr ""
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como lido"
 
 #, fuzzy
 msgid "Mark above as read"
 msgstr "Marcar como lido"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como lido"
 
 #, fuzzy
 msgid "Mark below as read"
 msgstr "Marcar como lido"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 #, fuzzy
 msgid "Remove label"
 msgstr "Remover"
 
 #, fuzzy
 msgid "Remove label"
 msgstr "Remover"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 #, fuzzy
 msgid "Playing..."
 msgstr "Salvando o Feed..."
 
 #, fuzzy
 msgid "Playing..."
 msgstr "Salvando o Feed..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 #, fuzzy
 msgid "Click to pause"
 msgstr "Favoritos"
 
 #, fuzzy
 msgid "Click to pause"
 msgstr "Favoritos"
 

+#, fuzzy
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "Adicionando a categoria <b>%s</b>."
+
+#, fuzzy
+#~ msgid "OK"
+#~ msgstr "OK!"
+
+#, fuzzy
+#~ msgid "Register"
+#~ msgstr "Remover as categorias selecionadas?"
+
+#, fuzzy
+#~ msgid "after"
+#~ msgstr "Atualizar"
+
+#, fuzzy
+#~ msgid "Perform Action"
+#~ msgstr "Ação"
+
+#, fuzzy
+#~ msgid "Options"
+#~ msgstr "Opções:"
+
+#~ msgid "Enabled"
+#~ msgstr "Ativado"
+
+#, fuzzy
+#~ msgid "Apply to category"
+#~ msgstr "Salvando categoria..."
+
+#~ msgid "Test"
+#~ msgstr "Teste"
+
+#~ msgid "Create"
+#~ msgstr "Criar"
+
+#, fuzzy
+#~ msgid "Multiple articles"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Subject:"
+#~ msgstr "Selecione:"
+
+#, fuzzy
+#~ msgid "Send e-mail"
+#~ msgstr "Mudar E-mail"
+
+#, fuzzy
+#~ msgid "(%d feeds)"
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid "Feed Title"
+#~ msgstr "Título"
+
+#, fuzzy
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Marcando todos os feeds como lidos..."
+
+#, fuzzy
+#~ msgid "Icon"
+#~ msgstr "Ação"
+
+#, fuzzy
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Removendo o Feed..."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Não pode criar o usuário <b>%s</b>"
+
+#, fuzzy
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "Sem Feeds para exibir."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "Sem Feeds para exibir."
+
+#, fuzzy
+#~ 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>"
+
+#, fuzzy
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "Removendo o Feed..."
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "A categoria <b>$%s</b> já existe na base de dados."
+
+#, fuzzy
+#~ msgid "Remove selected categories"
+#~ msgstr "Remover as categorias selecionadas?"
+
+#, fuzzy
+#~ msgid "Feeds with errors"
+#~ msgstr "Editor de Feed"
+
+#, fuzzy
+#~ msgid "Inactive feeds"
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid "Edit selected feeds"
+#~ msgstr "Removendo filtros selecionados…"
+
+#, fuzzy
+#~ msgid "Reset sort order"
+#~ msgstr "Remover as categorias selecionadas?"
+
+#, fuzzy
+#~ msgid "Categories"
+#~ msgstr "Categoria:"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Editar categorias"
+
+#, fuzzy
+#~ msgid "More actions..."
+#~ msgstr "Ações..."
+
+#, fuzzy
+#~ msgid "Clear feed data"
+#~ msgstr "Salvando o Feed..."
+
+#, fuzzy
+#~ msgid "Rescore articles"
+#~ msgstr "Favoritos"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#, fuzzy
+#~ msgid "Import my OPML"
+#~ msgstr "Importando OPML (usando a extensão DOMXML)..."
+
+#, fuzzy
+#~ msgid "Export OPML"
+#~ msgstr "Exportar OPML"
+
+#, fuzzy
+#~ msgid "Article archive"
+#~ msgstr "Feed não encontrado."
+
+#, fuzzy
+#~ msgid "Export my data"
+#~ msgstr "Exportar OPML"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#, fuzzy
+#~ msgid "Firefox integration"
+#~ msgstr "Informações do Feed:"
+
+#, fuzzy
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Removendo o Feed..."
+
+#, fuzzy
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr "Remover os filtros selecionados?"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "Remover os filtros selecionados?"
+
+#, fuzzy
+#~ msgid "Unshare all articles"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Twitter"
+#~ msgstr "Título"
+
+#, fuzzy
+#~ msgid "Clear stored credentials"
+#~ msgstr "Salvando o Feed..."
+
+#, fuzzy
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "Sem Feeds para exibir."
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "Seu nível de acesso é insuficiente para executar esse script."
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Removendo o Feed..."
+
+#, fuzzy
+#~ msgid "Caption"
+#~ msgstr "Opções:"
+
+#, fuzzy
+#~ msgid "Colors"
+#~ msgstr "Fechar"
+
+#, fuzzy
+#~ msgid "Clear colors"
+#~ msgstr "Favoritos"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "A senha antiga não pode ser vazia."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "A nova senha não pode ser vazia."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "As senhas informadas não conferem."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "Senha antiga incorreta"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#, fuzzy
+#~ msgid "Access level"
+#~ msgstr "Nível de acesso:"
+
+#, fuzzy
+#~ msgid "Save data"
+#~ msgstr "Salvar"
+
+#, 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."
+
+#~ msgid "Old password"
+#~ msgstr "Senha antiga"
+
+#~ msgid "New password"
+#~ msgstr "Senha nova"
+
+#~ msgid "Confirm password"
+#~ msgstr "Confirmar senha"
+
+#~ msgid "Change password"
+#~ msgstr "Mudar senha"
+
+#~ msgid "Select theme"
+#~ msgstr "Selecionar o tema"
+
+#~ msgid "Yes"
+#~ msgstr "Sim"
+
+#~ msgid "No"
+#~ msgstr "Não"
+
+#~ msgid "Save configuration"
+#~ msgstr "Salvar configuração"
+
+#~ msgid "User details"
+#~ msgstr "Detalhes do usuário"
+
+#, fuzzy
+#~ msgid "User not found"
+#~ msgstr "Feed não encontrado."
+
+#, fuzzy
+#~ msgid "Last logged in"
+#~ msgstr "Último Login"
+
+#, fuzzy
+#~ msgid "User Editor"
+#~ msgstr "Editor de usuário"
+
+#, fuzzy
+#~ msgid "Access level: "
+#~ msgstr "Nível de acesso:"
+
+#, fuzzy
+#~ msgid "Change password to"
+#~ msgstr "Mudar senha"
+
+#, fuzzy
+#~ msgid "E-mail: "
+#~ msgstr "E-mail:"
+
+#~ msgid "Added user <b>%s</b> with password <b>%s</b>"
+#~ msgstr "Adicionado usuário  <b>%s</b> com senha <b>%s</b>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "Não pode criar o usuário <b>%s</b>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "O usuário <b>%s</b> já existe."
+
+#, fuzzy
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\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>"
+
+#, fuzzy
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "Adicionando a categoria <b>%s</b>."
+
+#~ msgid "Access Level"
+#~ msgstr "Nível de acesso"
+
+#~ msgid "Last login"
+#~ msgstr "Último Login"
+
+#, fuzzy
+#~ msgid "No users defined."
+#~ msgstr "Nenhum usuário foi selecionado."
+
+#, fuzzy
+#~ msgid "Share by URL"
+#~ msgstr "Favoritos"
+
+#, fuzzy
+#~ msgid "Share on Twitter"
+#~ msgstr "Título"
+
+#, fuzzy
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Removendo o Feed..."
+
+#, fuzzy
+#~ msgid "Feed Categories"
+#~ msgstr "Categoria:"
+

 #, fuzzy
 #~ msgid "Help"
 #~ msgstr "Olá,"
 #, fuzzy
 #~ msgid "Help"
 #~ msgstr "Olá,"


@@ -3173,9 +2763,6 @@ msgstr "Favoritos"
 #~ msgid "Feed Browser"
 #~ msgstr "Editor de Feed"
 
 #~ msgid "Feed Browser"
 #~ msgstr "Editor de Feed"
 

-#~ msgid "Category editor"
-#~ msgstr "Editor de Categoria"
-

 #, fuzzy
 #~ msgid "Filter Editor"
 #~ msgstr "Editor de Feed"
 #, fuzzy
 #~ msgid "Filter Editor"
 #~ msgstr "Editor de Feed"

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 004a4a1f1b4215d00e25addae7e39557a0b299bd..b587066e0bde48f63e167d176f01e1b9798a864d 100644 (file)
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 e0e517ab94661427f5781005c7b4146bdcf2959e..0b959bf5fa803ed655f901b617b9d5826cf3b0b8 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+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"
 "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,95 +22,91 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: utf-8\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "По умолчанию"
 
 msgid "Use default"
 msgstr "По умолчанию"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "Никогда"
 
 msgid "Never purge"
 msgstr "Никогда"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "Неделя"
 
 msgid "1 week old"
 msgstr "Неделя"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "Две недели"
 
 msgid "2 weeks old"
 msgstr "Две недели"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "Один месяц"
 
 msgid "1 month old"
 msgstr "Один месяц"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "Два месяца"
 
 msgid "2 months old"
 msgstr "Два месяца"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "Три месяца"
 
 msgid "3 months old"
 msgstr "Три месяца"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "Интервал обновления:"
 
 msgid "Default interval"
 msgstr "Интервал обновления:"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "Не обновлять"
 
 msgid "Disable updates"
 msgstr "Не обновлять"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "Каждые 15 минут"
 
 msgid "Each 15 minutes"
 msgstr "Каждые 15 минут"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "Каждые 30 минут"
 
 msgid "Each 30 minutes"
 msgstr "Каждые 30 минут"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "Каждый час"
 
 msgid "Hourly"
 msgstr "Каждый час"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "Каждые 4 часа"
 
 msgid "Each 4 hours"
 msgstr "Каждые 4 часа"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "Каждые 12 часов"
 
 msgid "Each 12 hours"
 msgstr "Каждые 12 часов"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "Раз в день"
 
 msgid "Daily"
 msgstr "Раз в день"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "Раз в неделю"
 
 msgid "Weekly"
 msgstr "Раз в неделю"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "По умолчанию"
 
 msgid "Default"
 msgstr "По умолчанию"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "Пользователь"
 
 msgid "User"
 msgstr "Пользователь"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Активный пользователь"
 
 msgid "Power User"
 msgstr "Активный пользователь"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "Администратор"
 
 msgid "Administrator"
 msgstr "Администратор"
 


@@ -140,8 +136,7 @@ msgstr "Tiny Tiny RSS база данных обновлена."
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "Вернуться к Tiny Tiny RSS"
 


@@ -217,22 +212,24 @@ msgstr ""
 "\t\tдля функционала этой программы. Пожалуйста, проверьте\n"
 "\t\tнастройки вашего браузера."
 
 "\t\tдля функционала этой программы. Пожалуйста, проверьте\n"
 "\t\tнастройки вашего браузера."
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 
 msgid "Loading, please wait..."
 msgstr "Идет загрузка..."
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "Привет,"
 
 msgid "Hello,"
 msgstr "Привет,"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Выход"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "Выход"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -301,207 +298,153 @@ msgstr ""
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "Настройки"
 
 msgid "Preferences"
 msgstr "Настройки"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "Комментарии?"
 
 msgid "Comments?"
 msgstr "Комментарии?"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 
 msgid "Collapse feedlist"
 msgstr "Свернуть список каналов"
 

-#: index.php:148
+#: index.php:165

 msgid "Show articles"
 msgstr "Показать статьи"
 
 msgid "Show articles"
 msgstr "Показать статьи"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "Адаптивно"
 
 msgid "Adaptive"
 msgstr "Адаптивно"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "Все статьи"
 
 msgid "All Articles"
 msgstr "Все статьи"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "Отмеченные"
 
 msgid "Starred"
 msgstr "Отмеченные"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "Опубликован"
 
 msgid "Published"
 msgstr "Опубликован"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "Новые"
 
 msgid "Unread"
 msgstr "Новые"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 
 msgid "Ignore Scoring"
 msgstr "Игнорировать Оценки"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "Обновлено"
 
 msgid "Updated"
 msgstr "Обновлено"
 

-#: index.php:160
+#: index.php:177

 msgid "Sort articles"
 msgstr "Сортировать статьи"
 
 msgid "Sort articles"
 msgstr "Сортировать статьи"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "Дата"
 
 msgid "Date"
 msgstr "Дата"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "Заголовок"
 
 msgid "Title"
 msgstr "Заголовок"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "Оценка"
 
 msgid "Score"
 msgstr "Оценка"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "Редактировать категории"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "Обновить"
 
 msgid "Update"
 msgstr "Обновить"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "Как прочитанные"
 
 msgid "Mark as read"
 msgstr "Как прочитанные"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "Действия..."
 
 msgid "Actions..."
 msgstr "Действия..."
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "Поиск..."
 
 msgid "Search..."
 msgstr "Поиск..."
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 
 msgid "Feed actions:"
 msgstr "Действия над каналами:"
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 
 msgid "Subscribe to feed..."
 msgstr "Подписаться на канал..."
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 
 msgid "Edit this feed..."
 msgstr "Редактировать канал..."
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 
 msgid "Rescore feed"
 msgstr "Заново оценить канал"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "Отписаться"
 
 msgid "Unsubscribe"
 msgstr "Отписаться"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "Все каналы:"
 
 msgid "All feeds:"
 msgstr "Все каналы:"
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 
 msgid "(Un)hide read feeds"
 msgstr "Показать/скрыть прочитанные"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "Другие действия:"
 
 msgid "Other actions:"
 msgstr "Другие действия:"
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr "Перейти в дайджест..."
 
 msgid "Switch to digest..."
 msgstr "Перейти в дайджест..."
 

-#: index.php:194
+#: index.php:216

 msgid "Show tag cloud..."
 msgstr "Показать облако тегов..."
 
 msgid "Show tag cloud..."
 msgstr "Показать облако тегов..."
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr "Выбрать по тегам..."
 
 msgid "Select by tags..."
 msgstr "Выбрать по тегам..."
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "Создать метку..."
 
 msgid "Create label..."
 msgstr "Создать метку..."
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "Создать фильтр..."
 
 msgid "Create filter..."
 msgstr "Создать фильтр..."
 

-#: index.php:198
+#: index.php:220

 msgid "Keyboard shortcuts help"
 msgstr "Горячие клавиши"
 
 msgid "Keyboard shortcuts help"
 msgstr "Горячие клавиши"
 

-#: opml.php:81
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>Добавляется категория <b>%s</b>.</li>"
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "Устанавливаю ключ настроек %s в %s"
-
-#: opml.php:123
-#, php-format
-msgid "Adding label %s"
-msgstr "Добавляю метку %s"
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr "Метка уже существует: %s"
-
-#: opml.php:180
-#, php-format
-msgid "Adding filter %s"
-msgstr "Добавляю фильтр %s"
-
-#: opml.php:196
-#, php-format
-msgid "Duplicate filter %s"
-msgstr "Фильтр %s уже существует"
-
-#: opml.php:241
-msgid "is already imported."
-msgstr "уже импортирован."
-
-#: opml.php:271
-msgid "OK"
-msgstr "OK"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "Ошибка при разборе документа."
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "Ошибка: пожалуйста загрузите OPML файл."
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "Утилита OPML"
-
-#: opml.php:530
-msgid "Importing OPML..."
-msgstr "Импортирую OPML..."
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "Вернуться к настройкам"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"


@@ -510,18 +453,16 @@ msgstr "Горячие Клавиши"
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "Каналы"
 
 msgid "Feeds"
 msgstr "Каналы"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "Фильтры"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "Фильтры"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "Метки"
 
 msgid "Labels"
 msgstr "Метки"
 


@@ -590,22 +531,6 @@ msgstr "Аккаунт успешно создан."
 msgid "New user registrations are currently closed."
 msgstr "Регистрация новых пользователей временно закрыта."
 
 msgid "New user registrations are currently closed."
 msgstr "Регистрация новых пользователей временно закрыта."
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-msgid "Register"
-msgstr "Регистрация"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Горячие Клавиши"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "Горячие Клавиши"


@@ -678,11 +603,11 @@ msgstr "Другие действия:"
 msgid "Select article under mouse cursor"
 msgstr "Выбрать статью под курсором мыши"
 
 msgid "Select article under mouse cursor"
 msgstr "Выбрать статью под курсором мыши"
 

-#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "Создать метку"
 
 msgid "Create label"
 msgstr "Создать метку"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "Создать фильтр"
 
 msgid "Create filter"
 msgstr "Создать фильтр"
 


@@ -722,11 +647,11 @@ msgstr "Действия над каналом"
 msgid "Refresh active feed"
 msgstr "Обновить активный канал"
 
 msgid "Refresh active feed"
 msgstr "Обновить активный канал"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 
 msgid "Subscribe to feed"
 msgstr "Подписаться на канал"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "Редактировать канал"
 
 msgid "Edit feed"
 msgstr "Редактировать канал"
 


@@ -750,19 +675,19 @@ msgstr "Если котегория видна, (раз)свернуть её"
 msgid "Go to..."
 msgstr "Перейти к.."
 
 msgid "Go to..."
 msgstr "Перейти к.."
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "Все статьи"
 
 msgid "All articles"
 msgstr "Все статьи"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "Свежие"
 
 msgid "Fresh articles"
 msgstr "Свежие"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "Отмеченные"
 
 msgid "Starred articles"
 msgstr "Отмеченные"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "Опубликованные"
 
 msgid "Published articles"
 msgstr "Опубликованные"
 


@@ -798,7 +723,7 @@ msgstr "Лучшие 25 каналов"
 msgid "Edit feed categories"
 msgstr "Редактировать категории канала"
 
 msgid "Edit feed categories"
 msgstr "Редактировать категории канала"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "Добавить пользователя"
 
 msgid "Create user"
 msgstr "Добавить пользователя"
 


@@ -826,6 +751,10 @@ msgstr "Логин:"
 msgid "Password:"
 msgstr "Пароль:"
 
 msgid "Password:"
 msgstr "Пароль:"
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -833,8 +762,8 @@ msgstr "Пароль:"
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "Особые"
 
 msgid "Special"
 msgstr "Особые"
 


@@ -890,13 +819,11 @@ msgstr "Раздел помощи не найден."
 msgid "Prepare data"
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "Закрыть это окно"
 
 msgid "Close this window"
 msgstr "Закрыть это окно"
 


@@ -908,45 +835,58 @@ msgstr ""
 "Если вы импортировали метки или фильтры, вам возможно придется перезагрузить "
 "настройки чтобы увидеть новые данные."
 
 "Если вы импортировали метки или фильтры, вам возможно придется перезагрузить "
 "настройки чтобы увидеть новые данные."
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+msgid "Select"
+msgstr "Выбрать"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "Все"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "Ничего"
+
+#: classes/dlg.php:85

 msgid "Create profile"
 msgstr "Создать профиль"
 
 msgid "Create profile"
 msgstr "Создать профиль"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 #, fuzzy
 msgid "(active)"
 msgstr "Адаптивно"
 
 #, fuzzy
 msgid "(active)"
 msgstr "Адаптивно"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 msgid "Default profile"
 msgstr "Профиль по умолчанию"
 
 msgid "Default profile"
 msgstr "Профиль по умолчанию"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 msgid "Remove selected profiles"
 msgstr "Удалить выбранные профили?"
 
 msgid "Remove selected profiles"
 msgstr "Удалить выбранные профили?"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 msgid "Activate profile"
 msgstr "Активировать профиль"
 
 msgid "Activate profile"
 msgstr "Активировать профиль"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr "Публичная ссылка на OPML"
 
 msgid "Public OPML URL"
 msgstr "Публичная ссылка на OPML"
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 msgid "Your Public OPML URL is:"
 msgstr "Ссылка на ваш опубликованный OPML:"
 
 msgid "Your Public OPML URL is:"
 msgstr "Ссылка на ваш опубликованный OPML:"
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 msgid "Generate new URL"
 msgstr "Создать новую ссылку"
 
 msgid "Generate new URL"
 msgstr "Создать новую ссылку"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "Сообщение"
 
 msgid "Notice"
 msgstr "Сообщение"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -956,11 +896,11 @@ msgstr ""
 "запущен. Он необходим для обновления всех каналов.\n"
 "Пожалуйста, запустите демон обновлений или сообщите администратору."
 
 "запущен. Он необходим для обновления всех каналов.\n"
 "Пожалуйста, запустите демон обновлений или сообщите администратору."
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "Последнее обновление:"
 
 msgid "Last update:"
 msgstr "Последнее обновление:"
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -970,252 +910,185 @@ msgstr ""
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 
 "Это обозначает что существует проблема подобная краху или зависанию демона.\n"
 "Пожалуйста проверьте процесс демона или сообщите администратору."
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "Канал"
 
 msgid "Feed"
 msgstr "Канал"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "Поместить в категорию:"
 
 msgid "Place in category:"
 msgstr "Поместить в категорию:"
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 msgid "Available feeds"
 msgstr "Доступные каналы"
 
 msgid "Available feeds"
 msgstr "Доступные каналы"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "Авторизация"
 
 msgid "Authentication"
 msgstr "Авторизация"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "Пользователь:"
 
 msgid "Login"
 msgstr "Пользователь:"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 msgid "Password"
 msgstr "Пароль"
 
 msgid "Password"
 msgstr "Пароль"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 
 msgid "This feed requires authentication."
 msgstr "Этот канал требует авторизации."
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "Подписаться"
 
 msgid "Subscribe"
 msgstr "Подписаться"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 msgid "More feeds"
 msgstr "Другие каналы"
 
 msgid "More feeds"
 msgstr "Другие каналы"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "Отмена"
 
 msgid "Cancel"
 msgstr "Отмена"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "Поиск"
 
 msgid "Search"
 msgstr "Поиск"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 #, fuzzy
 msgid "Popular feeds"
 msgstr "показать каналы"
 
 #, fuzzy
 msgid "Popular feeds"
 msgstr "показать каналы"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 #, fuzzy
 msgid "Feed archive"
 msgstr "Действия над каналом:"
 
 #, fuzzy
 msgid "Feed archive"
 msgstr "Действия над каналом:"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 #, fuzzy
 msgid "limit:"
 msgstr "Сколько:"
 
 #, fuzzy
 msgid "limit:"
 msgstr "Сколько:"
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "Удалить"
 
 msgid "Remove"
 msgstr "Удалить"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr ""
 
 msgid "Look for"
 msgstr ""
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 #, fuzzy
 msgid "match on"
 msgstr "соответствие:"
 
 #, fuzzy
 msgid "match on"
 msgstr "соответствие:"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "Содержимое"
 
 msgid "Content"
 msgstr "Содержимое"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 
 msgid "Title or content"
 msgstr "Заголовок или содержимое"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "Ограничить поиск:"
 
 msgid "Limit search to:"
 msgstr "Ограничить поиск:"
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "Все каналы"
 
 msgid "All feeds"
 msgstr "Все каналы"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "Этот канал"
 
 msgid "This feed"
 msgstr "Этот канал"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "Искать"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "перед"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "после"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "Проверить"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "по полю:"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "в"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "Выполнить действия"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "с параметрами:"
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "Опции:"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "Включен"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "Инвертировать фильтр"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-msgid "Apply to category"
-msgstr "Применить к категории"
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "Проверить"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "Создать"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "Эти каналы не были обновлены в течение трех месяцев:"
 
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "Эти каналы не были обновлены в течение трех месяцев:"
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 msgid "Click to edit feed"
 msgstr "Щёлкните для редактирования"
 
 msgid "Click to edit feed"
 msgstr "Щёлкните для редактирования"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 msgid "Unsubscribe from selected feeds"
 msgstr "Отписаться от выбранных каналов?"
 
 msgid "Unsubscribe from selected feeds"
 msgstr "Отписаться от выбранных каналов?"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не были обновлены из-за ошибок:"
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "Эти каналы не были обновлены из-за ошибок:"
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 
 msgid "Tags for this article (separated by commas):"
 msgstr "Теги для этой статьи (разделенные запятыми):"
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "Сохранить"
 
 msgid "Save"
 msgstr "Сохранить"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Облако тегов"
 
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "Облако тегов"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr "Поиск:"
 
 msgid "Match:"
 msgstr "Поиск:"
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 #, fuzzy
 msgid "Display entries"
 msgstr "показать каналы"
 
 #, fuzzy
 msgid "Display entries"
 msgstr "показать каналы"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 msgid "View as RSS"
 msgstr "Показать в формате RSS"
 
 msgid "View as RSS"
 msgstr "Показать в формате RSS"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Доступна новая версия Tiny Tiny RSS (%s)."
 
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Доступна новая версия Tiny Tiny RSS (%s)."
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 msgid "Details"
 msgstr "Подробнее"
 
 msgid "Details"
 msgstr "Подробнее"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr "Скачать"
 
 msgid "Download"
 msgstr "Скачать"
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1223,157 +1096,142 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr "Инсталляция"
 
 msgid "Instance"
 msgstr "Инсталляция"
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr "URL инсталляции"
 
 msgid "Instance URL"
 msgstr "URL инсталляции"
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 #, fuzzy
 msgid "Access key:"
 msgstr "Уровень доступа:"
 
 #, fuzzy
 msgid "Access key:"
 msgstr "Уровень доступа:"
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 #, fuzzy
 msgid "Access key"
 msgstr "Уровень доступа:"
 
 #, fuzzy
 msgid "Access key"
 msgstr "Уровень доступа:"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr "Используйте один ключ доступа для обоих инсталляций"
 
 msgid "Use one access key for both linked instances."
 msgstr "Используйте один ключ доступа для обоих инсталляций"
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 #, fuzzy
 msgid "Generate new key"
 msgstr "Генерировать канал"
 
 #, fuzzy
 msgid "Generate new key"
 msgstr "Генерировать канал"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 msgid "Create link"
 msgstr "Создать ссылку"
 
 msgid "Create link"
 msgstr "Создать ссылку"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Этот канал требует авторизации."
 
 #, fuzzy
 msgid "Feeds require authentication."
 msgstr "Этот канал требует авторизации."
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 msgid "Visit the website"
 msgstr "Посетить официальный сайт"
 
 msgid "Visit the website"
 msgstr "Посетить официальный сайт"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 msgid "View as RSS feed"
 msgstr "Показать в формате RSS"
 
 msgid "View as RSS feed"
 msgstr "Показать в формате RSS"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "Выбрать:"
 
 msgid "Select:"
 msgstr "Выбрать:"
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "Все"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "Инвертировать"
 
 msgid "Invert"
 msgstr "Инвертировать"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "Ничего"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "Переключить выбранное:"
 
 msgid "Selection toggle:"
 msgstr "Переключить выбранное:"
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "Выбрано:"
 
 msgid "Selection:"
 msgstr "Выбрано:"
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 msgid "Archive"
 msgstr "Архивировать"
 
 msgid "Archive"
 msgstr "Архивировать"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 msgid "Move back"
 msgstr "Переместить назад"
 
 msgid "Move back"
 msgstr "Переместить назад"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 msgid "Delete"
 msgstr "Удалить"
 
 msgid "Delete"
 msgstr "Удалить"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 msgid "Forward by email"
 msgstr "Отправить по почте"
 
 msgid "Forward by email"
 msgstr "Отправить по почте"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "Канал:"
 
 msgid "Feed:"
 msgstr "Канал:"
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "Канал не найден."
 
 msgid "Feed not found."
 msgstr "Канал не найден."
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "Отметить как прочитанные"
 
 msgid "mark as read"
 msgstr "Отметить как прочитанные"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 msgid "Originally from:"
 msgstr "Оригинал:"
 
 msgid "Originally from:"
 msgstr "Оригинал:"
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 msgid "Open article in new tab"
 msgstr "Открыть статью в новом табе"
 
 msgid "Open article in new tab"
 msgstr "Открыть статью в новом табе"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 msgid "Close article"
 msgstr "Закрыть статью"
 
 msgid "Close article"
 msgstr "Закрыть статью"
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 
 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1381,849 +1239,222 @@ msgstr ""
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Последнее обновление в %s"
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Последнее обновление в %s"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr "Некоторые каналы не могут быть обновлены (щёлкните для подробностей)"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-msgid "Uncategorized"
-msgstr "Нет категории"
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "Утилита OPML"

 
 

-#: classes/mail_button.php:52 classes/mail_button.php:58
-msgid "[Forwarded]"
-msgstr ""
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "Импортирую OPML..."

 
 

-#: classes/mail_button.php:52
-msgid "Multiple articles"
-msgstr "Все статьи"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "Вернуться к настройкам"

 
 

-#: classes/mail_button.php:73
-msgid "From:"
-msgstr "От:"
+#: classes/opml.php:270
+#, fuzzy, php-format
+msgid "Adding feed: %s"
+msgstr "Добавляю фильтр %s"

 
 

-#: classes/mail_button.php:82
-msgid "To:"
-msgstr "Кому:"
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "Метка уже существует: %s"

 
 

-#: classes/mail_button.php:95
-msgid "Subject:"
-msgstr "Заголовок:"
+#: classes/opml.php:293
+#, php-format
+msgid "Adding label %s"
+msgstr "Добавляю метку %s"

 
 

-#: classes/mail_button.php:111
-msgid "Send e-mail"
-msgstr "Отправить письмо"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "Метка уже существует: %s"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-msgid "Edit article note"
-msgstr "Редактировать заметку"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "Устанавливаю ключ настроек %s в %s"

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "Проверить доступность поля"
+#: classes/opml.php:337
+#, fuzzy
+msgid "Adding filter..."
+msgstr "Добавляю фильтр %s"

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
-#, php-format
-msgid "(%d feeds)"
-msgstr "(%d каналов)"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "Нет категории"

 
 

-#: classes/pref_feeds.php:306
-msgid "Feed Title"
-msgstr "Заголовок"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "Поместить в категорию:"

 
 

-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "иÑ\81полÑ\8cзование"
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "Ð\9eÑ\88ибка: пожалÑ\83йÑ\81Ñ\82а загÑ\80Ñ\83зиÑ\82е OPML Ñ\84айл."

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "Удаление Ñ\81ообÑ\89ений:"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "Ð\9eÑ\88ибка пÑ\80и Ñ\80азбоÑ\80е докÑ\83менÑ\82а."

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "нет тегов"

 
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-msgid "Hide from Popular feeds"
-msgstr "Спрятать из списка популярных каналов"
+#: classes/rpc.php:736
+#, fuzzy
+msgid "Your request could not be completed."
+msgstr "Не полностью заполнена ваша регистрационная информация."

 
 

-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "ЯзÑ\8bк канала пиÑ\88еÑ\82Ñ\81Ñ\8f Ñ\81пÑ\80ава налево"
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."
+msgstr "Ð\9eбновление канала запланиÑ\80овано"

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "Включить в e-mail дайджест"
+#: classes/rpc.php:748
+#, fuzzy
+msgid "Category update has been scheduled."
+msgstr "Пароль был изменен."

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr "Ð\92Ñ\81егда показÑ\8bваÑ\82Ñ\8c вложеннÑ\8bе изобÑ\80ажениÑ\8f"
+#: classes/rpc.php:761
+msgid "Can't update this kind of feed."
+msgstr "Ð\92Ñ\8b не можеÑ\82е обновиÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 канал."

 
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "Кэшировать изображения локально"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."
+msgstr ""

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
-msgid "Mark updated articles as unread"
-msgstr "Ð\9fомеÑ\82иÑ\82Ñ\8c вÑ\81е Ñ\81Ñ\82аÑ\82Ñ\8cи как пÑ\80оÑ\87иÑ\82аннÑ\8bе?"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "Ð\9eÑ\88ибка пÑ\80овеÑ\80ки Ñ\81еÑ\81Ñ\81ии (некоÑ\80Ñ\80екÑ\82нÑ\8bй IP)"

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
-msgstr "Ð\9fÑ\80и изменении Ñ\82екÑ\81Ñ\82а Ñ\81Ñ\82аÑ\82Ñ\8cи, помеÑ\87аÑ\82Ñ\8c ее как обновленнÑ\83Ñ\8e"
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "Ð\9dекоÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f или паÑ\80олÑ\8c"

 
 

-#: classes/pref_feeds.php:491
-msgid "Icon"
-msgstr "Ð\98конка"
+#: include/functions.php:2049
+msgid "Archived articles"
+msgstr "Ð\90Ñ\80Ñ\85ив Ñ\81Ñ\82аÑ\82ей"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
-msgstr "Заменить"
+#: include/functions.php:2051
+msgid "Recently read"
+msgstr ""

 
 

-#: classes/pref_feeds.php:524
-msgid "Resubscribe to push updates"
-msgstr "Ð\9fеÑ\80еподпиÑ\81аÑ\82Ñ\8cÑ\81Ñ\8f на PUSH обновления"
+#: include/functions.php:3223 js/viewfeed.js:1996
+msgid "Click to play"
+msgstr "ЩÑ\91лкниÑ\82е длÑ\8f пÑ\80оигÑ\80Ñ\8bвания"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "СбÑ\80аÑ\81Ñ\8bваеÑ\82 Ñ\81Ñ\82аÑ\82Ñ\83Ñ\81подпиÑ\81ки Ñ\81 помоÑ\89Ñ\8cÑ\8e меÑ\85анизма PubSubHubbub"
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"
+msgstr "Ð\98гÑ\80аÑ\82Ñ\8c"

 
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "Всё выполнено."
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "Добавлена подписка на <b>%s</b>."
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1021
-#, fuzzy, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr "Ð\9aанал <b>%s</b> Ñ\83же подпиÑ\81ан."
+#: include/functions.php:4186
+#, fuzzy
+msgid "(edit note)"
+msgstr "пÑ\80авиÑ\82Ñ\8c замеÑ\82кÑ\83"

 
 

-#: classes/pref_feeds.php:1024
-#, fuzzy, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "Каналы не найдены."
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "Канал не выбран."

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "Канал <b>%s</b> уже подписан."
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "неизвестный тип"

 
 

-#: classes/pref_feeds.php:1030
+#: include/functions.php:4844

 #, fuzzy
 #, fuzzy

-msgid "Multiple feed URLs found."
-msgstr "Ð\9eпÑ\83бликованнÑ\8bй URL канала изменÑ\91н."
+msgid "Attachments"
+msgstr "Ð\92ложениÑ\8f:"

 
 

-#: classes/pref_feeds.php:1035
+#: include/functions.php:5286

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr "Ð\9aанал <b>%s</b> Ñ\83же подпиÑ\81ан."
+msgid "%d archived articles"
+msgstr "Ð\9eÑ\82меÑ\87еннÑ\8bе"

 
 

-#: classes/pref_feeds.php:1057
-#, fuzzy
-msgid "Subscribe to selected feed"
-msgstr "Отписаться от выбранных каналов?"
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "Каналы не найдены."
+
+#: include/functions.php:5356
+msgid "Could not import: incorrect schema version."
+msgstr "Не могу импортировать данные: некорректная версия схемы."

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "РедакÑ\82иÑ\80оваÑ\82Ñ\8c опÑ\86ии  подпиÑ\81ки"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."
+msgstr "Ð\9dе могÑ\83 импоÑ\80Ñ\82иÑ\80оваÑ\82Ñ\8c даннÑ\8bе: неизвеÑ\81Ñ\82Ñ\8bнй Ñ\84оÑ\80маÑ\82 даннÑ\8bÑ\85."

 
 

-#: classes/pref_feeds.php:1161
+#: include/functions.php:5520

 #, php-format
 #, php-format

-msgid "Category <b>$%s</b> already exists in the database."
-msgstr "Категория <b>$%s</b> уже существует."
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "СоздаÑ\82Ñ\8c каÑ\82егоÑ\80иÑ\8e"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr "Ð\9dе могÑ\83 загÑ\80Ñ\83зиÑ\82Ñ\8c XML докÑ\83менÑ\82."

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "Ð\9aаÑ\82егоÑ\80ии оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\82."
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "Ð\97аголовок или Ñ\81одеÑ\80жимое"

 
 

-#: classes/pref_feeds.php:1243
-#, fuzzy
-msgid "Remove selected categories"
-msgstr "Удалить выбранные категории?"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "Ссылка"

 
 

-#: classes/pref_feeds.php:1267
-msgid "Feeds with errors"
-msgstr "Ð\9aаналÑ\8b Ñ\81 оÑ\88ибками"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "Ð\94аÑ\82а СÑ\82аÑ\82Ñ\8cи"

 
 

-#: classes/pref_feeds.php:1287
-msgid "Inactive feeds"
-msgstr "Ð\9dеакÑ\82ивнÑ\8bе каналÑ\8b"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "УдалиÑ\82Ñ\8c Ñ\81Ñ\82аÑ\82Ñ\8cÑ\8e"

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-msgid "Select"
-msgstr "Выбрать"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "Отметить"

 
 

-#: classes/pref_feeds.php:1324
-msgid "Edit selected feeds"
-msgstr "Редактировать выбранные каналы"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:475
+msgid "Publish article"
+msgstr "Опубликовать"

 
 

-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-msgid "Reset sort order"
-msgstr "СбÑ\80оÑ\81иÑ\82Ñ\8c Ñ\81оÑ\80Ñ\82иÑ\80овкÑ\83"
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "Ð\9fÑ\80имениÑ\82Ñ\8c Ñ\82еги"

 
 

-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-#, fuzzy
-msgid "Batch subscribe"
-msgstr "Отписаться"
+#: include/localized_schema.php:14 js/viewfeed.js:1960
+msgid "Assign label"
+msgstr "Применить метку"

 
 

-#: classes/pref_feeds.php:1333
-msgid "Categories"
-msgstr "Ð\9aаÑ\82егоÑ\80ии"
+#: include/localized_schema.php:15
+msgid "Modify score"
+msgstr "Ð\98змениÑ\82Ñ\8c оÑ\86енкÑ\83"

 
 

-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "Редактировать категории"
-
-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "Редактировать категории"
-
-#: classes/pref_feeds.php:1354
-msgid "More actions..."
-msgstr "Действия..."
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "Ручная очистка"
-
-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "Очистить данные канала."
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "Заново оценить статьи"
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr "Вы можете менять категории и каналы местами"
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "Только главный профиль настроек будет экспортирован в OPML."
-
-#: classes/pref_feeds.php:1432
-#, fuzzy
-msgid "Import my OPML"
-msgstr "Импортирую OPML..."
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-#, fuzzy
-msgid "Include settings"
-msgstr "Включить в e-mail дайджест"
-
-#: classes/pref_feeds.php:1442
-#, fuzzy
-msgid "Export OPML"
-msgstr "Экспортировать OPML"
-
-#: classes/pref_feeds.php:1446
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
-"быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-msgid "Article archive"
-msgstr "Архив статей"
-
-#: classes/pref_feeds.php:1456
-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:1459
-#, fuzzy
-msgid "Export my data"
-msgstr "Экспортировать данные"
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "Импортировать"
-
-#: classes/pref_feeds.php:1481
-#, fuzzy
-msgid "Firefox integration"
-msgstr "Интеграция в Firefox"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-"Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
-"Для этого щёлкните по ссылке ниже."
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, fuzzy, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "Вернуться к Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1508
-#, fuzzy
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "Вернуться к Tiny Tiny RSS"
-
-#: classes/pref_feeds.php:1512
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "Заново оценить статьи в выбранных каналах?"
-
-#: classes/pref_feeds.php:1514
-#, fuzzy
-msgid "Published articles and generated feeds"
-msgstr "Заново оценить статьи в выбранных каналах?"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-"Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
-"быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
-
-#: classes/pref_feeds.php:1522
-#, fuzzy
-msgid "Display URL"
-msgstr "показать теги"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-#, fuzzy
-msgid "Unshare all articles"
-msgstr "Отмеченные"
-
-#: classes/pref_feeds.php:1538
-#, fuzzy
-msgid "Twitter"
-msgstr "Заголовок"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-#, fuzzy
-msgid "Clear stored credentials"
-msgstr "Очистить данные канала."
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr ""
-
-#: classes/pref_filters.php:89
-#, fuzzy
-msgid "No articles matching this filter has been found."
-msgstr "Не найдено совпадений с фильтром."
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "Добавлен фильтр <b>%s</b>"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "Редактировать"
-
-#: classes/pref_instances.php:13 classes/pref_users.php:6
-msgid "Your access level is insufficient to open this tab."
-msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr ""
-
-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-#, fuzzy
-msgid "Stored feeds"
-msgstr "Больше каналов"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "Щёлкните для редактирования"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "Заголовок"
-
-#: classes/pref_labels.php:37
-msgid "Colors"
-msgstr "Цвета"
-
-#: classes/pref_labels.php:42
-msgid "Foreground:"
-msgstr "Передний план:"
-
-#: classes/pref_labels.php:42
-msgid "Background:"
-msgstr "Фон:"
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "Добавлена метка <b>%s</b>"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "Очистить цвета"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "Старый пароль не может быть пустым."
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "Новый пароль не может быть пустым."
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "Пароли не совпадают."
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "Пароль был изменен."
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "Старый пароль неправилен."
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "Конфигурация сохранена."
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "Неизвестная опция: %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-#, fuzzy
-msgid "Personal data / Authentication"
-msgstr "Авторизация"
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr "Полное имя"
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "E-mail"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "Уровень доступа:"
-
-#: classes/pref_prefs.php:213
-msgid "Save data"
-msgstr "Сохранить"
-
-#: classes/pref_prefs.php:224
-msgid "Your password is at default value, please change it."
-msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "Старый пароль"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "Новый пароль"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "Подтверждение пароля"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "Изменить пароль"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "Выбор темы"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "Да"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "Нет"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "Сохранить конфигурацию"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr "Управление профилями"
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "Сбросить настройки"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "Подробнее..."
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "Пользователь не найден"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "Зарегистрирован"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "Последний вход"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "Количество подписанных каналов"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "Подписан на каналы"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "Редактор пользователей"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "Уровень доступа:"
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "Изменить пароль на"
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: classes/pref_users.php:257
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "Не могу добавить пользователя <b>%s</b>"
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "Пользователь <b>%s</b> уже существует."
-
-#: classes/pref_users.php:291
-#, fuzzy, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
-msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "Уведомление <b>%s</b>."
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] Уведомление о смене пароля"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "Сбросить пароль"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "Уровень доступа:"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "Последний вход"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "Пользователи не определены."
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "Подходящих пользователей не найдено."
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "нет тегов"
-
-#: classes/rpc.php:742
-#, fuzzy
-msgid "Your request could not be completed."
-msgstr "Не полностью заполнена ваша регистрационная информация."
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr "Обновление канала запланировано"
-
-#: classes/rpc.php:754
-#, fuzzy
-msgid "Category update has been scheduled."
-msgstr "Пароль был изменен."
-
-#: classes/rpc.php:767
-msgid "Can't update this kind of feed."
-msgstr "Вы не можете обновить этот канал."
-
-#: classes/share_button.php:7
-#, fuzzy
-msgid "Share by URL"
-msgstr "Расшарить статью по ссылке"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-#, fuzzy
-msgid "Share on Twitter"
-msgstr "Заголовок"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "Ошибка проверки сессии (некорректный IP)"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "Некорректное имя пользователя или пароль"
-
-#: include/functions.php:2099
-msgid "Archived articles"
-msgstr "Архив статей"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-msgid "Click to play"
-msgstr "Щёлкните для проигрывания"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr "Играть"
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-#, fuzzy
-msgid "(edit note)"
-msgstr "править заметку"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "Канал не выбран."
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "неизвестный тип"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "Вложение:"
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "Вложения:"
-
-#: include/functions.php:5261
-#, fuzzy, php-format
-msgid "%d archived articles"
-msgstr "Отмеченные"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "Каналы не найдены."
-
-#: include/functions.php:5331
-msgid "Could not import: incorrect schema version."
-msgstr "Не могу импортировать данные: некорректная версия схемы."
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr "Не могу импортировать данные: неизвестынй формат данных."
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr "Не могу загрузить XML документ."
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "Заголовок или содержимое"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "Ссылка"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "Дата Статьи"
-
-#: include/localized_schema.php:9
-msgid "Delete article"
-msgstr "Удалить статью"
-
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "Отметить"
-
-#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
-#: js/viewfeed.js:466
-msgid "Publish article"
-msgstr "Опубликовать"
-
-#: include/localized_schema.php:13
-msgid "Assign tags"
-msgstr "Применить теги"
-
-#: include/localized_schema.php:14 js/viewfeed.js:1935
-msgid "Assign label"
-msgstr "Применить метку"
-
-#: include/localized_schema.php:15
-msgid "Modify score"
-msgstr "Изменить оценку"
-
-#: include/localized_schema.php:17
-msgid "General"
-msgstr "Общие"
+#: include/localized_schema.php:17
+msgid "General"
+msgstr "Общие"

 
 #: include/localized_schema.php:18
 msgid "Interface"
 
 #: include/localized_schema.php:18
 msgid "Interface"


@@ -2294,11 +1525,11 @@ msgstr ""
 "каналам"
 
 #: include/localized_schema.php:29
 "каналам"
 
 #: include/localized_schema.php:29

-msgid "Use feed-specified date to sort headlines instead of local import date."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2311,7 +1542,8 @@ msgid "Uses UTC timezone"
 msgstr "Часовой пояс"
 
 #: include/localized_schema.php:33
 msgstr "Часовой пояс"
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr "Стирать статьи старше этого количества дней (0 - выключает)"
 
 #: include/localized_schema.php:34
 msgstr "Стирать статьи старше этого количества дней (0 - выключает)"
 
 #: include/localized_schema.php:34


@@ -2418,14 +1650,14 @@ msgstr ""
 msgid "User timezone"
 msgstr "Часовой пояс"
 
 msgid "User timezone"
 msgstr "Часовой пояс"
 

-#: include/localized_schema.php:60
-msgid "Sort headlines by feed date"
-msgstr "Сортировать каналы по дате, указанной в канале"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 msgid "Customize stylesheet"
 msgstr "Изменить пользовательские стили"
 
 msgid "Customize stylesheet"
 msgstr "Изменить пользовательские стили"
 

+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"
+msgstr "Сортировать каналы по дате, указанной в канале"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Вход с помощью SSL сертификата"
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "Вход с помощью SSL сертификата"


@@ -2446,7 +1678,7 @@ msgstr "Профиль:"
 msgid "Use less traffic"
 msgstr "Использовать меньше трафика"
 
 msgid "Use less traffic"
 msgstr "Использовать меньше трафика"
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 
 msgid "Mark all articles in %s as read?"
 msgstr "Отметить все статьи в %s как прочитанные?"
 


@@ -2455,15 +1687,19 @@ msgstr "Отметить все статьи в %s как прочитанные
 msgid "Mark %d displayed articles as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "в"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "Не отмеченные"
 
 msgid "Unstar article"
 msgstr "Не отмеченные"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "Отмеченные"
 
 msgid "Star article"
 msgstr "Отмеченные"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "Не публиковать"
 
 msgid "Unpublish article"
 msgstr "Не публиковать"
 


@@ -2502,11 +1738,11 @@ msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 msgid "Load more..."
 msgstr "Идет загрузка помощи..."
 
 msgid "Load more..."
 msgstr "Идет загрузка помощи..."
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 #, fuzzy
 msgid "Update feed"
 msgstr "Обновить все каналы"
 #, fuzzy
 msgid "Update feed"
 msgstr "Обновить все каналы"


@@ -2517,136 +1753,147 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Старый пароль неправилен."
 
 #, fuzzy
 msgid "Date syntax appears to be correct:"
 msgstr "Старый пароль неправилен."
 

-#: js/functions.js:650
+#: js/functions.js:621

 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Старый пароль неправилен."
 
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "Старый пароль неправилен."
 

-#: js/functions.js:777
+#: js/functions.js:748

 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Удалить сохранённые данные"
 
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "Удалить сохранённые данные"
 

-#: js/functions.js:809
+#: js/functions.js:780

 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Пожалуйста выберите только один канал."
 
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "Пожалуйста выберите только один канал."
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "Пожалуйста, введите заголовок метки:"
 
 msgid "Please enter label caption:"
 msgstr "Пожалуйста, введите заголовок метки:"
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "Не могу создать метку: отсутствует заголовок."
 
 msgid "Can't create label: missing caption."
 msgstr "Не могу создать метку: отсутствует заголовок."
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "Подписаться на канал"
 
 msgid "Subscribe to Feed"
 msgstr "Подписаться на канал"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "Подписаться на канал..."
-
-#: js/functions.js:901
+#: js/functions.js:873

 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Подписаны каналы:"
 
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "Подписаны каналы:"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 msgid "Specified URL seems to be invalid."
 msgstr ""
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 

-#: js/functions.js:945
+#: js/functions.js:917

 #, fuzzy
 #, fuzzy

-msgid "Couldn't download the specified URL."
+msgid "Couldn't download the specified URL: %s"

 msgstr "Не могу подписаться: нет URL"
 
 msgstr "Не могу подписаться: нет URL"
 

-#: js/functions.js:948
+#: js/functions.js:921

 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Нельзя отписаться от категории."
 
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "Нельзя отписаться от категории."
 

-#: js/functions.js:980
-msgid "Create Filter"
-msgstr "Создать фильтр"
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "Фильтры"
+
+#: js/functions.js:1049
+#, fuzzy
+msgid "Add rule"
+msgstr "Добавить метку..."
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Edit action"
+msgstr "Действия над каналом"

 
 

-#: js/functions.js:1008 js/prefs.js:168
+#: js/functions.js:1075

 #, fuzzy
 #, fuzzy

-msgid "Filter Test Results"
-msgstr "Выражение"
+msgid "Add action"
+msgstr "Действия над каналом"
+
+#: js/functions.js:1112
+msgid "Create Filter"
+msgstr "Создать фильтр"

 
 

-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 
 msgid "Unsubscribe from %s?"
 msgstr "Отписаться от %s?"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 
 msgid "You can't edit this kind of feed."
 msgstr "Вы не можете редактировать этот канал."
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 #, fuzzy
 msgid "Edit Feed"
 msgstr "Редактировать канал"
 
 #, fuzzy
 msgid "Edit Feed"
 msgstr "Редактировать канал"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 #, fuzzy
 msgid "More Feeds"
 msgstr "Больше каналов"
 
 #, fuzzy
 msgid "More Feeds"
 msgstr "Больше каналов"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 
 msgid "No feeds are selected."
 msgstr "Нет выбранных каналов."
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Ошибки обновления"
 
 #, fuzzy
 msgid "Feeds with update errors"
 msgstr "Ошибки обновления"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Удалить выбранные фильтры?"
 
 #, fuzzy
 msgid "Remove selected feeds?"
 msgstr "Удалить выбранные фильтры?"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 
 msgid "No articles are selected."
 msgstr "Нет выбранных статей."
 


@@ -2655,6 +1902,20 @@ msgstr "Нет выбранных статей."
 msgid "Forward article by email"
 msgstr "Отмеченные"
 
 msgid "Forward article by email"
 msgstr "Отмеченные"
 

+#: js/note_button.js:11
+msgid "Edit article note"
+msgstr "Редактировать заметку"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "Редактировать категории"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "Создать категорию"
+

 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"
 #: js/PrefFilterTree.js:32
 #, fuzzy
 msgid "Inverse"


@@ -2673,311 +1934,816 @@ msgstr "Не могу добавить пользователя: не указа
 msgid "Edit Filter"
 msgstr "Фильтры"
 
 msgid "Edit Filter"
 msgstr "Фильтры"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "Удалить фильтр %s?"
 
 msgstr "Удалить фильтр %s?"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "Удалить выбранные метки?"
 
 msgid "Remove selected labels?"
 msgstr "Удалить выбранные метки?"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
 msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 
 msgid "No users are selected."
 msgstr "Нет выбранных пользователей."
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "Удалить выбранные фильтры?"
 
 msgid "Remove selected filters?"
 msgstr "Удалить выбранные фильтры?"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 
 msgid "No filters are selected."
 msgstr "Нет выбранных фильтров."
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписаться от выбранных каналов?"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "Отписаться от выбранных каналов?"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "Пожалуйста выберите только один канал."
 
 msgid "Please select only one feed."
 msgstr "Пожалуйста выберите только один канал."
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Стереть все не отмеченные статьи в выбранном канале?"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "Стереть все не отмеченные статьи в выбранном канале?"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "Сколько дней хранить статьи (0 - по умолчанию)?"
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "Поле логина не может быть пустым."
 
 msgid "Login field cannot be blank."
 msgstr "Поле логина не может быть пустым."
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "Пожалуйста выберите только одного пользователя."
 
 msgid "Please select only one user."
 msgstr "Пожалуйста выберите только одного пользователя."
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "Сбросить пароль выбранного пользователя?"
 
 msgid "Reset password of selected user?"
 msgstr "Сбросить пароль выбранного пользователя?"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "Пожалуйста выберите только один фильтр."
 
 msgid "Please select only one filter."
 msgstr "Пожалуйста выберите только один фильтр."
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "Удалить выбранные фильтры?"
+
+#: js/prefs.js:704

 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Редактор канала"
 
 #, fuzzy
 msgid "Edit Multiple Feeds"
 msgstr "Редактор канала"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "Сохранить изменения выбранных каналов?"
 
 msgid "Save changes to selected feeds?"
 msgstr "Сохранить изменения выбранных каналов?"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 msgid "OPML Import"
 msgstr "Импорт OPML"
 
 msgid "OPML Import"
 msgstr "Импорт OPML"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 msgid "Please choose an OPML file first."
 msgstr "Пожалуйста выберите файл OPML."
 
 msgid "Please choose an OPML file first."
 msgstr "Пожалуйста выберите файл OPML."
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 msgid "Please choose the file first."
 msgstr "Пожалуйста выберите файл."
 
 msgid "Please choose the file first."
 msgstr "Пожалуйста выберите файл."
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 
 msgid "Reset to defaults?"
 msgstr "Сбросить настройки?"
 

-#: js/prefs.js:1152
-msgid "Feed Categories"
-msgstr "Категории"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "Удалить выбранные категории?"
 
 msgid "Remove selected categories?"
 msgstr "Удалить выбранные категории?"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 
 msgid "No categories are selected."
 msgstr "Нет выбранных категорий."
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "Редактор категорий"
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr "Давно не обновлявшиеся каналы"
 
 msgid "Feeds without recent updates"
 msgstr "Давно не обновлявшиеся каналы"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Изменить текущий адрес публикации OPML на новый?"
 
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "Изменить текущий адрес публикации OPML на новый?"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr "Заново оценить статьи в выбранных каналах?"
 
 msgid "Rescore articles in selected feeds?"
 msgstr "Заново оценить статьи в выбранных каналах?"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Оценить заново все статьи? Эта операция может продолжаться длительное время."
 
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 "Оценить заново все статьи? Эта операция может продолжаться длительное время."
 

-#: js/prefs.js:1422
+#: js/prefs.js:1507

 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Сбросить метку цветов, на цвета по умолчанию?"
 
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "Сбросить метку цветов, на цвета по умолчанию?"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr "Профили настроек"
 
 msgid "Settings Profiles"
 msgstr "Профили настроек"
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 msgid "No profiles are selected."
 msgstr "Профиль не выбран"
 
 msgid "No profiles are selected."
 msgstr "Профиль не выбран"
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 msgid "Activate selected profile?"
 msgstr "Активировать выбранный профиль?"
 
 msgid "Activate selected profile?"
 msgstr "Активировать выбранный профиль?"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 msgid "Please choose a profile to activate."
 msgstr "Пожалуйста выберите какой-нибудь профиль."
 
 msgid "Please choose a profile to activate."
 msgstr "Пожалуйста выберите какой-нибудь профиль."
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "Редактор Меток"
 
 msgid "Label Editor"
 msgstr "Редактор Меток"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 #, fuzzy
 msgid "Link Instance"
 msgstr "Редактировать теги"
 
 #, fuzzy
 msgid "Link Instance"
 msgstr "Редактировать теги"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 #, fuzzy
 msgid "Edit Instance"
 msgstr "Редактировать теги"
 
 #, fuzzy
 msgid "Edit Instance"
 msgstr "Редактировать теги"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Удалить выбранные фильтры?"
 
 #, fuzzy
 msgid "Remove selected instances?"
 msgstr "Удалить выбранные фильтры?"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 #, fuzzy
 msgid "No instances are selected."
 msgstr "Нет выбранных фильтров."
 
 #, fuzzy
 msgid "No instances are selected."
 msgstr "Нет выбранных фильтров."
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Пожалуйста выберите только один фильтр."
 
 #, fuzzy
 msgid "Please select only one instance."
 msgstr "Пожалуйста выберите только один фильтр."
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 msgid "Export Data"
 msgstr "Экспортировать данные"
 
 msgid "Export Data"
 msgstr "Экспортировать данные"
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 msgid "Data Import"
 msgstr "Импортировать данные"
 
 msgid "Data Import"
 msgstr "Импортировать данные"
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+#, fuzzy
+msgid "Batch subscribe"
+msgstr "Отписаться"
+
+#: js/prefs.js:2191

 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Подписаться на канал..."
 
 #, fuzzy
 msgid "Subscribing to feeds..."
 msgstr "Подписаться на канал..."
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "Вернуться к Tiny Tiny RSS"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "Расшарить статью по ссылке"
 
 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "Расшарить статью по ссылке"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "Пометить все статьи как прочитанные?"
 
 msgid "Mark all articles as read?"
 msgstr "Пометить все статьи как прочитанные?"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 
 msgid "You can't unsubscribe from the category."
 msgstr "Нельзя отписаться от категории."
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 
 msgid "Please select some feed first."
 msgstr "Пожалуйста выберите какой-нибудь канал."
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 
 msgid "You can't rescore this kind of feed."
 msgstr "Вы не можете снова оценить этот канал."
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 #, fuzzy
 msgid "New version available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 
 #, fuzzy
 msgid "New version available!"
 msgstr "Доступная новая версия Tiny Tiny RSS!"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "Отметить все видимые статьи в %s как прочитанные?"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "Отметить все видимые статьи в %s как прочитанные?"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 msgid "Delete %d selected articles?"
 msgstr "Удалить %d выбранных статей?"
 
 msgid "Delete %d selected articles?"
 msgstr "Удалить %d выбранных статей?"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 msgid "Archive %d selected articles in %s?"
 msgstr "Архивировать %d выбранных статей в %s?"
 
 msgid "Archive %d selected articles in %s?"
 msgstr "Архивировать %d выбранных статей в %s?"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 msgid "Move %d archived articles back?"
 msgstr "Переместить %d архивированных статей назад?"
 
 msgid "Move %d archived articles back?"
 msgstr "Переместить %d архивированных статей назад?"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "Отметить %d выбранные статьи в %s как прочитанные?"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 msgid "Edit article Tags"
 msgstr "Редактировать теги"
 
 msgid "Edit article Tags"
 msgstr "Редактировать теги"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "Статья не выбрана"
 
 msgid "No article is selected."
 msgstr "Статья не выбрана"
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "Статей для отметки не найдено."
 
 msgid "No articles found to mark"
 msgstr "Статей для отметки не найдено."
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 
 msgid "Mark %d article(s) as read?"
 msgstr "Отметить %d статью(ей) как прочитанные?"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 msgid "Loading..."
 msgstr "Идет загрузка..."
 
 msgid "Loading..."
 msgstr "Идет загрузка..."
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 
 msgid "Open original article"
 msgstr "Показать оригинальное содержимое статьи"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 msgid "View in a tt-rss tab"
 msgstr "Открыть статью в новой закладке tt-rss"
 
 msgid "View in a tt-rss tab"
 msgstr "Открыть статью в новой закладке tt-rss"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 msgid "Mark above as read"
 msgstr "Отметить статьи выше как прочитанные"
 
 msgid "Mark above as read"
 msgstr "Отметить статьи выше как прочитанные"
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 msgid "Mark below as read"
 msgstr "Отметить статьи ниже как прочитанные"
 
 msgid "Mark below as read"
 msgstr "Отметить статьи ниже как прочитанные"
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 msgid "Remove label"
 msgstr "Удалить метку"
 
 msgid "Remove label"
 msgstr "Удалить метку"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 msgid "Playing..."
 msgstr "Проигрываю..."
 
 msgid "Playing..."
 msgstr "Проигрываю..."
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 msgid "Click to pause"
 msgstr "Пауза"
 
 msgid "Click to pause"
 msgstr "Пауза"
 

+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "<li>Добавляется категория <b>%s</b>.</li>"
+
+#~ msgid "Duplicate filter %s"
+#~ msgstr "Фильтр %s уже существует"
+
+#~ msgid "is already imported."
+#~ msgstr "уже импортирован."
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Register"
+#~ msgstr "Регистрация"
+
+#~ msgid "Match"
+#~ msgstr "Искать"
+
+#~ msgid "before"
+#~ msgstr "перед"
+
+#~ msgid "after"
+#~ msgstr "после"
+
+#~ msgid "Check it"
+#~ msgstr "Проверить"
+
+#~ msgid "on field"
+#~ msgstr "по полю:"
+
+#~ msgid "Perform Action"
+#~ msgstr "Выполнить действия"
+
+#~ msgid "with parameters:"
+#~ msgstr "с параметрами:"
+
+#~ msgid "Options"
+#~ msgstr "Опции:"
+
+#~ msgid "Enabled"
+#~ msgstr "Включен"
+
+#~ msgid "Inverse match"
+#~ msgstr "Инвертировать фильтр"
+
+#~ msgid "Apply to category"
+#~ msgstr "Применить к категории"
+
+#~ msgid "Test"
+#~ msgstr "Проверить"
+
+#~ msgid "Create"
+#~ msgstr "Создать"
+
+#~ msgid "Multiple articles"
+#~ msgstr "Все статьи"
+
+#~ msgid "From:"
+#~ msgstr "От:"
+
+#~ msgid "To:"
+#~ msgstr "Кому:"
+
+#~ msgid "Subject:"
+#~ msgstr "Заголовок:"
+
+#~ msgid "Send e-mail"
+#~ msgstr "Отправить письмо"
+
+#~ msgid "Check to enable field"
+#~ msgstr "Проверить доступность поля"
+
+#~ msgid "(%d feeds)"
+#~ msgstr "(%d каналов)"
+
+#~ msgid "Feed Title"
+#~ msgstr "Заголовок"
+
+#~ msgid "using"
+#~ msgstr "использование"
+
+#~ msgid "Article purging:"
+#~ msgstr "Удаление сообщений:"
+
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "Спрятать из списка популярных каналов"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "Язык канала пишется справа налево"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "Включить в e-mail дайджест"
+
+#~ msgid "Always display image attachments"
+#~ msgstr "Всегда показывать вложенные изображения"
+
+#~ msgid "Cache images locally"
+#~ msgstr "Кэшировать изображения локально"
+
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "Пометить все статьи как прочитанные?"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "При изменении текста статьи, помечать ее как обновленную"
+
+#~ msgid "Icon"
+#~ msgstr "Иконка"
+
+#~ msgid "Replace"
+#~ msgstr "Заменить"
+
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "Переподписаться на PUSH обновления"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "Сбрасывает статусподписки с помощью механизма PubSubHubbub"
+
+#~ msgid "All done."
+#~ msgstr "Всё выполнено."
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "Добавлена подписка на <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "Канал <b>%s</b> уже подписан."
+
+#, fuzzy
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "Каналы не найдены."
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "Канал <b>%s</b> уже подписан."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "Опубликованный URL канала изменён."
+
+#, fuzzy
+#~ msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#~ msgstr "Канал <b>%s</b> уже подписан."
+
+#, fuzzy
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "Отписаться от выбранных каналов?"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "Редактировать опции  подписки"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "Категория <b>$%s</b> уже существует."
+
+#~ msgid "No feed categories defined."
+#~ msgstr "Категории отсутствуют."
+
+#, fuzzy
+#~ msgid "Remove selected categories"
+#~ msgstr "Удалить выбранные категории?"
+
+#~ msgid "Feeds with errors"
+#~ msgstr "Каналы с ошибками"
+
+#~ msgid "Inactive feeds"
+#~ msgstr "Неактивные каналы"
+
+#~ msgid "Edit selected feeds"
+#~ msgstr "Редактировать выбранные каналы"
+
+#~ msgid "Reset sort order"
+#~ msgstr "Сбросить сортировку"
+
+#~ msgid "Categories"
+#~ msgstr "Категории"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "Редактировать категории"
+
+#~ msgid "More actions..."
+#~ msgstr "Действия..."
+
+#~ msgid "Manual purge"
+#~ msgstr "Ручная очистка"
+
+#~ msgid "Clear feed data"
+#~ msgstr "Очистить данные канала."
+
+#~ msgid "Rescore articles"
+#~ msgstr "Заново оценить статьи"
+
+#~ msgid "<b>Hint:</b> you can drag feeds and categories around."
+#~ msgstr "Вы можете менять категории и каналы местами"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#~ msgid "Only main settings profile can be migrated using OPML."
+#~ msgstr "Только главный профиль настроек будет экспортирован в OPML."
+
+#, fuzzy
+#~ msgid "Import my OPML"
+#~ msgstr "Импортирую OPML..."
+
+#, fuzzy
+#~ msgid "Include settings"
+#~ msgstr "Включить в e-mail дайджест"
+
+#, fuzzy
+#~ msgid "Export OPML"
+#~ msgstr "Экспортировать OPML"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ msgstr ""
+#~ "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
+#~ "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
+
+#~ msgid "Article archive"
+#~ msgstr "Архив статей"
+
+#, fuzzy
+#~ msgid "Export my data"
+#~ msgstr "Экспортировать данные"
+
+#~ msgid "Import"
+#~ msgstr "Импортировать"
+
+#, fuzzy
+#~ msgid "Firefox integration"
+#~ msgstr "Интеграция в Firefox"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
+#~ "Для этого щёлкните по ссылке ниже."
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
+
+#, fuzzy
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "Вернуться к Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "Вернуться к Tiny Tiny RSS"
+
+#, fuzzy
+#~ msgid "Published & shared articles / Generated feeds"
+#~ msgstr "Заново оценить статьи в выбранных каналах?"
+
+#, fuzzy
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "Заново оценить статьи в выбранных каналах?"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ msgstr ""
+#~ "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
+#~ "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
+
+#, fuzzy
+#~ msgid "Display URL"
+#~ msgstr "показать теги"
+
+#, fuzzy
+#~ msgid "Unshare all articles"
+#~ msgstr "Отмеченные"
+
+#, fuzzy
+#~ msgid "Twitter"
+#~ msgstr "Заголовок"
+
+#, fuzzy
+#~ msgid "Clear stored credentials"
+#~ msgstr "Очистить данные канала."
+
+#, fuzzy
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "Не найдено совпадений с фильтром."
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "Добавлен фильтр <b>%s</b>"
+
+#~ msgid "Edit"
+#~ msgstr "Редактировать"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "Вашего уровня доступа недостаточно для открытия этой вкладки."
+
+#, fuzzy
+#~ msgid "Stored feeds"
+#~ msgstr "Больше каналов"
+
+#~ msgid "Click to edit"
+#~ msgstr "Щёлкните для редактирования"
+
+#~ msgid "Caption"
+#~ msgstr "Заголовок"
+
+#~ msgid "Colors"
+#~ msgstr "Цвета"
+
+#~ msgid "Foreground:"
+#~ msgstr "Передний план:"
+
+#~ msgid "Background:"
+#~ msgstr "Фон:"
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "Добавлена метка <b>%s</b>"
+
+#~ msgid "Clear colors"
+#~ msgstr "Очистить цвета"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "Старый пароль не может быть пустым."
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "Новый пароль не может быть пустым."
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "Пароли не совпадают."
+
+#~ msgid "Password has been changed."
+#~ msgstr "Пароль был изменен."
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "Старый пароль неправилен."
+
+#~ msgid "The configuration was saved."
+#~ msgstr "Конфигурация сохранена."
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "Неизвестная опция: %s"
+
+#, fuzzy
+#~ msgid "Personal data / Authentication"
+#~ msgstr "Авторизация"
+
+#~ msgid "Full name"
+#~ msgstr "Полное имя"
+
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
+#~ msgid "Access level"
+#~ msgstr "Уровень доступа:"
+
+#~ msgid "Save data"
+#~ msgstr "Сохранить"
+
+#~ msgid "Your password is at default value, please change it."
+#~ msgstr "Используется пароль по умолчанию, пожалуйста, измените его."
+
+#~ msgid "Old password"
+#~ msgstr "Старый пароль"
+
+#~ msgid "New password"
+#~ msgstr "Новый пароль"
+
+#~ msgid "Confirm password"
+#~ msgstr "Подтверждение пароля"
+
+#~ msgid "Change password"
+#~ msgstr "Изменить пароль"
+
+#~ msgid "Select theme"
+#~ msgstr "Выбор темы"
+
+#~ msgid "Yes"
+#~ msgstr "Да"
+
+#~ msgid "No"
+#~ msgstr "Нет"
+
+#~ msgid "Save configuration"
+#~ msgstr "Сохранить конфигурацию"
+
+#~ msgid "Manage profiles"
+#~ msgstr "Управление профилями"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "Сбросить настройки"
+
+#~ msgid "User details"
+#~ msgstr "Подробнее..."
+
+#~ msgid "User not found"
+#~ msgstr "Пользователь не найден"
+
+#~ msgid "Registered"
+#~ msgstr "Зарегистрирован"
+
+#~ msgid "Last logged in"
+#~ msgstr "Последний вход"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "Количество подписанных каналов"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "Подписан на каналы"
+
+#~ msgid "User Editor"
+#~ msgstr "Редактор пользователей"
+
+#~ msgid "Access level: "
+#~ msgstr "Уровень доступа:"
+
+#~ msgid "Change password to"
+#~ msgstr "Изменить пароль на"
+
+#~ msgid "E-mail: "
+#~ msgstr "E-mail: "
+
+#~ msgid "Added user <b>%s</b> with password <b>%s</b>"
+#~ msgstr "Добавлен пользователь <b>%s</b> с паролем <b>%s</b>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "Не могу добавить пользователя <b>%s</b>"
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "Пользователь <b>%s</b> уже существует."
+
+#, fuzzy
+#~ msgid ""
+#~ "Changed password of user <b>%s</b>\n"
+#~ "\t\t\t\t to <b>%s</b>"
+#~ msgstr "Пароль пользователя <b>%s</b> изменен на <b>%s</b>"
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "Уведомление <b>%s</b>."
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] Уведомление о смене пароля"
+
+#~ msgid "Reset password"
+#~ msgstr "Сбросить пароль"
+
+#~ msgid "Access Level"
+#~ msgstr "Уровень доступа:"
+
+#~ msgid "Last login"
+#~ msgstr "Последний вход"
+
+#~ msgid "No users defined."
+#~ msgstr "Пользователи не определены."
+
+#~ msgid "No matching users found."
+#~ msgstr "Подходящих пользователей не найдено."
+
+#, fuzzy
+#~ msgid "Share by URL"
+#~ msgstr "Расшарить статью по ссылке"
+
+#, fuzzy
+#~ msgid "Share on Twitter"
+#~ msgstr "Заголовок"
+
+#~ msgid "Attachment:"
+#~ msgstr "Вложение:"
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "Подписаться на канал..."
+
+#, fuzzy
+#~ msgid "Filter Test Results"
+#~ msgstr "Выражение"
+
+#~ msgid "Feed Categories"
+#~ msgstr "Категории"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."


@@ -3067,9 +2833,6 @@ msgstr "Пауза"
 #~ msgid "Add category..."
 #~ msgstr "Добавить категорию..."
 
 #~ msgid "Add category..."
 #~ msgstr "Добавить категорию..."
 

-#~ msgid "Add label..."
-#~ msgstr "Добавить метку..."
-

 #~ msgid "description"
 #~ msgstr "описание"
 
 #~ msgid "description"
 #~ msgstr "описание"
 


@@ -3267,9 +3030,6 @@ msgstr "Пауза"
 #~ msgid "Update Errors"
 #~ msgstr "Ошибки обновления"
 
 #~ msgid "Update Errors"
 #~ msgstr "Ошибки обновления"
 

-#~ msgid "Category editor"
-#~ msgstr "Редактор категорий"
-

 #~ msgid "Show last article times"
 #~ msgstr "Показать дату последней статьи"
 
 #~ msgid "Show last article times"
 #~ msgstr "Показать дату последней статьи"
 


@@ -3345,10 +3105,6 @@ msgstr "Пауза"
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Фильтр <b>%s</b> сохранен"
 
 #~ msgid "Saved filter <b>%s</b>"
 #~ msgstr "Фильтр <b>%s</b> сохранен"
 

-#, fuzzy
-#~ msgid "Tiny Tiny RSS"
-#~ msgstr "Вернуться к Tiny Tiny RSS"
-

 #~ msgid "Click to collapse category"
 #~ msgstr "Щёлкните, чтобы развернуть категорию"
 
 #~ msgid "Click to collapse category"
 #~ msgstr "Щёлкните, чтобы развернуть категорию"
 

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 84e67f96fe17b00bbacf4b710a40cc5fbaf8cebf..e6f6aeeaf755ba84b674edf3aa32b7e7e2c59943 100644 (file)
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 a23c6d5f019c684d573854024329041c86c85de8..ec5e07647989cf99763b33ad869b151cf8ab6db1 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+0400\n"

 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Sai <lazycai.ffsky@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Sai <lazycai.ffsky@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/"


@@ -19,95 +19,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr "使用默认"
 
 msgid "Use default"
 msgstr "使用默认"
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr "从不清理"
 
 msgid "Never purge"
 msgstr "从不清理"
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr "1周前"
 
 msgid "1 week old"
 msgstr "1周前"
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr "2周前"
 
 msgid "2 weeks old"
 msgstr "2周前"
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr "1个月前"
 
 msgid "1 month old"
 msgstr "1个月前"
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr "2个月前"
 
 msgid "2 months old"
 msgstr "2个月前"
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr "3个月前"
 
 msgid "3 months old"
 msgstr "3个月前"
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr "默认间隔"
 
 msgid "Default interval"
 msgstr "默认间隔"
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr "禁用更新"
 
 msgid "Disable updates"
 msgstr "禁用更新"
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr "每小时"
 
 msgid "Hourly"
 msgstr "每小时"
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr "每4小时"
 
 msgid "Each 4 hours"
 msgstr "每4小时"
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr "每12小时"
 
 msgid "Each 12 hours"
 msgstr "每12小时"
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr "每天"
 
 msgid "Daily"
 msgstr "每天"
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr "每周"
 
 msgid "Weekly"
 msgstr "每周"
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr "默认"
 
 msgid "Default"
 msgstr "默认"
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr "Magpie"
 
 msgid "Magpie"
 msgstr "Magpie"
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr "SimplePie"
 
 msgid "SimplePie"
 msgstr "SimplePie"
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr "Twitter OAuth 认证"
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr "用户"
 
 msgid "User"
 msgstr "用户"
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr "Power User"
 
 msgid "Power User"
 msgstr "Power User"
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr "管理员"
 
 msgid "Administrator"
 msgstr "管理员"
 


@@ -137,8 +133,7 @@ msgstr "Tiny Tiny RSS 数据库是最新版。"
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 


@@ -211,22 +206,24 @@ msgstr ""
 "本页面需要JavaScript支持。\n"
 "\t\t\t请检查您的浏览器设置。"
 
 "本页面需要JavaScript支持。\n"
 "\t\t\t请检查您的浏览器设置。"
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 
 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr "您好，"
 
 msgid "Hello,"
 msgstr "您好，"
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "注销"
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr "注销"
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -288,207 +285,153 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr "偏好设置"
 
 msgid "Preferences"
 msgstr "偏好设置"
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr "评论些什么？"
 
 msgid "Comments?"
 msgstr "评论些什么？"
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS 有新版本啦！"
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS 有新版本啦！"
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr "新闻"
 
 msgid "News"
 msgstr "新闻"
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr "收缩侧边栏"
 
 msgid "Collapse feedlist"
 msgstr "收缩侧边栏"
 

-#: index.php:148
+#: index.php:165

 msgid "Show articles"
 msgstr "显示文章"
 
 msgid "Show articles"
 msgstr "显示文章"
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr "自动适应"
 
 msgid "Adaptive"
 msgstr "自动适应"
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr "全部文章"
 
 msgid "All Articles"
 msgstr "全部文章"
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr "加星标的"
 
 msgid "Starred"
 msgstr "加星标的"
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr "已发布"
 
 msgid "Published"
 msgstr "已发布"
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr "未读"
 
 msgid "Unread"
 msgstr "未读"
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr "忽略评分"
 
 msgid "Ignore Scoring"
 msgstr "忽略评分"
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr "有更新的"
 
 msgid "Updated"
 msgstr "有更新的"
 

-#: index.php:160
+#: index.php:177

 msgid "Sort articles"
 msgstr "排序文章"
 
 msgid "Sort articles"
 msgstr "排序文章"
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr "日期"
 
 msgid "Date"
 msgstr "日期"
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr "标题"
 
 msgid "Title"
 msgstr "标题"
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr "评分"
 
 msgid "Score"
 msgstr "评分"
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+#, fuzzy
+msgid "With subcategories"
+msgstr "编辑类别"
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr "更新列表"
 
 msgid "Update"
 msgstr "更新列表"
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr "标记为已读"
 
 msgid "Mark as read"
 msgstr "标记为已读"
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr "动作"
 
 msgid "Actions..."
 msgstr "动作"
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr "搜索"
 
 msgid "Search..."
 msgstr "搜索"
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr "信息源操作："
 
 msgid "Feed actions:"
 msgstr "信息源操作："
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr "编辑信息源"
 
 msgid "Edit this feed..."
 msgstr "编辑信息源"
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr "取消订阅"
 
 msgid "Unsubscribe"
 msgstr "取消订阅"
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr "全部信息源："
 
 msgid "All feeds:"
 msgstr "全部信息源："
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr "其他操作："
 
 msgid "Other actions:"
 msgstr "其他操作："
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr "切换至摘要模式"
 
 msgid "Switch to digest..."
 msgstr "切换至摘要模式"
 

-#: index.php:194
+#: index.php:216

 msgid "Show tag cloud..."
 msgstr "显示标签云"
 
 msgid "Show tag cloud..."
 msgstr "显示标签云"
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr "通过自定义标签选择"
 
 msgid "Select by tags..."
 msgstr "通过自定义标签选择"
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr "创建预定义标签"
 
 msgid "Create label..."
 msgstr "创建预定义标签"
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr "创建过滤器"
 
 msgid "Create filter..."
 msgstr "创建过滤器"
 

-#: index.php:198
+#: index.php:220

 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 

-#: opml.php:81
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr "<li>添加类别：<b>%s</b>。</li>"
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "将偏好按键从 %s 设置为 %s"
-
-#: opml.php:123
-#, php-format
-msgid "Adding label %s"
-msgstr ""
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, php-format
-msgid "Adding filter %s"
-msgstr ""
-
-#: opml.php:196
-#, php-format
-msgid "Duplicate filter %s"
-msgstr ""
-
-#: opml.php:241
-msgid "is already imported."
-msgstr "已经导入过。"
-
-#: opml.php:271
-msgid "OK"
-msgstr "OK"
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr "解析文档时发生错误。"
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr "错误：请上传 OPML 文件。"
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr "OPML 工具"
-
-#: opml.php:530
-msgid "Importing OPML..."
-msgstr "正在导入 OPML ……"
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr "返回偏好设置"
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr "快捷键"


@@ -497,18 +440,16 @@ msgstr "快捷键"
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr "信息源"
 
 msgid "Feeds"
 msgstr "信息源"
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr "预定义标签"
 
 msgid "Labels"
 msgstr "预定义标签"
 


@@ -575,22 +516,6 @@ msgstr "帐号创建成功。"
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr "通过 Twitter 注册"
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr "无法连接 Twitter 。请刷新页面或过会儿重试。"
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr "恭喜！您已经成功通过 Twitter 注册。"
-
-#: twitter.php:118 classes/pref_prefs.php:469
-msgid "Register"
-msgstr "注册"
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"


@@ -663,11 +588,11 @@ msgstr "其他动作"
 msgid "Select article under mouse cursor"
 msgstr "选择鼠标指向的文章"
 
 msgid "Select article under mouse cursor"
 msgstr "选择鼠标指向的文章"
 

-#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr "创建预定义标签"
 
 msgid "Create label"
 msgstr "创建预定义标签"
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr "创建过滤器"
 
 msgid "Create filter"
 msgstr "创建过滤器"
 


@@ -707,11 +632,11 @@ msgstr "信息源动作"
 msgid "Refresh active feed"
 msgstr "刷新活动的信息源"
 
 msgid "Refresh active feed"
 msgstr "刷新活动的信息源"
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr "编辑信息源"
 
 msgid "Edit feed"
 msgstr "编辑信息源"
 


@@ -735,19 +660,19 @@ msgstr "查看类别时将其折叠/展开"
 msgid "Go to..."
 msgstr "跳转至……"
 
 msgid "Go to..."
 msgstr "跳转至……"
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr "全部文章"
 
 msgid "All articles"
 msgstr "全部文章"
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr "加星标文章"
 
 msgid "Starred articles"
 msgstr "加星标文章"
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr "已发布文章"
 
 msgid "Published articles"
 msgstr "已发布文章"
 


@@ -783,7 +708,7 @@ msgstr "前25位的信息源"
 msgid "Edit feed categories"
 msgstr "编辑信息源类别"
 
 msgid "Edit feed categories"
 msgstr "编辑信息源类别"
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr "创建用户"
 
 msgid "Create user"
 msgstr "创建用户"
 


@@ -811,6 +736,10 @@ msgstr "登陆："
 msgid "Password:"
 msgstr "密码："
 
 msgid "Password:"
 msgstr "密码："
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -818,8 +747,8 @@ msgstr "密码："
 msgid "Home"
 msgstr "主页"
 
 msgid "Home"
 msgstr "主页"
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr "特殊区域"
 
 msgid "Special"
 msgstr "特殊区域"
 


@@ -869,13 +798,11 @@ msgstr "未找到帮助主题。"
 msgid "Prepare data"
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr "关闭本窗口"
 
 msgid "Close this window"
 msgstr "关闭本窗口"
 


@@ -885,44 +812,57 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+msgid "Select"
+msgstr "选择"
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr "全部"
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr "无"
+
+#: classes/dlg.php:85

 msgid "Create profile"
 msgstr "创建偏好文件"
 
 msgid "Create profile"
 msgstr "创建偏好文件"
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 msgid "(active)"
 msgstr "（当前使用的）"
 
 msgid "(active)"
 msgstr "（当前使用的）"
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 msgid "Default profile"
 msgstr "默认偏好设置"
 
 msgid "Default profile"
 msgstr "默认偏好设置"
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 msgid "Remove selected profiles"
 msgstr "移除选中的偏好文件"
 
 msgid "Remove selected profiles"
 msgstr "移除选中的偏好文件"
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 msgid "Activate profile"
 msgstr "启用偏好文件"
 
 msgid "Activate profile"
 msgstr "启用偏好文件"
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 msgid "Your Public OPML URL is:"
 msgstr "你的公共 OPML URL 是："
 
 msgid "Your Public OPML URL is:"
 msgstr "你的公共 OPML URL 是："
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 msgid "Generate new URL"
 msgstr "生成一个新的 URL"
 
 msgid "Generate new URL"
 msgstr "生成一个新的 URL"
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr "提示"
 
 msgid "Notice"
 msgstr "提示"
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
 "running, which prevents all feeds from updating. Please start the daemon "


@@ -931,11 +871,11 @@ msgstr ""
 "更新进程已在配置中启用，但守护进程没有运行，无法抓取信息。请启动守护进程，或"
 "联系管理员。"
 
 "更新进程已在配置中启用，但守护进程没有运行，无法抓取信息。请启动守护进程，或"
 "联系管理员。"
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr "上次更新："
 
 msgid "Last update:"
 msgstr "上次更新："
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 "
 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 "


@@ -944,245 +884,178 @@ msgstr ""
 "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管"
 "理员。"
 
 "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管"
 "理员。"
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr "信息源"
 
 msgid "Feed"
 msgstr "信息源"
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 msgid "Feed URL"
 msgstr "信息源 URL"
 
 msgid "Feed URL"
 msgstr "信息源 URL"
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr "加入到类别："
 
 msgid "Place in category:"
 msgstr "加入到类别："
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 msgid "Available feeds"
 msgstr "可用的信息源"
 
 msgid "Available feeds"
 msgstr "可用的信息源"
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr "登录密码"
 
 msgid "Authentication"
 msgstr "登录密码"
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr "登陆"
 
 msgid "Login"
 msgstr "登陆"
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 msgid "Password"
 msgstr "密码"
 
 msgid "Password"
 msgstr "密码"
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr "订阅"
 
 msgid "Subscribe"
 msgstr "订阅"
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 msgid "More feeds"
 msgstr "更多信息源"
 
 msgid "More feeds"
 msgstr "更多信息源"
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr "取消"
 
 msgid "Cancel"
 msgstr "取消"
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 msgid "Feed archive"
 msgstr "信息源存档"
 
 msgid "Feed archive"
 msgstr "信息源存档"
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 msgid "limit:"
 msgstr "限制："
 
 msgid "limit:"
 msgstr "限制："
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr "查找"
 
 msgid "Look for"
 msgstr "查找"
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr "匹配"
 
 msgid "match on"
 msgstr "匹配"
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr "内容"
 
 msgid "Content"
 msgstr "内容"
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr "标题或内容"
 
 msgid "Title or content"
 msgstr "标题或内容"
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr "限制搜索条件："
 
 msgid "Limit search to:"
 msgstr "限制搜索条件："
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr "全部信息源"
 
 msgid "All feeds"
 msgstr "全部信息源"
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr "本信息源"
 
 msgid "This feed"
 msgstr "本信息源"
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr "匹配"
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr "之前"
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr "之后"
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr "检查一下"
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr "on field"
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr "在"
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr "执行动作"
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr "指定参数："
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr "选项"
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr "已启用"
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr "反向匹配"
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-msgid "Apply to category"
-msgstr ""
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr "测试"
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr "创建"
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr "信息源因为如下错误未能更新："
 
 msgid "These feeds have not been updated because of errors:"
 msgstr "信息源因为如下错误未能更新："
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 msgid "Tag Cloud"
 msgstr "标签云"
 
 msgid "Tag Cloud"
 msgstr "标签云"
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr "通过自定义标签选择"
 
 msgid "Select item(s) by tags"
 msgstr "通过自定义标签选择"
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr "匹配："
 
 msgid "Match:"
 msgstr "匹配："
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr "哪些标签？"
 
 msgid "Which Tags?"
 msgstr "哪些标签？"
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 msgid "Display entries"
 msgstr "显示条目"
 
 msgid "Display entries"
 msgstr "显示条目"
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
 
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 msgid "Details"
 msgstr "详细"
 
 msgid "Details"
 msgstr "详细"
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr "下载"
 
 msgid "Download"
 msgstr "下载"
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1192,153 +1065,138 @@ msgstr ""
 "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" "
 "class=\"visibleLink\" href=\"%s\">本文件</a>。"
 
 "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" "
 "class=\"visibleLink\" href=\"%s\">本文件</a>。"
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr "实例"
 
 msgid "Instance"
 msgstr "实例"
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr "URL："
 
 msgid "URL:"
 msgstr "URL："
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr "实例 URL："
 
 msgid "Instance URL"
 msgstr "实例 URL："
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 msgid "Access key:"
 msgstr "访问密钥："
 
 msgid "Access key:"
 msgstr "访问密钥："
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 msgid "Access key"
 msgstr "访问密钥"
 
 msgid "Access key"
 msgstr "访问密钥"
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr "为两个相联的实例使用一个访问密钥。"
 
 msgid "Use one access key for both linked instances."
 msgstr "为两个相联的实例使用一个访问密钥。"
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 msgid "Generate new key"
 msgstr "生成新的密钥"
 
 msgid "Generate new key"
 msgstr "生成新的密钥"
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 msgid "Create link"
 msgstr "创建链接"
 
 msgid "Create link"
 msgstr "创建链接"
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 msgid "Feeds require authentication."
 msgstr ""
 
 msgid "Feeds require authentication."
 msgstr ""
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 msgid "Visit the website"
 msgstr "访问网站"
 
 msgid "Visit the website"
 msgstr "访问网站"
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 msgid "View as RSS feed"
 msgstr "以RSS信息源方式阅读"
 
 msgid "View as RSS feed"
 msgstr "以RSS信息源方式阅读"
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr "选择："
 
 msgid "Select:"
 msgstr "选择："
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr "全部"
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr "反选"
 
 msgid "Invert"
 msgstr "反选"
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr "无"
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr "锁定选择："
 
 msgid "Selection toggle:"
 msgstr "锁定选择："
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr "选择："
 
 msgid "Selection:"
 msgstr "选择："
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 msgid "Archive"
 msgstr "存档"
 
 msgid "Archive"
 msgstr "存档"
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 msgid "Move back"
 msgstr "移回原位"
 
 msgid "Move back"
 msgstr "移回原位"
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 msgid "Delete"
 msgstr "删除"
 
 msgid "Delete"
 msgstr "删除"
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 msgid "Forward by email"
 msgstr "通过邮件转发"
 
 msgid "Forward by email"
 msgstr "通过邮件转发"
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr "信息源："
 
 msgid "Feed:"
 msgstr "信息源："
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr "找不到信息源。"
 
 msgid "Feed not found."
 msgstr "找不到信息源。"
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr "标记为已读"
 
 msgid "mark as read"
 msgstr "标记为已读"
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 msgid "Originally from:"
 msgstr "来源："
 
 msgid "Originally from:"
 msgstr "来源："
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 msgid "Open article in new tab"
 msgstr "在新标签页中打开文章"
 
 msgid "Open article in new tab"
 msgstr "在新标签页中打开文章"
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 msgid "Close article"
 msgstr ""
 
 msgid "Close article"
 msgstr ""
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."


@@ -1346,839 +1204,229 @@ msgstr ""
 "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
 "动作菜单）。"
 
 "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
 "动作菜单）。"
 

-#: classes/feeds.php:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-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/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML 工具"

 
 

-#: classes/note_button.php:7 js/note_button.js:11
-msgid "Edit article note"
-msgstr "编辑文章注记"
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "正在导入 OPML ……"

 
 

-#: classes/pref_feeds.php:12
-msgid "Check to enable field"
-msgstr "勾选以启用"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "返回偏好设置"

 
 

-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
+#: classes/opml.php:270

 #, php-format
 #, php-format

-msgid "(%d feeds)"
-msgstr "(%d 个信息源)"
-
-#: classes/pref_feeds.php:306
-msgid "Feed Title"
-msgstr "信息源标题"
-
-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr "使用"
+msgid "Adding feed: %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr "文章清理："
+#: classes/opml.php:279
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "更新信息源"

 
 

-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
+#: classes/opml.php:293
+#, php-format
+msgid "Adding label %s"

 msgstr ""
 msgstr ""

-"<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除"
-"外。"

 
 

-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-msgid "Hide from Popular feeds"
-msgstr "从最受欢迎的信息源中隐藏"
-
-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr "右至左的内容"
+#: classes/opml.php:296
+#, php-format
+msgid "Duplicate label: %s"
+msgstr ""

 
 

-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr "包含电子邮件摘要"
+#: classes/opml.php:308
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "将偏好按键从 %s 设置为 %s"

 
 

-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr "始终显示图片附件"
+#: classes/opml.php:337
+#, fuzzy
+msgid "Adding filter..."
+msgstr "创建过滤器"

 
 

-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr "本地缓存图片"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"
+msgstr "未分类"

 
 

-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
-msgid "Mark updated articles as unread"
-msgstr "将已更新的文章标记为未读"
+#: classes/opml.php:411
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "加入到类别："

 
 

-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
-msgstr "将内容更改过的文章标记为已更新状态"
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."
+msgstr "错误：请上传 OPML 文件。"

 
 

-#: classes/pref_feeds.php:491
-msgid "Icon"
-msgstr "图标"
+#: classes/opml.php:465
+msgid "Error while parsing document."
+msgstr "解析文档时发生错误。"

 
 

-#: classes/pref_feeds.php:505
-msgid "Replace"
-msgstr "æ\9b¿æ\8d¢"
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161
+msgid "no tags"
+msgstr "æ\97 æ \87ç­¾"

 
 

-#: classes/pref_feeds.php:524
-msgid "Resubscribe to push updates"
-msgstr "重新订阅以推送更新"
+#: classes/rpc.php:736
+msgid "Your request could not be completed."
+msgstr "您的请求无法完成。"

 
 

-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "为å\90¯ç\94¨æ\8e¨é\80\81ç\9a\84ä¿¡æ\81¯æº\90é\87\8dç½® PubSubHubbub 订é\98\85。"
+#: classes/rpc.php:740
+msgid "Feed update has been scheduled."
+msgstr "ä¿¡æ\81¯æº\90æ\9b´æ\96°ç\9a\84ä»»å\8a¡è®¡å\88\92å·²å\88¶å®\9a。"

 
 

-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr "å\85¨é\83¨å®\8cæ\88\90。"
+#: classes/rpc.php:748
+msgid "Category update has been scheduled."
+msgstr "å\88\86ç±»æ\9b´æ\96°å·²å\88\97å\85¥ä»»å\8a¡è®¡å\88\92。"

 
 

-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr "订阅到 <b>%s</b>."
+#: classes/rpc.php:761
+msgid "Can't update this kind of feed."
+msgstr "无法更新这种类型的信息源。"

 
 

-#: classes/pref_feeds.php:1021
+#: include/functions.php:669

 #, php-format
 #, php-format

-msgid "Could not subscribe to <b>%s</b>."
-msgstr "无法订阅 <b>%s</b>。"
+msgid "Fatal: authentication module %s not found."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1024
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr "在 <b>%s</b> 中没有找到信息源。"
+#: include/functions.php:787
+msgid "Session failed to validate (incorrect IP)"
+msgstr "无法验证会话（IP 错误）"

 
 

-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr "已经订阅到 <b>%s</b>."
+#: include/functions.php:861
+msgid "Incorrect username or password"
+msgstr "用户名或密码错误"

 
 

-#: classes/pref_feeds.php:1030
-#, fuzzy
-msgid "Multiple feed URLs found."
-msgstr "未找到信息源。"
+#: include/functions.php:2049
+msgid "Archived articles"
+msgstr "存档的文章"

 
 

-#: classes/pref_feeds.php:1035
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
+#: include/functions.php:2051
+msgid "Recently read"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1057
-msgid "Subscribe to selected feed"
-msgstr "订阅选中的信息源"
+#: include/functions.php:3223 js/viewfeed.js:1996
+msgid "Click to play"
+msgstr "点击播放"

 
 

-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr "编辑订阅选项"
+#: include/functions.php:3224 js/viewfeed.js:1995
+msgid "Play"
+msgstr "播放"

 
 

-#: classes/pref_feeds.php:1161
-#, php-format
-msgid "Category <b>$%s</b> already exists in the database."
-msgstr "数据库中已经有 <b>$%s</b> 这个类别。"
+#: include/functions.php:3356
+msgid " - "
+msgstr " - "

 
 

-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr "创建类别"
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""

 
 

-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr "没有定义过的信息源类别。"
+#: include/functions.php:4186
+msgid "(edit note)"
+msgstr "（编辑注记）"

 
 

-#: classes/pref_feeds.php:1243
-msgid "Remove selected categories"
-msgstr "移除选定的类别"
+#: include/functions.php:4618
+msgid "No feed selected."
+msgstr "没有选中的信息源。"

 
 

-#: classes/pref_feeds.php:1267
-msgid "Feeds with errors"
-msgstr "æ\9c\89é\94\99误ç\9a\84ä¿¡æ\81¯æº\90"
+#: include/functions.php:4802
+msgid "unknown type"
+msgstr "æ\9cªç\9f¥ç±»å\9e\8b"

 
 

-#: classes/pref_feeds.php:1287
-msgid "Inactive feeds"
-msgstr "很久不活跃的信息源"
+#: include/functions.php:4844
+#, fuzzy
+msgid "Attachments"
+msgstr "附件："

 
 

-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-msgid "Select"
-msgstr "选择"
+#: include/functions.php:5286
+#, php-format
+msgid "%d archived articles"
+msgstr "%d 个存档的文章"

 
 

-#: classes/pref_feeds.php:1324
-msgid "Edit selected feeds"
-msgstr "编辑选定的信息源"
+#: include/functions.php:5310
+msgid "No feeds found."
+msgstr "未找到信息源。"

 
 

-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-msgid "Reset sort order"
-msgstr "重置排序"
+#: include/functions.php:5356
+msgid "Could not import: incorrect schema version."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-msgid "Batch subscribe"
+#: include/functions.php:5361
+msgid "Could not import: unrecognized document format."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1333
-msgid "Categories"
-msgstr "类别"
+#: include/functions.php:5520
+#, php-format
+msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr "编辑类别"
+#: include/functions.php:5526
+msgid "Could not load XML document."
+msgstr ""

 
 

-#: classes/pref_feeds.php:1338
-#, fuzzy
-msgid "(Un)hide empty categories"
-msgstr "编辑类别"
+#: include/localized_schema.php:4
+msgid "Title or Content"
+msgstr "标题或内容"

 
 

-#: classes/pref_feeds.php:1354
-msgid "More actions..."
-msgstr "更多动作"
+#: include/localized_schema.php:5
+msgid "Link"
+msgstr "链接"

 
 

-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr "æ\89\8bå\8a¨æ¸\85é\99¤"
+#: include/localized_schema.php:7
+msgid "Article Date"
+msgstr "æ\96\87ç« å\8f\91å¸\83æ\97¶é\97´"

 
 

-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr "清空信息源数据"
+#: include/localized_schema.php:9
+msgid "Delete article"
+msgstr "删除文章"

 
 

-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr "为文章重新评分"
+#: include/localized_schema.php:11
+msgid "Set starred"
+msgstr "加星标"

 
 

-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr "<b>提示：</b> 您可以拖拽信息源和类别。"
+#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
+#: js/viewfeed.js:475
+msgid "Publish article"
+msgstr "发布文章"

 
 

-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
+#: include/localized_schema.php:13
+msgid "Assign tags"
+msgstr "添加自定义标签"

 
 

-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr "OPML"
+#: include/localized_schema.php:14 js/viewfeed.js:1960
+msgid "Assign label"
+msgstr "添加预定义标签"

 
 

-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
+#: include/localized_schema.php:15
+msgid "Modify score"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
+#: include/localized_schema.php:17
+msgid "General"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1432
-msgid "Import my OPML"
+#: include/localized_schema.php:18
+msgid "Interface"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr "文件名："
-
-#: classes/pref_feeds.php:1438
-msgid "Include settings"
-msgstr "包含设置"
-
-#: classes/pref_feeds.php:1442
-msgid "Export OPML"
+#: include/localized_schema.php:19
+msgid "Advanced"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_feeds.php:1446
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-msgid "Article archive"
-msgstr ""
-
-#: classes/pref_feeds.php:1456
-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:1459
-msgid "Export my data"
-msgstr ""
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr "导入"
-
-#: classes/pref_feeds.php:1481
-msgid "Firefox integration"
-msgstr "Firefox 集成"
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr "点击此处将本站注册为信息源阅读器。"
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr "通过书签订阅"
-
-#: classes/pref_feeds.php:1500
-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 ""
-"将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接"
-"以订阅。"
-
-#: classes/pref_feeds.php:1504
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
-
-#: classes/pref_feeds.php:1508
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "在 Tiny Tiny RSS 中订阅"
-
-#: classes/pref_feeds.php:1512
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-
-#: classes/pref_feeds.php:1514
-msgid "Published articles and generated feeds"
-msgstr "已发布的文章和生成的信息源"
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-"已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订"
-"阅。"
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr "显示 URL"
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr "清空所有生成的 URL"
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr "通过 URL 分享的文章"
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "您可以取消所有通过 URL 分享的文章。"
-
-#: classes/pref_feeds.php:1532
-msgid "Unshare all articles"
-msgstr "取消所有分享"
-
-#: classes/pref_feeds.php:1538
-msgid "Twitter"
-msgstr "Twitter"
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-"更新 Twitter 信息源之前，您必须在 Twitter.com 上注册这个 Tiny Tiny RSS 的实"
-"例。"
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr "您已经成功在 Twitter.com 上注册并获取您的 Twitter 信息源的访问权。"
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr "在 Twitter.com 上注册"
-
-#: classes/pref_feeds.php:1559
-msgid "Clear stored credentials"
-msgstr "清空保存的个人信息"
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
-msgstr "符合本过滤器条件的文章："
-
-#: classes/pref_filters.php:89
-msgid "No articles matching this filter has been found."
-msgstr "本过滤器下没有匹配到文章。"
-
-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
-msgstr ""
-
-#: classes/pref_filters.php:533
-#, php-format
-msgid "Created filter <b>%s</b>"
-msgstr "创建过滤器 <b>%s</b>"
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr "编辑"
-
-#: classes/pref_instances.php:13 classes/pref_users.php:6
-msgid "Your access level is insufficient to open this tab."
-msgstr "您的访问级别不够，无法打开这个舌签。"
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
-msgstr "链接实例"
-
-#: 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 ""
-"您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这个 "
-"URL 为本实例建立链接："
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr "上次连接"
-
-#: classes/pref_instances.php:170
-msgid "Stored feeds"
-msgstr "保存的信息源"
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr "点击进行编辑"
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr "标题"
-
-#: classes/pref_labels.php:37
-msgid "Colors"
-msgstr "颜色"
-
-#: classes/pref_labels.php:42
-msgid "Foreground:"
-msgstr "前端："
-
-#: classes/pref_labels.php:42
-msgid "Background:"
-msgstr "背景："
-
-#: classes/pref_labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "创建预定义标签 <b>%s</b>"
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr "清空颜色"
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr "请输入之前使用的密码。"
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
-msgstr "请输入一个新密码。"
-
-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr "两次输入的密码不一致。"
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr "密码更改成功。"
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr "原密码输入错误。"
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr "设置已保存。"
-
-#: classes/pref_prefs.php:112
-#, php-format
-msgid "Unknown option: %s"
-msgstr "未知选项： %s"
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr "您的个人数据已保存。"
-
-#: classes/pref_prefs.php:166
-msgid "Personal data / Authentication"
-msgstr ""
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr "姓名"
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr "电子邮件"
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr "访问级别"
-
-#: classes/pref_prefs.php:213
-msgid "Save data"
-msgstr "保存信息"
-
-#: classes/pref_prefs.php:224
-msgid "Your password is at default value, please change it."
-msgstr "您还在使用系统默认的密码，请修改。"
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr "原密码"
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr "新密码"
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr "确认密码"
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr "更改密码"
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr "选择主题"
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr "自定义"
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr "是"
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr "否"
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr "清空"
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr "保存设置"
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr "管理偏好文件"
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr "恢复到默认"
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr "用户详细资料"
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr "未找到用户"
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr "注册时间"
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr "上次登录"
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr "订阅的信息源数量"
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr "订阅的信息源"
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr "编辑用户信息"
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr "访问级别："
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr "更改密码为："
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
-msgstr "电子邮件："
-
-#: classes/pref_users.php:257
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
-
-#: classes/pref_users.php:264
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "无法创建用户 <b>%s</b> "
-
-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "用户 <b>%s</b> 已存在。"
-
-#: classes/pref_users.php:291
-#, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
-msgstr ""
-
-#: classes/pref_users.php:298
-#, php-format
-msgid "Notifying <b>%s</b>."
-msgstr "提醒 <b>%s</b>。"
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr "[tt-rss] 密码更换提醒"
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr "重置密码"
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr "访问级别"
-
-#: classes/pref_users.php:440
-msgid "Last login"
-msgstr "最后登陆"
-
-#: classes/pref_users.php:480
-msgid "No users defined."
-msgstr "没有定义用户。"
-
-#: classes/pref_users.php:482
-msgid "No matching users found."
-msgstr "没有匹配的用户。"
-
-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
-msgid "no tags"
-msgstr "无标签"
-
-#: classes/rpc.php:742
-msgid "Your request could not be completed."
-msgstr "您的请求无法完成。"
-
-#: classes/rpc.php:746
-msgid "Feed update has been scheduled."
-msgstr "信息源更新的任务计划已制定。"
-
-#: classes/rpc.php:754
-msgid "Category update has been scheduled."
-msgstr "分类更新已列入任务计划。"
-
-#: classes/rpc.php:767
-msgid "Can't update this kind of feed."
-msgstr "无法更新这种类型的信息源。"
-
-#: classes/share_button.php:7
-msgid "Share by URL"
-msgstr "通过 URL 分享"
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr "您可以通过以下唯一 URL 分享本文："
-
-#: classes/tweet_button.php:7
-msgid "Share on Twitter"
-msgstr "在 Twitter 上分享"
-
-#: include/functions.php:919
-msgid "Session failed to validate (incorrect IP)"
-msgstr "无法验证会话（IP 错误）"
-
-#: include/functions.php:993
-msgid "Incorrect username or password"
-msgstr "用户名或密码错误"
-
-#: include/functions.php:2099
-msgid "Archived articles"
-msgstr "存档的文章"
-
-#: include/functions.php:3232 js/viewfeed.js:1971
-msgid "Click to play"
-msgstr "点击播放"
-
-#: include/functions.php:3233 js/viewfeed.js:1970
-msgid "Play"
-msgstr "播放"
-
-#: include/functions.php:3359
-msgid " - "
-msgstr " - "
-
-#: include/functions.php:4178
-msgid "(edit note)"
-msgstr "（编辑注记）"
-
-#: include/functions.php:4591
-msgid "No feed selected."
-msgstr "没有选中的信息源。"
-
-#: include/functions.php:4775
-msgid "unknown type"
-msgstr "未知类型"
-
-#: include/functions.php:4815
-msgid "Attachment:"
-msgstr "附件："
-
-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr "附件："
-
-#: include/functions.php:5261
-#, php-format
-msgid "%d archived articles"
-msgstr "%d 个存档的文章"
-
-#: include/functions.php:5285
-msgid "No feeds found."
-msgstr "未找到信息源。"
-
-#: include/functions.php:5331
-msgid "Could not import: incorrect schema version."
-msgstr ""
-
-#: include/functions.php:5336
-msgid "Could not import: unrecognized document format."
-msgstr ""
-
-#: include/functions.php:5495
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
-msgstr ""
-
-#: include/functions.php:5501
-msgid "Could not load XML document."
-msgstr ""
-
-#: include/localized_schema.php:4
-msgid "Title or Content"
-msgstr "标题或内容"
-
-#: include/localized_schema.php:5
-msgid "Link"
-msgstr "链接"
-
-#: include/localized_schema.php:7
-msgid "Article Date"
-msgstr "文章发布时间"
-
-#: include/localized_schema.php:9
-msgid "Delete article"
-msgstr "删除文章"
-
-#: include/localized_schema.php:11
-msgid "Set starred"
-msgstr "加星标"
-
-#: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
-#: js/viewfeed.js:466
-msgid "Publish article"
-msgstr "发布文章"
-
-#: include/localized_schema.php:13
-msgid "Assign tags"
-msgstr "添加自定义标签"
-
-#: include/localized_schema.php:14 js/viewfeed.js:1935
-msgid "Assign label"
-msgstr "添加预定义标签"
-
-#: include/localized_schema.php:15
-msgid "Modify score"
-msgstr ""
-
-#: include/localized_schema.php:17
-msgid "General"
-msgstr ""
-
-#: include/localized_schema.php:18
-msgid "Interface"
-msgstr ""
-
-#: include/localized_schema.php:19
-msgid "Advanced"
-msgstr ""
-
-#: include/localized_schema.php:21
+#: 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 "
 msgid ""
 "This option is useful when you are reading several planet-type aggregators "
 "with partially colliding userbase. When disabled, it forces same posts from "


@@ -2227,13 +1475,13 @@ msgid ""
 msgstr "选择本项可让特殊区域和预定义标签中的文章标题以信息源顺序排列"
 
 #: include/localized_schema.php:29
 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 "自定义 CSS 样式"
 
 msgid "Customize CSS stylesheet to your liking"
 msgstr "自定义 CSS 样式"
 

+#: include/localized_schema.php:30
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr "使用信息源中定义的时间，而非本地导入的时间来排序。"
+

 #: include/localized_schema.php:31
 msgid "Click to register your SSL client certificate with tt-rss"
 msgstr "在 tt-rss 处注册您的 SSL 证书"
 #: include/localized_schema.php:31
 msgid "Click to register your SSL client certificate with tt-rss"
 msgstr "在 tt-rss 处注册您的 SSL 证书"


@@ -2244,7 +1492,8 @@ msgid "Uses UTC timezone"
 msgstr "用户所在时区"
 
 #: include/localized_schema.php:33
 msgstr "用户所在时区"
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr "清除多少天之前的文章？（0为不启用）"
 
 #: include/localized_schema.php:34
 msgstr "清除多少天之前的文章？（0为不启用）"
 
 #: include/localized_schema.php:34


@@ -2351,14 +1600,14 @@ msgstr "允许使用外部 API"
 msgid "User timezone"
 msgstr "用户所在时区"
 
 msgid "User timezone"
 msgstr "用户所在时区"
 

-#: include/localized_schema.php:60
-msgid "Sort headlines by feed date"
-msgstr "以信息源的日期排序"
-
-#: include/localized_schema.php:61 js/prefs.js:1780
+#: include/localized_schema.php:60 js/prefs.js:1865

 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 

+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"
+msgstr "以信息源的日期排序"
+

 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "使用 SSL 证书登录"
 #: include/localized_schema.php:62
 msgid "Login with an SSL certificate"
 msgstr "使用 SSL 证书登录"


@@ -2379,7 +1628,7 @@ msgstr "偏好："
 msgid "Use less traffic"
 msgstr "使用较少流量"
 
 msgid "Use less traffic"
 msgstr "使用较少流量"
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 


@@ -2387,15 +1636,19 @@ msgstr "将 %s 中的全部文章标记为已读？"
 msgid "Mark %d displayed articles as read?"
 msgstr "将显示的 %d 篇文章标记为已读？"
 
 msgid "Mark %d displayed articles as read?"
 msgstr "将显示的 %d 篇文章标记为已读？"
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr "在"
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr "取消星标"
 
 msgid "Unstar article"
 msgstr "取消星标"
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr "加星标"
 
 msgid "Star article"
 msgstr "加星标"
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr "取消发布文章"
 
 msgid "Unpublish article"
 msgstr "取消发布文章"
 


@@ -2427,11 +1680,11 @@ msgstr "没有未读的信息源。"
 msgid "Load more..."
 msgstr "加载更多……"
 
 msgid "Load more..."
 msgstr "加载更多……"
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr "本信息源中的最新文章（点击显示）"
 
 msgid "New articles available in this feed (click to show)"
 msgstr "本信息源中的最新文章（点击显示）"
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 msgid "Update feed"
 msgstr "更新信息源"
 
 msgid "Update feed"
 msgstr "更新信息源"
 


@@ -2443,124 +1696,136 @@ msgstr ""
 "您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览器信息。您的IP将被存入数"
 "据库。"
 
 "您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览器信息。您的IP将被存入数"
 "据库。"
 

-#: js/functions.js:647
+#: js/functions.js:618

 msgid "Date syntax appears to be correct:"
 msgstr "日期的语法正确："
 
 msgid "Date syntax appears to be correct:"
 msgstr "日期的语法正确："
 

-#: js/functions.js:650
+#: js/functions.js:621

 msgid "Date syntax is incorrect."
 msgstr "日期的语法错误。"
 
 msgid "Date syntax is incorrect."
 msgstr "日期的语法错误。"
 

-#: js/functions.js:777
+#: js/functions.js:748

 msgid "Remove stored feed icon?"
 msgstr "移除已保存的信息源图标？"
 
 msgid "Remove stored feed icon?"
 msgstr "移除已保存的信息源图标？"
 

-#: js/functions.js:809
+#: js/functions.js:780

 msgid "Please select an image file to upload."
 msgstr "请选择图片文件上传。"
 
 msgid "Please select an image file to upload."
 msgstr "请选择图片文件上传。"
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr "为本信息源上传一个新的图标？"
 
 msgid "Upload new icon for this feed?"
 msgstr "为本信息源上传一个新的图标？"
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr "请填写预定义标签的说明："
 
 msgid "Please enter label caption:"
 msgstr "请填写预定义标签的说明："
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：没有标题。"
 
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：没有标题。"
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr "订阅信息源"
 
 msgid "Subscribe to Feed"
 msgstr "订阅信息源"
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr "正在订阅信息源……"
-
-#: js/functions.js:901
+#: js/functions.js:873

 msgid "Subscribed to %s"
 msgstr "已订阅至 %s"
 
 msgid "Subscribed to %s"
 msgstr "已订阅至 %s"
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr "指定的 URL 无效。"
 
 msgid "Specified URL seems to be invalid."
 msgstr "指定的 URL 无效。"
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "指定的 URL 没有包含任何信息源。"
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "指定的 URL 没有包含任何信息源。"
 

-#: js/functions.js:945
-msgid "Couldn't download the specified URL."
+#: js/functions.js:917
+#, fuzzy
+msgid "Couldn't download the specified URL: %s"

 msgstr "无法下载指定的 URL 。"
 
 msgstr "无法下载指定的 URL 。"
 

-#: js/functions.js:948
+#: js/functions.js:921

 msgid "You are already subscribed to this feed."
 msgstr "您已经订阅过这个信息源啦。"
 
 msgid "You are already subscribed to this feed."
 msgstr "您已经订阅过这个信息源啦。"
 

-#: js/functions.js:980
+#: js/functions.js:1049
+#, fuzzy
+msgid "Edit rule"
+msgstr "编辑过滤器"
+
+#: js/functions.js:1049
+msgid "Add rule"
+msgstr ""
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Edit action"
+msgstr "信息源动作"
+
+#: js/functions.js:1075
+#, fuzzy
+msgid "Add action"
+msgstr "信息源动作"
+
+#: js/functions.js:1112

 msgid "Create Filter"
 msgstr "创建过滤器"
 
 msgid "Create Filter"
 msgstr "创建过滤器"
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
-msgstr "过滤器测试结果"
-
-#: js/functions.js:1068
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 msgid "Please enter category title:"
 msgstr "请填写类别名称："
 
 msgid "Please enter category title:"
 msgstr "请填写类别名称："
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 msgid "Edit Feed"
 msgstr "编辑信息源"
 
 msgid "Edit Feed"
 msgstr "编辑信息源"
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 msgid "More Feeds"
 msgstr "更多信息源"
 
 msgid "More Feeds"
 msgstr "更多信息源"
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 


@@ -2568,6 +1833,20 @@ msgstr "没有选中任何文章。"
 msgid "Forward article by email"
 msgstr "用邮件转发文章"
 
 msgid "Forward article by email"
 msgstr "用邮件转发文章"
 

+#: js/note_button.js:11
+msgid "Edit article note"
+msgstr "编辑文章注记"
+
+#: js/PrefFeedTree.js:47
+#, fuzzy
+msgid "Edit category"
+msgstr "编辑类别"
+
+#: js/PrefFeedTree.js:54
+#, fuzzy
+msgid "Remove category"
+msgstr "创建类别"
+

 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "反选"
 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr "反选"


@@ -2584,300 +1863,828 @@ msgstr "无法创建用户：没有指定登录名。"
 msgid "Edit Filter"
 msgstr "编辑过滤器"
 
 msgid "Edit Filter"
 msgstr "编辑过滤器"
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+#, fuzzy
+msgid "Remove filter?"

 msgstr "移除这个过滤器： %s ？"
 
 msgstr "移除这个过滤器： %s ？"
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr "移除选中的预定义标签？"
 
 msgid "Remove selected labels?"
 msgstr "移除选中的预定义标签？"
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 
 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr "移除选中的用户？默认管理员和您的帐户不会被移除。"
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr "移除选中的用户？默认管理员和您的帐户不会被移除。"
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr "没有选中任何用户。"
 
 msgid "No users are selected."
 msgstr "没有选中任何用户。"
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr "没有选中的过滤器。"
 
 msgid "No filters are selected."
 msgstr "没有选中的过滤器。"
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr "从选中的信息源取消订阅？"
 
 msgid "Unsubscribe from selected feeds?"
 msgstr "从选中的信息源取消订阅？"
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr "请仅选择一个信息源。"
 
 msgid "Please select only one feed."
 msgstr "请仅选择一个信息源。"
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr "清空选中的信息源当中所有未加星标的文章？"
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "清空选中的信息源当中所有未加星标的文章？"
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "文章保存几天？（填写0则采用默认设置）"
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "文章保存几天？（填写0则采用默认设置）"
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr "请填写登录信息。"
 
 msgid "Login field cannot be blank."
 msgstr "请填写登录信息。"
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr "请仅选择一个用户。"
 
 msgid "Please select only one user."
 msgstr "请仅选择一个用户。"
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr "重置选定用户的密码？"
 
 msgid "Reset password of selected user?"
 msgstr "重置选定用户的密码？"
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr "请仅选择一个过滤器。"
 
 msgid "Please select only one filter."
 msgstr "请仅选择一个过滤器。"
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+#, fuzzy
+msgid "Combine selected filters?"
+msgstr "移除选定的过滤器？"
+
+#: js/prefs.js:704

 msgid "Edit Multiple Feeds"
 msgstr "编辑多个信息源"
 
 msgid "Edit Multiple Feeds"
 msgstr "编辑多个信息源"
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr "保存对信息源的更改？"
 
 msgid "Save changes to selected feeds?"
 msgstr "保存对信息源的更改？"
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 msgid "OPML Import"
 msgstr "OPML 导入"
 
 msgid "OPML Import"
 msgstr "OPML 导入"
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 
 msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 msgid "Please choose the file first."
 msgstr ""
 
 msgid "Please choose the file first."
 msgstr ""
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 
 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 

-#: js/prefs.js:1152
-msgid "Feed Categories"
-msgstr "信息源类别"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."
+msgstr ""

 
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr "移除选中的类别？"
 
 msgid "Remove selected categories?"
 msgstr "移除选中的类别？"
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr "没有选中任何类别。"
 
 msgid "No categories are selected."
 msgstr "没有选中任何类别。"
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+#, fuzzy
+msgid "Category title:"
+msgstr "类别"
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr "最近没更新的信息源"
 
 msgid "Feeds without recent updates"
 msgstr "最近没更新的信息源"
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 msgid "Replace current OPML publishing address with a new one?"
 msgstr "将当前的 OPML 发布地址更改替换为新地址？"
 
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "将当前的 OPML 发布地址更改替换为新地址？"
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr "为选中信息源中的文章重置评分？"
 
 msgid "Rescore articles in selected feeds?"
 msgstr "为选中信息源中的文章重置评分？"
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "重置所有文章的评分？这可能将花费很长时间。"
 
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "重置所有文章的评分？这可能将花费很长时间。"
 

-#: js/prefs.js:1422
+#: js/prefs.js:1507

 msgid "Reset selected labels to default colors?"
 msgstr "将选中的可选标签重置为默认颜色？"
 
 msgid "Reset selected labels to default colors?"
 msgstr "将选中的可选标签重置为默认颜色？"
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr "偏好文件的设置"
 
 msgid "Settings Profiles"
 msgstr "偏好文件的设置"
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 msgid "No profiles are selected."
 msgstr "未选择偏好文件。"
 
 msgid "No profiles are selected."
 msgstr "未选择偏好文件。"
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 msgid "Activate selected profile?"
 msgstr "启用选中的偏好文件？"
 
 msgid "Activate selected profile?"
 msgstr "启用选中的偏好文件？"
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 msgid "Please choose a profile to activate."
 msgstr "请选择希望启用的偏好文件。"
 
 msgid "Please choose a profile to activate."
 msgstr "请选择希望启用的偏好文件。"
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 msgid "Link Instance"
 msgstr "链接实例"
 
 msgid "Link Instance"
 msgstr "链接实例"
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 msgid "Edit Instance"
 msgstr "编辑实例"
 
 msgid "Edit Instance"
 msgstr "编辑实例"
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 msgid "Remove selected instances?"
 msgstr "移除选中的实例？"
 
 msgid "Remove selected instances?"
 msgstr "移除选中的实例？"
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 msgid "No instances are selected."
 msgstr "未选中任何实例。"
 
 msgid "No instances are selected."
 msgstr "未选中任何实例。"
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 msgid "Please select only one instance."
 msgstr "请仅选择一个实例。"
 
 msgid "Please select only one instance."
 msgstr "请仅选择一个实例。"
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 msgid "Export Data"
 msgstr ""
 
 msgid "Export Data"
 msgstr ""
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 msgid "Data Import"
 msgstr ""
 
 msgid "Data Import"
 msgstr ""
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+msgid "Batch subscribe"
+msgstr ""
+
+#: js/prefs.js:2191

 msgid "Subscribing to feeds..."
 msgstr ""
 
 msgid "Subscribing to feeds..."
 msgstr ""
 

+#: js/prefs.js:2219
+#, fuzzy
+msgid "Update Tiny Tiny RSS"
+msgstr "返回 Tiny Tiny RSS"
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "通过 URL 分享文章"
 
 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr "通过 URL 分享文章"
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr "将所有文章标记为已读？"
 
 msgid "Mark all articles as read?"
 msgstr "将所有文章标记为已读？"
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 msgid "New version available!"
 msgstr "有可用的新版本啦！"
 
 msgid "New version available!"
 msgstr "有可用的新版本啦！"
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr "标记 %s 中所有可见的文章为已读？"
 
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记 %s 中所有可见的文章为已读？"
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 msgid "Delete %d selected articles in %s?"
 msgstr "删除 %s 中选择的 %d 篇文章？"
 
 msgid "Delete %d selected articles in %s?"
 msgstr "删除 %s 中选择的 %d 篇文章？"
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 msgid "Delete %d selected articles?"
 msgstr "删除选中的 %d 篇文章？"
 
 msgid "Delete %d selected articles?"
 msgstr "删除选中的 %d 篇文章？"
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 msgid "Archive %d selected articles in %s?"
 msgstr "将 %s 中的 %d 篇选中的文章存档？"
 
 msgid "Archive %d selected articles in %s?"
 msgstr "将 %s 中的 %d 篇选中的文章存档？"
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 msgid "Move %d archived articles back?"
 msgstr "将存档的 %d 篇文章移回原处？"
 
 msgid "Move %d archived articles back?"
 msgstr "将存档的 %d 篇文章移回原处？"
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr "将 %s 中选中的 %d 篇文章标记为已读？"
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr "将 %s 中选中的 %d 篇文章标记为已读？"
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 
 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr "未选中任何文章。"
 
 msgid "No article is selected."
 msgstr "未选中任何文章。"
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr "未找到需要标记的文章"
 
 msgid "No articles found to mark"
 msgstr "未找到需要标记的文章"
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr "将 %d 篇文章标记为已读？"
 
 msgid "Mark %d article(s) as read?"
 msgstr "将 %d 篇文章标记为已读？"
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 msgid "Loading..."
 msgstr "加载中……"
 
 msgid "Loading..."
 msgstr "加载中……"
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 msgid "Open original article"
 msgstr "打开原文"
 
 msgid "Open original article"
 msgstr "打开原文"
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 msgid "View in a tt-rss tab"
 msgstr "在 tt-rss 舌签中查看"
 
 msgid "View in a tt-rss tab"
 msgstr "在 tt-rss 舌签中查看"
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 msgid "Mark above as read"
 msgstr ""
 
 msgid "Mark above as read"
 msgstr ""
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 msgid "Mark below as read"
 msgstr ""
 
 msgid "Mark below as read"
 msgstr ""
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 msgid "Remove label"
 msgstr "移除预定义标签"
 
 msgid "Remove label"
 msgstr "移除预定义标签"
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 msgid "Playing..."
 msgstr "播放中……"
 
 msgid "Playing..."
 msgstr "播放中……"
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 msgid "Click to pause"
 msgstr "点击暂停"
 
 msgid "Click to pause"
 msgstr "点击暂停"
 

+#~ msgid "Twitter OAuth"
+#~ msgstr "Twitter OAuth 认证"
+
+#~ msgid "<li>Adding category <b>%s</b>.</li>"
+#~ msgstr "<li>添加类别：<b>%s</b>。</li>"
+
+#~ msgid "is already imported."
+#~ msgstr "已经导入过。"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Register with Twitter"
+#~ msgstr "通过 Twitter 注册"
+
+#~ msgid "Could not connect to Twitter. Refresh the page or try again later."
+#~ msgstr "无法连接 Twitter 。请刷新页面或过会儿重试。"
+
+#~ msgid "Congratulations! You have successfully registered with Twitter."
+#~ msgstr "恭喜！您已经成功通过 Twitter 注册。"
+
+#~ msgid "Register"
+#~ msgstr "注册"
+
+#~ msgid "Match"
+#~ msgstr "匹配"
+
+#~ msgid "before"
+#~ msgstr "之前"
+
+#~ msgid "after"
+#~ msgstr "之后"
+
+#~ msgid "Check it"
+#~ msgstr "检查一下"
+
+#~ msgid "on field"
+#~ msgstr "on field"
+
+#~ msgid "Perform Action"
+#~ msgstr "执行动作"
+
+#~ msgid "with parameters:"
+#~ msgstr "指定参数："
+
+#~ msgid "Options"
+#~ msgstr "选项"
+
+#~ msgid "Enabled"
+#~ msgstr "已启用"
+
+#~ msgid "Inverse match"
+#~ msgstr "反向匹配"
+
+#~ msgid "Test"
+#~ msgstr "测试"
+
+#~ msgid "Create"
+#~ msgstr "创建"
+
+#~ msgid "[Forwarded]"
+#~ msgstr "[已转发]"
+
+#~ msgid "Multiple articles"
+#~ msgstr "多个文章"
+
+#~ msgid "From:"
+#~ msgstr "发信人："
+
+#~ msgid "To:"
+#~ msgstr "收信人："
+
+#~ msgid "Subject:"
+#~ msgstr "主题："
+
+#~ msgid "Send e-mail"
+#~ msgstr "发送邮件"
+
+#~ msgid "Check to enable field"
+#~ msgstr "勾选以启用"
+
+#~ msgid "(%d feeds)"
+#~ msgstr "(%d 个信息源)"
+
+#~ msgid "Feed Title"
+#~ msgstr "信息源标题"
+
+#~ msgid "using"
+#~ msgstr "使用"
+
+#~ msgid "Article purging:"
+#~ msgstr "文章清理："
+
+#~ 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 信息"
+#~ "源除外。"
+
+#~ msgid "Hide from Popular feeds"
+#~ msgstr "从最受欢迎的信息源中隐藏"
+
+#~ msgid "Right-to-left content"
+#~ msgstr "右至左的内容"
+
+#~ msgid "Include in e-mail digest"
+#~ msgstr "包含电子邮件摘要"
+
+#~ msgid "Always display image attachments"
+#~ msgstr "始终显示图片附件"
+
+#~ msgid "Cache images locally"
+#~ msgstr "本地缓存图片"
+
+#~ msgid "Mark updated articles as unread"
+#~ msgstr "将已更新的文章标记为未读"
+
+#~ msgid "Mark posts as updated on content change"
+#~ msgstr "将内容更改过的文章标记为已更新状态"
+
+#~ msgid "Icon"
+#~ msgstr "图标"
+
+#~ msgid "Replace"
+#~ msgstr "替换"
+
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "重新订阅以推送更新"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
+
+#~ msgid "All done."
+#~ msgstr "全部完成。"
+
+#~ msgid "Subscribed to <b>%s</b>."
+#~ msgstr "订阅到 <b>%s</b>."
+
+#~ msgid "Could not subscribe to <b>%s</b>."
+#~ msgstr "无法订阅 <b>%s</b>。"
+
+#~ msgid "No feeds found in <b>%s</b>."
+#~ msgstr "在 <b>%s</b> 中没有找到信息源。"
+
+#~ msgid "Already subscribed to <b>%s</b>."
+#~ msgstr "已经订阅到 <b>%s</b>."
+
+#, fuzzy
+#~ msgid "Multiple feed URLs found."
+#~ msgstr "未找到信息源。"
+
+#~ msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#~ msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
+
+#~ msgid "Subscribe to selected feed"
+#~ msgstr "订阅选中的信息源"
+
+#~ msgid "Edit subscription options"
+#~ msgstr "编辑订阅选项"
+
+#~ msgid "Category <b>$%s</b> already exists in the database."
+#~ msgstr "数据库中已经有 <b>$%s</b> 这个类别。"
+
+#~ msgid "No feed categories defined."
+#~ msgstr "没有定义过的信息源类别。"
+
+#~ msgid "Remove selected categories"
+#~ msgstr "移除选定的类别"
+
+#~ msgid "Feeds with errors"
+#~ msgstr "有错误的信息源"
+
+#~ msgid "Inactive feeds"
+#~ msgstr "很久不活跃的信息源"
+
+#~ msgid "Edit selected feeds"
+#~ msgstr "编辑选定的信息源"
+
+#~ msgid "Reset sort order"
+#~ msgstr "重置排序"
+
+#, fuzzy
+#~ msgid "(Un)hide empty categories"
+#~ msgstr "编辑类别"
+
+#~ msgid "More actions..."
+#~ msgstr "更多动作"
+
+#~ msgid "Manual purge"
+#~ msgstr "手动清除"
+
+#~ msgid "Clear feed data"
+#~ msgstr "清空信息源数据"
+
+#~ msgid "Rescore articles"
+#~ msgstr "为文章重新评分"
+
+#~ msgid "<b>Hint:</b> you can drag feeds and categories around."
+#~ msgstr "<b>提示：</b> 您可以拖拽信息源和类别。"
+
+#~ msgid "OPML"
+#~ msgstr "OPML"
+
+#~ msgid "Filename:"
+#~ msgstr "文件名："
+
+#~ msgid "Include settings"
+#~ msgstr "包含设置"
+
+#~ msgid ""
+#~ "Your OPML can be published publicly and can be subscribed by anyone who "
+#~ "knows the URL below."
+#~ msgstr ""
+#~ "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
+
+#~ msgid "Import"
+#~ msgstr "导入"
+
+#~ msgid "Firefox integration"
+#~ msgstr "Firefox 集成"
+
+#~ msgid ""
+#~ "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking "
+#~ "the link below."
+#~ msgstr ""
+#~ "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
+
+#~ msgid "Click here to register this site as a feed reader."
+#~ msgstr "点击此处将本站注册为信息源阅读器。"
+
+#~ msgid "Subscribing using bookmarklet"
+#~ msgstr "通过书签订阅"
+
+#~ 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 ""
+#~ "将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链"
+#~ "接以订阅。"
+
+#~ msgid "Subscribe to %s in Tiny Tiny RSS?"
+#~ msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
+
+#~ msgid "Subscribe in Tiny Tiny RSS"
+#~ msgstr "在 Tiny Tiny RSS 中订阅"
+
+#~ msgid "Published articles and generated feeds"
+#~ msgstr "已发布的文章和生成的信息源"
+
+#~ msgid ""
+#~ "Published articles are exported as a public RSS feed and can be "
+#~ "subscribed by anyone who knows the URL specified below."
+#~ msgstr ""
+#~ "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行"
+#~ "订阅。"
+
+#~ msgid "Display URL"
+#~ msgstr "显示 URL"
+
+#~ msgid "Clear all generated URLs"
+#~ msgstr "清空所有生成的 URL"
+
+#~ msgid "Articles shared by URL"
+#~ msgstr "通过 URL 分享的文章"
+
+#~ msgid "You can disable all articles shared by unique URLs here."
+#~ msgstr "您可以取消所有通过 URL 分享的文章。"
+
+#~ msgid "Unshare all articles"
+#~ msgstr "取消所有分享"
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "Before you can update your Twitter feeds, you must register this instance "
+#~ "of Tiny Tiny RSS with Twitter.com."
+#~ msgstr ""
+#~ "更新 Twitter 信息源之前，您必须在 Twitter.com 上注册这个 Tiny Tiny RSS 的"
+#~ "实例。"
+
+#~ msgid ""
+#~ "You have been successfully registered with Twitter.com and should be able "
+#~ "to access your Twitter feeds."
+#~ msgstr "您已经成功在 Twitter.com 上注册并获取您的 Twitter 信息源的访问权。"
+
+#~ msgid "Register with Twitter.com"
+#~ msgstr "在 Twitter.com 上注册"
+
+#~ msgid "Clear stored credentials"
+#~ msgstr "清空保存的个人信息"
+
+#~ msgid "Articles matching this filter:"
+#~ msgstr "符合本过滤器条件的文章："
+
+#~ msgid "No articles matching this filter has been found."
+#~ msgstr "本过滤器下没有匹配到文章。"
+
+#~ msgid "Created filter <b>%s</b>"
+#~ msgstr "创建过滤器 <b>%s</b>"
+
+#~ msgid "Edit"
+#~ msgstr "编辑"
+
+#~ msgid "Your access level is insufficient to open this tab."
+#~ msgstr "您的访问级别不够，无法打开这个舌签。"
+
+#~ msgid "Link instance"
+#~ msgstr "链接实例"
+
+#~ 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 ""
+#~ "您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这"
+#~ "个 URL 为本实例建立链接："
+
+#~ msgid "Last connected"
+#~ msgstr "上次连接"
+
+#~ msgid "Stored feeds"
+#~ msgstr "保存的信息源"
+
+#~ msgid "Click to edit"
+#~ msgstr "点击进行编辑"
+
+#~ msgid "Caption"
+#~ msgstr "标题"
+
+#~ msgid "Colors"
+#~ msgstr "颜色"
+
+#~ msgid "Foreground:"
+#~ msgstr "前端："
+
+#~ msgid "Background:"
+#~ msgstr "背景："
+
+#~ msgid "Created label <b>%s</b>"
+#~ msgstr "创建预定义标签 <b>%s</b>"
+
+#~ msgid "Clear colors"
+#~ msgstr "清空颜色"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "请输入之前使用的密码。"
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "请输入一个新密码。"
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "两次输入的密码不一致。"
+
+#~ msgid "Password has been changed."
+#~ msgstr "密码更改成功。"
+
+#~ msgid "Old password is incorrect."
+#~ msgstr "原密码输入错误。"
+
+#~ msgid "The configuration was saved."
+#~ msgstr "设置已保存。"
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "未知选项： %s"
+
+#~ msgid "Your personal data has been saved."
+#~ msgstr "您的个人数据已保存。"
+
+#~ msgid "Full name"
+#~ msgstr "姓名"
+
+#~ msgid "E-mail"
+#~ msgstr "电子邮件"
+
+#~ msgid "Access level"
+#~ msgstr "访问级别"
+
+#~ msgid "Save data"
+#~ msgstr "保存信息"
+
+#~ msgid "Your password is at default value, please change it."
+#~ msgstr "您还在使用系统默认的密码，请修改。"
+
+#~ msgid "Old password"
+#~ msgstr "原密码"
+
+#~ msgid "New password"
+#~ msgstr "新密码"
+
+#~ msgid "Confirm password"
+#~ msgstr "确认密码"
+
+#~ msgid "Change password"
+#~ msgstr "更改密码"
+
+#~ msgid "Select theme"
+#~ msgstr "选择主题"
+
+#~ msgid "Customize"
+#~ msgstr "自定义"
+
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "No"
+#~ msgstr "否"
+
+#~ msgid "Clear"
+#~ msgstr "清空"
+
+#~ msgid "Save configuration"
+#~ msgstr "保存设置"
+
+#~ msgid "Manage profiles"
+#~ msgstr "管理偏好文件"
+
+#~ msgid "Reset to defaults"
+#~ msgstr "恢复到默认"
+
+#~ msgid "User details"
+#~ msgstr "用户详细资料"
+
+#~ msgid "User not found"
+#~ msgstr "未找到用户"
+
+#~ msgid "Registered"
+#~ msgstr "注册时间"
+
+#~ msgid "Last logged in"
+#~ msgstr "上次登录"
+
+#~ msgid "Subscribed feeds count"
+#~ msgstr "订阅的信息源数量"
+
+#~ msgid "Subscribed feeds"
+#~ msgstr "订阅的信息源"
+
+#~ msgid "User Editor"
+#~ msgstr "编辑用户信息"
+
+#~ msgid "Access level: "
+#~ msgstr "访问级别："
+
+#~ msgid "Change password to"
+#~ msgstr "更改密码为："
+
+#~ msgid "E-mail: "
+#~ msgstr "电子邮件："
+
+#~ msgid "Added user <b>%s</b> with password <b>%s</b>"
+#~ msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
+
+#~ msgid "Could not create user <b>%s</b>"
+#~ msgstr "无法创建用户 <b>%s</b> "
+
+#~ msgid "User <b>%s</b> already exists."
+#~ msgstr "用户 <b>%s</b> 已存在。"
+
+#~ msgid "Notifying <b>%s</b>."
+#~ msgstr "提醒 <b>%s</b>。"
+
+#~ msgid "[tt-rss] Password change notification"
+#~ msgstr "[tt-rss] 密码更换提醒"
+
+#~ msgid "Reset password"
+#~ msgstr "重置密码"
+
+#~ msgid "Access Level"
+#~ msgstr "访问级别"
+
+#~ msgid "Last login"
+#~ msgstr "最后登陆"
+
+#~ msgid "No users defined."
+#~ msgstr "没有定义用户。"
+
+#~ msgid "No matching users found."
+#~ msgstr "没有匹配的用户。"
+
+#~ msgid "Share by URL"
+#~ msgstr "通过 URL 分享"
+
+#~ msgid "You can share this article by the following unique URL:"
+#~ msgstr "您可以通过以下唯一 URL 分享本文："
+
+#~ msgid "Share on Twitter"
+#~ msgstr "在 Twitter 上分享"
+
+#~ msgid "Attachment:"
+#~ msgstr "附件："
+
+#~ msgid "Subscribing to feed..."
+#~ msgstr "正在订阅信息源……"
+
+#~ msgid "Filter Test Results"
+#~ msgstr "过滤器测试结果"
+
+#~ msgid "Feed Categories"
+#~ msgstr "信息源类别"
+

 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."
 #~ msgid ""
 #~ "When \"Mark as read\" button is clicked in toolbar, automatically open "
 #~ "next feed with unread articles."

diff --git a/messages.pot b/messages.pot
index ca1d2bc6a599ef2dde4bc6a3700c064ec87e0c2f..f46aac896521922e08f8a3247cb2fb3dc69d66be 100644 (file)
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-06-06 12:33+0400\n"
+"POT-Creation-Date: 2012-09-09 20:16+0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -17,95 +17,91 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: backend.php:82
+#: backend.php:81

 msgid "Use default"
 msgstr ""
 
 msgid "Use default"
 msgstr ""
 

-#: backend.php:83
+#: backend.php:82

 msgid "Never purge"
 msgstr ""
 
 msgid "Never purge"
 msgstr ""
 

-#: backend.php:84
+#: backend.php:83

 msgid "1 week old"
 msgstr ""
 
 msgid "1 week old"
 msgstr ""
 

-#: backend.php:85
+#: backend.php:84

 msgid "2 weeks old"
 msgstr ""
 
 msgid "2 weeks old"
 msgstr ""
 

-#: backend.php:86
+#: backend.php:85

 msgid "1 month old"
 msgstr ""
 
 msgid "1 month old"
 msgstr ""
 

-#: backend.php:87
+#: backend.php:86

 msgid "2 months old"
 msgstr ""
 
 msgid "2 months old"
 msgstr ""
 

-#: backend.php:88
+#: backend.php:87

 msgid "3 months old"
 msgstr ""
 
 msgid "3 months old"
 msgstr ""
 

-#: backend.php:91
+#: backend.php:90

 msgid "Default interval"
 msgstr ""
 
 msgid "Default interval"
 msgstr ""
 

-#: backend.php:92 backend.php:102
+#: backend.php:91 backend.php:101

 msgid "Disable updates"
 msgstr ""
 
 msgid "Disable updates"
 msgstr ""
 

-#: backend.php:93 backend.php:103
+#: backend.php:92 backend.php:102

 msgid "Each 15 minutes"
 msgstr ""
 
 msgid "Each 15 minutes"
 msgstr ""
 

-#: backend.php:94 backend.php:104
+#: backend.php:93 backend.php:103

 msgid "Each 30 minutes"
 msgstr ""
 
 msgid "Each 30 minutes"
 msgstr ""
 

-#: backend.php:95 backend.php:105
+#: backend.php:94 backend.php:104

 msgid "Hourly"
 msgstr ""
 
 msgid "Hourly"
 msgstr ""
 

-#: backend.php:96 backend.php:106
+#: backend.php:95 backend.php:105

 msgid "Each 4 hours"
 msgstr ""
 
 msgid "Each 4 hours"
 msgstr ""
 

-#: backend.php:97 backend.php:107
+#: backend.php:96 backend.php:106

 msgid "Each 12 hours"
 msgstr ""
 
 msgid "Each 12 hours"
 msgstr ""
 

-#: backend.php:98 backend.php:108
+#: backend.php:97 backend.php:107

 msgid "Daily"
 msgstr ""
 
 msgid "Daily"
 msgstr ""
 

-#: backend.php:99 backend.php:109
+#: backend.php:98 backend.php:108

 msgid "Weekly"
 msgstr ""
 
 msgid "Weekly"
 msgstr ""
 

-#: backend.php:112 index.php:163 classes/pref_prefs.php:362
+#: backend.php:111 index.php:180

 msgid "Default"
 msgstr ""
 
 msgid "Default"
 msgstr ""
 

-#: backend.php:113
+#: backend.php:112

 msgid "Magpie"
 msgstr ""
 
 msgid "Magpie"
 msgstr ""
 

-#: backend.php:114
+#: backend.php:113

 msgid "SimplePie"
 msgstr ""
 
 msgid "SimplePie"
 msgstr ""
 

-#: backend.php:115
-msgid "Twitter OAuth"
-msgstr ""
-
-#: backend.php:124 classes/pref_users.php:139
+#: backend.php:122

 msgid "User"
 msgstr ""
 
 msgid "User"
 msgstr ""
 

-#: backend.php:125
+#: backend.php:123

 msgid "Power User"
 msgstr ""
 
 msgid "Power User"
 msgstr ""
 

-#: backend.php:126
+#: backend.php:124

 msgid "Administrator"
 msgstr ""
 
 msgid "Administrator"
 msgstr ""
 


@@ -135,8 +131,7 @@ msgstr ""
 
 #: 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:286
 
 #: 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:286

-#: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1087
+#: register.php:371 register.php:381 register.php:393

 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 


@@ -205,22 +200,24 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr ""
 
 "\t\t\tbrowser settings."
 msgstr ""
 

-#: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1376
-#: classes/pref_filters.php:612 classes/pref_labels.php:296
-#: js/viewfeed.js:1112 js/viewfeed.js:1289
+#: digest.php:64 index.php:104 index.php:146 index.php:235 prefs.php:68
+#: classes/backend.php:6 js/viewfeed.js:1121 js/viewfeed.js:1302

 msgid "Loading, please wait..."
 msgstr ""
 
 msgid "Loading, please wait..."
 msgstr ""
 

-#: digest.php:72 index.php:97
+#: digest.php:72 index.php:114

 msgid "Hello,"
 msgstr ""
 
 msgid "Hello,"
 msgstr ""
 

-#: digest.php:75 index.php:107 mobile/mobile-functions.php:69
+#: digest.php:75 index.php:124 mobile/mobile-functions.php:69

 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr ""
 
 #: mobile/mobile-functions.php:244
 msgid "Logout"
 msgstr ""
 

+#: digest.php:78
+msgid "Regular version"
+msgstr ""
+

 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
 #: errors.php:9
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "


@@ -279,207 +276,152 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 

-#: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:278
+#: index.php:116 prefs.php:90 help/main.php:71 help/prefs.php:8

 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 

-#: index.php:103
+#: index.php:120

 msgid "Comments?"
 msgstr ""
 
 msgid "Comments?"
 msgstr ""
 

-#: index.php:113
+#: index.php:130

 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 

-#: index.php:136
+#: index.php:153

 msgid "News"
 msgstr ""
 
 msgid "News"
 msgstr ""
 

-#: index.php:145
+#: index.php:162

 msgid "Collapse feedlist"
 msgstr ""
 
 msgid "Collapse feedlist"
 msgstr ""
 

-#: index.php:148
+#: index.php:165

 msgid "Show articles"
 msgstr ""
 
 msgid "Show articles"
 msgstr ""
 

-#: index.php:151
+#: index.php:168

 msgid "Adaptive"
 msgstr ""
 
 msgid "Adaptive"
 msgstr ""
 

-#: index.php:152
+#: index.php:169

 msgid "All Articles"
 msgstr ""
 
 msgid "All Articles"
 msgstr ""
 

-#: index.php:153 classes/feeds.php:130
+#: index.php:170 classes/feeds.php:87

 msgid "Starred"
 msgstr ""
 
 msgid "Starred"
 msgstr ""
 

-#: index.php:154 classes/feeds.php:131
+#: index.php:171 classes/feeds.php:88

 msgid "Published"
 msgstr ""
 
 msgid "Published"
 msgstr ""
 

-#: index.php:155 classes/feeds.php:117 classes/feeds.php:129
+#: index.php:172 classes/feeds.php:74 classes/feeds.php:86

 msgid "Unread"
 msgstr ""
 
 msgid "Unread"
 msgstr ""
 

-#: index.php:156
+#: index.php:173

 msgid "Ignore Scoring"
 msgstr ""
 
 msgid "Ignore Scoring"
 msgstr ""
 

-#: index.php:157
+#: index.php:174

 msgid "Updated"
 msgstr ""
 
 msgid "Updated"
 msgstr ""
 

-#: index.php:160
+#: index.php:177

 msgid "Sort articles"
 msgstr ""
 
 msgid "Sort articles"
 msgstr ""
 

-#: index.php:164 classes/pref_filters.php:256
+#: index.php:181

 msgid "Date"
 msgstr ""
 
 msgid "Date"
 msgstr ""
 

-#: index.php:165 classes/dlg.php:375 include/localized_schema.php:3
+#: index.php:182 classes/dlg.php:388 include/localized_schema.php:3

 msgid "Title"
 msgstr ""
 
 msgid "Title"
 msgstr ""
 

-#: index.php:166
+#: index.php:183

 msgid "Score"
 msgstr ""
 
 msgid "Score"
 msgstr ""
 

-#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
+#: index.php:189
+msgid "With subcategories"
+msgstr ""
+
+#: index.php:193 update.php:28

 msgid "Update"
 msgstr ""
 
 msgid "Update"
 msgstr ""
 

-#: 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:128
-#: js/FeedTree.js:154
+#: index.php:197 index.php:212 classes/feeds.php:92 classes/feeds.php:107
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:136
+#: js/FeedTree.js:162

 msgid "Mark as read"
 msgstr ""
 
 msgid "Mark as read"
 msgstr ""
 

-#: index.php:181 classes/feeds.php:125
+#: index.php:203 classes/feeds.php:82

 msgid "Actions..."
 msgstr ""
 
 msgid "Actions..."
 msgstr ""
 

-#: index.php:183
+#: index.php:205

 msgid "Search..."
 msgstr ""
 
 msgid "Search..."
 msgstr ""
 

-#: index.php:184
+#: index.php:206

 msgid "Feed actions:"
 msgstr ""
 
 msgid "Feed actions:"
 msgstr ""
 

-#: index.php:185
+#: index.php:207

 msgid "Subscribe to feed..."
 msgstr ""
 
 msgid "Subscribe to feed..."
 msgstr ""
 

-#: index.php:186
+#: index.php:208

 msgid "Edit this feed..."
 msgstr ""
 
 msgid "Edit this feed..."
 msgstr ""
 

-#: index.php:187
+#: index.php:209

 msgid "Rescore feed"
 msgstr ""
 
 msgid "Rescore feed"
 msgstr ""
 

-#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
+#: index.php:210 js/PrefFeedTree.js:73

 msgid "Unsubscribe"
 msgstr ""
 
 msgid "Unsubscribe"
 msgstr ""
 

-#: index.php:189
+#: index.php:211

 msgid "All feeds:"
 msgstr ""
 
 msgid "All feeds:"
 msgstr ""
 

-#: index.php:191 help/main.php:54
+#: index.php:213 help/main.php:54

 msgid "(Un)hide read feeds"
 msgstr ""
 
 msgid "(Un)hide read feeds"
 msgstr ""
 

-#: index.php:192
+#: index.php:214

 msgid "Other actions:"
 msgstr ""
 
 msgid "Other actions:"
 msgstr ""
 

-#: index.php:193
+#: index.php:215

 msgid "Switch to digest..."
 msgstr ""
 
 msgid "Switch to digest..."
 msgstr ""
 

-#: index.php:194
+#: index.php:216

 msgid "Show tag cloud..."
 msgstr ""
 
 msgid "Show tag cloud..."
 msgstr ""
 

-#: index.php:195
+#: index.php:217

 msgid "Select by tags..."
 msgstr ""
 
 msgid "Select by tags..."
 msgstr ""
 

-#: index.php:196
+#: index.php:218

 msgid "Create label..."
 msgstr ""
 
 msgid "Create label..."
 msgstr ""
 

-#: index.php:197
+#: index.php:219

 msgid "Create filter..."
 msgstr ""
 
 msgid "Create filter..."
 msgstr ""
 

-#: index.php:198
+#: index.php:220

 msgid "Keyboard shortcuts help"
 msgstr ""
 
 msgid "Keyboard shortcuts help"
 msgstr ""
 

-#: opml.php:81
-#, php-format
-msgid "<li>Adding category <b>%s</b>.</li>"
-msgstr ""
-
-#: opml.php:103
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr ""
-
-#: opml.php:123
-#, php-format
-msgid "Adding label %s"
-msgstr ""
-
-#: opml.php:126
-#, php-format
-msgid "Duplicate label: %s"
-msgstr ""
-
-#: opml.php:180
-#, php-format
-msgid "Adding filter %s"
-msgstr ""
-
-#: opml.php:196
-#, php-format
-msgid "Duplicate filter %s"
-msgstr ""
-
-#: opml.php:241
-msgid "is already imported."
-msgstr ""
-
-#: opml.php:271
-msgid "OK"
-msgstr ""
-
-#: opml.php:280
-msgid "Error while parsing document."
-msgstr ""
-
-#: opml.php:284
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: opml.php:507 opml.php:512
-msgid "OPML Utility"
-msgstr ""
-
-#: opml.php:530
-msgid "Importing OPML..."
-msgstr ""
-
-#: opml.php:534
-msgid "Return to preferences"
-msgstr ""
-

 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr ""
 #: prefs.php:81
 msgid "Keyboard shortcuts"
 msgstr ""


@@ -488,18 +430,16 @@ msgstr ""
 msgid "Exit preferences"
 msgstr ""
 
 msgid "Exit preferences"
 msgstr ""
 

-#: prefs.php:93 classes/feeds.php:964 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
+#: prefs.php:93

 msgid "Feeds"
 msgstr ""
 
 msgid "Feeds"
 msgstr ""
 

-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
+#: prefs.php:96 help/prefs.php:11

 msgid "Filters"
 msgstr ""
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205
 msgid "Filters"
 msgstr ""
 
 #: prefs.php:99 help/prefs.php:12 mobile/mobile-functions.php:205

-#: classes/pref_labels.php:90 include/functions.php:1477
-#: include/functions.php:2045
+#: include/functions.php:1344 include/functions.php:1990

 msgid "Labels"
 msgstr ""
 
 msgid "Labels"
 msgstr ""
 


@@ -566,22 +506,6 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
 msgid "New user registrations are currently closed."
 msgstr ""
 

-#: twitter.php:98
-msgid "Register with Twitter"
-msgstr ""
-
-#: twitter.php:102
-msgid "Could not connect to Twitter. Refresh the page or try again later."
-msgstr ""
-
-#: twitter.php:106
-msgid "Congratulations! You have successfully registered with Twitter."
-msgstr ""
-
-#: twitter.php:118 classes/pref_prefs.php:469
-msgid "Register"
-msgstr ""
-

 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr ""
 #: help/main.php:1 help/prefs.php:1
 msgid "Keyboard Shortcuts"
 msgstr ""


@@ -654,11 +578,11 @@ msgstr ""
 msgid "Select article under mouse cursor"
 msgstr ""
 
 msgid "Select article under mouse cursor"
 msgstr ""
 

-#: help/main.php:33 help/prefs.php:26 classes/pref_labels.php:281
+#: help/main.php:33 help/prefs.php:26

 msgid "Create label"
 msgstr ""
 
 msgid "Create label"
 msgstr ""
 

-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
+#: help/main.php:34 help/prefs.php:25

 msgid "Create filter"
 msgstr ""
 
 msgid "Create filter"
 msgstr ""
 


@@ -698,11 +622,11 @@ msgstr ""
 msgid "Refresh active feed"
 msgstr ""
 
 msgid "Refresh active feed"
 msgstr ""
 

-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
+#: help/main.php:55 help/prefs.php:22

 msgid "Subscribe to feed"
 msgstr ""
 
 msgid "Subscribe to feed"
 msgstr ""
 

-#: help/main.php:56 js/FeedTree.js:134
+#: help/main.php:56 js/FeedTree.js:142 js/PrefFeedTree.js:67

 msgid "Edit feed"
 msgstr ""
 
 msgid "Edit feed"
 msgstr ""
 


@@ -726,19 +650,19 @@ msgstr ""
 msgid "Go to..."
 msgstr ""
 
 msgid "Go to..."
 msgstr ""
 

-#: help/main.php:66 include/functions.php:2097
+#: help/main.php:66 include/functions.php:2047

 msgid "All articles"
 msgstr ""
 
 msgid "All articles"
 msgstr ""
 

-#: help/main.php:67 include/functions.php:2095
+#: help/main.php:67 include/functions.php:2045

 msgid "Fresh articles"
 msgstr ""
 
 msgid "Fresh articles"
 msgstr ""
 

-#: help/main.php:68 include/functions.php:2091
+#: help/main.php:68 include/functions.php:2041

 msgid "Starred articles"
 msgstr ""
 
 msgid "Starred articles"
 msgstr ""
 

-#: help/main.php:69 include/functions.php:2093
+#: help/main.php:69 include/functions.php:2043

 msgid "Published articles"
 msgstr ""
 
 msgid "Published articles"
 msgstr ""
 


@@ -774,7 +698,7 @@ msgstr ""
 msgid "Edit feed categories"
 msgstr ""
 
 msgid "Edit feed categories"
 msgstr ""
 

-#: help/prefs.php:27 classes/pref_users.php:385
+#: help/prefs.php:27

 msgid "Create user"
 msgstr ""
 
 msgid "Create user"
 msgstr ""
 


@@ -800,6 +724,10 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 

+#: mobile/login_form.php:50
+msgid "Open regular version"
+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/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


@@ -807,8 +735,8 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: mobile/mobile-functions.php:178 include/functions.php:1475
-#: include/functions.php:2043
+#: mobile/mobile-functions.php:178 include/functions.php:1342
+#: include/functions.php:1988

 msgid "Special"
 msgstr ""
 
 msgid "Special"
 msgstr ""
 


@@ -858,13 +786,11 @@ msgstr ""
 msgid "Prepare data"
 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:624
-#: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
-#: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
-#: classes/pref_filters.php:546 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3493
+#: classes/dlg.php:30 classes/dlg.php:59 classes/dlg.php:178
+#: classes/dlg.php:201 classes/dlg.php:238 classes/dlg.php:526
+#: classes/dlg.php:597 classes/dlg.php:696 classes/dlg.php:729
+#: classes/dlg.php:760 classes/dlg.php:793 classes/dlg.php:894
+#: include/functions.php:3515

 msgid "Close this window"
 msgstr ""
 
 msgid "Close this window"
 msgstr ""
 


@@ -874,300 +800,246 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
 "preferences to see your new data."
 msgstr ""
 

-#: classes/dlg.php:87
+#: classes/dlg.php:71 classes/dlg.php:471 classes/dlg.php:540
+msgid "Select"
+msgstr ""
+
+#: classes/dlg.php:74 classes/dlg.php:474 classes/dlg.php:543
+#: classes/feeds.php:73
+msgid "All"
+msgstr ""
+
+#: classes/dlg.php:76 classes/dlg.php:476 classes/dlg.php:545
+#: classes/feeds.php:76
+msgid "None"
+msgstr ""
+
+#: classes/dlg.php:85

 msgid "Create profile"
 msgstr ""
 
 msgid "Create profile"
 msgstr ""
 

-#: classes/dlg.php:107 classes/dlg.php:136
+#: classes/dlg.php:108 classes/dlg.php:138

 msgid "(active)"
 msgstr ""
 
 msgid "(active)"
 msgstr ""
 

-#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
-#: include/login_form.php:151
+#: classes/dlg.php:114 classes/rpc.php:147 include/login_form.php:151

 msgid "Default profile"
 msgstr ""
 
 msgid "Default profile"
 msgstr ""
 

-#: classes/dlg.php:170
+#: classes/dlg.php:172

 msgid "Remove selected profiles"
 msgstr ""
 
 msgid "Remove selected profiles"
 msgstr ""
 

-#: classes/dlg.php:172
+#: classes/dlg.php:174

 msgid "Activate profile"
 msgstr ""
 
 msgid "Activate profile"
 msgstr ""
 

-#: classes/dlg.php:182
+#: classes/dlg.php:184

 msgid "Public OPML URL"
 msgstr ""
 
 msgid "Public OPML URL"
 msgstr ""
 

-#: classes/dlg.php:187
+#: classes/dlg.php:189

 msgid "Your Public OPML URL is:"
 msgstr ""
 
 msgid "Your Public OPML URL is:"
 msgstr ""
 

-#: classes/dlg.php:196 classes/dlg.php:842
+#: classes/dlg.php:198 classes/dlg.php:757

 msgid "Generate new URL"
 msgstr ""
 
 msgid "Generate new URL"
 msgstr ""
 

-#: classes/dlg.php:208
+#: classes/dlg.php:210

 msgid "Notice"
 msgstr ""
 
 msgid "Notice"
 msgstr ""
 

-#: classes/dlg.php:214
+#: classes/dlg.php:216

 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 ""
 
 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 ""
 

-#: classes/dlg.php:218 classes/dlg.php:227
+#: classes/dlg.php:220 classes/dlg.php:229

 msgid "Last update:"
 msgstr ""
 
 msgid "Last update:"
 msgstr ""
 

-#: classes/dlg.php:223
+#: classes/dlg.php:225

 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 ""
 
 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 ""
 

-#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
+#: classes/dlg.php:250

 msgid "Feed"
 msgstr ""
 
 msgid "Feed"
 msgstr ""
 

-#: classes/dlg.php:252 classes/feeds.php:621 classes/pref_feeds.php:319
-#: include/functions.php:3454
+#: classes/dlg.php:259 classes/feeds.php:581 include/functions.php:3451

 msgid "Feed URL"
 msgstr ""
 
 msgid "Feed URL"
 msgstr ""
 

-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
-#: classes/pref_feeds.php:579
+#: classes/dlg.php:265 classes/dlg.php:908

 msgid "Place in category:"
 msgstr ""
 
 msgid "Place in category:"
 msgstr ""
 

-#: classes/dlg.php:266
+#: classes/dlg.php:273

 msgid "Available feeds"
 msgstr ""
 
 msgid "Available feeds"
 msgstr ""
 

-#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
-#: classes/pref_users.php:155
+#: classes/dlg.php:285

 msgid "Authentication"
 msgstr ""
 
 msgid "Authentication"
 msgstr ""
 

-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626 classes/pref_users.php:437
+#: classes/dlg.php:289 classes/dlg.php:922

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 

-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
-#: classes/pref_feeds.php:632
+#: classes/dlg.php:292 classes/dlg.php:925

 msgid "Password"
 msgstr ""
 
 msgid "Password"
 msgstr ""
 

-#: classes/dlg.php:288 classes/dlg.php:1009
+#: classes/dlg.php:295 classes/dlg.php:928

 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 
 msgid "OAuth will be used automatically for Twitter feeds."
 msgstr ""
 

-#: classes/dlg.php:296
+#: classes/dlg.php:303

 msgid "This feed requires authentication."
 msgstr ""
 
 msgid "This feed requires authentication."
 msgstr ""
 

-#: classes/dlg.php:301 classes/dlg.php:350 classes/dlg.php:1025
+#: classes/dlg.php:308 classes/dlg.php:363 classes/dlg.php:944

 msgid "Subscribe"
 msgstr ""
 
 msgid "Subscribe"
 msgstr ""
 

-#: classes/dlg.php:302
+#: classes/dlg.php:311

 msgid "More feeds"
 msgstr ""
 
 msgid "More feeds"
 msgstr ""
 

-#: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
-#: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
-#: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:534
-#: classes/pref_feeds.php:691 classes/pref_filters.php:390
-#: classes/pref_instances.php:103 classes/pref_labels.php:81
-#: classes/pref_users.php:194
+#: classes/dlg.php:314 classes/dlg.php:365 classes/dlg.php:443
+#: classes/dlg.php:629 classes/dlg.php:822 classes/dlg.php:872
+#: classes/dlg.php:945

 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 

-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
-#: classes/pref_users.php:367 js/tt-rss.js:232
+#: classes/dlg.php:335 classes/dlg.php:442 js/tt-rss.js:238

 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: classes/dlg.php:326
+#: classes/dlg.php:339

 msgid "Popular feeds"
 msgstr ""
 
 msgid "Popular feeds"
 msgstr ""
 

-#: classes/dlg.php:327
+#: classes/dlg.php:340

 msgid "Feed archive"
 msgstr ""
 
 msgid "Feed archive"
 msgstr ""
 

-#: classes/dlg.php:330
+#: classes/dlg.php:343

 msgid "limit:"
 msgstr ""
 
 msgid "limit:"
 msgstr ""
 

-#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
-#: classes/pref_filters.php:599 classes/pref_instances.php:149
-#: classes/pref_labels.php:284 classes/pref_users.php:393
+#: classes/dlg.php:364

 msgid "Remove"
 msgstr ""
 
 msgid "Remove"
 msgstr ""
 

-#: classes/dlg.php:362
+#: classes/dlg.php:375

 msgid "Look for"
 msgstr ""
 
 msgid "Look for"
 msgstr ""
 

-#: classes/dlg.php:372
+#: classes/dlg.php:385

 msgid "match on"
 msgstr ""
 
 msgid "match on"
 msgstr ""
 

-#: classes/dlg.php:376 include/localized_schema.php:6
+#: classes/dlg.php:389 include/localized_schema.php:6

 msgid "Content"
 msgstr ""
 
 msgid "Content"
 msgstr ""
 

-#: classes/dlg.php:377
+#: classes/dlg.php:390

 msgid "Title or content"
 msgstr ""
 
 msgid "Title or content"
 msgstr ""
 

-#: classes/dlg.php:388
+#: classes/dlg.php:401

 msgid "Limit search to:"
 msgstr ""
 
 msgid "Limit search to:"
 msgstr ""
 

-#: classes/dlg.php:391 include/functions.php:1978
+#: classes/dlg.php:404 include/functions.php:1840

 msgid "All feeds"
 msgstr ""
 
 msgid "All feeds"
 msgstr ""
 

-#: classes/dlg.php:404
+#: classes/dlg.php:417

 msgid "This feed"
 msgstr ""
 
 msgid "This feed"
 msgstr ""
 

-#: classes/dlg.php:452 classes/pref_filters.php:247
-msgid "Match"
-msgstr ""
-
-#: classes/dlg.php:459 classes/pref_filters.php:259
-msgid "before"
-msgstr ""
-
-#: classes/dlg.php:460 classes/pref_filters.php:260
-msgid "after"
-msgstr ""
-
-#: classes/dlg.php:475 classes/pref_filters.php:273
-msgid "Check it"
-msgstr ""
-
-#: classes/dlg.php:478 classes/pref_filters.php:276
-msgid "on field"
-msgstr ""
-
-#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
-#: js/PrefFilterTree.js:29
-msgid "in"
-msgstr ""
-
-#: classes/dlg.php:498 classes/pref_filters.php:301
-msgid "Perform Action"
-msgstr ""
-
-#: classes/dlg.php:515 classes/pref_filters.php:321
-msgid "with parameters:"
-msgstr ""
-
-#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
-#: classes/pref_filters.php:341 classes/pref_users.php:177
-msgid "Options"
-msgstr ""
-
-#: classes/dlg.php:533 classes/pref_filters.php:353
-msgid "Enabled"
-msgstr ""
-
-#: classes/dlg.php:536 classes/pref_filters.php:362
-msgid "Inverse match"
-msgstr ""
-
-#: classes/dlg.php:539 classes/pref_filters.php:371
-msgid "Apply to category"
-msgstr ""
-
-#: classes/dlg.php:547 classes/pref_filters.php:384
-msgid "Test"
-msgstr ""
-
-#: classes/dlg.php:550
-msgid "Create"
-msgstr ""
-
-#: classes/dlg.php:578
+#: classes/dlg.php:467

 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 
 msgid ""
 "These feeds have not been updated with new content for 3 months (oldest "
 "first):"
 msgstr ""
 

-#: classes/dlg.php:602 classes/dlg.php:658
+#: classes/dlg.php:504 classes/dlg.php:573

 msgid "Click to edit feed"
 msgstr ""
 
 msgid "Click to edit feed"
 msgstr ""
 

-#: classes/dlg.php:620 classes/dlg.php:678
+#: classes/dlg.php:522 classes/dlg.php:593

 msgid "Unsubscribe from selected feeds"
 msgstr ""
 
 msgid "Unsubscribe from selected feeds"
 msgstr ""
 

-#: classes/dlg.php:631
+#: classes/dlg.php:533

 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 

-#: classes/dlg.php:689
+#: classes/dlg.php:604

 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 

-#: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
-#: classes/pref_filters.php:387 classes/pref_instances.php:100
-#: classes/pref_labels.php:79 classes/pref_users.php:192
+#: classes/dlg.php:627 classes/dlg.php:820

 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 

-#: classes/dlg.php:720
+#: classes/dlg.php:635

 msgid "Tag Cloud"
 msgstr ""
 
 msgid "Tag Cloud"
 msgstr ""
 

-#: classes/dlg.php:789
+#: classes/dlg.php:704

 msgid "Select item(s) by tags"
 msgstr ""
 
 msgid "Select item(s) by tags"
 msgstr ""
 

-#: classes/dlg.php:792
+#: classes/dlg.php:707

 msgid "Match:"
 msgstr ""
 
 msgid "Match:"
 msgstr ""
 

-#: classes/dlg.php:797
+#: classes/dlg.php:712

 msgid "Which Tags?"
 msgstr ""
 
 msgid "Which Tags?"
 msgstr ""
 

-#: classes/dlg.php:810
+#: classes/dlg.php:725

 msgid "Display entries"
 msgstr ""
 
 msgid "Display entries"
 msgstr ""
 

-#: classes/dlg.php:822 classes/feeds.php:152
+#: classes/dlg.php:737 classes/feeds.php:109

 msgid "View as RSS"
 msgstr ""
 
 msgid "View as RSS"
 msgstr ""
 

-#: classes/dlg.php:833
+#: classes/dlg.php:748

 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 
 msgid "You can view this feed as RSS using the following URL:"
 msgstr ""
 

-#: classes/dlg.php:861
+#: classes/dlg.php:776

 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr ""
 

-#: classes/dlg.php:871 classes/pref_users.php:389
+#: classes/dlg.php:784
+msgid ""
+"You can update using built-in updater in the Preferences or by using update."
+"php"
+msgstr ""
+
+#: classes/dlg.php:788

 msgid "Details"
 msgstr ""
 
 msgid "Details"
 msgstr ""
 

-#: classes/dlg.php:873
+#: classes/dlg.php:790

 msgid "Download"
 msgstr ""
 
 msgid "Download"
 msgstr ""
 

-#: classes/dlg.php:886
+#: classes/dlg.php:804

 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "
 #, php-format
 msgid ""
 "You can override colors, fonts and layout of your currently selected theme "


@@ -1175,926 +1047,311 @@ msgid ""
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 
 "\" href=\"%s\">This file</a> can be used as a baseline."
 msgstr ""
 

-#: classes/dlg.php:912 classes/pref_instances.php:59
+#: classes/dlg.php:831

 msgid "Instance"
 msgstr ""
 
 msgid "Instance"
 msgstr ""
 

-#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
-#: classes/pref_instances.php:67
+#: classes/dlg.php:837

 msgid "URL:"
 msgstr ""
 
 msgid "URL:"
 msgstr ""
 

-#: classes/dlg.php:921 classes/pref_instances.php:70
-#: classes/pref_instances.php:167
+#: classes/dlg.php:840

 msgid "Instance URL"
 msgstr ""
 
 msgid "Instance URL"
 msgstr ""
 

-#: classes/dlg.php:931 classes/pref_instances.php:81
+#: classes/dlg.php:850

 msgid "Access key:"
 msgstr ""
 
 msgid "Access key:"
 msgstr ""
 

-#: classes/dlg.php:934 classes/pref_instances.php:84
-#: classes/pref_instances.php:168
+#: classes/dlg.php:853

 msgid "Access key"
 msgstr ""
 
 msgid "Access key"
 msgstr ""
 

-#: classes/dlg.php:938 classes/pref_instances.php:88
+#: classes/dlg.php:857

 msgid "Use one access key for both linked instances."
 msgstr ""
 
 msgid "Use one access key for both linked instances."
 msgstr ""
 

-#: classes/dlg.php:946 classes/pref_instances.php:96
+#: classes/dlg.php:865

 msgid "Generate new key"
 msgstr ""
 
 msgid "Generate new key"
 msgstr ""
 

-#: classes/dlg.php:950
+#: classes/dlg.php:869

 msgid "Create link"
 msgstr ""
 
 msgid "Create link"
 msgstr ""
 

-#: classes/dlg.php:968
+#: classes/dlg.php:887

 #, 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 ""
 
 #, 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/dlg.php:986
+#: classes/dlg.php:905

 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 

-#: classes/dlg.php:995
+#: classes/dlg.php:914

 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 

-#: classes/dlg.php:1018
+#: classes/dlg.php:937

 msgid "Feeds require authentication."
 msgstr ""
 
 msgid "Feeds require authentication."
 msgstr ""
 

-#: classes/feeds.php:94 include/functions.php:3469
+#: classes/feeds.php:51 include/functions.php:3466

 msgid "Visit the website"
 msgstr ""
 
 msgid "Visit the website"
 msgstr ""
 

-#: classes/feeds.php:107
+#: classes/feeds.php:64

 msgid "View as RSS feed"
 msgstr ""
 
 msgid "View as RSS feed"
 msgstr ""
 

-#: classes/feeds.php:115
+#: classes/feeds.php:72

 msgid "Select:"
 msgstr ""
 
 msgid "Select:"
 msgstr ""
 

-#: classes/feeds.php:116 classes/pref_feeds.php:1313
-#: classes/pref_filters.php:587 classes/pref_instances.php:142
-#: classes/pref_labels.php:275 classes/pref_users.php:380
-msgid "All"
-msgstr ""
-
-#: classes/feeds.php:118
+#: classes/feeds.php:75

 msgid "Invert"
 msgstr ""
 
 msgid "Invert"
 msgstr ""
 

-#: classes/feeds.php:119 classes/pref_feeds.php:1315
-#: classes/pref_filters.php:589 classes/pref_instances.php:144
-#: classes/pref_labels.php:277 classes/pref_users.php:382
-msgid "None"
-msgstr ""
-
-#: classes/feeds.php:127
+#: classes/feeds.php:84

 msgid "Selection toggle:"
 msgstr ""
 
 msgid "Selection toggle:"
 msgstr ""
 

-#: classes/feeds.php:133
+#: classes/feeds.php:90

 msgid "Selection:"
 msgstr ""
 
 msgid "Selection:"
 msgstr ""
 

-#: classes/feeds.php:138
+#: classes/feeds.php:95

 msgid "Archive"
 msgstr ""
 
 msgid "Archive"
 msgstr ""
 

-#: classes/feeds.php:140
+#: classes/feeds.php:97

 msgid "Move back"
 msgstr ""
 
 msgid "Move back"
 msgstr ""
 

-#: classes/feeds.php:141
+#: classes/feeds.php:98

 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 

-#: classes/feeds.php:145 classes/mail_button.php:7
+#: classes/feeds.php:102

 msgid "Forward by email"
 msgstr ""
 
 msgid "Forward by email"
 msgstr ""
 

-#: classes/feeds.php:148
+#: classes/feeds.php:105

 msgid "Feed:"
 msgstr ""
 
 msgid "Feed:"
 msgstr ""
 

-#: classes/feeds.php:196 classes/feeds.php:1020
+#: classes/feeds.php:153 classes/feeds.php:793

 msgid "Feed not found."
 msgstr ""
 
 msgid "Feed not found."
 msgstr ""
 

-#: classes/feeds.php:429 classes/feeds.php:511
+#: classes/feeds.php:386 classes/feeds.php:468

 msgid "mark as read"
 msgstr ""
 
 msgid "mark as read"
 msgstr ""
 

-#: classes/feeds.php:608 include/functions.php:3441
+#: classes/feeds.php:568 include/functions.php:3438

 msgid "Originally from:"
 msgstr ""
 
 msgid "Originally from:"
 msgstr ""
 

-#: classes/feeds.php:668 include/functions.php:3398
+#: classes/feeds.php:628 include/functions.php:3395

 msgid "Edit tags for this article"
 msgstr ""
 
 msgid "Edit tags for this article"
 msgstr ""
 

-#: classes/feeds.php:695 include/functions.php:3408
+#: classes/feeds.php:655 include/functions.php:3405

 msgid "Open article in new tab"
 msgstr ""
 
 msgid "Open article in new tab"
 msgstr ""
 

-#: classes/feeds.php:706 include/functions.php:3424
+#: classes/feeds.php:666 include/functions.php:3421

 msgid "Close article"
 msgstr ""
 
 msgid "Close article"
 msgstr ""
 

-#: classes/feeds.php:727
+#: classes/feeds.php:687

 msgid "No unread articles found to display."
 msgstr ""
 
 msgid "No unread articles found to display."
 msgstr ""
 

-#: classes/feeds.php:730
+#: classes/feeds.php:690

 msgid "No updated articles found to display."
 msgstr ""
 
 msgid "No updated articles found to display."
 msgstr ""
 

-#: classes/feeds.php:733
+#: classes/feeds.php:693

 msgid "No starred articles found to display."
 msgstr ""
 
 msgid "No starred articles found to display."
 msgstr ""
 

-#: classes/feeds.php:737
+#: classes/feeds.php:697

 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
 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:739
+#: classes/feeds.php:699

 msgid "No articles found to display."
 msgstr ""
 
 msgid "No articles found to display."
 msgstr ""
 

-#: classes/feeds.php:754 include/functions.php:4601
+#: classes/feeds.php:714 include/functions.php:4628

 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 

-#: classes/feeds.php:764 include/functions.php:4611
+#: classes/feeds.php:724 include/functions.php:4638

 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 

-#: classes/feeds.php:905 classes/feeds.php:914 classes/pref_feeds.php:95
-#: classes/pref_filters.php:191 include/functions.php:2010
-#: include/functions.php:2053 include/functions.php:2900
-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:12
-msgid "Check to enable field"
-msgstr ""
-
-#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
-#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
-#, php-format
-msgid "(%d feeds)"
-msgstr ""
-
-#: classes/pref_feeds.php:306
-msgid "Feed Title"
-msgstr ""
-
-#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
-msgid "using"
-msgstr ""
-
-#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
-msgid "Article purging:"
-msgstr ""
-
-#: classes/pref_feeds.php:395
-msgid ""
-"<b>Hint:</b> you need to fill in your login information if your feed "
-"requires authentication, except for Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
-msgid "Hide from Popular feeds"
-msgstr ""
-
-#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
-msgid "Right-to-left content"
-msgstr ""
-
-#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
-msgid "Include in e-mail digest"
-msgstr ""
-
-#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
-msgid "Always display image attachments"
-msgstr ""
-
-#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
-msgid "Cache images locally"
-msgstr ""
-
-#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
-msgid "Mark updated articles as unread"
-msgstr ""
-
-#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
-msgid "Mark posts as updated on content change"
-msgstr ""
-
-#: classes/pref_feeds.php:491
-msgid "Icon"
-msgstr ""
-
-#: classes/pref_feeds.php:505
-msgid "Replace"
-msgstr ""
-
-#: classes/pref_feeds.php:524
-msgid "Resubscribe to push updates"
-msgstr ""
-
-#: classes/pref_feeds.php:531
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
-msgid "All done."
-msgstr ""
-
-#: classes/pref_feeds.php:1018
-#, php-format
-msgid "Subscribed to <b>%s</b>."
-msgstr ""
-
-#: classes/pref_feeds.php:1021
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
-msgstr ""
-
-#: classes/pref_feeds.php:1024
-#, php-format
-msgid "No feeds found in <b>%s</b>."
-msgstr ""
-
-#: classes/pref_feeds.php:1027
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
-msgstr ""
-
-#: classes/pref_feeds.php:1030
-msgid "Multiple feed URLs found."
-msgstr ""
-
-#: classes/pref_feeds.php:1035
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
-msgstr ""
-
-#: classes/pref_feeds.php:1057
-msgid "Subscribe to selected feed"
-msgstr ""
-
-#: classes/pref_feeds.php:1082
-msgid "Edit subscription options"
-msgstr ""
-
-#: classes/pref_feeds.php:1161
-#, php-format
-msgid "Category <b>$%s</b> already exists in the database."
-msgstr ""
-
-#: classes/pref_feeds.php:1177
-msgid "Create category"
-msgstr ""
-
-#: classes/pref_feeds.php:1237
-msgid "No feed categories defined."
-msgstr ""
-
-#: classes/pref_feeds.php:1243
-msgid "Remove selected categories"
-msgstr ""
-
-#: classes/pref_feeds.php:1267
-msgid "Feeds with errors"
-msgstr ""
-
-#: classes/pref_feeds.php:1287
-msgid "Inactive feeds"
-msgstr ""
-
-#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
-#: classes/pref_instances.php:139 classes/pref_labels.php:272
-#: classes/pref_users.php:377
-msgid "Select"
-msgstr ""
-
-#: classes/pref_feeds.php:1324
-msgid "Edit selected feeds"
-msgstr ""
-
-#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
-msgid "Reset sort order"
-msgstr ""
-
-#: classes/pref_feeds.php:1328 js/prefs.js:2100
-msgid "Batch subscribe"
-msgstr ""
-
-#: classes/pref_feeds.php:1333
-msgid "Categories"
-msgstr ""
-
-#: classes/pref_feeds.php:1336
-msgid "Edit categories"
-msgstr ""
-
-#: classes/pref_feeds.php:1338
-msgid "(Un)hide empty categories"
-msgstr ""
-
-#: classes/pref_feeds.php:1354
-msgid "More actions..."
-msgstr ""
-
-#: classes/pref_feeds.php:1358
-msgid "Manual purge"
-msgstr ""
-
-#: classes/pref_feeds.php:1362
-msgid "Clear feed data"
-msgstr ""
-
-#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
-msgid "Rescore articles"
-msgstr ""
-
-#: classes/pref_feeds.php:1405
-msgid "<b>Hint:</b> you can drag feeds and categories around."
-msgstr ""
-
-#: classes/pref_feeds.php:1413
-msgid "Import and export"
-msgstr ""
-
-#: classes/pref_feeds.php:1415
-msgid "OPML"
-msgstr ""
-
-#: classes/pref_feeds.php:1417
-msgid ""
-"Using OPML you can export and import your feeds, filters, labels and Tiny "
-"Tiny RSS settings."
-msgstr ""
-
-#: classes/pref_feeds.php:1419
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref_feeds.php:1432
-msgid "Import my OPML"
-msgstr ""
-
-#: classes/pref_feeds.php:1436
-msgid "Filename:"
-msgstr ""
-
-#: classes/pref_feeds.php:1438
-msgid "Include settings"
-msgstr ""
-
-#: classes/pref_feeds.php:1442
-msgid "Export OPML"
-msgstr ""
-
-#: classes/pref_feeds.php:1446
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: classes/pref_feeds.php:1448
-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:1451
-msgid "Display published OPML URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1454
-msgid "Article archive"
-msgstr ""
-
-#: classes/pref_feeds.php:1456
-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:1459
-msgid "Export my data"
-msgstr ""
-
-#: classes/pref_feeds.php:1474
-msgid "Import"
-msgstr ""
-
-#: classes/pref_feeds.php:1481
-msgid "Firefox integration"
-msgstr ""
-
-#: classes/pref_feeds.php:1483
-msgid ""
-"This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
-"link below."
-msgstr ""
-
-#: classes/pref_feeds.php:1490
-msgid "Click here to register this site as a feed reader."
-msgstr ""
-
-#: classes/pref_feeds.php:1498
-msgid "Subscribing using bookmarklet"
-msgstr ""
-
-#: classes/pref_feeds.php:1500
-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 ""
-
-#: classes/pref_feeds.php:1504
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr ""
-
-#: classes/pref_feeds.php:1508
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr ""
-
-#: classes/pref_feeds.php:1512
-msgid "Published & shared articles / Generated feeds"
-msgstr ""
-
-#: classes/pref_feeds.php:1514
-msgid "Published articles and generated feeds"
-msgstr ""
-
-#: classes/pref_feeds.php:1516
-msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr ""
-
-#: classes/pref_feeds.php:1522
-msgid "Display URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1525
-msgid "Clear all generated URLs"
-msgstr ""
-
-#: classes/pref_feeds.php:1527
-msgid "Articles shared by URL"
-msgstr ""
-
-#: classes/pref_feeds.php:1529
-msgid "You can disable all articles shared by unique URLs here."
-msgstr ""
-
-#: classes/pref_feeds.php:1532
-msgid "Unshare all articles"
-msgstr ""
-
-#: classes/pref_feeds.php:1538
-msgid "Twitter"
-msgstr ""
-
-#: classes/pref_feeds.php:1547
-msgid ""
-"Before you can update your Twitter feeds, you must register this instance of "
-"Tiny Tiny RSS with Twitter.com."
-msgstr ""
-
-#: classes/pref_feeds.php:1549
-msgid ""
-"You have been successfully registered with Twitter.com and should be able to "
-"access your Twitter feeds."
-msgstr ""
-
-#: classes/pref_feeds.php:1553
-msgid "Register with Twitter.com"
-msgstr ""
-
-#: classes/pref_feeds.php:1559
-msgid "Clear stored credentials"
-msgstr ""
-
-#: classes/pref_filters.php:39
-msgid "Articles matching this filter:"
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_filters.php:89
-msgid "No articles matching this filter has been found."
+#: classes/opml.php:37
+msgid "Importing OPML..."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_filters.php:93
-msgid "Invalid regular expression."
+#: classes/opml.php:41
+msgid "Return to preferences"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_filters.php:533
+#: classes/opml.php:270

 #, php-format
 #, php-format

-msgid "Created filter <b>%s</b>"
-msgstr ""
-
-#: classes/pref_filters.php:596 classes/pref_instances.php:148
-#: classes/pref_users.php:391
-msgid "Edit"
-msgstr ""
-
-#: classes/pref_instances.php:13 classes/pref_users.php:6
-msgid "Your access level is insufficient to open this tab."
-msgstr ""
-
-#: classes/pref_instances.php:147
-msgid "Link instance"
+msgid "Adding feed: %s"

 msgstr ""
 
 msgstr ""
 

-#: 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 ""
-
-#: classes/pref_instances.php:169
-msgid "Last connected"
-msgstr ""
-
-#: classes/pref_instances.php:170
-msgid "Stored feeds"
-msgstr ""
-
-#: classes/pref_instances.php:188 classes/pref_users.php:460
-msgid "Click to edit"
-msgstr ""
-
-#: classes/pref_labels.php:22
-msgid "Caption"
-msgstr ""
-
-#: classes/pref_labels.php:37
-msgid "Colors"
-msgstr ""
-
-#: classes/pref_labels.php:42
-msgid "Foreground:"
-msgstr ""
-
-#: classes/pref_labels.php:42
-msgid "Background:"
-msgstr ""
-
-#: classes/pref_labels.php:232
+#: classes/opml.php:279

 #, php-format
 #, php-format

-msgid "Created label <b>%s</b>"
-msgstr ""
-
-#: classes/pref_labels.php:287
-msgid "Clear colors"
-msgstr ""
-
-#: classes/pref_prefs.php:17
-msgid "Old password cannot be blank."
-msgstr ""
-
-#: classes/pref_prefs.php:22
-msgid "New password cannot be blank."
+msgid "Duplicate feed: %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_prefs.php:27
-msgid "Entered passwords do not match."
-msgstr ""
-
-#: classes/pref_prefs.php:64
-msgid "Password has been changed."
-msgstr ""
-
-#: classes/pref_prefs.php:66
-msgid "Old password is incorrect."
-msgstr ""
-
-#: classes/pref_prefs.php:97
-msgid "The configuration was saved."
-msgstr ""
-
-#: classes/pref_prefs.php:112
+#: classes/opml.php:293

 #, php-format
 #, php-format

-msgid "Unknown option: %s"
-msgstr ""
-
-#: classes/pref_prefs.php:126
-msgid "Your personal data has been saved."
-msgstr ""
-
-#: classes/pref_prefs.php:166
-msgid "Personal data / Authentication"
-msgstr ""
-
-#: classes/pref_prefs.php:193
-msgid "Full name"
-msgstr ""
-
-#: classes/pref_prefs.php:197
-msgid "E-mail"
-msgstr ""
-
-#: classes/pref_prefs.php:203
-msgid "Access level"
-msgstr ""
-
-#: classes/pref_prefs.php:213
-msgid "Save data"
-msgstr ""
-
-#: classes/pref_prefs.php:224
-msgid "Your password is at default value, please change it."
-msgstr ""
-
-#: classes/pref_prefs.php:252
-msgid "Old password"
-msgstr ""
-
-#: classes/pref_prefs.php:255
-msgid "New password"
-msgstr ""
-
-#: classes/pref_prefs.php:260
-msgid "Confirm password"
-msgstr ""
-
-#: classes/pref_prefs.php:270
-msgid "Change password"
-msgstr ""
-
-#: classes/pref_prefs.php:356
-msgid "Select theme"
-msgstr ""
-
-#: classes/pref_prefs.php:408
-msgid "Customize"
-msgstr ""
-
-#: classes/pref_prefs.php:427 classes/pref_prefs.php:434
-#: classes/pref_prefs.php:439
-msgid "Yes"
-msgstr ""
-
-#: classes/pref_prefs.php:429 classes/pref_prefs.php:439
-msgid "No"
-msgstr ""
-
-#: classes/pref_prefs.php:473
-msgid "Clear"
-msgstr ""
-
-#: classes/pref_prefs.php:479
-#, php-format
-msgid "Current server time: %s (UTC)"
-msgstr ""
-
-#: classes/pref_prefs.php:504
-msgid "Save configuration"
-msgstr ""
-
-#: classes/pref_prefs.php:507
-msgid "Manage profiles"
-msgstr ""
-
-#: classes/pref_prefs.php:510
-msgid "Reset to defaults"
-msgstr ""
-
-#: classes/pref_users.php:27
-msgid "User details"
-msgstr ""
-
-#: classes/pref_users.php:41
-msgid "User not found"
-msgstr ""
-
-#: classes/pref_users.php:60 classes/pref_users.php:439
-msgid "Registered"
-msgstr ""
-
-#: classes/pref_users.php:61
-msgid "Last logged in"
-msgstr ""
-
-#: classes/pref_users.php:68
-msgid "Subscribed feeds count"
-msgstr ""
-
-#: classes/pref_users.php:72
-msgid "Subscribed feeds"
-msgstr ""
-
-#: classes/pref_users.php:122
-msgid "User Editor"
-msgstr ""
-
-#: classes/pref_users.php:158
-msgid "Access level: "
-msgstr ""
-
-#: classes/pref_users.php:171
-msgid "Change password to"
-msgstr ""
-
-#: classes/pref_users.php:180
-msgid "E-mail: "
+msgid "Adding label %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_users.php:257
+#: classes/opml.php:296

 #, php-format
 #, php-format

-msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgid "Duplicate label: %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_users.php:264
+#: classes/opml.php:308

 #, php-format
 #, php-format

-msgid "Could not create user <b>%s</b>"
+msgid "Setting preference key %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_users.php:268
-#, php-format
-msgid "User <b>%s</b> already exists."
+#: classes/opml.php:337
+msgid "Adding filter..."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_users.php:291
-#, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
+#: classes/opml.php:411 include/functions.php:1891 include/functions.php:1976
+#: include/functions.php:1998 include/functions.php:2854
+msgid "Uncategorized"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_users.php:298
+#: classes/opml.php:411

 #, php-format
 #, php-format

-msgid "Notifying <b>%s</b>."
-msgstr ""
-
-#: classes/pref_users.php:335
-msgid "[tt-rss] Password change notification"
-msgstr ""
-
-#: classes/pref_users.php:395
-msgid "Reset password"
-msgstr ""
-
-#: classes/pref_users.php:438
-msgid "Access Level"
-msgstr ""
-
-#: classes/pref_users.php:440
-msgid "Last login"
+msgid "Processing category: %s"

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_users.php:480
-msgid "No users defined."
+#: classes/opml.php:458
+msgid "Error: please upload OPML file."

 msgstr ""
 
 msgstr ""
 

-#: classes/pref_users.php:482
-msgid "No matching users found."
+#: classes/opml.php:465
+msgid "Error while parsing document."

 msgstr ""
 
 msgstr ""
 

-#: classes/rpc.php:426 include/functions.php:3388 include/functions.php:4153
+#: classes/rpc.php:420 include/functions.php:3385 include/functions.php:4161

 msgid "no tags"
 msgstr ""
 
 msgid "no tags"
 msgstr ""
 

-#: classes/rpc.php:742
+#: classes/rpc.php:736

 msgid "Your request could not be completed."
 msgstr ""
 
 msgid "Your request could not be completed."
 msgstr ""
 

-#: classes/rpc.php:746
+#: classes/rpc.php:740

 msgid "Feed update has been scheduled."
 msgstr ""
 
 msgid "Feed update has been scheduled."
 msgstr ""
 

-#: classes/rpc.php:754
+#: classes/rpc.php:748

 msgid "Category update has been scheduled."
 msgstr ""
 
 msgid "Category update has been scheduled."
 msgstr ""
 

-#: classes/rpc.php:767
+#: classes/rpc.php:761

 msgid "Can't update this kind of feed."
 msgstr ""
 
 msgid "Can't update this kind of feed."
 msgstr ""
 

-#: classes/share_button.php:7
-msgid "Share by URL"
-msgstr ""
-
-#: classes/share_button.php:29
-msgid "You can share this article by the following unique URL:"
-msgstr ""
-
-#: classes/tweet_button.php:7
-msgid "Share on Twitter"
+#: include/functions.php:669
+#, php-format
+msgid "Fatal: authentication module %s not found."

 msgstr ""
 
 msgstr ""
 

-#: include/functions.php:919
+#: include/functions.php:787

 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 

-#: include/functions.php:993
+#: include/functions.php:861

 msgid "Incorrect username or password"
 msgstr ""
 
 msgid "Incorrect username or password"
 msgstr ""
 

-#: include/functions.php:2099
+#: include/functions.php:2049

 msgid "Archived articles"
 msgstr ""
 
 msgid "Archived articles"
 msgstr ""
 

-#: include/functions.php:3232 js/viewfeed.js:1971
+#: include/functions.php:2051
+msgid "Recently read"
+msgstr ""
+
+#: include/functions.php:3223 js/viewfeed.js:1996

 msgid "Click to play"
 msgstr ""
 
 msgid "Click to play"
 msgstr ""
 

-#: include/functions.php:3233 js/viewfeed.js:1970
+#: include/functions.php:3224 js/viewfeed.js:1995

 msgid "Play"
 msgstr ""
 
 msgid "Play"
 msgstr ""
 

-#: include/functions.php:3359
+#: include/functions.php:3356

 msgid " - "
 msgstr ""
 
 msgid " - "
 msgstr ""
 

-#: include/functions.php:4178
+#: include/functions.php:3485
+msgid "Related"
+msgstr ""
+
+#: include/functions.php:4186

 msgid "(edit note)"
 msgstr ""
 
 msgid "(edit note)"
 msgstr ""
 

-#: include/functions.php:4591
+#: include/functions.php:4618

 msgid "No feed selected."
 msgstr ""
 
 msgid "No feed selected."
 msgstr ""
 

-#: include/functions.php:4775
+#: include/functions.php:4802

 msgid "unknown type"
 msgstr ""
 
 msgid "unknown type"
 msgstr ""
 

-#: include/functions.php:4815
-msgid "Attachment:"
+#: include/functions.php:4844
+msgid "Attachments"

 msgstr ""
 
 msgstr ""
 

-#: include/functions.php:4817
-msgid "Attachments:"
-msgstr ""
-
-#: include/functions.php:5261
+#: include/functions.php:5286

 #, php-format
 msgid "%d archived articles"
 msgstr ""
 
 #, php-format
 msgid "%d archived articles"
 msgstr ""
 

-#: include/functions.php:5285
+#: include/functions.php:5310

 msgid "No feeds found."
 msgstr ""
 
 msgid "No feeds found."
 msgstr ""
 

-#: include/functions.php:5331
+#: include/functions.php:5356

 msgid "Could not import: incorrect schema version."
 msgstr ""
 
 msgid "Could not import: incorrect schema version."
 msgstr ""
 

-#: include/functions.php:5336
+#: include/functions.php:5361

 msgid "Could not import: unrecognized document format."
 msgstr ""
 
 msgid "Could not import: unrecognized document format."
 msgstr ""
 

-#: include/functions.php:5495
+#: include/functions.php:5520

 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 

-#: include/functions.php:5501
+#: include/functions.php:5526

 msgid "Could not load XML document."
 msgstr ""
 
 msgid "Could not load XML document."
 msgstr ""
 


@@ -2119,7 +1376,7 @@ msgid "Set starred"
 msgstr ""
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730
 msgstr ""
 
 #: include/localized_schema.php:12 js/digest.js:262 js/digest.js:730

-#: js/viewfeed.js:466
+#: js/viewfeed.js:475

 msgid "Publish article"
 msgstr ""
 
 msgid "Publish article"
 msgstr ""
 


@@ -2127,7 +1384,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr ""
 
 msgid "Assign tags"
 msgstr ""
 

-#: include/localized_schema.php:14 js/viewfeed.js:1935
+#: include/localized_schema.php:14 js/viewfeed.js:1960

 msgid "Assign label"
 msgstr ""
 
 msgid "Assign label"
 msgstr ""
 


@@ -2194,11 +1451,11 @@ msgid ""
 msgstr ""
 
 #: include/localized_schema.php:29
 msgstr ""
 
 #: include/localized_schema.php:29

-msgid "Use feed-specified date to sort headlines instead of local import date."
+msgid "Customize CSS stylesheet to your liking"

 msgstr ""
 
 #: include/localized_schema.php:30
 msgstr ""
 
 #: include/localized_schema.php:30

-msgid "Customize CSS stylesheet to your liking"
+msgid "Use feed-specified date to sort headlines instead of local import date."

 msgstr ""
 
 #: include/localized_schema.php:31
 msgstr ""
 
 #: include/localized_schema.php:31


@@ -2210,7 +1467,7 @@ msgid "Uses UTC timezone"
 msgstr ""
 
 #: include/localized_schema.php:33
 msgstr ""
 
 #: include/localized_schema.php:33

-msgid "Purge old posts after this number of days (0 - disables)"
+msgid "Purge articles after this number of days (0 - disables)"

 msgstr ""
 
 #: include/localized_schema.php:34
 msgstr ""
 
 #: include/localized_schema.php:34


@@ -2317,12 +1574,12 @@ msgstr ""
 msgid "User timezone"
 msgstr ""
 
 msgid "User timezone"
 msgstr ""
 

-#: include/localized_schema.php:60
-msgid "Sort headlines by feed date"
+#: include/localized_schema.php:60 js/prefs.js:1865
+msgid "Customize stylesheet"

 msgstr ""
 
 msgstr ""
 

-#: include/localized_schema.php:61 js/prefs.js:1780
-msgid "Customize stylesheet"
+#: include/localized_schema.php:61
+msgid "Sort headlines by feed date"

 msgstr ""
 
 #: include/localized_schema.php:62
 msgstr ""
 
 #: include/localized_schema.php:62


@@ -2345,7 +1602,7 @@ msgstr ""
 msgid "Use less traffic"
 msgstr ""
 
 msgid "Use less traffic"
 msgstr ""
 

-#: js/digest.js:23 js/feedlist.js:470 js/feedlist.js:485
+#: js/digest.js:23 js/feedlist.js:501 js/feedlist.js:516

 msgid "Mark all articles in %s as read?"
 msgstr ""
 
 msgid "Mark all articles in %s as read?"
 msgstr ""
 


@@ -2353,15 +1610,19 @@ msgstr ""
 msgid "Mark %d displayed articles as read?"
 msgstr ""
 
 msgid "Mark %d displayed articles as read?"
 msgstr ""
 

-#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:421
+#: js/digest.js:239 js/PrefFilterTree.js:29
+msgid "in"
+msgstr ""
+
+#: js/digest.js:255 js/digest.js:690 js/viewfeed.js:430

 msgid "Unstar article"
 msgstr ""
 
 msgid "Unstar article"
 msgstr ""
 

-#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:426
+#: js/digest.js:257 js/digest.js:694 js/viewfeed.js:435

 msgid "Star article"
 msgstr ""
 
 msgid "Star article"
 msgstr ""
 

-#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:461
+#: js/digest.js:260 js/digest.js:725 js/viewfeed.js:470

 msgid "Unpublish article"
 msgstr ""
 
 msgid "Unpublish article"
 msgstr ""
 


@@ -2393,11 +1654,11 @@ msgstr ""
 msgid "Load more..."
 msgstr ""
 
 msgid "Load more..."
 msgstr ""
 

-#: js/feedlist.js:266
+#: js/feedlist.js:270

 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 

-#: js/FeedTree.js:140
+#: js/FeedTree.js:148

 msgid "Update feed"
 msgstr ""
 
 msgid "Update feed"
 msgstr ""
 


@@ -2407,123 +1668,131 @@ msgid ""
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 

-#: js/functions.js:647
+#: js/functions.js:618

 msgid "Date syntax appears to be correct:"
 msgstr ""
 
 msgid "Date syntax appears to be correct:"
 msgstr ""
 

-#: js/functions.js:650
+#: js/functions.js:621

 msgid "Date syntax is incorrect."
 msgstr ""
 
 msgid "Date syntax is incorrect."
 msgstr ""
 

-#: js/functions.js:777
+#: js/functions.js:748

 msgid "Remove stored feed icon?"
 msgstr ""
 
 msgid "Remove stored feed icon?"
 msgstr ""
 

-#: js/functions.js:809
+#: js/functions.js:780

 msgid "Please select an image file to upload."
 msgstr ""
 
 msgid "Please select an image file to upload."
 msgstr ""
 

-#: js/functions.js:811
+#: js/functions.js:782

 msgid "Upload new icon for this feed?"
 msgstr ""
 
 msgid "Upload new icon for this feed?"
 msgstr ""
 

-#: js/functions.js:828
+#: js/functions.js:799

 msgid "Please enter label caption:"
 msgstr ""
 
 msgid "Please enter label caption:"
 msgstr ""
 

-#: js/functions.js:833
+#: js/functions.js:804

 msgid "Can't create label: missing caption."
 msgstr ""
 
 msgid "Can't create label: missing caption."
 msgstr ""
 

-#: js/functions.js:875
+#: js/functions.js:846

 msgid "Subscribe to Feed"
 msgstr ""
 
 msgid "Subscribe to Feed"
 msgstr ""
 

-#: js/functions.js:883
-msgid "Subscribing to feed..."
-msgstr ""
-
-#: js/functions.js:901
+#: js/functions.js:873

 msgid "Subscribed to %s"
 msgstr ""
 
 msgid "Subscribed to %s"
 msgstr ""
 

-#: js/functions.js:906
+#: js/functions.js:878

 msgid "Specified URL seems to be invalid."
 msgstr ""
 
 msgid "Specified URL seems to be invalid."
 msgstr ""
 

-#: js/functions.js:909
+#: js/functions.js:881

 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 

-#: js/functions.js:945
-msgid "Couldn't download the specified URL."
+#: js/functions.js:917
+msgid "Couldn't download the specified URL: %s"

 msgstr ""
 
 msgstr ""
 

-#: js/functions.js:948
+#: js/functions.js:921

 msgid "You are already subscribed to this feed."
 msgstr ""
 
 msgid "You are already subscribed to this feed."
 msgstr ""
 

-#: js/functions.js:980
-msgid "Create Filter"
+#: js/functions.js:1049
+msgid "Edit rule"

 msgstr ""
 
 msgstr ""
 

-#: js/functions.js:1008 js/prefs.js:168
-msgid "Filter Test Results"
+#: js/functions.js:1049
+msgid "Add rule"

 msgstr ""
 
 msgstr ""
 

-#: js/functions.js:1068
+#: js/functions.js:1075
+msgid "Edit action"
+msgstr ""
+
+#: js/functions.js:1075
+msgid "Add action"
+msgstr ""
+
+#: js/functions.js:1112
+msgid "Create Filter"
+msgstr ""
+
+#: js/functions.js:1216

 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 

-#: js/functions.js:1089 js/tt-rss.js:394
+#: js/functions.js:1237 js/tt-rss.js:432

 msgid "Unsubscribe from %s?"
 msgstr ""
 
 msgid "Unsubscribe from %s?"
 msgstr ""
 

-#: js/functions.js:1196
+#: js/functions.js:1344

 msgid "Please enter category title:"
 msgstr ""
 
 msgid "Please enter category title:"
 msgstr ""
 

-#: js/functions.js:1227
+#: js/functions.js:1375

 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 

-#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:856
+#: js/functions.js:1566 js/tt-rss.js:411 js/tt-rss.js:895

 msgid "You can't edit this kind of feed."
 msgstr ""
 
 msgid "You can't edit this kind of feed."
 msgstr ""
 

-#: js/functions.js:1426
+#: js/functions.js:1581

 msgid "Edit Feed"
 msgstr ""
 
 msgid "Edit Feed"
 msgstr ""
 

-#: js/functions.js:1464
+#: js/functions.js:1619

 msgid "More Feeds"
 msgstr ""
 
 msgid "More Feeds"
 msgstr ""
 

-#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
-#: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
-#: js/prefs.js:1395
+#: js/functions.js:1680 js/functions.js:1790 js/prefs.js:417 js/prefs.js:447
+#: js/prefs.js:479 js/prefs.js:662 js/prefs.js:682 js/prefs.js:1335
+#: js/prefs.js:1480

 msgid "No feeds are selected."
 msgstr ""
 
 msgid "No feeds are selected."
 msgstr ""
 

-#: js/functions.js:1567
+#: js/functions.js:1722

 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 

-#: js/functions.js:1606
+#: js/functions.js:1761

 msgid "Feeds with update errors"
 msgstr ""
 
 msgid "Feeds with update errors"
 msgstr ""
 

-#: js/functions.js:1617 js/prefs.js:1232
+#: js/functions.js:1772 js/prefs.js:1317

 msgid "Remove selected feeds?"
 msgstr ""
 
 msgid "Remove selected feeds?"
 msgstr ""
 

-#: js/mail_button.js:7 js/viewfeed.js:641 js/viewfeed.js:669
-#: js/viewfeed.js:696 js/viewfeed.js:758 js/viewfeed.js:790 js/viewfeed.js:906
-#: js/viewfeed.js:949 js/viewfeed.js:999
+#: js/mail_button.js:7 js/viewfeed.js:650 js/viewfeed.js:678
+#: js/viewfeed.js:705 js/viewfeed.js:767 js/viewfeed.js:799 js/viewfeed.js:915
+#: js/viewfeed.js:958 js/viewfeed.js:1008

 msgid "No articles are selected."
 msgstr ""
 
 msgid "No articles are selected."
 msgstr ""
 


@@ -2531,6 +1800,18 @@ msgstr ""
 msgid "Forward article by email"
 msgstr ""
 
 msgid "Forward article by email"
 msgstr ""
 

+#: js/note_button.js:11
+msgid "Edit article note"
+msgstr ""
+
+#: js/PrefFeedTree.js:47
+msgid "Edit category"
+msgstr ""
+
+#: js/PrefFeedTree.js:54
+msgid "Remove category"
+msgstr ""
+

 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr ""
 #: js/PrefFilterTree.js:32
 msgid "Inverse"
 msgstr ""


@@ -2547,296 +1828,319 @@ msgstr ""
 msgid "Edit Filter"
 msgstr ""
 
 msgid "Edit Filter"
 msgstr ""
 

-#: js/prefs.js:141
-msgid "Remove filter %s?"
+#: js/prefs.js:184
+msgid "Remove filter?"

 msgstr ""
 
 msgstr ""
 

-#: js/prefs.js:275
+#: js/prefs.js:299

 msgid "Remove selected labels?"
 msgstr ""
 
 msgid "Remove selected labels?"
 msgstr ""
 

-#: js/prefs.js:291 js/prefs.js:1436
+#: js/prefs.js:315 js/prefs.js:1521

 msgid "No labels are selected."
 msgstr ""
 
 msgid "No labels are selected."
 msgstr ""
 

-#: js/prefs.js:305
+#: js/prefs.js:329

 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 

-#: js/prefs.js:322 js/prefs.js:503 js/prefs.js:524 js/prefs.js:563
+#: js/prefs.js:346 js/prefs.js:527 js/prefs.js:548 js/prefs.js:587

 msgid "No users are selected."
 msgstr ""
 
 msgid "No users are selected."
 msgstr ""
 

-#: js/prefs.js:340
+#: js/prefs.js:364

 msgid "Remove selected filters?"
 msgstr ""
 
 msgid "Remove selected filters?"
 msgstr ""
 

-#: js/prefs.js:355 js/prefs.js:593
+#: js/prefs.js:379 js/prefs.js:617 js/prefs.js:636

 msgid "No filters are selected."
 msgstr ""
 
 msgid "No filters are selected."
 msgstr ""
 

-#: js/prefs.js:374
+#: js/prefs.js:398

 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 
 msgid "Unsubscribe from selected feeds?"
 msgstr ""
 

-#: js/prefs.js:408
+#: js/prefs.js:432

 msgid "Please select only one feed."
 msgstr ""
 
 msgid "Please select only one feed."
 msgstr ""
 

-#: js/prefs.js:414
+#: js/prefs.js:438

 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 
 msgid "Erase all non-starred articles in selected feed?"
 msgstr ""
 

-#: js/prefs.js:436
+#: js/prefs.js:460

 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 

-#: js/prefs.js:474
+#: js/prefs.js:498

 msgid "Login field cannot be blank."
 msgstr ""
 
 msgid "Login field cannot be blank."
 msgstr ""
 

-#: js/prefs.js:508 js/prefs.js:529 js/prefs.js:568
+#: js/prefs.js:532 js/prefs.js:553 js/prefs.js:592

 msgid "Please select only one user."
 msgstr ""
 
 msgid "Please select only one user."
 msgstr ""
 

-#: js/prefs.js:533
+#: js/prefs.js:557

 msgid "Reset password of selected user?"
 msgstr ""
 
 msgid "Reset password of selected user?"
 msgstr ""
 

-#: js/prefs.js:598
+#: js/prefs.js:622

 msgid "Please select only one filter."
 msgstr ""
 
 msgid "Please select only one filter."
 msgstr ""
 

-#: js/prefs.js:655
+#: js/prefs.js:640
+msgid "Combine selected filters?"
+msgstr ""
+
+#: js/prefs.js:704

 msgid "Edit Multiple Feeds"
 msgstr ""
 
 msgid "Edit Multiple Feeds"
 msgstr ""
 

-#: js/prefs.js:679
+#: js/prefs.js:728

 msgid "Save changes to selected feeds?"
 msgstr ""
 
 msgid "Save changes to selected feeds?"
 msgstr ""
 

-#: js/prefs.js:771
+#: js/prefs.js:820

 msgid "OPML Import"
 msgstr ""
 
 msgid "OPML Import"
 msgstr ""
 

-#: js/prefs.js:798
+#: js/prefs.js:847

 msgid "Please choose an OPML file first."
 msgstr ""
 
 msgid "Please choose an OPML file first."
 msgstr ""
 

-#: js/prefs.js:814
+#: js/prefs.js:863

 msgid "Please choose the file first."
 msgstr ""
 
 msgid "Please choose the file first."
 msgstr ""
 

-#: js/prefs.js:941
+#: js/prefs.js:1019

 msgid "Reset to defaults?"
 msgstr ""
 
 msgid "Reset to defaults?"
 msgstr ""
 

-#: js/prefs.js:1152
-msgid "Feed Categories"
+#: js/prefs.js:1224
+msgid ""
+"Remove category %s? Any nested feeds would be placed into Uncategorized."

 msgstr ""
 
 msgstr ""
 

-#: js/prefs.js:1161
+#: js/prefs.js:1251

 msgid "Remove selected categories?"
 msgstr ""
 
 msgid "Remove selected categories?"
 msgstr ""
 

-#: js/prefs.js:1180
+#: js/prefs.js:1267

 msgid "No categories are selected."
 msgstr ""
 
 msgid "No categories are selected."
 msgstr ""
 

-#: js/prefs.js:1221
+#: js/prefs.js:1275
+msgid "Category title:"
+msgstr ""
+
+#: js/prefs.js:1306

 msgid "Feeds without recent updates"
 msgstr ""
 
 msgid "Feeds without recent updates"
 msgstr ""
 

-#: js/prefs.js:1270
+#: js/prefs.js:1355

 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 
 msgid "Replace current OPML publishing address with a new one?"
 msgstr ""
 

-#: js/prefs.js:1379
+#: js/prefs.js:1464

 msgid "Rescore articles in selected feeds?"
 msgstr ""
 
 msgid "Rescore articles in selected feeds?"
 msgstr ""
 

-#: js/prefs.js:1402
+#: js/prefs.js:1487

 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 

-#: js/prefs.js:1422
+#: js/prefs.js:1507

 msgid "Reset selected labels to default colors?"
 msgstr ""
 
 msgid "Reset selected labels to default colors?"
 msgstr ""
 

-#: js/prefs.js:1459
+#: js/prefs.js:1544

 msgid "Settings Profiles"
 msgstr ""
 
 msgid "Settings Profiles"
 msgstr ""
 

-#: js/prefs.js:1468
+#: js/prefs.js:1553

 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 

-#: js/prefs.js:1486
+#: js/prefs.js:1571

 msgid "No profiles are selected."
 msgstr ""
 
 msgid "No profiles are selected."
 msgstr ""
 

-#: js/prefs.js:1494 js/prefs.js:1547
+#: js/prefs.js:1579 js/prefs.js:1632

 msgid "Activate selected profile?"
 msgstr ""
 
 msgid "Activate selected profile?"
 msgstr ""
 

-#: js/prefs.js:1510 js/prefs.js:1563
+#: js/prefs.js:1595 js/prefs.js:1648

 msgid "Please choose a profile to activate."
 msgstr ""
 
 msgid "Please choose a profile to activate."
 msgstr ""
 

-#: js/prefs.js:1571
+#: js/prefs.js:1656

 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1590
+#: js/prefs.js:1675

 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr ""
 

-#: js/prefs.js:1688
+#: js/prefs.js:1773

 msgid "Label Editor"
 msgstr ""
 
 msgid "Label Editor"
 msgstr ""
 

-#: js/prefs.js:1751
+#: js/prefs.js:1836

 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
 

-#: js/prefs.js:1822
+#: js/prefs.js:1907

 msgid "Link Instance"
 msgstr ""
 
 msgid "Link Instance"
 msgstr ""
 

-#: js/prefs.js:1873
+#: js/prefs.js:1958

 msgid "Edit Instance"
 msgstr ""
 
 msgid "Edit Instance"
 msgstr ""
 

-#: js/prefs.js:1922
+#: js/prefs.js:2007

 msgid "Remove selected instances?"
 msgstr ""
 
 msgid "Remove selected instances?"
 msgstr ""
 

-#: js/prefs.js:1939 js/prefs.js:1951
+#: js/prefs.js:2024 js/prefs.js:2036

 msgid "No instances are selected."
 msgstr ""
 
 msgid "No instances are selected."
 msgstr ""
 

-#: js/prefs.js:1956
+#: js/prefs.js:2041

 msgid "Please select only one instance."
 msgstr ""
 
 msgid "Please select only one instance."
 msgstr ""
 

-#: js/prefs.js:1991
+#: js/prefs.js:2076

 msgid "Export Data"
 msgstr ""
 
 msgid "Export Data"
 msgstr ""
 

-#: js/prefs.js:2018
+#: js/prefs.js:2103

 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 

-#: js/prefs.js:2071
+#: js/prefs.js:2156

 msgid "Data Import"
 msgstr ""
 
 msgid "Data Import"
 msgstr ""
 

-#: js/prefs.js:2106
+#: js/prefs.js:2185
+msgid "Batch subscribe"
+msgstr ""
+
+#: js/prefs.js:2191

 msgid "Subscribing to feeds..."
 msgstr ""
 
 msgid "Subscribing to feeds..."
 msgstr ""
 

+#: js/prefs.js:2219
+msgid "Update Tiny Tiny RSS"
+msgstr ""
+
+#: js/prefs.js:2267
+msgid ""
+"Live updating is considered experimental. Backup your tt-rss directory "
+"before continuing. Please type 'yes' to continue."
+msgstr ""
+

 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr ""
 
 #: js/share_button.js:10
 msgid "Share article by URL"
 msgstr ""
 

-#: js/tt-rss.js:146
+#: js/tt-rss.js:151

 msgid "Mark all articles as read?"
 msgstr ""
 
 msgid "Mark all articles as read?"
 msgstr ""
 

-#: js/tt-rss.js:383
+#: js/tt-rss.js:421

 msgid "You can't unsubscribe from the category."
 msgstr ""
 
 msgid "You can't unsubscribe from the category."
 msgstr ""
 

-#: js/tt-rss.js:388 js/tt-rss.js:568 js/tt-rss.js:1014
+#: js/tt-rss.js:426 js/tt-rss.js:607 js/tt-rss.js:1053

 msgid "Please select some feed first."
 msgstr ""
 
 msgid "Please select some feed first."
 msgstr ""
 

-#: js/tt-rss.js:563
+#: js/tt-rss.js:602

 msgid "You can't rescore this kind of feed."
 msgstr ""
 
 msgid "You can't rescore this kind of feed."
 msgstr ""
 

-#: js/tt-rss.js:573
+#: js/tt-rss.js:612

 msgid "Rescore articles in %s?"
 msgstr ""
 
 msgid "Rescore articles in %s?"
 msgstr ""
 

-#: js/tt-rss.js:1054
+#: js/tt-rss.js:1093

 msgid "New version available!"
 msgstr ""
 
 msgid "New version available!"
 msgstr ""
 

-#: js/viewfeed.js:886
+#: js/viewfeed.js:895

 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
 msgid "Mark all visible articles in %s as read?"
 msgstr ""
 

-#: js/viewfeed.js:914
+#: js/viewfeed.js:923

 msgid "Delete %d selected articles in %s?"
 msgstr ""
 
 msgid "Delete %d selected articles in %s?"
 msgstr ""
 

-#: js/viewfeed.js:916
+#: js/viewfeed.js:925

 msgid "Delete %d selected articles?"
 msgstr ""
 
 msgid "Delete %d selected articles?"
 msgstr ""
 

-#: js/viewfeed.js:958
+#: js/viewfeed.js:967

 msgid "Archive %d selected articles in %s?"
 msgstr ""
 
 msgid "Archive %d selected articles in %s?"
 msgstr ""
 

-#: js/viewfeed.js:961
+#: js/viewfeed.js:970

 msgid "Move %d archived articles back?"
 msgstr ""
 
 msgid "Move %d archived articles back?"
 msgstr ""
 

-#: js/viewfeed.js:1005
+#: js/viewfeed.js:1014

 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 
 msgid "Mark %d selected articles in %s as read?"
 msgstr ""
 

-#: js/viewfeed.js:1029
+#: js/viewfeed.js:1038

 msgid "Edit article Tags"
 msgstr ""
 
 msgid "Edit article Tags"
 msgstr ""
 

-#: js/viewfeed.js:1186
+#: js/viewfeed.js:1199

 msgid "No article is selected."
 msgstr ""
 
 msgid "No article is selected."
 msgstr ""
 

-#: js/viewfeed.js:1221
+#: js/viewfeed.js:1234

 msgid "No articles found to mark"
 msgstr ""
 
 msgid "No articles found to mark"
 msgstr ""
 

-#: js/viewfeed.js:1223
+#: js/viewfeed.js:1236

 msgid "Mark %d article(s) as read?"
 msgstr ""
 
 msgid "Mark %d article(s) as read?"
 msgstr ""
 

-#: js/viewfeed.js:1387
+#: js/viewfeed.js:1400

 msgid "Loading..."
 msgstr ""
 
 msgid "Loading..."
 msgstr ""
 

-#: js/viewfeed.js:1874
+#: js/viewfeed.js:1889

 msgid "Open original article"
 msgstr ""
 
 msgid "Open original article"
 msgstr ""
 

-#: js/viewfeed.js:1880
+#: js/viewfeed.js:1895

 msgid "View in a tt-rss tab"
 msgstr ""
 
 msgid "View in a tt-rss tab"
 msgstr ""
 

-#: js/viewfeed.js:1888
+#: js/viewfeed.js:1903

 msgid "Mark above as read"
 msgstr ""
 
 msgid "Mark above as read"
 msgstr ""
 

-#: js/viewfeed.js:1894
+#: js/viewfeed.js:1909

 msgid "Mark below as read"
 msgstr ""
 
 msgid "Mark below as read"
 msgstr ""
 

-#: js/viewfeed.js:1940
+#: js/viewfeed.js:1965

 msgid "Remove label"
 msgstr ""
 
 msgid "Remove label"
 msgstr ""
 

-#: js/viewfeed.js:1964
+#: js/viewfeed.js:1989

 msgid "Playing..."
 msgstr ""
 
 msgid "Playing..."
 msgstr ""
 

-#: js/viewfeed.js:1965
+#: js/viewfeed.js:1990

 msgid "Click to pause"
 msgstr ""
 msgid "Click to pause"
 msgstr ""